diff --git a/docs-web/src/main/webapp/package.json b/docs-web/src/main/webapp/package.json
index d3daccdf..da4c9ba5 100644
--- a/docs-web/src/main/webapp/package.json
+++ b/docs-web/src/main/webapp/package.json
@@ -43,13 +43,11 @@
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-less": "^1.3.0",
+    "grunt-contrib-less": "^1.4.1",
     "grunt-contrib-uglify": "^1.0.1",
     "grunt-css": "^0.5.4",
     "grunt-htmlrefs": "^0.5.0",
     "grunt-ng-annotate": "^2.0.2",
-    "grunt-text-replace": "^0.4.0",
-    "protractor": "^3.3.0",
-    "selenium": "^2.20.0"
+    "grunt-text-replace": "^0.4.0"
   }
 }
diff --git a/docs-web/src/main/webapp/src/app/docs/app.js b/docs-web/src/main/webapp/src/app/docs/app.js
index c8407ab5..0f72ac61 100644
--- a/docs-web/src/main/webapp/src/app/docs/app.js
+++ b/docs-web/src/main/webapp/src/app/docs/app.js
@@ -5,14 +5,16 @@
  */
 angular.module('docs',
     // Dependencies
-    ['ui.router', 'ui.route', 'ui.bootstrap', 'ui.keypress', 'ui.validate', 'dialog', 'ngProgress', 'monospaced.qrcode', 'yaru22.angular-timeago',
-      'ui.sortable', 'restangular', 'ngSanitize', 'ngTouch', 'colorpicker.module', 'angularFileUpload', 'pascalprecht.translate']
+    ['ui.router', 'ui.bootstrap', 'dialog', 'ngProgress', 'monospaced.qrcode', 'yaru22.angular-timeago', 'ui.validate',
+      'ui.sortable', 'restangular', 'ngSanitize', 'ngTouch', 'colorpicker.module', 'ngFileUpload', 'pascalprecht.translate']
   )
 
 /**
  * Configuring modules.
  */
-.config(function($stateProvider, $httpProvider, RestangularProvider, $translateProvider, timeAgoSettings) {
+.config(function($locationProvider, $urlRouterProvider, $stateProvider, $httpProvider, RestangularProvider, $translateProvider, timeAgoSettings) {
+  $locationProvider.hashPrefix('');
+
   // Configuring UI Router
   $stateProvider
     .state('main', {
@@ -417,20 +419,6 @@ angular.module('docs',
     $rootScope.appName = data.name;
   });
 })
-/**
- * Redirection support for ui-router.
- * Thanks to https://github.com/acollard
- * See https://github.com/angular-ui/ui-router/issues/1584#issuecomment-76993045
- */
-.run(function($rootScope, $state){
-  $rootScope.$on('$stateChangeStart', function(event, toState, toParams) {
-    var redirect = toState.redirectTo;
-    if (redirect) {
-      event.preventDefault();
-      $state.go(redirect, toParams);
-    }
-  });
-})
 /**
  * Initialize ngProgress.
  */
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js b/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js
index 4497d41a..3e40cad2 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js
@@ -3,7 +3,7 @@
 /**
  * Document controller.
  */
-angular.module('docs').controller('Document', function($scope, $timeout, $state, Restangular) {
+angular.module('docs').controller('Document', function ($scope, $rootScope, $timeout, $state, Restangular) {
   /**
    * Documents table sort status.
    */
@@ -13,7 +13,7 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   $scope.currentPage = 1;
   $scope.limit = _.isUndefined(localStorage.documentsPageSize) ? 10 : localStorage.documentsPageSize;
   $scope.search = $state.params.search ? $state.params.search : '';
-  $scope.setSearch = function(search) { $scope.search = search };
+  $scope.setSearch = function (search) { $scope.search = search };
 
   // A timeout promise is used to slow down search requests to the server
   // We keep track of it for cancellation purpose
@@ -22,9 +22,9 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Load new documents page.
    */
-  $scope.pageDocuments = function() {
-    Restangular.one('document')
-        .getList('list', {
+  $scope.pageDocuments = function () {
+    Restangular.one('document/list')
+        .get({
           offset: $scope.offset,
           limit: $scope.limit,
           sort_column: $scope.sortColumn,
@@ -40,7 +40,7 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Reload documents.
    */
-  $scope.loadDocuments = function() {
+  $scope.loadDocuments = function () {
     $scope.offset = 0;
     $scope.currentPage = 1;
     $scope.pageDocuments();
@@ -49,8 +49,8 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Watch for current page change.
    */
-  $scope.$watch('currentPage', function(prev, next) {
-    if (prev == next) {
+  $scope.$watch('currentPage', function (prev, next) {
+    if (prev === next) {
       return;
     }
     $scope.offset = ($scope.currentPage - 1) * $scope.limit;
@@ -60,15 +60,15 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Watch for search scope change.
    */
-  $scope.$watch('search', function() {
+  $scope.$watch('search', function () {
     if (timeoutPromise) {
       // Cancel previous timeout
       $timeout.cancel(timeoutPromise);
     }
 
-    if ($state.current.name == 'document.default'
-        || $state.current.name == 'document.default.search') {
-      $state.go($scope.search == '' ?
+    if ($state.current.name === 'document.default'
+        || $state.current.name === 'document.default.search') {
+      $state.go($scope.search === '' ?
           'document.default' : 'document.default.search', {
         search: $scope.search
       }, {
@@ -86,8 +86,8 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Sort documents.
    */
-  $scope.sortDocuments = function(sortColumn) {
-    if (sortColumn == $scope.sortColumn) {
+  $scope.sortDocuments = function (sortColumn) {
+    if (sortColumn === $scope.sortColumn) {
       $scope.asc = !$scope.asc;
     } else {
       $scope.asc = true;
@@ -99,9 +99,9 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Watch for page size change.
    */
-  $scope.$watch('limit', function(next, prev) {
+  $scope.$watch('limit', function (next, prev) {
     localStorage.documentsPageSize = next;
-    if (next == prev) {
+    if (next === prev) {
       return;
     }
     $scope.loadDocuments();
@@ -110,13 +110,13 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
   /**
    * Display a document.
    */
-  $scope.viewDocument = function(id) {
+  $scope.viewDocument = function (id) {
     $state.go('document.view', { id: id });
   };
 
   // Load tags
   var tags = [];
-  Restangular.one('tag/list').getList().then(function(data) {
+  Restangular.one('tag/list').get().then(function (data) {
     tags = data.tags;
   });
 
@@ -126,7 +126,16 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
    */
   $scope.getChildrenTags = function(parent) {
     return _.filter(tags, function(tag) {
-      return tag.parent == parent;
+      return tag.parent === parent;
     });
   };
+
+  // Hack to reload the pagination directive after language change
+  $scope.paginationShown = true;
+  $rootScope.$on('$translateChangeSuccess', function () {
+    $scope.paginationShown = false;
+    $timeout(function () {
+      $scope.paginationShown = true;
+    });
+  })
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js
index ea370ac1..fd0e998b 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js
@@ -3,7 +3,7 @@
 /**
  * Document default controller.
  */
-angular.module('docs').controller('DocumentDefault', function($scope, $rootScope, $state, Restangular, $upload, $translate) {
+angular.module('docs').controller('DocumentDefault', function($scope, $rootScope, $state, Restangular, Upload, $translate) {
   // Load user audit log
   Restangular.one('auditlog').get().then(function(data) {
     $scope.logs = data.logs;
@@ -13,7 +13,7 @@ angular.module('docs').controller('DocumentDefault', function($scope, $rootScope
    * Load unlinked files.
    */
   $scope.loadFiles = function() {
-    Restangular.one('file').getList('list').then(function (data) {
+    Restangular.one('file/list').get().then(function (data) {
       $scope.files = data.files;
       // TODO Keep currently uploading files
     });
@@ -59,7 +59,7 @@ angular.module('docs').controller('DocumentDefault', function($scope, $rootScope
   $scope.uploadFile = function(file, newfile) {
     // Upload the file
     newfile.status = $translate.instant('document.default.upload_progress');
-    return $upload.upload({
+    return Upload.upload({
       method: 'PUT',
       url: '../api/file',
       file: file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
index 65e19ea5..ce642fe9 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
@@ -11,7 +11,7 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $
   $scope.vocabularies = [];
 
   // Orphan files to add
-  $scope.orphanFiles = $stateParams.files ? $stateParams.files.split(',') : [];
+  $scope.orphanFiles = $stateParams.files ? $stateParams.files : [];
 
   /**
    * Close an alert.
@@ -25,8 +25,8 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $
    */
   $scope.getTitleTypeahead = function($viewValue) {
     var deferred = $q.defer();
-    Restangular.one('document')
-    .getList('list', {
+    Restangular.one('document/list')
+    .get({
       limit: 5,
       sort_column: 1,
       asc: true,
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalPdf.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalPdf.js
index ed8ab96c..c1dac720 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalPdf.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalPdf.js
@@ -3,7 +3,7 @@
 /**
  * Document modal PDF controller.
  */
-angular.module('docs').controller('DocumentModalPdf', function ($scope, $window, $stateParams, $modalInstance) {
+angular.module('docs').controller('DocumentModalPdf', function ($scope, $window, $stateParams, $uibModalInstance) {
   $scope.export = {
     metadata: false,
     comments: false,
@@ -19,11 +19,11 @@ angular.module('docs').controller('DocumentModalPdf', function ($scope, $window,
         + '&fitimagetopage=' + $scope.export.fitimagetopage
         + '&margin=' + $scope.export.margin);
 
-    $modalInstance.close();
+    $uibModalInstance.close();
   };
 
   // Close the modal
   $scope.close = function () {
-    $modalInstance.close();
+    $uibModalInstance.close();
   }
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalShare.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalShare.js
index 2695591d..aa0f5f76 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalShare.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalShare.js
@@ -3,9 +3,9 @@
 /**
  * Document modal share controller.
  */
-angular.module('docs').controller('DocumentModalShare', function ($scope, $modalInstance) {
+angular.module('docs').controller('DocumentModalShare', function ($scope, $uibModalInstance) {
   $scope.name = '';
   $scope.close = function(name) {
-    $modalInstance.close(name);
+    $uibModalInstance.close(name);
   }
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js
index 67a22779..73368b92 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js
@@ -3,7 +3,7 @@
 /**
  * Document view controller.
  */
-angular.module('docs').controller('DocumentView', function ($scope, $state, $stateParams, $location, $dialog, $modal, Restangular, $translate) {
+angular.module('docs').controller('DocumentView', function ($scope, $state, $stateParams, $location, $dialog, $uibModal, Restangular, $translate) {
   // Load document data from server
   Restangular.one('document', $stateParams.id).get().then(function(data) {
     $scope.document = data;
@@ -81,7 +81,7 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
    * Open the share dialog.
    */
   $scope.share = function () {
-    $modal.open({
+    $uibModal.open({
       templateUrl: 'partial/docs/document.share.html',
       controller: 'DocumentModalShare'
     }).result.then(function (name) {
@@ -131,7 +131,7 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
    * Export the current document to PDF.
    */
   $scope.exportPdf = function() {
-    $modal.open({
+    $uibModal.open({
       templateUrl: 'partial/docs/document.pdf.html',
       controller: 'DocumentModalPdf'
     });
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js
index d6e456d9..2d33e949 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js
@@ -3,7 +3,7 @@
 /**
  * Document view content controller.
  */
-angular.module('docs').controller('DocumentViewContent', function ($scope, $rootScope, $stateParams, Restangular, $dialog, $state, $upload, $translate) {
+angular.module('docs').controller('DocumentViewContent', function ($scope, $rootScope, $stateParams, Restangular, $dialog, $state, Upload, $translate) {
   /**
    * Configuration for file sorting.
    */
@@ -27,7 +27,7 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root
    * Load files from server.
    */
   $scope.loadFiles = function () {
-    Restangular.one('file').getList('list', { id: $stateParams.id }).then(function (data) {
+    Restangular.one('file/list').get({ id: $stateParams.id }).then(function (data) {
       $scope.files = data.files;
       // TODO Keep currently uploading files
     });
@@ -53,7 +53,7 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root
     ];
 
     $dialog.messageBox(title, msg, btns, function (result) {
-      if (result == 'ok') {
+      if (result === 'ok') {
         Restangular.one('file', file.id).remove().then(function () {
           // File deleted, decrease used quota
           $rootScope.userInfo.storage_current -= file.size;
@@ -105,7 +105,7 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root
   $scope.uploadFile = function(file, newfile) {
     // Upload the file
     newfile.status = $translate.instant('document.view.content.upload_progress');
-    return $upload.upload({
+    return Upload.upload({
       method: 'PUT',
       url: '../api/file',
       file: file,
@@ -126,7 +126,7 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root
         })
         .error(function (data) {
           newfile.status = $translate.instant('document.view.content.upload_error');
-          if (data.type == 'QuotaReached') {
+          if (data.type === 'QuotaReached') {
             newfile.status += ' - ' + $translate.instant('document.view.content.upload_error_quota');
           }
         });
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/FileModalView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/FileModalView.js
index fd5f1b55..ae4baf6a 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/FileModalView.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/FileModalView.js
@@ -3,14 +3,14 @@
 /**
  * File modal view controller.
  */
-angular.module('docs').controller('FileModalView', function($rootScope, $modalInstance, $scope, $state, $stateParams, Restangular) {
+angular.module('docs').controller('FileModalView', function($uibModalInstance, $scope, $state, $stateParams, Restangular, $transitions) {
   // Load files
-  Restangular.one('file').getList('list', { id: $stateParams.id }).then(function(data) {
+  Restangular.one('file/list').get({ id: $stateParams.id }).then(function(data) {
     $scope.files = data.files;
 
     // Search current file
     _.each($scope.files, function(value) {
-      if (value.id == $stateParams.fileId) {
+      if (value.id === $stateParams.fileId) {
         $scope.file = value;
       }
     });
@@ -21,7 +21,7 @@ angular.module('docs').controller('FileModalView', function($rootScope, $modalIn
    */
   $scope.nextFile = function() {
     _.each($scope.files, function(value, key) {
-      if (value.id == $stateParams.fileId) {
+      if (value.id === $stateParams.fileId) {
         var next = $scope.files[key + 1];
         if (next) {
           $state.go('^.file', { id: $stateParams.id, fileId: next.id });
@@ -35,7 +35,7 @@ angular.module('docs').controller('FileModalView', function($rootScope, $modalIn
    */
   $scope.previousFile = function() {
     _.each($scope.files, function(value, key) {
-      if (value.id == $stateParams.fileId) {
+      if (value.id === $stateParams.fileId) {
         var previous = $scope.files[key - 1];
         if (previous) {
           $state.go('^.file', { id: $stateParams.id, fileId: previous.id });
@@ -66,16 +66,16 @@ angular.module('docs').controller('FileModalView', function($rootScope, $modalIn
    * Close the file preview.
    */
   $scope.closeFile = function () {
-    $modalInstance.dismiss();
+    $uibModalInstance.dismiss();
   };
 
   // Close the modal when the user exits this state
-  var off = $rootScope.$on('$stateChangeStart', function(event, toState) {
-    if (!$modalInstance.closed) {
-      if (toState.name == $state.current.name) {
-        $modalInstance.close();
+  var off = $transitions.onStart({}, function(transition) {
+    if (!$uibModalInstance.closed) {
+      if (transition.to().name === $state.current.name) {
+        $uibModalInstance.close();
       } else {
-        $modalInstance.dismiss();
+        $uibModalInstance.dismiss();
       }
     }
     off();
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js
index 02c887d2..45b86c10 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js
@@ -3,8 +3,8 @@
 /**
  * File view controller.
  */
-angular.module('docs').controller('FileView', function($modal, $state, $stateParams) {
-  var modal = $modal.open({
+angular.module('docs').controller('FileView', function($uibModal, $state, $stateParams) {
+  var modal = $uibModal.open({
     windowClass: 'modal modal-fileview',
     templateUrl: 'partial/docs/file.view.html',
     controller: 'FileModalView'
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js
index 5e0532d5..7efaac1d 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js
@@ -26,7 +26,7 @@ angular.module('docs').controller('SettingsConfig', function($scope, $rootScope,
 
   // Update the theme
   $scope.update = function() {
-    $scope.theme.name = $scope.theme.name.length == 0 ? 'Sismics Docs' : $scope.theme.name;
+    $scope.theme.name = $scope.theme.name.length === 0 ? 'Sismics Docs' : $scope.theme.name;
     Restangular.one('theme').post('', $scope.theme).then(function() {
       var stylesheet = $('#theme-stylesheet')[0];
       stylesheet.href = stylesheet.href.replace(/\?.*|$/, '?' + new Date().getTime());
@@ -39,7 +39,7 @@ angular.module('docs').controller('SettingsConfig', function($scope, $rootScope,
   $scope.sendImage = function(type, image) {
     // Build the payload
     var formData = new FormData();
-    formData.append('image', image[0]);
+    formData.append('image', image);
 
     // Send the file
     var done = function() {
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroupEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroupEdit.js
index 21db3000..3650c480 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroupEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroupEdit.js
@@ -60,7 +60,7 @@ angular.module('docs').controller('SettingsGroupEdit', function($scope, $dialog,
     ];
 
     $dialog.messageBox(title, msg, btns, function(result) {
-      if (result == 'ok') {
+      if (result === 'ok') {
         Restangular.one('group', $stateParams.name).remove().then(function() {
           $scope.loadGroups();
           $state.go('settings.group');
@@ -77,7 +77,7 @@ angular.module('docs').controller('SettingsGroupEdit', function($scope, $dialog,
   $scope.getGroupTypeahead = function($viewValue) {
     var deferred = $q.defer();
     Restangular.one('group')
-        .getList('', {
+        .get({
           sort_column: 1,
           asc: true
         }).then(function(data) {
@@ -93,8 +93,8 @@ angular.module('docs').controller('SettingsGroupEdit', function($scope, $dialog,
    */
   $scope.getUserTypeahead = function($viewValue) {
     var deferred = $q.defer();
-    Restangular.one('user')
-        .getList('list', {
+    Restangular.one('user/list')
+        .get({
           search: $viewValue,
           sort_column: 1,
           asc: true
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js
index 27946f37..c1e2a0d7 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js
@@ -3,7 +3,7 @@
 /**
  * Settings security controller.
  */
-angular.module('docs').controller('SettingsSecurity', function($scope, User, $dialog, $modal, Restangular, $translate) {
+angular.module('docs').controller('SettingsSecurity', function($scope, User, $dialog, $uibModal, Restangular, $translate) {
   User.userInfo().then(function(data) {
     $scope.user = data;
   });
@@ -20,7 +20,7 @@ angular.module('docs').controller('SettingsSecurity', function($scope, User, $di
     ];
 
     $dialog.messageBox(title, msg, btns, function(result) {
-      if (result == 'ok') {
+      if (result === 'ok') {
         Restangular.one('user/enable_totp').post().then(function(data) {
           $scope.secret = data.secret;
           User.userInfo(true).then(function(data) {
@@ -35,11 +35,11 @@ angular.module('docs').controller('SettingsSecurity', function($scope, User, $di
    * Disable TOTP.
    */
   $scope.disableTotp = function() {
-    $modal.open({
+    $uibModal.open({
       templateUrl: 'partial/docs/settings.security.disabletotp.html',
       controller: 'SettingsSecurityModalDisableTotp'
     }).result.then(function (password) {
-      if (password == null) {
+      if (password === null) {
         return;
       }
 
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurityModalDisableTotp.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurityModalDisableTotp.js
index 2f588bdb..d0c082b9 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurityModalDisableTotp.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurityModalDisableTotp.js
@@ -3,9 +3,9 @@
 /**
  * Settings modal disable TOTP controller.
  */
-angular.module('docs').controller('SettingsSecurityModalDisableTotp', function ($scope, $modalInstance) {
+angular.module('docs').controller('SettingsSecurityModalDisableTotp', function ($scope, $uibModalInstance) {
   $scope.password = '';
   $scope.close = function(password) {
-    $modalInstance.close(password);
+    $uibModalInstance.close(password);
   }
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSession.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSession.js
index 26f2957c..cc1be24e 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSession.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSession.js
@@ -8,7 +8,7 @@ angular.module('docs').controller('SettingsSession', function($scope, Restangula
    * Load sessions.
    */
   $scope.loadSession = function() {
-    Restangular.one('user').getList('session').then(function(data) {
+    Restangular.one('user/session').get().then(function(data) {
       $scope.sessions = data.sessions;
     });
   };
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/tag/TagEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/tag/TagEdit.js
index 5905fbba..1df1c2d2 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/tag/TagEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/tag/TagEdit.js
@@ -10,7 +10,7 @@ angular.module('docs').controller('TagEdit', function($scope, $stateParams, Rest
 
     // Replace the tag from the list with this reference
     _.each($scope.tags, function(tag, i) {
-      if (tag.id == $scope.tag.id) {
+      if (tag.id === $scope.tag.id) {
         $scope.tags[i] = $scope.tag;
       }
     });
@@ -36,7 +36,7 @@ angular.module('docs').controller('TagEdit', function($scope, $stateParams, Rest
     ];
 
     $dialog.messageBox(title, msg, btns, function(result) {
-      if (result == 'ok') {
+      if (result === 'ok') {
         Restangular.one('tag', tag.id).remove().then(function() {
           $scope.loadTags();
           $state.go('tag.default');
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/Acl.js b/docs-web/src/main/webapp/src/app/docs/directive/Acl.js
index 3fd0a22c..7a88b7e5 100644
--- a/docs-web/src/main/webapp/src/app/docs/directive/Acl.js
+++ b/docs-web/src/main/webapp/src/app/docs/directive/Acl.js
@@ -6,7 +6,7 @@
 angular.module('docs').directive('acl', function() {
   return {
     restrict: 'E',
-    template: '<span ng-if="data.type"><em>{{ \'acl.\' + data.type | translate }}</em> {{ data.name }}</span>',
+    template: '<span ng-show="data.type"><em>{{ \'acl.\' + data.type | translate }}</em> {{ data.name }}</span>',
     replace: true,
     scope: {
       data: '='
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/AclEdit.js b/docs-web/src/main/webapp/src/app/docs/directive/AclEdit.js
index 0e53b207..06b2c7c2 100644
--- a/docs-web/src/main/webapp/src/app/docs/directive/AclEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/directive/AclEdit.js
@@ -43,7 +43,7 @@ angular.module('docs').directive('aclEdit', function() {
         // Compute ACLs to add
         $scope.acl.source = $scope.source;
         var acls = [];
-        if ($scope.acl.perm == 'READWRITE') {
+        if ($scope.acl.perm === 'READWRITE') {
           acls = [{
             source: $scope.source,
             target: $scope.acl.target.name,
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/ImgError.js b/docs-web/src/main/webapp/src/app/docs/directive/ImgError.js
index 78772edd..5cbcd62a 100644
--- a/docs-web/src/main/webapp/src/app/docs/directive/ImgError.js
+++ b/docs-web/src/main/webapp/src/app/docs/directive/ImgError.js
@@ -8,7 +8,7 @@ angular.module('docs').directive('imgError', function() {
     restrict: 'A',
     link: function(scope, element, attrs) {
       element.bind('error', function() {
-        //call the function that was passed
+        // call the function that was passed
         scope.$apply(attrs.imgError);
       });
     }
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/SelectRelation.js b/docs-web/src/main/webapp/src/app/docs/directive/SelectRelation.js
index df0cdce6..bdbd3ee4 100644
--- a/docs-web/src/main/webapp/src/app/docs/directive/SelectRelation.js
+++ b/docs-web/src/main/webapp/src/app/docs/directive/SelectRelation.js
@@ -20,7 +20,7 @@ angular.module('docs').directive('selectRelation', function() {
       $scope.addRelation = function($item) {
         // Does the new relation is already in the model
         var duplicate = _.find($scope.relations, function(relation) {
-          if ($item.id == relation.id) {
+          if ($item.id === relation.id) {
             return relation;
           }
         });
@@ -41,7 +41,7 @@ angular.module('docs').directive('selectRelation', function() {
        */
       $scope.deleteRelation = function(deleteRelation) {
         $scope.relations = _.reject($scope.relations, function(relation) {
-          return relation.id == deleteRelation.id;
+          return relation.id === deleteRelation.id;
         })
       };
 
@@ -50,8 +50,8 @@ angular.module('docs').directive('selectRelation', function() {
        */
       $scope.getDocumentTypeahead = function($viewValue) {
         var deferred = $q.defer();
-        Restangular.one('document')
-            .getList('list', {
+        Restangular.one('document/list')
+            .get({
               limit: 5,
               sort_column: 1,
               asc: true,
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/SelectTag.js b/docs-web/src/main/webapp/src/app/docs/directive/SelectTag.js
index d61ee60e..3765e0b8 100644
--- a/docs-web/src/main/webapp/src/app/docs/directive/SelectTag.js
+++ b/docs-web/src/main/webapp/src/app/docs/directive/SelectTag.js
@@ -25,14 +25,14 @@ angular.module('docs').directive('selectTag', function() {
       $scope.addTag = function($event) {
         // Does the new tag exists
         var tag = _.find($scope.allTags, function(tag) {
-          if (tag.name == $scope.input) {
+          if (tag.name === $scope.input) {
             return tag;
           }
         });
         
         // Does the new tag is already in the model
         var duplicate = _.find($scope.tags, function(tag2) {
-          if (tag && tag2.id == tag.id) {
+          if (tag && tag2.id === tag.id) {
             return tag2;
           }
         });
@@ -55,7 +55,7 @@ angular.module('docs').directive('selectTag', function() {
        */
       $scope.deleteTag = function(deleteTag) {
         $scope.tags = _.reject($scope.tags, function(tag) {
-          return tag.id == deleteTag.id;
+          return tag.id === deleteTag.id;
         })
       };
     },
diff --git a/docs-web/src/main/webapp/src/app/docs/service/User.js b/docs-web/src/main/webapp/src/app/docs/service/User.js
index 31c411f6..980aafd1 100644
--- a/docs-web/src/main/webapp/src/app/docs/service/User.js
+++ b/docs-web/src/main/webapp/src/app/docs/service/User.js
@@ -12,7 +12,7 @@ angular.module('docs').factory('User', function(Restangular) {
      * @param force If true, force reloading data
      */
     userInfo: function(force) {
-      if (userInfo == null || force) {
+      if (userInfo === null || force) {
         userInfo = Restangular.one('user').get();
       }
       return userInfo;
diff --git a/docs-web/src/main/webapp/src/app/share/app.js b/docs-web/src/main/webapp/src/app/share/app.js
index e9c69b98..c162fb96 100644
--- a/docs-web/src/main/webapp/src/app/share/app.js
+++ b/docs-web/src/main/webapp/src/app/share/app.js
@@ -11,7 +11,9 @@ angular.module('share',
 /**
  * Configuring modules.
  */
-.config(function($stateProvider, $httpProvider, RestangularProvider) {
+.config(function($locationProvider, $stateProvider, $httpProvider, RestangularProvider) {
+  $locationProvider.hashPrefix('');
+
   // Configuring UI Router
   $stateProvider
   .state('main', {
diff --git a/docs-web/src/main/webapp/src/app/share/controller/FileModalView.js b/docs-web/src/main/webapp/src/app/share/controller/FileModalView.js
index f705378c..497d29bd 100644
--- a/docs-web/src/main/webapp/src/app/share/controller/FileModalView.js
+++ b/docs-web/src/main/webapp/src/app/share/controller/FileModalView.js
@@ -3,14 +3,14 @@
 /**
  * File modal view controller.
  */
-angular.module('share').controller('FileModalView', function($rootScope, $modalInstance, $scope, $state, $stateParams, Restangular) {
+angular.module('share').controller('FileModalView', function($uibModalInstance, $scope, $state, $stateParams, Restangular, $transitions) {
   // Load files
-  Restangular.one('file').getList('list', { id: $stateParams.documentId, share: $stateParams.shareId }).then(function(data) {
+  Restangular.one('file/list').get({ id: $stateParams.documentId, share: $stateParams.shareId }).then(function(data) {
     $scope.files = data.files;
 
     // Search current file
     _.each($scope.files, function(value) {
-      if (value.id == $stateParams.fileId) {
+      if (value.id === $stateParams.fileId) {
         $scope.file = value;
       }
     });
@@ -21,7 +21,7 @@ angular.module('share').controller('FileModalView', function($rootScope, $modalI
    */
   $scope.nextFile = function() {
     _.each($scope.files, function(value, key) {
-      if (value.id == $stateParams.fileId) {
+      if (value.id === $stateParams.fileId) {
         var next = $scope.files[key + 1];
         if (next) {
           $state.go('share.file', { documentId: $stateParams.documentId, shareId: $stateParams.shareId, fileId: next.id });
@@ -35,7 +35,7 @@ angular.module('share').controller('FileModalView', function($rootScope, $modalI
    */
   $scope.previousFile = function() {
     _.each($scope.files, function(value, key) {
-      if (value.id == $stateParams.fileId) {
+      if (value.id === $stateParams.fileId) {
         var previous = $scope.files[key - 1];
         if (previous) {
           $state.go('share.file', { documentId: $stateParams.documentId, shareId: $stateParams.shareId,  fileId: previous.id });
@@ -66,16 +66,16 @@ angular.module('share').controller('FileModalView', function($rootScope, $modalI
    * Close the file preview.
    */
   $scope.closeFile = function () {
-    $modalInstance.dismiss();
+    $uibModalInstance.dismiss();
   };
 
   // Close the modal when the user exits this state
-  var off = $rootScope.$on('$stateChangeStart', function(event, toState){
-    if (!$modalInstance.closed) {
-      if (toState.name == 'share.file') {
-        $modalInstance.close();
+  var off = $transitions.onStart({}, function(transition) {
+    if (!$uibModalInstance.closed) {
+      if (transition.to().name === $state.current.name) {
+        $uibModalInstance.close();
       } else {
-        $modalInstance.dismiss();
+        $uibModalInstance.dismiss();
       }
     }
     off();
diff --git a/docs-web/src/main/webapp/src/app/share/controller/FileView.js b/docs-web/src/main/webapp/src/app/share/controller/FileView.js
index 07e45b23..9ae22d2d 100644
--- a/docs-web/src/main/webapp/src/app/share/controller/FileView.js
+++ b/docs-web/src/main/webapp/src/app/share/controller/FileView.js
@@ -3,8 +3,8 @@
 /**
  * File view controller.
  */
-angular.module('share').controller('FileView', function($modal, $state, $stateParams) {
-  var modal = $modal.open({
+angular.module('share').controller('FileView', function($uibModal, $state, $stateParams) {
+  var modal = $uibModal.open({
     windowClass: 'modal modal-fileview',
     templateUrl: 'partial/share/file.view.html',
     controller: 'FileModalView'
@@ -14,7 +14,7 @@ angular.module('share').controller('FileView', function($modal, $state, $statePa
   modal.closed = false;
   modal.result.then(function() {
     modal.closed = true;
-  },function(result) {
+  },function() {
     modal.closed = true;
     $state.go('share', { documentId: $stateParams.documentId, shareId: $stateParams.shareId });
   });
diff --git a/docs-web/src/main/webapp/src/app/share/controller/Share.js b/docs-web/src/main/webapp/src/app/share/controller/Share.js
index 981aea98..72d7e510 100644
--- a/docs-web/src/main/webapp/src/app/share/controller/Share.js
+++ b/docs-web/src/main/webapp/src/app/share/controller/Share.js
@@ -3,19 +3,19 @@
 /**
  * Share controller.
  */
-angular.module('share').controller('Share', function($scope, $state, $stateParams, Restangular, $modal) {
+angular.module('share').controller('Share', function($scope, $state, $stateParams, Restangular, $uibModal) {
   // Load document
   Restangular.one('document', $stateParams.documentId).get({ share: $stateParams.shareId })
       .then(function (data) {
         $scope.document = data;
       }, function (response) {
-        if (response.status == 403) {
+        if (response.status === 403) {
           $state.go('403');
         }
       });
 
   // Load files
-  Restangular.one('file').getList('list', { id: $stateParams.documentId, share: $stateParams.shareId })
+  Restangular.one('file/list').get({ id: $stateParams.documentId, share: $stateParams.shareId })
       .then(function (data) {
         $scope.files = data.files;
       });
@@ -38,7 +38,7 @@ angular.module('share').controller('Share', function($scope, $state, $stateParam
    * Export the current document to PDF.
    */
   $scope.exportPdf = function() {
-    $modal.open({
+    $uibModal.open({
       templateUrl: 'partial/share/share.pdf.html',
       controller: 'ShareModalPdf'
     });
diff --git a/docs-web/src/main/webapp/src/app/share/controller/ShareModalPdf.js b/docs-web/src/main/webapp/src/app/share/controller/ShareModalPdf.js
index ff6b2cd9..65b49dcc 100644
--- a/docs-web/src/main/webapp/src/app/share/controller/ShareModalPdf.js
+++ b/docs-web/src/main/webapp/src/app/share/controller/ShareModalPdf.js
@@ -3,7 +3,7 @@
 /**
  * Document modal PDF controller.
  */
-angular.module('share').controller('ShareModalPdf', function ($scope, $window, $stateParams, $modalInstance) {
+angular.module('share').controller('ShareModalPdf', function ($scope, $window, $stateParams, $uibModalInstance) {
   $scope.export = {
     metadata: false,
     comments: false,
@@ -20,11 +20,11 @@ angular.module('share').controller('ShareModalPdf', function ($scope, $window, $
         + '&margin=' + $scope.export.margin
         + '&share=' + $stateParams.shareId);
 
-    $modalInstance.close();
+    $uibModalInstance.close();
   };
 
   // Close the modal
   $scope.close = function () {
-    $modalInstance.close();
+    $uibModalInstance.close();
   }
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html
index 694c2508..f76a131d 100644
--- a/docs-web/src/main/webapp/src/index.html
+++ b/docs-web/src/main/webapp/src/index.html
@@ -36,8 +36,8 @@
     <script src="lib/angular.touch.js" type="text/javascript"></script>
     <script src="lib/angular.ui-router.js" type="text/javascript"></script>
     <script src="lib/angular.ui-bootstrap.js" type="text/javascript"></script>
-    <script src="lib/angular.ui-utils.js" type="text/javascript"></script>
     <script src="lib/angular.ui-sortable.js" type="text/javascript"></script>
+    <script src="lib/angular.ui-validate.js" type="text/javascript"></script>
     <script src="lib/angular.restangular.js" type="text/javascript"></script>
     <script src="lib/angular.colorpicker.js" type="text/javascript"></script>
     <script src="lib/angular.file-upload.js" type="text/javascript"></script>
@@ -89,7 +89,7 @@
     <script src="app/docs/directive/AclEdit.js" type="text/javascript"></script>
     <!-- endref -->
   </head>
-  <body translate-cloak>
+  <body translate-cloak ng-cloak>
     <nav class="navbar navbar-inverse" role="navigation" ng-controller="Navigation">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle"
@@ -110,13 +110,13 @@
 
       <div class="collapse navbar-collapse" collapse="isCollapsed">
         <ul class="nav navbar-nav" ng-show="!userInfo.anonymous">
-          <li ng-class="{active: $uiRoute}" ui-route="/document.*">
+          <li ui-sref-active="{ active: 'document.**' }">
             <a href="#/document"><span class="glyphicon glyphicon-book"></span> {{ 'index.nav_documents' | translate }}</a>
           </li>
-          <li ng-class="{active: $uiRoute}" ui-route="/tag.*">
+          <li ui-sref-active="{ active: 'tag.**' }">
             <a href="#/tag"><span class="glyphicon glyphicon-tags"></span> {{ 'index.nav_tags' | translate }}</a>
           </li>
-          <li ng-class="{active: $uiRoute}" ui-route="/user.*|/group.*">
+          <li ui-sref-active="{ active: 'user.**', active2: 'group.**' }">
             <a href="#/user"><span class="glyphicon glyphicon-user"></span> {{ 'index.nav_users_groups' | translate }}</a>
           </li>
         </ul>
@@ -124,17 +124,18 @@
         <ul class="nav navbar-nav navbar-right" ng-show="!userInfo.anonymous">
           <li ng-show="errorNumber > 0">
               <a href="#/settings/log" ng-click="openLogs()" class="nav-text-error">
-                <span class="glyphicon glyphicon-warning-sign"></span> {{ 'index.error_info' | translate: '{ count: errorNumber }' }}
+                <span class="glyphicon glyphicon-warning-sign"></span>
+                <span translate="index.error_info" translate-values="{ count: errorNumber }"></span>
               </a>
           </li>
           <li>
             <a href="{{ userInfo.username == 'guest' ? '#/user/guest' : '#/settings/account' }}"
-               title="{{ 'index.logged_as' | translate: '{ username: userInfo.username }' }}">
+               translate-attr="{ title: 'index.logged_as' }" translate-values="{ username: userInfo.username }">
               <span class="glyphicon glyphicon-user"></span>
               {{ userInfo.username }}
             </a>
           </li>
-          <li ng-class="{active: $uiRoute}" ui-route="/settings.*" ng-show="userInfo.username != 'guest'">
+          <li ui-sref-active="{ active: 'settings.**' }" ng-show="userInfo.username != 'guest'">
             <a href="#/settings/account">
               <span class="glyphicon glyphicon-cog"></span> {{ 'index.nav_settings' | translate }}
             </a>
@@ -154,8 +155,8 @@
     <div class="row" ng-controller="Footer">
       <div class="col-md-12 footer text-center text-muted">
         <ul class="list-inline">
-          <li dropdown class="dropdown">
-            <a href dropdown-toggle>
+          <li uib-dropdown class="dropdown">
+            <a href uib-dropdown-toggle>
               <span ng-switch="currentLang">
                 <span ng-switch-when="en">English</span>
                 <span ng-switch-when="fr">Français</span>
diff --git a/docs-web/src/main/webapp/src/lib/angular.file-upload.js b/docs-web/src/main/webapp/src/lib/angular.file-upload.js
index 118d3318..41567747 100644
--- a/docs-web/src/main/webapp/src/lib/angular.file-upload.js
+++ b/docs-web/src/main/webapp/src/lib/angular.file-upload.js
@@ -1,480 +1,2134 @@
-/**
- * AngularJS file upload/drop directive and service with progress and abort
+/**!
+ * AngularJS file upload directives and services. Supoorts: file upload/drop/paste, resume, cancel/abort,
+ * progress, resize, thumbnail, preview, validation and CORS
  * @author  Danial  <danial.farid@gmail.com>
- * @version 3.1.1
+ * @version 12.2.13
  */
-(function() {
 
-  function patchXHR(fnName, newFn) {
-    window.XMLHttpRequest.prototype[fnName] = newFn(window.XMLHttpRequest.prototype[fnName]);
-  }
-
-  if (window.XMLHttpRequest && !window.XMLHttpRequest.__isFileAPIShim) {
-    patchXHR('setRequestHeader', function(orig) {
-      return function(header, value) {
-        if (header === '__setXHR_') {
-          var val = value(this);
-          // fix for angular < 1.2.0
-          if (val instanceof Function) {
-            val(this);
-          }
-        } else {
-          orig.apply(this, arguments);
+if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {
+  window.XMLHttpRequest.prototype.setRequestHeader = (function (orig) {
+    return function (header, value) {
+      if (header === '__setXHR_') {
+        var val = value(this);
+        // fix for angular < 1.2.0
+        if (val instanceof Function) {
+          val(this);
         }
+      } else {
+        orig.apply(this, arguments);
       }
-    });
-  }
+    };
+  })(window.XMLHttpRequest.prototype.setRequestHeader);
+}
 
-  var angularFileUpload = angular.module('angularFileUpload', []);
+var ngFileUpload = angular.module('ngFileUpload', []);
 
-  angularFileUpload.version = '3.1.1';
-  angularFileUpload.service('$upload', ['$http', '$q', '$timeout', function($http, $q, $timeout) {
-    function sendHttp(config) {
-      config.method = config.method || 'POST';
-      config.headers = config.headers || {};
-      config.transformRequest = config.transformRequest || function(data, headersGetter) {
-        if (window.ArrayBuffer && data instanceof window.ArrayBuffer) {
-          return data;
-        }
-        return $http.defaults.transformRequest[0](data, headersGetter);
-      };
-      var deferred = $q.defer();
-      var promise = deferred.promise;
+ngFileUpload.version = '12.2.13';
 
-      config.headers['__setXHR_'] = function() {
-        return function(xhr) {
-          if (!xhr) return;
+ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) {
+  var upload = this;
+  upload.promisesCount = 0;
+
+  this.isResumeSupported = function () {
+    return window.Blob && window.Blob.prototype.slice;
+  };
+
+  var resumeSupported = this.isResumeSupported();
+
+  function sendHttp(config) {
+    config.method = config.method || 'POST';
+    config.headers = config.headers || {};
+
+    var deferred = config._deferred = config._deferred || $q.defer();
+    var promise = deferred.promise;
+
+    function notifyProgress(e) {
+      if (deferred.notify) {
+        deferred.notify(e);
+      }
+      if (promise.progressFunc) {
+        $timeout(function () {
+          promise.progressFunc(e);
+        });
+      }
+    }
+
+    function getNotifyEvent(n) {
+      if (config._start != null && resumeSupported) {
+        return {
+          loaded: n.loaded + config._start,
+          total: (config._file && config._file.size) || n.total,
+          type: n.type, config: config,
+          lengthComputable: true, target: n.target
+        };
+      } else {
+        return n;
+      }
+    }
+
+    if (!config.disableProgress) {
+      config.headers.__setXHR_ = function () {
+        return function (xhr) {
+          if (!xhr || !xhr.upload || !xhr.upload.addEventListener) return;
           config.__XHR = xhr;
-          config.xhrFn && config.xhrFn(xhr);
-          xhr.upload.addEventListener('progress', function(e) {
+          if (config.xhrFn) config.xhrFn(xhr);
+          xhr.upload.addEventListener('progress', function (e) {
             e.config = config;
-            deferred.notify ? deferred.notify(e) : promise.progress_fn && $timeout(function(){promise.progress_fn(e)});
+            notifyProgress(getNotifyEvent(e));
           }, false);
           //fix for firefox not firing upload progress end, also IE8-9
-          xhr.upload.addEventListener('load', function(e) {
+          xhr.upload.addEventListener('load', function (e) {
             if (e.lengthComputable) {
               e.config = config;
-              deferred.notify ? deferred.notify(e) : promise.progress_fn && $timeout(function(){promise.progress_fn(e)});
+              notifyProgress(getNotifyEvent(e));
             }
           }, false);
         };
       };
-
-      $http(config).then(function(r){deferred.resolve(r)}, function(e){deferred.reject(e)}, function(n){deferred.notify(n)});
-
-      promise.success = function(fn) {
-        promise.then(function(response) {
-          fn(response.data, response.status, response.headers, config);
-        });
-        return promise;
-      };
-
-      promise.error = function(fn) {
-        promise.then(null, function(response) {
-          fn(response.data, response.status, response.headers, config);
-        });
-        return promise;
-      };
-
-      promise.progress = function(fn) {
-        promise.progress_fn = fn;
-        promise.then(null, null, function(update) {
-          fn(update);
-        });
-        return promise;
-      };
-      promise.abort = function() {
-        if (config.__XHR) {
-          $timeout(function() {
-            config.__XHR.abort();
-          });
-        }
-        return promise;
-      };
-      promise.xhr = function(fn) {
-        config.xhrFn = (function(origXhrFn) {
-          return function() {
-            origXhrFn && origXhrFn.apply(promise, arguments);
-            fn.apply(promise, arguments);
-          }
-        })(config.xhrFn);
-        return promise;
-      };
-
-      return promise;
     }
 
-    this.upload = function(config) {
+    function uploadWithAngular() {
+      $http(config).then(function (r) {
+          if (resumeSupported && config._chunkSize && !config._finished && config._file) {
+            var fileSize = config._file && config._file.size || 0;
+            notifyProgress({
+                loaded: Math.min(config._end, fileSize),
+                total: fileSize,
+                config: config,
+                type: 'progress'
+              }
+            );
+            upload.upload(config, true);
+          } else {
+            if (config._finished) delete config._finished;
+            deferred.resolve(r);
+          }
+        }, function (e) {
+          deferred.reject(e);
+        }, function (n) {
+          deferred.notify(n);
+        }
+      );
+    }
+
+    if (!resumeSupported) {
+      uploadWithAngular();
+    } else if (config._chunkSize && config._end && !config._finished) {
+      config._start = config._end;
+      config._end += config._chunkSize;
+      uploadWithAngular();
+    } else if (config.resumeSizeUrl) {
+      $http.get(config.resumeSizeUrl).then(function (resp) {
+        if (config.resumeSizeResponseReader) {
+          config._start = config.resumeSizeResponseReader(resp.data);
+        } else {
+          config._start = parseInt((resp.data.size == null ? resp.data : resp.data.size).toString());
+        }
+        if (config._chunkSize) {
+          config._end = config._start + config._chunkSize;
+        }
+        uploadWithAngular();
+      }, function (e) {
+        throw e;
+      });
+    } else if (config.resumeSize) {
+      config.resumeSize().then(function (size) {
+        config._start = size;
+        if (config._chunkSize) {
+          config._end = config._start + config._chunkSize;
+        }
+        uploadWithAngular();
+      }, function (e) {
+        throw e;
+      });
+    } else {
+      if (config._chunkSize) {
+        config._start = 0;
+        config._end = config._start + config._chunkSize;
+      }
+      uploadWithAngular();
+    }
+
+
+    promise.success = function (fn) {
+      promise.then(function (response) {
+        fn(response.data, response.status, response.headers, config);
+      });
+      return promise;
+    };
+
+    promise.error = function (fn) {
+      promise.then(null, function (response) {
+        fn(response.data, response.status, response.headers, config);
+      });
+      return promise;
+    };
+
+    promise.progress = function (fn) {
+      promise.progressFunc = fn;
+      promise.then(null, null, function (n) {
+        fn(n);
+      });
+      return promise;
+    };
+    promise.abort = promise.pause = function () {
+      if (config.__XHR) {
+        $timeout(function () {
+          config.__XHR.abort();
+        });
+      }
+      return promise;
+    };
+    promise.xhr = function (fn) {
+      config.xhrFn = (function (origXhrFn) {
+        return function () {
+          if (origXhrFn) origXhrFn.apply(promise, arguments);
+          fn.apply(promise, arguments);
+        };
+      })(config.xhrFn);
+      return promise;
+    };
+
+    upload.promisesCount++;
+    if (promise['finally'] && promise['finally'] instanceof Function) {
+      promise['finally'](function () {
+        upload.promisesCount--;
+      });
+    }
+    return promise;
+  }
+
+  this.isUploadInProgress = function () {
+    return upload.promisesCount > 0;
+  };
+
+  this.rename = function (file, name) {
+    file.ngfName = name;
+    return file;
+  };
+
+  this.jsonBlob = function (val) {
+    if (val != null && !angular.isString(val)) {
+      val = JSON.stringify(val);
+    }
+    var blob = new window.Blob([val], {type: 'application/json'});
+    blob._ngfBlob = true;
+    return blob;
+  };
+
+  this.json = function (val) {
+    return angular.toJson(val);
+  };
+
+  function copy(obj) {
+    var clone = {};
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        clone[key] = obj[key];
+      }
+    }
+    return clone;
+  }
+
+  this.isFile = function (file) {
+    return file != null && (file instanceof window.Blob || (file.flashId && file.name && file.size));
+  };
+
+  this.upload = function (config, internal) {
+    function toResumeFile(file, formData) {
+      if (file._ngfBlob) return file;
+      config._file = config._file || file;
+      if (config._start != null && resumeSupported) {
+        if (config._end && config._end >= file.size) {
+          config._finished = true;
+          config._end = file.size;
+        }
+        var slice = file.slice(config._start, config._end || file.size);
+        slice.name = file.name;
+        slice.ngfName = file.ngfName;
+        if (config._chunkSize) {
+          formData.append('_chunkSize', config._chunkSize);
+          formData.append('_currentChunkSize', config._end - config._start);
+          formData.append('_chunkNumber', Math.floor(config._start / config._chunkSize));
+          formData.append('_totalSize', config._file.size);
+        }
+        return slice;
+      }
+      return file;
+    }
+
+    function addFieldToFormData(formData, val, key) {
+      if (val !== undefined) {
+        if (angular.isDate(val)) {
+          val = val.toISOString();
+        }
+        if (angular.isString(val)) {
+          formData.append(key, val);
+        } else if (upload.isFile(val)) {
+          var file = toResumeFile(val, formData);
+          var split = key.split(',');
+          if (split[1]) {
+            file.ngfName = split[1].replace(/^\s+|\s+$/g, '');
+            key = split[0];
+          }
+          config._fileKey = config._fileKey || key;
+          formData.append(key, file, file.ngfName || file.name);
+        } else {
+          if (angular.isObject(val)) {
+            if (val.$$ngfCircularDetection) throw 'ngFileUpload: Circular reference in config.data. Make sure specified data for Upload.upload() has no circular reference: ' + key;
+
+            val.$$ngfCircularDetection = true;
+            try {
+              for (var k in val) {
+                if (val.hasOwnProperty(k) && k !== '$$ngfCircularDetection') {
+                  var objectKey = config.objectKey == null ? '[i]' : config.objectKey;
+                  if (val.length && parseInt(k) > -1) {
+                    objectKey = config.arrayKey == null ? objectKey : config.arrayKey;
+                  }
+                  addFieldToFormData(formData, val[k], key + objectKey.replace(/[ik]/g, k));
+                }
+              }
+            } finally {
+              delete val.$$ngfCircularDetection;
+            }
+          } else {
+            formData.append(key, val);
+          }
+        }
+      }
+    }
+
+    function digestConfig() {
+      config._chunkSize = upload.translateScalars(config.resumeChunkSize);
+      config._chunkSize = config._chunkSize ? parseInt(config._chunkSize.toString()) : null;
+
       config.headers = config.headers || {};
       config.headers['Content-Type'] = undefined;
-      var origTransformRequest = config.transformRequest;
       config.transformRequest = config.transformRequest ?
-          (Object.prototype.toString.call(config.transformRequest) === '[object Array]' ?
-              config.transformRequest : [config.transformRequest]) : [];
-      config.transformRequest.push(function(data, headerGetter) {
-        var formData = new FormData();
-        var allFields = {};
-        for (var key in config.fields) allFields[key] = config.fields[key];
-        if (data) allFields['data'] = data;
+        (angular.isArray(config.transformRequest) ?
+          config.transformRequest : [config.transformRequest]) : [];
+      config.transformRequest.push(function (data) {
+        var formData = new window.FormData(), key;
+        data = data || config.fields || {};
+        if (config.file) {
+          data.file = config.file;
+        }
+        for (key in data) {
+          if (data.hasOwnProperty(key)) {
+            var val = data[key];
+            if (config.formDataAppender) {
+              config.formDataAppender(formData, key, val);
+            } else {
+              addFieldToFormData(formData, val, key);
+            }
+          }
+        }
 
-        if (config.formDataAppender) {
-          for (var key in allFields) {
-            config.formDataAppender(formData, key, allFields[key]);
+        return formData;
+      });
+    }
+
+    if (!internal) config = copy(config);
+    if (!config._isDigested) {
+      config._isDigested = true;
+      digestConfig();
+    }
+
+    return sendHttp(config);
+  };
+
+  this.http = function (config) {
+    config = copy(config);
+    config.transformRequest = config.transformRequest || function (data) {
+      if ((window.ArrayBuffer && data instanceof window.ArrayBuffer) || data instanceof window.Blob) {
+        return data;
+      }
+      return $http.defaults.transformRequest[0].apply(this, arguments);
+    };
+    config._chunkSize = upload.translateScalars(config.resumeChunkSize);
+    config._chunkSize = config._chunkSize ? parseInt(config._chunkSize.toString()) : null;
+
+    return sendHttp(config);
+  };
+
+  this.translateScalars = function (str) {
+    if (angular.isString(str)) {
+      if (str.search(/kb/i) === str.length - 2) {
+        return parseFloat(str.substring(0, str.length - 2) * 1024);
+      } else if (str.search(/mb/i) === str.length - 2) {
+        return parseFloat(str.substring(0, str.length - 2) * 1048576);
+      } else if (str.search(/gb/i) === str.length - 2) {
+        return parseFloat(str.substring(0, str.length - 2) * 1073741824);
+      } else if (str.search(/b/i) === str.length - 1) {
+        return parseFloat(str.substring(0, str.length - 1));
+      } else if (str.search(/s/i) === str.length - 1) {
+        return parseFloat(str.substring(0, str.length - 1));
+      } else if (str.search(/m/i) === str.length - 1) {
+        return parseFloat(str.substring(0, str.length - 1) * 60);
+      } else if (str.search(/h/i) === str.length - 1) {
+        return parseFloat(str.substring(0, str.length - 1) * 3600);
+      }
+    }
+    return str;
+  };
+
+  this.urlToBlob = function(url) {
+    var defer = $q.defer();
+    $http({url: url, method: 'get', responseType: 'arraybuffer'}).then(function (resp) {
+      var arrayBufferView = new Uint8Array(resp.data);
+      var type = resp.headers('content-type') || 'image/WebP';
+      var blob = new window.Blob([arrayBufferView], {type: type});
+      var matches = url.match(/.*\/(.+?)(\?.*)?$/);
+      if (matches.length > 1) {
+        blob.name = matches[1];
+      }
+      defer.resolve(blob);
+    }, function (e) {
+      defer.reject(e);
+    });
+    return defer.promise;
+  };
+
+  this.setDefaults = function (defaults) {
+    this.defaults = defaults || {};
+  };
+
+  this.defaults = {};
+  this.version = ngFileUpload.version;
+}
+
+]);
+
+ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadExif', function ($parse, $timeout, $compile, $q, UploadExif) {
+  var upload = UploadExif;
+  upload.getAttrWithDefaults = function (attr, name) {
+    if (attr[name] != null) return attr[name];
+    var def = upload.defaults[name];
+    return (def == null ? def : (angular.isString(def) ? def : JSON.stringify(def)));
+  };
+
+  upload.attrGetter = function (name, attr, scope, params) {
+    var attrVal = this.getAttrWithDefaults(attr, name);
+    if (scope) {
+      try {
+        if (params) {
+          return $parse(attrVal)(scope, params);
+        } else {
+          return $parse(attrVal)(scope);
+        }
+      } catch (e) {
+        // hangle string value without single qoute
+        if (name.search(/min|max|pattern/i)) {
+          return attrVal;
+        } else {
+          throw e;
+        }
+      }
+    } else {
+      return attrVal;
+    }
+  };
+
+  upload.shouldUpdateOn = function (type, attr, scope) {
+    var modelOptions = upload.attrGetter('ngfModelOptions', attr, scope);
+    if (modelOptions && modelOptions.updateOn) {
+      return modelOptions.updateOn.split(' ').indexOf(type) > -1;
+    }
+    return true;
+  };
+
+  upload.emptyPromise = function () {
+    var d = $q.defer();
+    var args = arguments;
+    $timeout(function () {
+      d.resolve.apply(d, args);
+    });
+    return d.promise;
+  };
+
+  upload.rejectPromise = function () {
+    var d = $q.defer();
+    var args = arguments;
+    $timeout(function () {
+      d.reject.apply(d, args);
+    });
+    return d.promise;
+  };
+
+  upload.happyPromise = function (promise, data) {
+    var d = $q.defer();
+    promise.then(function (result) {
+      d.resolve(result);
+    }, function (error) {
+      $timeout(function () {
+        throw error;
+      });
+      d.resolve(data);
+    });
+    return d.promise;
+  };
+
+  function applyExifRotations(files, attr, scope) {
+    var promises = [upload.emptyPromise()];
+    angular.forEach(files, function (f, i) {
+      if (f.type.indexOf('image/jpeg') === 0 && upload.attrGetter('ngfFixOrientation', attr, scope, {$file: f})) {
+        promises.push(upload.happyPromise(upload.applyExifRotation(f), f).then(function (fixedFile) {
+          files.splice(i, 1, fixedFile);
+        }));
+      }
+    });
+    return $q.all(promises);
+  }
+
+  function resizeFile(files, attr, scope, ngModel) {
+    var resizeVal = upload.attrGetter('ngfResize', attr, scope);
+    if (!resizeVal || !upload.isResizeSupported() || !files.length) return upload.emptyPromise();
+    if (resizeVal instanceof Function) {
+      var defer = $q.defer();
+      return resizeVal(files).then(function (p) {
+        resizeWithParams(p, files, attr, scope, ngModel).then(function (r) {
+          defer.resolve(r);
+        }, function (e) {
+          defer.reject(e);
+        });
+      }, function (e) {
+        defer.reject(e);
+      });
+    } else {
+      return resizeWithParams(resizeVal, files, attr, scope, ngModel);
+    }
+  }
+
+  function resizeWithParams(params, files, attr, scope, ngModel) {
+    var promises = [upload.emptyPromise()];
+
+    function handleFile(f, i) {
+      if (f.type.indexOf('image') === 0) {
+        if (params.pattern && !upload.validatePattern(f, params.pattern)) return;
+        params.resizeIf = function (width, height) {
+          return upload.attrGetter('ngfResizeIf', attr, scope,
+            {$width: width, $height: height, $file: f});
+        };
+        var promise = upload.resize(f, params);
+        promises.push(promise);
+        promise.then(function (resizedFile) {
+          files.splice(i, 1, resizedFile);
+        }, function (e) {
+          f.$error = 'resize';
+          (f.$errorMessages = (f.$errorMessages || {})).resize = true;
+          f.$errorParam = (e ? (e.message ? e.message : e) + ': ' : '') + (f && f.name);
+          ngModel.$ngfValidations.push({name: 'resize', valid: false});
+          upload.applyModelValidation(ngModel, files);
+        });
+      }
+    }
+
+    for (var i = 0; i < files.length; i++) {
+      handleFile(files[i], i);
+    }
+    return $q.all(promises);
+  }
+
+  upload.updateModel = function (ngModel, attr, scope, fileChange, files, evt, noDelay) {
+    function update(files, invalidFiles, newFiles, dupFiles, isSingleModel) {
+      attr.$$ngfPrevValidFiles = files;
+      attr.$$ngfPrevInvalidFiles = invalidFiles;
+      var file = files && files.length ? files[0] : null;
+      var invalidFile = invalidFiles && invalidFiles.length ? invalidFiles[0] : null;
+
+      if (ngModel) {
+        upload.applyModelValidation(ngModel, files);
+        ngModel.$setViewValue(isSingleModel ? file : files);
+      }
+
+      if (fileChange) {
+        $parse(fileChange)(scope, {
+          $files: files,
+          $file: file,
+          $newFiles: newFiles,
+          $duplicateFiles: dupFiles,
+          $invalidFiles: invalidFiles,
+          $invalidFile: invalidFile,
+          $event: evt
+        });
+      }
+
+      var invalidModel = upload.attrGetter('ngfModelInvalid', attr);
+      if (invalidModel) {
+        $timeout(function () {
+          $parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
+        });
+      }
+      $timeout(function () {
+        // scope apply changes
+      });
+    }
+
+    var allNewFiles, dupFiles = [], prevValidFiles, prevInvalidFiles,
+      invalids = [], valids = [];
+
+    function removeDuplicates() {
+      function equals(f1, f2) {
+        return f1.name === f2.name && (f1.$ngfOrigSize || f1.size) === (f2.$ngfOrigSize || f2.size) &&
+          f1.type === f2.type;
+      }
+
+      function isInPrevFiles(f) {
+        var j;
+        for (j = 0; j < prevValidFiles.length; j++) {
+          if (equals(f, prevValidFiles[j])) {
+            return true;
+          }
+        }
+        for (j = 0; j < prevInvalidFiles.length; j++) {
+          if (equals(f, prevInvalidFiles[j])) {
+            return true;
+          }
+        }
+        return false;
+      }
+
+      if (files) {
+        allNewFiles = [];
+        dupFiles = [];
+        for (var i = 0; i < files.length; i++) {
+          if (isInPrevFiles(files[i])) {
+            dupFiles.push(files[i]);
+          } else {
+            allNewFiles.push(files[i]);
+          }
+        }
+      }
+    }
+
+    function toArray(v) {
+      return angular.isArray(v) ? v : [v];
+    }
+
+    function resizeAndUpdate() {
+      function updateModel() {
+        $timeout(function () {
+          update(keep ? prevValidFiles.concat(valids) : valids,
+            keep ? prevInvalidFiles.concat(invalids) : invalids,
+            files, dupFiles, isSingleModel);
+        }, options && options.debounce ? options.debounce.change || options.debounce : 0);
+      }
+
+      var resizingFiles = validateAfterResize ? allNewFiles : valids;
+      resizeFile(resizingFiles, attr, scope, ngModel).then(function () {
+        if (validateAfterResize) {
+          upload.validate(allNewFiles, keep ? prevValidFiles.length : 0, ngModel, attr, scope)
+            .then(function (validationResult) {
+              valids = validationResult.validsFiles;
+              invalids = validationResult.invalidsFiles;
+              updateModel();
+            });
+        } else {
+          updateModel();
+        }
+      }, function () {
+        for (var i = 0; i < resizingFiles.length; i++) {
+          var f = resizingFiles[i];
+          if (f.$error === 'resize') {
+            var index = valids.indexOf(f);
+            if (index > -1) {
+              valids.splice(index, 1);
+              invalids.push(f);
+            }
+            updateModel();
+          }
+        }
+      });
+    }
+
+    prevValidFiles = attr.$$ngfPrevValidFiles || [];
+    prevInvalidFiles = attr.$$ngfPrevInvalidFiles || [];
+    if (ngModel && ngModel.$modelValue) {
+      prevValidFiles = toArray(ngModel.$modelValue);
+    }
+
+    var keep = upload.attrGetter('ngfKeep', attr, scope);
+    allNewFiles = (files || []).slice(0);
+    if (keep === 'distinct' || upload.attrGetter('ngfKeepDistinct', attr, scope) === true) {
+      removeDuplicates(attr, scope);
+    }
+
+    var isSingleModel = !keep && !upload.attrGetter('ngfMultiple', attr, scope) && !upload.attrGetter('multiple', attr);
+
+    if (keep && !allNewFiles.length) return;
+
+    upload.attrGetter('ngfBeforeModelChange', attr, scope, {
+      $files: files,
+      $file: files && files.length ? files[0] : null,
+      $newFiles: allNewFiles,
+      $duplicateFiles: dupFiles,
+      $event: evt
+    });
+
+    var validateAfterResize = upload.attrGetter('ngfValidateAfterResize', attr, scope);
+
+    var options = upload.attrGetter('ngfModelOptions', attr, scope);
+    upload.validate(allNewFiles, keep ? prevValidFiles.length : 0, ngModel, attr, scope)
+      .then(function (validationResult) {
+        if (noDelay) {
+          update(allNewFiles, [], files, dupFiles, isSingleModel);
+        } else {
+          if ((!options || !options.allowInvalid) && !validateAfterResize) {
+            valids = validationResult.validFiles;
+            invalids = validationResult.invalidFiles;
+          } else {
+            valids = allNewFiles;
+          }
+          if (upload.attrGetter('ngfFixOrientation', attr, scope) && upload.isExifSupported()) {
+            applyExifRotations(valids, attr, scope).then(function () {
+              resizeAndUpdate();
+            });
+          } else {
+            resizeAndUpdate();
+          }
+        }
+      });
+  };
+
+  return upload;
+}]);
+
+ngFileUpload.directive('ngfSelect', ['$parse', '$timeout', '$compile', 'Upload', function ($parse, $timeout, $compile, Upload) {
+  var generatedElems = [];
+
+  function isDelayedClickSupported(ua) {
+    // fix for android native browser < 4.4 and safari windows
+    var m = ua.match(/Android[^\d]*(\d+)\.(\d+)/);
+    if (m && m.length > 2) {
+      var v = Upload.defaults.androidFixMinorVersion || 4;
+      return parseInt(m[1]) < 4 || (parseInt(m[1]) === v && parseInt(m[2]) < v);
+    }
+
+    // safari on windows
+    return ua.indexOf('Chrome') === -1 && /.*Windows.*Safari.*/.test(ua);
+  }
+
+  function linkFileSelect(scope, elem, attr, ngModel, $parse, $timeout, $compile, upload) {
+    /** @namespace attr.ngfSelect */
+    /** @namespace attr.ngfChange */
+    /** @namespace attr.ngModel */
+    /** @namespace attr.ngfModelOptions */
+    /** @namespace attr.ngfMultiple */
+    /** @namespace attr.ngfCapture */
+    /** @namespace attr.ngfValidate */
+    /** @namespace attr.ngfKeep */
+    var attrGetter = function (name, scope) {
+      return upload.attrGetter(name, attr, scope);
+    };
+
+    function isInputTypeFile() {
+      return elem[0].tagName.toLowerCase() === 'input' && attr.type && attr.type.toLowerCase() === 'file';
+    }
+
+    function fileChangeAttr() {
+      return attrGetter('ngfChange') || attrGetter('ngfSelect');
+    }
+
+    function changeFn(evt) {
+      if (upload.shouldUpdateOn('change', attr, scope)) {
+        var fileList = evt.__files_ || (evt.target && evt.target.files), files = [];
+        /* Handle duplicate call in  IE11 */
+        if (!fileList) return;
+        for (var i = 0; i < fileList.length; i++) {
+          files.push(fileList[i]);
+        }
+        upload.updateModel(ngModel, attr, scope, fileChangeAttr(),
+          files.length ? files : null, evt);
+      }
+    }
+
+    upload.registerModelChangeValidator(ngModel, attr, scope);
+
+    var unwatches = [];
+    if (attrGetter('ngfMultiple')) {
+      unwatches.push(scope.$watch(attrGetter('ngfMultiple'), function () {
+        fileElem.attr('multiple', attrGetter('ngfMultiple', scope));
+      }));
+    }
+    if (attrGetter('ngfCapture')) {
+      unwatches.push(scope.$watch(attrGetter('ngfCapture'), function () {
+        fileElem.attr('capture', attrGetter('ngfCapture', scope));
+      }));
+    }
+    if (attrGetter('ngfAccept')) {
+      unwatches.push(scope.$watch(attrGetter('ngfAccept'), function () {
+        fileElem.attr('accept', attrGetter('ngfAccept', scope));
+      }));
+    }
+    unwatches.push(attr.$observe('accept', function () {
+      fileElem.attr('accept', attrGetter('accept'));
+    }));
+    function bindAttrToFileInput(fileElem, label) {
+      function updateId(val) {
+        fileElem.attr('id', 'ngf-' + val);
+        label.attr('id', 'ngf-label-' + val);
+      }
+
+      for (var i = 0; i < elem[0].attributes.length; i++) {
+        var attribute = elem[0].attributes[i];
+        if (attribute.name !== 'type' && attribute.name !== 'class' && attribute.name !== 'style') {
+          if (attribute.name === 'id') {
+            updateId(attribute.value);
+            unwatches.push(attr.$observe('id', updateId));
+          } else {
+            fileElem.attr(attribute.name, (!attribute.value && (attribute.name === 'required' ||
+              attribute.name === 'multiple')) ? attribute.name : attribute.value);
+          }
+        }
+      }
+    }
+
+    function createFileInput() {
+      if (isInputTypeFile()) {
+        return elem;
+      }
+
+      var fileElem = angular.element('<input type="file">');
+
+      var label = angular.element('<label>upload</label>');
+      label.css('visibility', 'hidden').css('position', 'absolute').css('overflow', 'hidden')
+        .css('width', '0px').css('height', '0px').css('border', 'none')
+        .css('margin', '0px').css('padding', '0px').attr('tabindex', '-1');
+      bindAttrToFileInput(fileElem, label);
+
+      generatedElems.push({el: elem, ref: label});
+
+      document.body.appendChild(label.append(fileElem)[0]);
+
+      return fileElem;
+    }
+
+    function clickHandler(evt) {
+      if (elem.attr('disabled')) return false;
+      if (attrGetter('ngfSelectDisabled', scope)) return;
+
+      var r = detectSwipe(evt);
+      // prevent the click if it is a swipe
+      if (r != null) return r;
+
+      resetModel(evt);
+
+      // fix for md when the element is removed from the DOM and added back #460
+      try {
+        if (!isInputTypeFile() && !document.body.contains(fileElem[0])) {
+          generatedElems.push({el: elem, ref: fileElem.parent()});
+          document.body.appendChild(fileElem.parent()[0]);
+          fileElem.bind('change', changeFn);
+        }
+      } catch (e) {/*ignore*/
+      }
+
+      if (isDelayedClickSupported(navigator.userAgent)) {
+        setTimeout(function () {
+          fileElem[0].click();
+        }, 0);
+      } else {
+        fileElem[0].click();
+      }
+
+      return false;
+    }
+
+
+    var initialTouchStartY = 0;
+    var initialTouchStartX = 0;
+
+    function detectSwipe(evt) {
+      var touches = evt.changedTouches || (evt.originalEvent && evt.originalEvent.changedTouches);
+      if (touches) {
+        if (evt.type === 'touchstart') {
+          initialTouchStartX = touches[0].clientX;
+          initialTouchStartY = touches[0].clientY;
+          return true; // don't block event default
+        } else {
+          // prevent scroll from triggering event
+          if (evt.type === 'touchend') {
+            var currentX = touches[0].clientX;
+            var currentY = touches[0].clientY;
+            if ((Math.abs(currentX - initialTouchStartX) > 20) ||
+              (Math.abs(currentY - initialTouchStartY) > 20)) {
+              evt.stopPropagation();
+              evt.preventDefault();
+              return false;
+            }
+          }
+          return true;
+        }
+      }
+    }
+
+    var fileElem = elem;
+
+    function resetModel(evt) {
+      if (upload.shouldUpdateOn('click', attr, scope) && fileElem.val()) {
+        fileElem.val(null);
+        upload.updateModel(ngModel, attr, scope, fileChangeAttr(), null, evt, true);
+      }
+    }
+
+    if (!isInputTypeFile()) {
+      fileElem = createFileInput();
+    }
+    fileElem.bind('change', changeFn);
+
+    if (!isInputTypeFile()) {
+      elem.bind('click touchstart touchend', clickHandler);
+    } else {
+      elem.bind('click', resetModel);
+    }
+
+    function ie10SameFileSelectFix(evt) {
+      if (fileElem && !fileElem.attr('__ngf_ie10_Fix_')) {
+        if (!fileElem[0].parentNode) {
+          fileElem = null;
+          return;
+        }
+        evt.preventDefault();
+        evt.stopPropagation();
+        fileElem.unbind('click');
+        var clone = fileElem.clone();
+        fileElem.replaceWith(clone);
+        fileElem = clone;
+        fileElem.attr('__ngf_ie10_Fix_', 'true');
+        fileElem.bind('change', changeFn);
+        fileElem.bind('click', ie10SameFileSelectFix);
+        fileElem[0].click();
+        return false;
+      } else {
+        fileElem.removeAttr('__ngf_ie10_Fix_');
+      }
+    }
+
+    if (navigator.appVersion.indexOf('MSIE 10') !== -1) {
+      fileElem.bind('click', ie10SameFileSelectFix);
+    }
+
+    if (ngModel) ngModel.$formatters.push(function (val) {
+      if (val == null || val.length === 0) {
+        if (fileElem.val()) {
+          fileElem.val(null);
+        }
+      }
+      return val;
+    });
+
+    scope.$on('$destroy', function () {
+      if (!isInputTypeFile()) fileElem.parent().remove();
+      angular.forEach(unwatches, function (unwatch) {
+        unwatch();
+      });
+    });
+
+    $timeout(function () {
+      for (var i = 0; i < generatedElems.length; i++) {
+        var g = generatedElems[i];
+        if (!document.body.contains(g.el[0])) {
+          generatedElems.splice(i, 1);
+          g.ref.remove();
+        }
+      }
+    });
+
+    if (window.FileAPI && window.FileAPI.ngfFixIE) {
+      window.FileAPI.ngfFixIE(elem, fileElem, changeFn);
+    }
+  }
+
+  return {
+    restrict: 'AEC',
+    require: '?ngModel',
+    link: function (scope, elem, attr, ngModel) {
+      linkFileSelect(scope, elem, attr, ngModel, $parse, $timeout, $compile, Upload);
+    }
+  };
+}]);
+
+(function () {
+
+  ngFileUpload.service('UploadDataUrl', ['UploadBase', '$timeout', '$q', function (UploadBase, $timeout, $q) {
+    var upload = UploadBase;
+    upload.base64DataUrl = function (file) {
+      if (angular.isArray(file)) {
+        var d = $q.defer(), count = 0;
+        angular.forEach(file, function (f) {
+          upload.dataUrl(f, true)['finally'](function () {
+            count++;
+            if (count === file.length) {
+              var urls = [];
+              angular.forEach(file, function (ff) {
+                urls.push(ff.$ngfDataUrl);
+              });
+              d.resolve(urls, file);
+            }
+          });
+        });
+        return d.promise;
+      } else {
+        return upload.dataUrl(file, true);
+      }
+    };
+    upload.dataUrl = function (file, disallowObjectUrl) {
+      if (!file) return upload.emptyPromise(file, file);
+      if ((disallowObjectUrl && file.$ngfDataUrl != null) || (!disallowObjectUrl && file.$ngfBlobUrl != null)) {
+        return upload.emptyPromise(disallowObjectUrl ? file.$ngfDataUrl : file.$ngfBlobUrl, file);
+      }
+      var p = disallowObjectUrl ? file.$$ngfDataUrlPromise : file.$$ngfBlobUrlPromise;
+      if (p) return p;
+
+      var deferred = $q.defer();
+      $timeout(function () {
+        if (window.FileReader && file &&
+          (!window.FileAPI || navigator.userAgent.indexOf('MSIE 8') === -1 || file.size < 20000) &&
+          (!window.FileAPI || navigator.userAgent.indexOf('MSIE 9') === -1 || file.size < 4000000)) {
+          //prefer URL.createObjectURL for handling refrences to files of all sizes
+          //since it doesn´t build a large string in memory
+          var URL = window.URL || window.webkitURL;
+          if (URL && URL.createObjectURL && !disallowObjectUrl) {
+            var url;
+            try {
+              url = URL.createObjectURL(file);
+            } catch (e) {
+              $timeout(function () {
+                file.$ngfBlobUrl = '';
+                deferred.reject();
+              });
+              return;
+            }
+            $timeout(function () {
+              file.$ngfBlobUrl = url;
+              if (url) {
+                deferred.resolve(url, file);
+                upload.blobUrls = upload.blobUrls || [];
+                upload.blobUrlsTotalSize = upload.blobUrlsTotalSize || 0;
+                upload.blobUrls.push({url: url, size: file.size});
+                upload.blobUrlsTotalSize += file.size || 0;
+                var maxMemory = upload.defaults.blobUrlsMaxMemory || 268435456;
+                var maxLength = upload.defaults.blobUrlsMaxQueueSize || 200;
+                while ((upload.blobUrlsTotalSize > maxMemory || upload.blobUrls.length > maxLength) && upload.blobUrls.length > 1) {
+                  var obj = upload.blobUrls.splice(0, 1)[0];
+                  URL.revokeObjectURL(obj.url);
+                  upload.blobUrlsTotalSize -= obj.size;
+                }
+              }
+            });
+          } else {
+            var fileReader = new FileReader();
+            fileReader.onload = function (e) {
+              $timeout(function () {
+                file.$ngfDataUrl = e.target.result;
+                deferred.resolve(e.target.result, file);
+                $timeout(function () {
+                  delete file.$ngfDataUrl;
+                }, 1000);
+              });
+            };
+            fileReader.onerror = function () {
+              $timeout(function () {
+                file.$ngfDataUrl = '';
+                deferred.reject();
+              });
+            };
+            fileReader.readAsDataURL(file);
           }
         } else {
-          for (var key in allFields) {
-            var val = allFields[key];
-            if (val !== undefined) {
-              if (Object.prototype.toString.call(val) === '[object String]') {
-                formData.append(key, val);
-              } else {
-                if (config.sendObjectsAsJsonBlob && typeof val === 'object') {
-                  formData.append(key, new Blob([val], { type: 'application/json' }));
+          $timeout(function () {
+            file[disallowObjectUrl ? '$ngfDataUrl' : '$ngfBlobUrl'] = '';
+            deferred.reject();
+          });
+        }
+      });
+
+      if (disallowObjectUrl) {
+        p = file.$$ngfDataUrlPromise = deferred.promise;
+      } else {
+        p = file.$$ngfBlobUrlPromise = deferred.promise;
+      }
+      p['finally'](function () {
+        delete file[disallowObjectUrl ? '$$ngfDataUrlPromise' : '$$ngfBlobUrlPromise'];
+      });
+      return p;
+    };
+    return upload;
+  }]);
+
+  function getTagType(el) {
+    if (el.tagName.toLowerCase() === 'img') return 'image';
+    if (el.tagName.toLowerCase() === 'audio') return 'audio';
+    if (el.tagName.toLowerCase() === 'video') return 'video';
+    return /./;
+  }
+
+  function linkFileDirective(Upload, $timeout, scope, elem, attr, directiveName, resizeParams, isBackground) {
+    function constructDataUrl(file) {
+      var disallowObjectUrl = Upload.attrGetter('ngfNoObjectUrl', attr, scope);
+      Upload.dataUrl(file, disallowObjectUrl)['finally'](function () {
+        $timeout(function () {
+          var src = (disallowObjectUrl ? file.$ngfDataUrl : file.$ngfBlobUrl) || file.$ngfDataUrl;
+          if (isBackground) {
+            elem.css('background-image', 'url(\'' + (src || '') + '\')');
+          } else {
+            elem.attr('src', src);
+          }
+          if (src) {
+            elem.removeClass('ng-hide');
+          } else {
+            elem.addClass('ng-hide');
+          }
+        });
+      });
+    }
+
+    $timeout(function () {
+      var unwatch = scope.$watch(attr[directiveName], function (file) {
+        var size = resizeParams;
+        if (directiveName === 'ngfThumbnail') {
+          if (!size) {
+            size = {
+              width: elem[0].naturalWidth || elem[0].clientWidth,
+              height: elem[0].naturalHeight || elem[0].clientHeight
+            };
+          }
+          if (size.width === 0 && window.getComputedStyle) {
+            var style = getComputedStyle(elem[0]);
+            if (style.width && style.width.indexOf('px') > -1 && style.height && style.height.indexOf('px') > -1) {
+              size = {
+                width: parseInt(style.width.slice(0, -2)),
+                height: parseInt(style.height.slice(0, -2))
+              };
+            }
+          }
+        }
+
+        if (angular.isString(file)) {
+          elem.removeClass('ng-hide');
+          if (isBackground) {
+            return elem.css('background-image', 'url(\'' + file + '\')');
+          } else {
+            return elem.attr('src', file);
+          }
+        }
+        if (file && file.type && file.type.search(getTagType(elem[0])) === 0 &&
+          (!isBackground || file.type.indexOf('image') === 0)) {
+          if (size && Upload.isResizeSupported()) {
+            size.resizeIf = function (width, height) {
+              return Upload.attrGetter('ngfResizeIf', attr, scope,
+                {$width: width, $height: height, $file: file});
+            };
+            Upload.resize(file, size).then(
+              function (f) {
+                constructDataUrl(f);
+              }, function (e) {
+                throw e;
+              }
+            );
+          } else {
+            constructDataUrl(file);
+          }
+        } else {
+          elem.addClass('ng-hide');
+        }
+      });
+
+      scope.$on('$destroy', function () {
+        unwatch();
+      });
+    });
+  }
+
+
+  /** @namespace attr.ngfSrc */
+  /** @namespace attr.ngfNoObjectUrl */
+  ngFileUpload.directive('ngfSrc', ['Upload', '$timeout', function (Upload, $timeout) {
+    return {
+      restrict: 'AE',
+      link: function (scope, elem, attr) {
+        linkFileDirective(Upload, $timeout, scope, elem, attr, 'ngfSrc',
+          Upload.attrGetter('ngfResize', attr, scope), false);
+      }
+    };
+  }]);
+
+  /** @namespace attr.ngfBackground */
+  /** @namespace attr.ngfNoObjectUrl */
+  ngFileUpload.directive('ngfBackground', ['Upload', '$timeout', function (Upload, $timeout) {
+    return {
+      restrict: 'AE',
+      link: function (scope, elem, attr) {
+        linkFileDirective(Upload, $timeout, scope, elem, attr, 'ngfBackground',
+          Upload.attrGetter('ngfResize', attr, scope), true);
+      }
+    };
+  }]);
+
+  /** @namespace attr.ngfThumbnail */
+  /** @namespace attr.ngfAsBackground */
+  /** @namespace attr.ngfSize */
+  /** @namespace attr.ngfNoObjectUrl */
+  ngFileUpload.directive('ngfThumbnail', ['Upload', '$timeout', function (Upload, $timeout) {
+    return {
+      restrict: 'AE',
+      link: function (scope, elem, attr) {
+        var size = Upload.attrGetter('ngfSize', attr, scope);
+        linkFileDirective(Upload, $timeout, scope, elem, attr, 'ngfThumbnail', size,
+          Upload.attrGetter('ngfAsBackground', attr, scope));
+      }
+    };
+  }]);
+
+  ngFileUpload.config(['$compileProvider', function ($compileProvider) {
+    if ($compileProvider.imgSrcSanitizationWhitelist) $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|mailto|tel|webcal|local|file|data|blob):/);
+    if ($compileProvider.aHrefSanitizationWhitelist) $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|tel|webcal|local|file|data|blob):/);
+  }]);
+
+  ngFileUpload.filter('ngfDataUrl', ['UploadDataUrl', '$sce', function (UploadDataUrl, $sce) {
+    return function (file, disallowObjectUrl, trustedUrl) {
+      if (angular.isString(file)) {
+        return $sce.trustAsResourceUrl(file);
+      }
+      var src = file && ((disallowObjectUrl ? file.$ngfDataUrl : file.$ngfBlobUrl) || file.$ngfDataUrl);
+      if (file && !src) {
+        if (!file.$ngfDataUrlFilterInProgress && angular.isObject(file)) {
+          file.$ngfDataUrlFilterInProgress = true;
+          UploadDataUrl.dataUrl(file, disallowObjectUrl);
+        }
+        return '';
+      }
+      if (file) delete file.$ngfDataUrlFilterInProgress;
+      return (file && src ? (trustedUrl ? $sce.trustAsResourceUrl(src) : src) : file) || '';
+    };
+  }]);
+
+})();
+
+ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', function (UploadDataUrl, $q, $timeout) {
+  var upload = UploadDataUrl;
+
+  function globStringToRegex(str) {
+    var regexp = '', excludes = [];
+    if (str.length > 2 && str[0] === '/' && str[str.length - 1] === '/') {
+      regexp = str.substring(1, str.length - 1);
+    } else {
+      var split = str.split(',');
+      if (split.length > 1) {
+        for (var i = 0; i < split.length; i++) {
+          var r = globStringToRegex(split[i]);
+          if (r.regexp) {
+            regexp += '(' + r.regexp + ')';
+            if (i < split.length - 1) {
+              regexp += '|';
+            }
+          } else {
+            excludes = excludes.concat(r.excludes);
+          }
+        }
+      } else {
+        if (str.indexOf('!') === 0) {
+          excludes.push('^((?!' + globStringToRegex(str.substring(1)).regexp + ').)*$');
+        } else {
+          if (str.indexOf('.') === 0) {
+            str = '*' + str;
+          }
+          regexp = '^' + str.replace(new RegExp('[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\-]', 'g'), '\\$&') + '$';
+          regexp = regexp.replace(/\\\*/g, '.*').replace(/\\\?/g, '.');
+        }
+      }
+    }
+    return {regexp: regexp, excludes: excludes};
+  }
+
+  upload.validatePattern = function (file, val) {
+    if (!val) {
+      return true;
+    }
+    var pattern = globStringToRegex(val), valid = true;
+    if (pattern.regexp && pattern.regexp.length) {
+      var regexp = new RegExp(pattern.regexp, 'i');
+      valid = (file.type != null && regexp.test(file.type)) ||
+        (file.name != null && regexp.test(file.name));
+    }
+    var len = pattern.excludes.length;
+    while (len--) {
+      var exclude = new RegExp(pattern.excludes[len], 'i');
+      valid = valid && (file.type == null || exclude.test(file.type)) &&
+        (file.name == null || exclude.test(file.name));
+    }
+    return valid;
+  };
+
+  upload.ratioToFloat = function (val) {
+    var r = val.toString(), xIndex = r.search(/[x:]/i);
+    if (xIndex > -1) {
+      r = parseFloat(r.substring(0, xIndex)) / parseFloat(r.substring(xIndex + 1));
+    } else {
+      r = parseFloat(r);
+    }
+    return r;
+  };
+
+  upload.registerModelChangeValidator = function (ngModel, attr, scope) {
+    if (ngModel) {
+      ngModel.$formatters.push(function (files) {
+        if (ngModel.$dirty) {
+          var filesArray = files;
+          if (files && !angular.isArray(files)) {
+            filesArray = [files];
+          }
+          upload.validate(filesArray, 0, ngModel, attr, scope).then(function () {
+            upload.applyModelValidation(ngModel, filesArray);
+          });
+        }
+        return files;
+      });
+    }
+  };
+
+  function markModelAsDirty(ngModel, files) {
+    if (files != null && !ngModel.$dirty) {
+      if (ngModel.$setDirty) {
+        ngModel.$setDirty();
+      } else {
+        ngModel.$dirty = true;
+      }
+    }
+  }
+
+  upload.applyModelValidation = function (ngModel, files) {
+    markModelAsDirty(ngModel, files);
+    angular.forEach(ngModel.$ngfValidations, function (validation) {
+      ngModel.$setValidity(validation.name, validation.valid);
+    });
+  };
+
+  upload.getValidationAttr = function (attr, scope, name, validationName, file) {
+    var dName = 'ngf' + name[0].toUpperCase() + name.substr(1);
+    var val = upload.attrGetter(dName, attr, scope, {$file: file});
+    if (val == null) {
+      val = upload.attrGetter('ngfValidate', attr, scope, {$file: file});
+      if (val) {
+        var split = (validationName || name).split('.');
+        val = val[split[0]];
+        if (split.length > 1) {
+          val = val && val[split[1]];
+        }
+      }
+    }
+    return val;
+  };
+
+  upload.validate = function (files, prevLength, ngModel, attr, scope) {
+    ngModel = ngModel || {};
+    ngModel.$ngfValidations = ngModel.$ngfValidations || [];
+
+    angular.forEach(ngModel.$ngfValidations, function (v) {
+      v.valid = true;
+    });
+
+    var attrGetter = function (name, params) {
+      return upload.attrGetter(name, attr, scope, params);
+    };
+
+    var ignoredErrors = (upload.attrGetter('ngfIgnoreInvalid', attr, scope) || '').split(' ');
+    var runAllValidation = upload.attrGetter('ngfRunAllValidations', attr, scope);
+
+    if (files == null || files.length === 0) {
+      return upload.emptyPromise({'validFiles': files, 'invalidFiles': []});
+    }
+
+    files = files.length === undefined ? [files] : files.slice(0);
+    var invalidFiles = [];
+
+    function validateSync(name, validationName, fn) {
+      if (files) {
+        var i = files.length, valid = null;
+        while (i--) {
+          var file = files[i];
+          if (file) {
+            var val = upload.getValidationAttr(attr, scope, name, validationName, file);
+            if (val != null) {
+              if (!fn(file, val, i)) {
+                if (ignoredErrors.indexOf(name) === -1) {
+                  file.$error = name;
+                  (file.$errorMessages = (file.$errorMessages || {}))[name] = true;
+                  file.$errorParam = val;
+                  if (invalidFiles.indexOf(file) === -1) {
+                    invalidFiles.push(file);
+                  }
+                  if (!runAllValidation) {
+                    files.splice(i, 1);
+                  }
+                  valid = false;
                 } else {
-                  formData.append(key, JSON.stringify(val));
+                  files.splice(i, 1);
                 }
               }
             }
           }
         }
-
-        if (config.file != null) {
-          var fileFormName = config.fileFormDataName || 'file';
-
-          if (Object.prototype.toString.call(config.file) === '[object Array]') {
-            var isFileFormNameString = Object.prototype.toString.call(fileFormName) === '[object String]';
-            for (var i = 0; i < config.file.length; i++) {
-              formData.append(isFileFormNameString ? fileFormName : fileFormName[i], config.file[i],
-                  (config.fileName && config.fileName[i]) || config.file[i].name);
-            }
-          } else {
-            formData.append(fileFormName, config.file, config.fileName || config.file.name);
-          }
-        }
-        return formData;
-      });
-
-      return sendHttp(config);
-    };
-
-    this.http = function(config) {
-      return sendHttp(config);
-    };
-  }]);
-
-  angularFileUpload.directive('ngFileSelect', [ '$parse', '$timeout', '$compile',
-    function($parse, $timeout, $compile) { return {
-      restrict: 'AEC',
-      require:'?ngModel',
-      link: function(scope, elem, attr, ngModel) {
-        handleFileSelect(scope, elem, attr, ngModel, $parse, $timeout, $compile);
-      }
-    }}]);
-
-  function handleFileSelect(scope, elem, attr, ngModel, $parse, $timeout, $compile) {
-    function isInputTypeFile() {
-      return elem[0].tagName.toLowerCase() === 'input' && elem.attr('type') && elem.attr('type').toLowerCase() === 'file';
-    }
-
-    var watchers = [];
-
-    function watchForRecompile(attrVal) {
-      $timeout(function() {
-        if (elem.parent().length) {
-          watchers.push(scope.$watch(attrVal, function(val, oldVal) {
-            if (val != oldVal) {
-              recompileElem();
-            }
-          }));
-        }
-      });
-    }
-
-    function recompileElem() {
-      var clone = elem.clone();
-      if (elem.attr('__afu_gen__')) {
-        angular.element(document.getElementById(elem.attr('id').substring(1))).remove();
-      }
-      if (elem.parent().length) {
-        for (var i = 0; i < watchers.length; i++) {
-          watchers[i]();
-        }
-        elem.replaceWith(clone);
-        $compile(clone)(scope);
-      }
-      return clone;
-    }
-
-    function bindAttr(bindAttr, attrName) {
-      if (bindAttr) {
-        watchForRecompile(bindAttr);
-        var val = $parse(bindAttr)(scope);
-        if (val) {
-          elem.attr(attrName, val);
-          attr[attrName] = val;
-        } else {
-          elem.attr(attrName, null);
-          delete attr[attrName];
+        if (valid !== null) {
+          ngModel.$ngfValidations.push({name: name, valid: valid});
         }
       }
     }
 
-    bindAttr(attr.ngMultiple, 'multiple');
-    bindAttr(attr.ngAccept, 'ng-accept');
-    bindAttr(attr.ngCapture, 'capture');
-
-    if (attr['ngFileSelect'] != '') {
-      attr.ngFileChange = attr.ngFileSelect;
-    }
-
-    function onChangeFn(evt) {
-      var files = [], fileList, i;
-      fileList = evt.__files_ || (evt.target && evt.target.files);
-      updateModel(fileList, attr, ngModel, scope, evt);
-    };
-
-    var fileElem = elem;
-    if (!isInputTypeFile()) {
-      fileElem = angular.element('<input type="file">')
-      if (elem.attr['multiple']) fileElem.attr('multiple', elem.attr['multiple']);
-      if (elem.attr['accept']) fileElem.attr('accept', elem.attr['accept']);
-      if (elem.attr['capture']) fileElem.attr('capture', elem.attr['capture']);
-      for (var key in attr) {
-        if (key.indexOf('inputFile') == 0) {
-          var name = key.substring('inputFile'.length);
-          name = name[0].toLowerCase() + name.substring(1);
-          fileElem.attr(name, attr[key]);
-        }
+    validateSync('pattern', null, upload.validatePattern);
+    validateSync('minSize', 'size.min', function (file, val) {
+      return file.size + 0.1 >= upload.translateScalars(val);
+    });
+    validateSync('maxSize', 'size.max', function (file, val) {
+      return file.size - 0.1 <= upload.translateScalars(val);
+    });
+    var totalSize = 0;
+    validateSync('maxTotalSize', null, function (file, val) {
+      totalSize += file.size;
+      if (totalSize > upload.translateScalars(val)) {
+        files.splice(0, files.length);
+        return false;
       }
-
-      fileElem.css('width', '0px').css('height', '0px').css('position', 'absolute').css('padding', 0).css('margin', 0)
-          .css('overflow', 'hidden').attr('tabindex', '-1').css('opacity', 0).attr('__afu_gen__', true);
-      elem.attr('__refElem__', true);
-      fileElem[0].__refElem__ = elem[0];
-      elem.parent()[0].insertBefore(fileElem[0], elem[0])
-      elem.css('overflow', 'hidden');
-      elem.bind('click', function(e) {
-        if (!resetAndClick(e)) {
-          fileElem[0].click();
-        }
-      });
-    } else {
-      elem.bind('click', resetAndClick);
-    }
-
-    function resetAndClick(evt) {
-      if (fileElem[0].value != null && fileElem[0].value != '') {
-        fileElem[0].value = null;
-        // IE 11 already fires change event when you set the value to null
-        if (navigator.userAgent.indexOf("Trident/7") === -1) {
-          onChangeFn({target: {files: []}});
-        }
-      }
-      // if this is manual click trigger we don't need to reset again
-      if (!elem.attr('__afu_clone__')) {
-        // fix for IE10 cannot set the value of the input to null programmatically by cloning and replacing input
-        // IE 11 setting the value to null event will be fired after file change clearing the selected file so
-        // we just recreate the element for IE 11 as well
-        if (navigator.appVersion.indexOf("MSIE 10") !== -1 || navigator.userAgent.indexOf("Trident/7") !== -1) {
-          var clone = recompileElem();
-          clone.attr('__afu_clone__', true);
-          clone[0].click();
-          evt.preventDefault();
-          evt.stopPropagation();
-          return true;
-        }
-      } else {
-        elem.attr('__afu_clone__', null);
-      }
-    }
-
-    fileElem.bind('change', onChangeFn);
-
-    elem.on('$destroy', function() {
-      for (var i = 0; i < watchers.length; i++) {
-        watchers[i]();
-      }
-      if (elem[0] != fileElem[0]) fileElem.remove();
+      return true;
     });
 
-    watchers.push(scope.$watch(attr.ngModel, function(val, oldVal) {
-      if (val != oldVal && (val == null || !val.length)) {
-        if (navigator.appVersion.indexOf("MSIE 10") !== -1) {
-          recompileElem();
-        } else {
-          fileElem[0].value = null;
-        }
-      }
-    }));
+    validateSync('validateFn', null, function (file, r) {
+      return r === true || r === null || r === '';
+    });
 
-    function updateModel(fileList, attr, ngModel, scope, evt) {
-      var files = [], rejFiles = [];
-      var accept = $parse(attr.ngAccept)(scope);
-      var regexp = angular.isString(accept) && accept ? new RegExp(globStringToRegex(accept), 'gi') : null;
-      var acceptFn = regexp ? null : attr.ngAccept;
+    if (!files.length) {
+      return upload.emptyPromise({'validFiles': [], 'invalidFiles': invalidFiles});
+    }
 
-      for (var i = 0; i < fileList.length; i++) {
-        var file = fileList.item(i);
-        if ((!regexp || file.type.match(regexp) || (file.name != null && file.name.match(regexp))) &&
-            (!acceptFn || $parse(acceptFn)(scope, {$file: file, $event: evt}))) {
-          files.push(file);
-        } else {
-          rejFiles.push(file);
-        }
-      }
-      $timeout(function() {
-        if (ngModel) {
-          $parse(attr.ngModel).assign(scope, files);
-          ngModel && ngModel.$setViewValue(files != null && files.length == 0 ? '' : files);
-          if (attr.ngModelRejected) {
-            $parse(attr.ngModelRejected).assign(scope, rejFiles);
+    function validateAsync(name, validationName, type, asyncFn, fn) {
+      function resolveResult(defer, file, val) {
+        function resolveInternal(fn) {
+          if (fn()) {
+            if (ignoredErrors.indexOf(name) === -1) {
+              file.$error = name;
+              (file.$errorMessages = (file.$errorMessages || {}))[name] = true;
+              file.$errorParam = val;
+              if (invalidFiles.indexOf(file) === -1) {
+                invalidFiles.push(file);
+              }
+              if (!runAllValidation) {
+                var i = files.indexOf(file);
+                if (i > -1) files.splice(i, 1);
+              }
+              defer.resolve(false);
+            } else {
+              var j = files.indexOf(file);
+              if (j > -1) files.splice(j, 1);
+              defer.resolve(true);
+            }
+          } else {
+            defer.resolve(true);
           }
         }
-        if (attr.ngFileChange && attr.ngFileChange != "") {
-          $parse(attr.ngFileChange)(scope, {
-            $files: files,
-            $rejectedFiles: rejFiles,
-            $event: evt
+
+        if (val != null) {
+          asyncFn(file, val).then(function (d) {
+            resolveInternal(function () {
+              return !fn(d, val);
+            });
+          }, function () {
+            resolveInternal(function () {
+              return attrGetter('ngfValidateForce', {$file: file});
+            });
           });
+        } else {
+          defer.resolve(true);
         }
-      });
-    }
-  }
+      }
 
-  angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', '$location', function($parse, $timeout, $location) { return {
-    restrict: 'AEC',
-    require:'?ngModel',
-    link: function(scope, elem, attr, ngModel) {
-      handleDrop(scope, elem, attr, ngModel, $parse, $timeout, $location);
-    }
-  }}]);
-
-  angularFileUpload.directive('ngNoFileDrop', function() {
-    return function(scope, elem, attr) {
-      if (dropAvailable()) elem.css('display', 'none')
-    }
-  });
-
-//for backward compatibility
-  angularFileUpload.directive('ngFileDropAvailable', [ '$parse', '$timeout', function($parse, $timeout) {
-    return function(scope, elem, attr) {
-      if (dropAvailable()) {
-        var fn = $parse(attr['ngFileDropAvailable']);
-        $timeout(function() {
-          fn(scope);
+      var promises = [upload.emptyPromise(true)];
+      if (files) {
+        files = files.length === undefined ? [files] : files;
+        angular.forEach(files, function (file) {
+          var defer = $q.defer();
+          promises.push(defer.promise);
+          if (type && (file.type == null || file.type.search(type) !== 0)) {
+            defer.resolve(true);
+            return;
+          }
+          if (name === 'dimensions' && upload.attrGetter('ngfDimensions', attr) != null) {
+            upload.imageDimensions(file).then(function (d) {
+              resolveResult(defer, file,
+                attrGetter('ngfDimensions', {$file: file, $width: d.width, $height: d.height}));
+            }, function () {
+              defer.resolve(false);
+            });
+          } else if (name === 'duration' && upload.attrGetter('ngfDuration', attr) != null) {
+            upload.mediaDuration(file).then(function (d) {
+              resolveResult(defer, file,
+                attrGetter('ngfDuration', {$file: file, $duration: d}));
+            }, function () {
+              defer.resolve(false);
+            });
+          } else {
+            resolveResult(defer, file,
+              upload.getValidationAttr(attr, scope, name, validationName, file));
+          }
         });
       }
+      var deffer = $q.defer();
+      $q.all(promises).then(function (values) {
+        var isValid = true;
+        for (var i = 0; i < values.length; i++) {
+          if (!values[i]) {
+            isValid = false;
+            break;
+          }
+        }
+        ngModel.$ngfValidations.push({name: name, valid: isValid});
+        deffer.resolve(isValid);
+      });
+      return deffer.promise;
     }
+
+    var deffer = $q.defer();
+    var promises = [];
+
+    promises.push(validateAsync('maxHeight', 'height.max', /image/,
+      this.imageDimensions, function (d, val) {
+        return d.height <= val;
+      }));
+    promises.push(validateAsync('minHeight', 'height.min', /image/,
+      this.imageDimensions, function (d, val) {
+        return d.height >= val;
+      }));
+    promises.push(validateAsync('maxWidth', 'width.max', /image/,
+      this.imageDimensions, function (d, val) {
+        return d.width <= val;
+      }));
+    promises.push(validateAsync('minWidth', 'width.min', /image/,
+      this.imageDimensions, function (d, val) {
+        return d.width >= val;
+      }));
+    promises.push(validateAsync('dimensions', null, /image/,
+      function (file, val) {
+        return upload.emptyPromise(val);
+      }, function (r) {
+        return r;
+      }));
+    promises.push(validateAsync('ratio', null, /image/,
+      this.imageDimensions, function (d, val) {
+        var split = val.toString().split(','), valid = false;
+        for (var i = 0; i < split.length; i++) {
+          if (Math.abs((d.width / d.height) - upload.ratioToFloat(split[i])) < 0.01) {
+            valid = true;
+          }
+        }
+        return valid;
+      }));
+    promises.push(validateAsync('maxRatio', 'ratio.max', /image/,
+      this.imageDimensions, function (d, val) {
+        return (d.width / d.height) - upload.ratioToFloat(val) < 0.0001;
+      }));
+    promises.push(validateAsync('minRatio', 'ratio.min', /image/,
+      this.imageDimensions, function (d, val) {
+        return (d.width / d.height) - upload.ratioToFloat(val) > -0.0001;
+      }));
+    promises.push(validateAsync('maxDuration', 'duration.max', /audio|video/,
+      this.mediaDuration, function (d, val) {
+        return d <= upload.translateScalars(val);
+      }));
+    promises.push(validateAsync('minDuration', 'duration.min', /audio|video/,
+      this.mediaDuration, function (d, val) {
+        return d >= upload.translateScalars(val);
+      }));
+    promises.push(validateAsync('duration', null, /audio|video/,
+      function (file, val) {
+        return upload.emptyPromise(val);
+      }, function (r) {
+        return r;
+      }));
+
+    promises.push(validateAsync('validateAsyncFn', null, null,
+      function (file, val) {
+        return val;
+      }, function (r) {
+        return r === true || r === null || r === '';
+      }));
+
+    $q.all(promises).then(function () {
+
+      if (runAllValidation) {
+        for (var i = 0; i < files.length; i++) {
+          var file = files[i];
+          if (file.$error) {
+            files.splice(i--, 1);
+          }
+        }
+      }
+
+      runAllValidation = false;
+      validateSync('maxFiles', null, function (file, val, i) {
+        return prevLength + i < val;
+      });
+
+      deffer.resolve({'validFiles': files, 'invalidFiles': invalidFiles});
+    });
+    return deffer.promise;
+  };
+
+  upload.imageDimensions = function (file) {
+    if (file.$ngfWidth && file.$ngfHeight) {
+      var d = $q.defer();
+      $timeout(function () {
+        d.resolve({width: file.$ngfWidth, height: file.$ngfHeight});
+      });
+      return d.promise;
+    }
+    if (file.$ngfDimensionPromise) return file.$ngfDimensionPromise;
+
+    var deferred = $q.defer();
+    $timeout(function () {
+      if (file.type.indexOf('image') !== 0) {
+        deferred.reject('not image');
+        return;
+      }
+      upload.dataUrl(file).then(function (dataUrl) {
+        var img = angular.element('<img>').attr('src', dataUrl)
+          .css('visibility', 'hidden').css('position', 'fixed')
+          .css('max-width', 'none !important').css('max-height', 'none !important');
+
+        function success() {
+          var width = img[0].naturalWidth || img[0].clientWidth;
+          var height = img[0].naturalHeight || img[0].clientHeight;
+          img.remove();
+          file.$ngfWidth = width;
+          file.$ngfHeight = height;
+          deferred.resolve({width: width, height: height});
+        }
+
+        function error() {
+          img.remove();
+          deferred.reject('load error');
+        }
+
+        img.on('load', success);
+        img.on('error', error);
+
+        var secondsCounter = 0;
+        function checkLoadErrorInCaseOfNoCallback() {
+          $timeout(function () {
+            if (img[0].parentNode) {
+              if (img[0].clientWidth) {
+                success();
+              } else if (secondsCounter++ > 10) {
+                error();
+              } else {
+                checkLoadErrorInCaseOfNoCallback();
+              }
+            }
+          }, 1000);
+        }
+
+        checkLoadErrorInCaseOfNoCallback();
+
+        angular.element(document.getElementsByTagName('body')[0]).append(img);
+      }, function () {
+        deferred.reject('load error');
+      });
+    });
+
+    file.$ngfDimensionPromise = deferred.promise;
+    file.$ngfDimensionPromise['finally'](function () {
+      delete file.$ngfDimensionPromise;
+    });
+    return file.$ngfDimensionPromise;
+  };
+
+  upload.mediaDuration = function (file) {
+    if (file.$ngfDuration) {
+      var d = $q.defer();
+      $timeout(function () {
+        d.resolve(file.$ngfDuration);
+      });
+      return d.promise;
+    }
+    if (file.$ngfDurationPromise) return file.$ngfDurationPromise;
+
+    var deferred = $q.defer();
+    $timeout(function () {
+      if (file.type.indexOf('audio') !== 0 && file.type.indexOf('video') !== 0) {
+        deferred.reject('not media');
+        return;
+      }
+      upload.dataUrl(file).then(function (dataUrl) {
+        var el = angular.element(file.type.indexOf('audio') === 0 ? '<audio>' : '<video>')
+          .attr('src', dataUrl).css('visibility', 'none').css('position', 'fixed');
+
+        function success() {
+          var duration = el[0].duration;
+          file.$ngfDuration = duration;
+          el.remove();
+          deferred.resolve(duration);
+        }
+
+        function error() {
+          el.remove();
+          deferred.reject('load error');
+        }
+
+        el.on('loadedmetadata', success);
+        el.on('error', error);
+        var count = 0;
+
+        function checkLoadError() {
+          $timeout(function () {
+            if (el[0].parentNode) {
+              if (el[0].duration) {
+                success();
+              } else if (count > 10) {
+                error();
+              } else {
+                checkLoadError();
+              }
+            }
+          }, 1000);
+        }
+
+        checkLoadError();
+
+        angular.element(document.body).append(el);
+      }, function () {
+        deferred.reject('load error');
+      });
+    });
+
+    file.$ngfDurationPromise = deferred.promise;
+    file.$ngfDurationPromise['finally'](function () {
+      delete file.$ngfDurationPromise;
+    });
+    return file.$ngfDurationPromise;
+  };
+  return upload;
+}
+]);
+
+ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadValidate, $q) {
+  var upload = UploadValidate;
+
+  /**
+   * Conserve aspect ratio of the original region. Useful when shrinking/enlarging
+   * images to fit into a certain area.
+   * Source:  http://stackoverflow.com/a/14731922
+   *
+   * @param {Number} srcWidth Source area width
+   * @param {Number} srcHeight Source area height
+   * @param {Number} maxWidth Nestable area maximum available width
+   * @param {Number} maxHeight Nestable area maximum available height
+   * @return {Object} { width, height }
+   */
+  var calculateAspectRatioFit = function (srcWidth, srcHeight, maxWidth, maxHeight, centerCrop) {
+    var ratio = centerCrop ? Math.max(maxWidth / srcWidth, maxHeight / srcHeight) :
+      Math.min(maxWidth / srcWidth, maxHeight / srcHeight);
+    return {
+      width: srcWidth * ratio, height: srcHeight * ratio,
+      marginX: srcWidth * ratio - maxWidth, marginY: srcHeight * ratio - maxHeight
+    };
+  };
+
+  // Extracted from https://github.com/romelgomez/angular-firebase-image-upload/blob/master/app/scripts/fileUpload.js#L89
+  var resize = function (imagen, width, height, quality, type, ratio, centerCrop, resizeIf) {
+    var deferred = $q.defer();
+    var canvasElement = document.createElement('canvas');
+    var imageElement = document.createElement('img');
+    imageElement.setAttribute('style', 'visibility:hidden;position:fixed;z-index:-100000');
+    document.body.appendChild(imageElement);
+
+    imageElement.onload = function () {
+      var imgWidth = imageElement.width, imgHeight = imageElement.height;
+      imageElement.parentNode.removeChild(imageElement);
+      if (resizeIf != null && resizeIf(imgWidth, imgHeight) === false) {
+        deferred.reject('resizeIf');
+        return;
+      }
+      try {
+        if (ratio) {
+          var ratioFloat = upload.ratioToFloat(ratio);
+          var imgRatio = imgWidth / imgHeight;
+          if (imgRatio < ratioFloat) {
+            width = imgWidth;
+            height = width / ratioFloat;
+          } else {
+            height = imgHeight;
+            width = height * ratioFloat;
+          }
+        }
+        if (!width) {
+          width = imgWidth;
+        }
+        if (!height) {
+          height = imgHeight;
+        }
+        var dimensions = calculateAspectRatioFit(imgWidth, imgHeight, width, height, centerCrop);
+        canvasElement.width = Math.min(dimensions.width, width);
+        canvasElement.height = Math.min(dimensions.height, height);
+        var context = canvasElement.getContext('2d');
+        context.drawImage(imageElement,
+          Math.min(0, -dimensions.marginX / 2), Math.min(0, -dimensions.marginY / 2),
+          dimensions.width, dimensions.height);
+        deferred.resolve(canvasElement.toDataURL(type || 'image/WebP', quality || 0.934));
+      } catch (e) {
+        deferred.reject(e);
+      }
+    };
+    imageElement.onerror = function () {
+      imageElement.parentNode.removeChild(imageElement);
+      deferred.reject();
+    };
+    imageElement.src = imagen;
+    return deferred.promise;
+  };
+
+  upload.dataUrltoBlob = function (dataurl, name, origSize) {
+    var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
+      bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+    while (n--) {
+      u8arr[n] = bstr.charCodeAt(n);
+    }
+    var blob = new window.Blob([u8arr], {type: mime});
+    blob.name = name;
+    blob.$ngfOrigSize = origSize;
+    return blob;
+  };
+
+  upload.isResizeSupported = function () {
+    var elem = document.createElement('canvas');
+    return window.atob && elem.getContext && elem.getContext('2d') && window.Blob;
+  };
+
+  if (upload.isResizeSupported()) {
+    // add name getter to the blob constructor prototype
+    Object.defineProperty(window.Blob.prototype, 'name', {
+      get: function () {
+        return this.$ngfName;
+      },
+      set: function (v) {
+        this.$ngfName = v;
+      },
+      configurable: true
+    });
+  }
+
+  upload.resize = function (file, options) {
+    if (file.type.indexOf('image') !== 0) return upload.emptyPromise(file);
+
+    var deferred = $q.defer();
+    upload.dataUrl(file, true).then(function (url) {
+      resize(url, options.width, options.height, options.quality, options.type || file.type,
+        options.ratio, options.centerCrop, options.resizeIf)
+        .then(function (dataUrl) {
+          if (file.type === 'image/jpeg' && options.restoreExif !== false) {
+            try {
+              dataUrl = upload.restoreExif(url, dataUrl);
+            } catch (e) {
+              setTimeout(function () {throw e;}, 1);
+            }
+          }
+          try {
+            var blob = upload.dataUrltoBlob(dataUrl, file.name, file.size);
+            deferred.resolve(blob);
+          } catch (e) {
+            deferred.reject(e);
+          }
+        }, function (r) {
+          if (r === 'resizeIf') {
+            deferred.resolve(file);
+          }
+          deferred.reject(r);
+        });
+    }, function (e) {
+      deferred.reject(e);
+    });
+    return deferred.promise;
+  };
+
+  return upload;
+}]);
+
+(function () {
+  ngFileUpload.directive('ngfDrop', ['$parse', '$timeout', '$window', 'Upload', '$http', '$q',
+    function ($parse, $timeout, $window, Upload, $http, $q) {
+      return {
+        restrict: 'AEC',
+        require: '?ngModel',
+        link: function (scope, elem, attr, ngModel) {
+          linkDrop(scope, elem, attr, ngModel, $parse, $timeout, $window, Upload, $http, $q);
+        }
+      };
+    }]);
+
+  ngFileUpload.directive('ngfNoFileDrop', function () {
+    return function (scope, elem) {
+      if (dropAvailable()) elem.css('display', 'none');
+    };
+  });
+
+  ngFileUpload.directive('ngfDropAvailable', ['$parse', '$timeout', 'Upload', function ($parse, $timeout, Upload) {
+    return function (scope, elem, attr) {
+      if (dropAvailable()) {
+        var model = $parse(Upload.attrGetter('ngfDropAvailable', attr));
+        $timeout(function () {
+          model(scope);
+          if (model.assign) {
+            model.assign(scope, true);
+          }
+        });
+      }
+    };
   }]);
 
-  function handleDrop(scope, elem, attr, ngModel, $parse, $timeout, $location) {
+  function linkDrop(scope, elem, attr, ngModel, $parse, $timeout, $window, upload, $http, $q) {
     var available = dropAvailable();
-    if (attr['dropAvailable']) {
-      $timeout(function() {
-        scope.dropAvailable ? scope.dropAvailable.value = available : scope.dropAvailable = available;
+
+    var attrGetter = function (name, scope, params) {
+      return upload.attrGetter(name, attr, scope, params);
+    };
+
+    if (attrGetter('dropAvailable')) {
+      $timeout(function () {
+        if (scope[attrGetter('dropAvailable')]) {
+          scope[attrGetter('dropAvailable')].value = available;
+        } else {
+          scope[attrGetter('dropAvailable')] = available;
+        }
       });
     }
     if (!available) {
-      if ($parse(attr.hideOnDropNotAvailable)(scope) != false) {
+      if (attrGetter('ngfHideOnDropNotAvailable', scope) === true) {
         elem.css('display', 'none');
       }
       return;
     }
+
+    function isDisabled() {
+      return elem.attr('disabled') || attrGetter('ngfDropDisabled', scope);
+    }
+
+    if (attrGetter('ngfSelect') == null) {
+      upload.registerModelChangeValidator(ngModel, attr, scope);
+    }
+
     var leaveTimeout = null;
-    var stopPropagation = $parse(attr.stopPropagation)(scope);
+    var stopPropagation = $parse(attrGetter('ngfStopPropagation'));
     var dragOverDelay = 1;
-    var accept = $parse(attr.ngAccept)(scope) || attr.accept;
-    var regexp = angular.isString(accept) && accept ? new RegExp(globStringToRegex(accept), 'gi') : null;
-    var acceptFn = regexp ? null : attr.ngAccept;
     var actualDragOverClass;
-    elem[0].addEventListener('dragover', function(evt) {
+
+    elem[0].addEventListener('dragover', function (evt) {
+      if (isDisabled() || !upload.shouldUpdateOn('drop', attr, scope)) return;
       evt.preventDefault();
-      if (stopPropagation) evt.stopPropagation();
+      if (stopPropagation(scope)) evt.stopPropagation();
       // handling dragover events from the Chrome download bar
-      if (navigator.userAgent.indexOf("Chrome") > -1) {
+      if (navigator.userAgent.indexOf('Chrome') > -1) {
         var b = evt.dataTransfer.effectAllowed;
         evt.dataTransfer.dropEffect = ('move' === b || 'linkMove' === b) ? 'move' : 'copy';
       }
       $timeout.cancel(leaveTimeout);
-      if (!scope.actualDragOverClass) {
-        actualDragOverClass = calculateDragOverClass(scope, attr, evt);
+      if (!actualDragOverClass) {
+        actualDragOverClass = 'C';
+        calculateDragOverClass(scope, attr, evt, function (clazz) {
+          actualDragOverClass = clazz;
+          elem.addClass(actualDragOverClass);
+          attrGetter('ngfDrag', scope, {$isDragging: true, $class: actualDragOverClass, $event: evt});
+        });
       }
-      elem.addClass(actualDragOverClass);
     }, false);
-    elem[0].addEventListener('dragenter', function(evt) {
+    elem[0].addEventListener('dragenter', function (evt) {
+      if (isDisabled() || !upload.shouldUpdateOn('drop', attr, scope)) return;
       evt.preventDefault();
-      if (stopPropagation) evt.stopPropagation();
+      if (stopPropagation(scope)) evt.stopPropagation();
     }, false);
-    elem[0].addEventListener('dragleave', function(evt) {
-      leaveTimeout = $timeout(function() {
-        elem.removeClass(actualDragOverClass);
+    elem[0].addEventListener('dragleave', function (evt) {
+      if (isDisabled() || !upload.shouldUpdateOn('drop', attr, scope)) return;
+      evt.preventDefault();
+      if (stopPropagation(scope)) evt.stopPropagation();
+      leaveTimeout = $timeout(function () {
+        if (actualDragOverClass) elem.removeClass(actualDragOverClass);
         actualDragOverClass = null;
-      }, dragOverDelay || 1);
+        attrGetter('ngfDrag', scope, {$isDragging: false, $event: evt});
+      }, dragOverDelay || 100);
     }, false);
-    if (attr['ngFileDrop'] != '') {
-      attr.ngFileChange = scope.ngFileDrop;
-    }
-    elem[0].addEventListener('drop', function(evt) {
+    elem[0].addEventListener('drop', function (evt) {
+      if (isDisabled() || !upload.shouldUpdateOn('drop', attr, scope)) return;
       evt.preventDefault();
-      if (stopPropagation) evt.stopPropagation();
-      elem.removeClass(actualDragOverClass);
+      if (stopPropagation(scope)) evt.stopPropagation();
+      if (actualDragOverClass) elem.removeClass(actualDragOverClass);
       actualDragOverClass = null;
-      extractFiles(evt, function(files, rejFiles) {
-        $timeout(function() {
-          if (ngModel) {
-            $parse(attr.ngModel).assign(scope, files);
-            ngModel && ngModel.$setViewValue(files != null && files.length == 0 ? '' : files);
-          }
-          if (attr['ngModelRejected']) {
-            if (scope[attr.ngModelRejected]) {
-              $parse(attr.ngModelRejected).assign(scope, rejFiles);
+      extractFilesAndUpdateModel(evt.dataTransfer, evt, 'dropUrl');
+    }, false);
+    elem[0].addEventListener('paste', function (evt) {
+      if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1 &&
+        attrGetter('ngfEnableFirefoxPaste', scope)) {
+        evt.preventDefault();
+      }
+      if (isDisabled() || !upload.shouldUpdateOn('paste', attr, scope)) return;
+      extractFilesAndUpdateModel(evt.clipboardData || evt.originalEvent.clipboardData, evt, 'pasteUrl');
+    }, false);
+
+    if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1 &&
+      attrGetter('ngfEnableFirefoxPaste', scope)) {
+      elem.attr('contenteditable', true);
+      elem.on('keypress', function (e) {
+        if (!e.metaKey && !e.ctrlKey) {
+          e.preventDefault();
+        }
+      });
+    }
+
+    function extractFilesAndUpdateModel(source, evt, updateOnType) {
+      if (!source) return;
+      // html needs to be calculated on the same process otherwise the data will be wiped
+      // after promise resolve or setTimeout.
+      var html;
+      try {
+        html = source && source.getData && source.getData('text/html');
+      } catch (e) {/* Fix IE11 that throw error calling getData */
+      }
+      extractFiles(source.items, source.files, attrGetter('ngfAllowDir', scope) !== false,
+        attrGetter('multiple') || attrGetter('ngfMultiple', scope)).then(function (files) {
+        if (files.length) {
+          updateModel(files, evt);
+        } else {
+          extractFilesFromHtml(updateOnType, html).then(function (files) {
+            updateModel(files, evt);
+          });
+        }
+      });
+    }
+
+    function updateModel(files, evt) {
+      upload.updateModel(ngModel, attr, scope, attrGetter('ngfChange') || attrGetter('ngfDrop'), files, evt);
+    }
+
+    function extractFilesFromHtml(updateOn, html) {
+      if (!upload.shouldUpdateOn(updateOn, attr, scope) || typeof html !== 'string') return upload.rejectPromise([]);
+      var urls = [];
+      html.replace(/<(img src|img [^>]* src) *=\"([^\"]*)\"/gi, function (m, n, src) {
+        urls.push(src);
+      });
+      var promises = [], files = [];
+      if (urls.length) {
+        angular.forEach(urls, function (url) {
+          promises.push(upload.urlToBlob(url).then(function (blob) {
+            files.push(blob);
+          }));
+        });
+        var defer = $q.defer();
+        $q.all(promises).then(function () {
+          defer.resolve(files);
+        }, function (e) {
+          defer.reject(e);
+        });
+        return defer.promise;
+      }
+      return upload.emptyPromise();
+    }
+
+    function calculateDragOverClass(scope, attr, evt, callback) {
+      var obj = attrGetter('ngfDragOverClass', scope, {$event: evt}), dClass = 'dragover';
+      if (angular.isString(obj)) {
+        dClass = obj;
+      } else if (obj) {
+        if (obj.delay) dragOverDelay = obj.delay;
+        if (obj.accept || obj.reject) {
+          var items = evt.dataTransfer.items;
+          if (items == null || !items.length) {
+            dClass = obj.accept;
+          } else {
+            var pattern = obj.pattern || attrGetter('ngfPattern', scope, {$event: evt});
+            var len = items.length;
+            while (len--) {
+              if (!upload.validatePattern(items[len], pattern)) {
+                dClass = obj.reject;
+                break;
+              } else {
+                dClass = obj.accept;
+              }
             }
           }
-        });
-        $timeout(function() {
-          $parse(attr.ngFileChange)(scope, {
-            $files: files,
-            $rejectedFiles: rejFiles,
-            $event: evt
-          });
-        });
-      }, $parse(attr.allowDir)(scope) != false, attr.multiple || $parse(attr.ngMultiple)(scope));
-    }, false);
-
-    function calculateDragOverClass(scope, attr, evt) {
-      var valid = true;
-      if (regexp || acceptFn) {
-        var items = evt.dataTransfer.items;
-        if (items != null) {
-          for (var i = 0 ; i < items.length && valid; i++) {
-            valid = valid && (items[i].kind == 'file' || items[i].kind == '') &&
-                ((acceptFn && $parse(acceptFn)(scope, {$file: items[i], $event: evt})) ||
-                    (regexp && (items[i].type != null && items[i].type.match(regexp)) ||
-                        (items[i].name != null && items[i].name.match(regexp))));
-          }
         }
       }
-      var clazz = $parse(attr.dragOverClass)(scope, {$event : evt});
-      if (clazz) {
-        if (clazz.delay) dragOverDelay = clazz.delay;
-        if (clazz.accept) clazz = valid ? clazz.accept : clazz.reject;
-      }
-      return clazz || attr['dragOverClass'] || 'dragover';
+      callback(dClass);
     }
 
-    function extractFiles(evt, callback, allowDir, multiple) {
-      var files = [], rejFiles = [], items = evt.dataTransfer.items, processing = 0;
+    function extractFiles(items, fileList, allowDir, multiple) {
+      var maxFiles = upload.getValidationAttr(attr, scope, 'maxFiles');
+      if (maxFiles == null) {
+        maxFiles = Number.MAX_VALUE;
+      }
+      var maxTotalSize = upload.getValidationAttr(attr, scope, 'maxTotalSize');
+      if (maxTotalSize == null) {
+        maxTotalSize = Number.MAX_VALUE;
+      }
+      var includeDir = attrGetter('ngfIncludeDir', scope);
+      var files = [], totalSize = 0;
 
-      function addFile(file) {
-        if ((!regexp || file.type.match(regexp) || (file.name != null && file.name.match(regexp))) &&
-            (!acceptFn || $parse(acceptFn)(scope, {$file: file, $event: evt}))) {
-          files.push(file);
-        } else {
-          rejFiles.push(file);
+      function traverseFileTree(entry, path) {
+        var defer = $q.defer();
+        if (entry != null) {
+          if (entry.isDirectory) {
+            var promises = [upload.emptyPromise()];
+            if (includeDir) {
+              var file = {type: 'directory'};
+              file.name = file.path = (path || '') + entry.name;
+              files.push(file);
+            }
+            var dirReader = entry.createReader();
+            var entries = [];
+            var readEntries = function () {
+              dirReader.readEntries(function (results) {
+                try {
+                  if (!results.length) {
+                    angular.forEach(entries.slice(0), function (e) {
+                      if (files.length <= maxFiles && totalSize <= maxTotalSize) {
+                        promises.push(traverseFileTree(e, (path ? path : '') + entry.name + '/'));
+                      }
+                    });
+                    $q.all(promises).then(function () {
+                      defer.resolve();
+                    }, function (e) {
+                      defer.reject(e);
+                    });
+                  } else {
+                    entries = entries.concat(Array.prototype.slice.call(results || [], 0));
+                    readEntries();
+                  }
+                } catch (e) {
+                  defer.reject(e);
+                }
+              }, function (e) {
+                defer.reject(e);
+              });
+            };
+            readEntries();
+          } else {
+            entry.file(function (file) {
+              try {
+                file.path = (path ? path : '') + file.name;
+                if (includeDir) {
+                  file = upload.rename(file, file.path);
+                }
+                files.push(file);
+                totalSize += file.size;
+                defer.resolve();
+              } catch (e) {
+                defer.reject(e);
+              }
+            }, function (e) {
+              defer.reject(e);
+            });
+          }
         }
+        return defer.promise;
       }
 
-      if (items && items.length > 0 && $location.protocol() != 'file') {
+      var promises = [upload.emptyPromise()];
+
+      if (items && items.length > 0 && $window.location.protocol !== 'file:') {
         for (var i = 0; i < items.length; i++) {
           if (items[i].webkitGetAsEntry && items[i].webkitGetAsEntry() && items[i].webkitGetAsEntry().isDirectory) {
             var entry = items[i].webkitGetAsEntry();
@@ -482,121 +2136,340 @@
               continue;
             }
             if (entry != null) {
-              traverseFileTree(files, entry);
+              promises.push(traverseFileTree(entry));
             }
           } else {
             var f = items[i].getAsFile();
-            if (f != null) addFile(f);
+            if (f != null) {
+              files.push(f);
+              totalSize += f.size;
+            }
           }
-          if (!multiple && files.length > 0) break;
+          if (files.length > maxFiles || totalSize > maxTotalSize ||
+            (!multiple && files.length > 0)) break;
         }
       } else {
-        var fileList = evt.dataTransfer.files;
         if (fileList != null) {
-          for (var i = 0; i < fileList.length; i++) {
-            addFile(fileList.item(i));
-            if (!multiple && files.length > 0) break;
+          for (var j = 0; j < fileList.length; j++) {
+            var file = fileList.item(j);
+            if (file.type || file.size > 0) {
+              files.push(file);
+              totalSize += file.size;
+            }
+            if (files.length > maxFiles || totalSize > maxTotalSize ||
+              (!multiple && files.length > 0)) break;
           }
         }
       }
-      var delays = 0;
-      (function waitForProcess(delay) {
-        $timeout(function() {
-          if (!processing) {
-            if (!multiple && files.length > 1) {
-              var i = 0;
-              while (files[i].type == 'directory') i++;
-              files = [files[i]];
-            }
-            callback(files, rejFiles);
-          } else {
-            if (delays++ * 10 < 20 * 1000) {
-              waitForProcess(10);
-            }
-          }
-        }, delay || 0)
-      })();
 
-      function traverseFileTree(files, entry, path) {
-        if (entry != null) {
-          if (entry.isDirectory) {
-            var filePath = (path || '') + entry.name;
-            addFile({name: entry.name, type: 'directory', path: filePath});
-            var dirReader = entry.createReader();
-            var entries = [];
-            processing++;
-            var readEntries = function() {
-              dirReader.readEntries(function(results) {
-                try {
-                  if (!results.length) {
-                    for (var i = 0; i < entries.length; i++) {
-                      traverseFileTree(files, entries[i], (path ? path : '') + entry.name + '/');
-                    }
-                    processing--;
-                  } else {
-                    entries = entries.concat(Array.prototype.slice.call(results || [], 0));
-                    readEntries();
-                  }
-                } catch (e) {
-                  processing--;
-                  console.error(e);
-                }
-              }, function() {
-                processing--;
-              });
-            };
-            readEntries();
-          } else {
-            processing++;
-            entry.file(function(file) {
-              try {
-                processing--;
-                file.path = (path ? path : '') + file.name;
-                addFile(file);
-              } catch (e) {
-                processing--;
-                console.error(e);
-              }
-            }, function(e) {
-              processing--;
-            });
-          }
+      var defer = $q.defer();
+      $q.all(promises).then(function () {
+        if (!multiple && !includeDir && files.length) {
+          var i = 0;
+          while (files[i] && files[i].type === 'directory') i++;
+          defer.resolve([files[i]]);
+        } else {
+          defer.resolve(files);
         }
-      }
+      }, function (e) {
+        defer.reject(e);
+      });
+
+      return defer.promise;
     }
   }
 
   function dropAvailable() {
     var div = document.createElement('div');
-    return ('draggable' in div) && ('ondrop' in div);
+    return ('draggable' in div) && ('ondrop' in div) && !/Edge\/12./i.test(navigator.userAgent);
   }
 
-  function globStringToRegex(str) {
-    if (str.length > 2 && str[0] === '/' && str[str.length -1] === '/') {
-      return str.substring(1, str.length - 1);
+})();
+
+// customized version of https://github.com/exif-js/exif-js
+ngFileUpload.service('UploadExif', ['UploadResize', '$q', function (UploadResize, $q) {
+  var upload = UploadResize;
+
+  upload.isExifSupported = function () {
+    return window.FileReader && new FileReader().readAsArrayBuffer && upload.isResizeSupported();
+  };
+
+  function applyTransform(ctx, orientation, width, height) {
+    switch (orientation) {
+      case 2:
+        return ctx.transform(-1, 0, 0, 1, width, 0);
+      case 3:
+        return ctx.transform(-1, 0, 0, -1, width, height);
+      case 4:
+        return ctx.transform(1, 0, 0, -1, 0, height);
+      case 5:
+        return ctx.transform(0, 1, 1, 0, 0, 0);
+      case 6:
+        return ctx.transform(0, 1, -1, 0, height, 0);
+      case 7:
+        return ctx.transform(0, -1, -1, 0, height, width);
+      case 8:
+        return ctx.transform(0, -1, 1, 0, 0, width);
     }
-    var split = str.split(','), result = '';
-    if (split.length > 1) {
-      for (var i = 0; i < split.length; i++) {
-        result += '(' + globStringToRegex(split[i]) + ')';
-        if (i < split.length - 1) {
-          result += '|'
+  }
+
+  upload.readOrientation = function (file) {
+    var defer = $q.defer();
+    var reader = new FileReader();
+    var slicedFile = file.slice ? file.slice(0, 64 * 1024) : file;
+    reader.readAsArrayBuffer(slicedFile);
+    reader.onerror = function (e) {
+      return defer.reject(e);
+    };
+    reader.onload = function (e) {
+      var result = {orientation: 1};
+      var view = new DataView(this.result);
+      if (view.getUint16(0, false) !== 0xFFD8) return defer.resolve(result);
+
+      var length = view.byteLength,
+        offset = 2;
+      while (offset < length) {
+        var marker = view.getUint16(offset, false);
+        offset += 2;
+        if (marker === 0xFFE1) {
+          if (view.getUint32(offset += 2, false) !== 0x45786966) return defer.resolve(result);
+
+          var little = view.getUint16(offset += 6, false) === 0x4949;
+          offset += view.getUint32(offset + 4, little);
+          var tags = view.getUint16(offset, little);
+          offset += 2;
+          for (var i = 0; i < tags; i++)
+            if (view.getUint16(offset + (i * 12), little) === 0x0112) {
+              var orientation = view.getUint16(offset + (i * 12) + 8, little);
+              if (orientation >= 2 && orientation <= 8) {
+                view.setUint16(offset + (i * 12) + 8, 1, little);
+                result.fixedArrayBuffer = e.target.result;
+              }
+              result.orientation = orientation;
+              return defer.resolve(result);
+            }
+        } else if ((marker & 0xFF00) !== 0xFF00) break;
+        else offset += view.getUint16(offset, false);
+      }
+      return defer.resolve(result);
+    };
+    return defer.promise;
+  };
+
+  function arrayBufferToBase64(buffer) {
+    var binary = '';
+    var bytes = new Uint8Array(buffer);
+    var len = bytes.byteLength;
+    for (var i = 0; i < len; i++) {
+      binary += String.fromCharCode(bytes[i]);
+    }
+    return window.btoa(binary);
+  }
+
+  upload.applyExifRotation = function (file) {
+    if (file.type.indexOf('image/jpeg') !== 0) {
+      return upload.emptyPromise(file);
+    }
+
+    var deferred = $q.defer();
+    upload.readOrientation(file).then(function (result) {
+      if (result.orientation < 2 || result.orientation > 8) {
+        return deferred.resolve(file);
+      }
+      upload.dataUrl(file, true).then(function (url) {
+        var canvas = document.createElement('canvas');
+        var img = document.createElement('img');
+
+        img.onload = function () {
+          try {
+            canvas.width = result.orientation > 4 ? img.height : img.width;
+            canvas.height = result.orientation > 4 ? img.width : img.height;
+            var ctx = canvas.getContext('2d');
+            applyTransform(ctx, result.orientation, img.width, img.height);
+            ctx.drawImage(img, 0, 0);
+            var dataUrl = canvas.toDataURL(file.type || 'image/WebP', 0.934);
+            dataUrl = upload.restoreExif(arrayBufferToBase64(result.fixedArrayBuffer), dataUrl);
+            var blob = upload.dataUrltoBlob(dataUrl, file.name);
+            deferred.resolve(blob);
+          } catch (e) {
+            return deferred.reject(e);
+          }
+        };
+        img.onerror = function () {
+          deferred.reject();
+        };
+        img.src = url;
+      }, function (e) {
+        deferred.reject(e);
+      });
+    }, function (e) {
+      deferred.reject(e);
+    });
+    return deferred.promise;
+  };
+
+  upload.restoreExif = function (orig, resized) {
+    var ExifRestorer = {};
+
+    ExifRestorer.KEY_STR = 'ABCDEFGHIJKLMNOP' +
+      'QRSTUVWXYZabcdef' +
+      'ghijklmnopqrstuv' +
+      'wxyz0123456789+/' +
+      '=';
+
+    ExifRestorer.encode64 = function (input) {
+      var output = '',
+        chr1, chr2, chr3 = '',
+        enc1, enc2, enc3, enc4 = '',
+        i = 0;
+
+      do {
+        chr1 = input[i++];
+        chr2 = input[i++];
+        chr3 = input[i++];
+
+        enc1 = chr1 >> 2;
+        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+        enc4 = chr3 & 63;
+
+        if (isNaN(chr2)) {
+          enc3 = enc4 = 64;
+        } else if (isNaN(chr3)) {
+          enc4 = 64;
+        }
+
+        output = output +
+          this.KEY_STR.charAt(enc1) +
+          this.KEY_STR.charAt(enc2) +
+          this.KEY_STR.charAt(enc3) +
+          this.KEY_STR.charAt(enc4);
+        chr1 = chr2 = chr3 = '';
+        enc1 = enc2 = enc3 = enc4 = '';
+      } while (i < input.length);
+
+      return output;
+    };
+
+    ExifRestorer.restore = function (origFileBase64, resizedFileBase64) {
+      if (origFileBase64.match('data:image/jpeg;base64,')) {
+        origFileBase64 = origFileBase64.replace('data:image/jpeg;base64,', '');
+      }
+
+      var rawImage = this.decode64(origFileBase64);
+      var segments = this.slice2Segments(rawImage);
+
+      var image = this.exifManipulation(resizedFileBase64, segments);
+
+      return 'data:image/jpeg;base64,' + this.encode64(image);
+    };
+
+
+    ExifRestorer.exifManipulation = function (resizedFileBase64, segments) {
+      var exifArray = this.getExifArray(segments),
+        newImageArray = this.insertExif(resizedFileBase64, exifArray);
+      return new Uint8Array(newImageArray);
+    };
+
+
+    ExifRestorer.getExifArray = function (segments) {
+      var seg;
+      for (var x = 0; x < segments.length; x++) {
+        seg = segments[x];
+        if (seg[0] === 255 & seg[1] === 225) //(ff e1)
+        {
+          return seg;
         }
       }
-    } else {
-      if (str.indexOf('.') == 0) {
-        str= '*' + str;
+      return [];
+    };
+
+
+    ExifRestorer.insertExif = function (resizedFileBase64, exifArray) {
+      var imageData = resizedFileBase64.replace('data:image/jpeg;base64,', ''),
+        buf = this.decode64(imageData),
+        separatePoint = buf.indexOf(255, 3),
+        mae = buf.slice(0, separatePoint),
+        ato = buf.slice(separatePoint),
+        array = mae;
+
+      array = array.concat(exifArray);
+      array = array.concat(ato);
+      return array;
+    };
+
+
+    ExifRestorer.slice2Segments = function (rawImageArray) {
+      var head = 0,
+        segments = [];
+
+      while (1) {
+        if (rawImageArray[head] === 255 & rawImageArray[head + 1] === 218) {
+          break;
+        }
+        if (rawImageArray[head] === 255 & rawImageArray[head + 1] === 216) {
+          head += 2;
+        }
+        else {
+          var length = rawImageArray[head + 2] * 256 + rawImageArray[head + 3],
+            endPoint = head + length + 2,
+            seg = rawImageArray.slice(head, endPoint);
+          segments.push(seg);
+          head = endPoint;
+        }
+        if (head > rawImageArray.length) {
+          break;
+        }
       }
-      result = '^' + str.replace(new RegExp('[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\' + '-]', 'g'), '\\$&') + '$';
-      result = result.replace(/\\\*/g, '.*').replace(/\\\?/g, '.');
-    }
-    return result;
-  }
 
-  var ngFileUpload = angular.module('ngFileUpload', []);
+      return segments;
+    };
 
-  for (var key in angularFileUpload) {
-    ngFileUpload[key] = angularFileUpload[key];
-  }
 
-})();
\ No newline at end of file
+    ExifRestorer.decode64 = function (input) {
+      var chr1, chr2, chr3 = '',
+        enc1, enc2, enc3, enc4 = '',
+        i = 0,
+        buf = [];
+
+      // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+      var base64test = /[^A-Za-z0-9\+\/\=]/g;
+      if (base64test.exec(input)) {
+        console.log('There were invalid base64 characters in the input text.\n' +
+          'Valid base64 characters are A-Z, a-z, 0-9, ' + ', ' / ',and "="\n' +
+          'Expect errors in decoding.');
+      }
+      input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+
+      do {
+        enc1 = this.KEY_STR.indexOf(input.charAt(i++));
+        enc2 = this.KEY_STR.indexOf(input.charAt(i++));
+        enc3 = this.KEY_STR.indexOf(input.charAt(i++));
+        enc4 = this.KEY_STR.indexOf(input.charAt(i++));
+
+        chr1 = (enc1 << 2) | (enc2 >> 4);
+        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+        chr3 = ((enc3 & 3) << 6) | enc4;
+
+        buf.push(chr1);
+
+        if (enc3 !== 64) {
+          buf.push(chr2);
+        }
+        if (enc4 !== 64) {
+          buf.push(chr3);
+        }
+
+        chr1 = chr2 = chr3 = '';
+        enc1 = enc2 = enc3 = enc4 = '';
+
+      } while (i < input.length);
+
+      return buf;
+    };
+
+    return ExifRestorer.restore(orig, resized);  //<= EXIF
+  };
+
+  return upload;
+}]);
diff --git a/docs-web/src/main/webapp/src/lib/angular.js b/docs-web/src/main/webapp/src/lib/angular.js
index 47eae1e2..7f0a5a24 100644
--- a/docs-web/src/main/webapp/src/lib/angular.js
+++ b/docs-web/src/main/webapp/src/lib/angular.js
@@ -1,9 +1,59 @@
 /**
- * @license AngularJS v1.2.8
- * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.6.6
+ * (c) 2010-2017 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, document, undefined) {'use strict';
+(function(window) {'use strict';
+
+  /* exported
+  minErrConfig,
+  errorHandlingConfig,
+  isValidObjectMaxDepth
+*/
+
+  var minErrConfig = {
+    objectMaxDepth: 5
+  };
+
+  /**
+   * @ngdoc function
+   * @name angular.errorHandlingConfig
+   * @module ng
+   * @kind function
+   *
+   * @description
+   * Configure several aspects of error handling in AngularJS if used as a setter or return the
+   * current configuration if used as a getter. The following options are supported:
+   *
+   * - **objectMaxDepth**: The maximum depth to which objects are traversed when stringified for error messages.
+   *
+   * Omitted or undefined options will leave the corresponding configuration values unchanged.
+   *
+   * @param {Object=} config - The configuration object. May only contain the options that need to be
+   *     updated. Supported keys:
+   *
+   * * `objectMaxDepth`  **{Number}** - The max depth for stringifying objects. Setting to a
+   *   non-positive or non-numeric value, removes the max depth limit.
+   *   Default: 5
+   */
+  function errorHandlingConfig(config) {
+    if (isObject(config)) {
+      if (isDefined(config.objectMaxDepth)) {
+        minErrConfig.objectMaxDepth = isValidObjectMaxDepth(config.objectMaxDepth) ? config.objectMaxDepth : NaN;
+      }
+    } else {
+      return minErrConfig;
+    }
+  }
+
+  /**
+   * @private
+   * @param {Number} maxDepth
+   * @return {boolean}
+   */
+  function isValidObjectMaxDepth(maxDepth) {
+    return isNumber(maxDepth) && maxDepth > 0;
+  }
 
   /**
    * @description
@@ -30,213 +80,255 @@
    * should all be static strings, not variables or general expressions.
    *
    * @param {string} module The namespace to use for the new minErr instance.
-   * @returns {function(string, string, ...): Error} instance
+   * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
+   *   error from returned function, for cases when a particular type of error is useful.
+   * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
    */
 
-  function minErr(module) {
-    return function () {
+  function minErr(module, ErrorConstructor) {
+    ErrorConstructor = ErrorConstructor || Error;
+    return function() {
       var code = arguments[0],
-          prefix = '[' + (module ? module + ':' : '') + code + '] ',
-          template = arguments[1],
-          templateArgs = arguments,
-          stringify = function (obj) {
-            if (typeof obj === 'function') {
-              return obj.toString().replace(/ \{[\s\S]*$/, '');
-            } else if (typeof obj === 'undefined') {
-              return 'undefined';
-            } else if (typeof obj !== 'string') {
-              return JSON.stringify(obj);
-            }
-            return obj;
-          },
-          message, i;
+        template = arguments[1],
+        message = '[' + (module ? module + ':' : '') + code + '] ',
+        templateArgs = sliceArgs(arguments, 2).map(function(arg) {
+          return toDebugString(arg, minErrConfig.objectMaxDepth);
+        }),
+        paramPrefix, i;
 
-      message = prefix + template.replace(/\{\d+\}/g, function (match) {
-        var index = +match.slice(1, -1), arg;
+      message += template.replace(/\{\d+\}/g, function(match) {
+        var index = +match.slice(1, -1);
 
-        if (index + 2 < templateArgs.length) {
-          arg = templateArgs[index + 2];
-          if (typeof arg === 'function') {
-            return arg.toString().replace(/ ?\{[\s\S]*$/, '');
-          } else if (typeof arg === 'undefined') {
-            return 'undefined';
-          } else if (typeof arg !== 'string') {
-            return toJson(arg);
-          }
-          return arg;
+        if (index < templateArgs.length) {
+          return templateArgs[index];
         }
+
         return match;
       });
 
-      message = message + '\nhttp://errors.angularjs.org/1.2.8/' +
-          (module ? module + '/' : '') + code;
-      for (i = 2; i < arguments.length; i++) {
-        message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
-            encodeURIComponent(stringify(arguments[i]));
+      message += '\nhttp://errors.angularjs.org/1.6.6/' +
+        (module ? module + '/' : '') + code;
+
+      for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+        message += paramPrefix + 'p' + i + '=' + encodeURIComponent(templateArgs[i]);
       }
 
-      return new Error(message);
+      return new ErrorConstructor(message);
     };
   }
 
-  /* We need to tell jshint what variables are being exported */
-  /* global
-   -angular,
-   -msie,
-   -jqLite,
-   -jQuery,
-   -slice,
-   -push,
-   -toString,
-   -ngMinErr,
-   -_angular,
-   -angularModule,
-   -nodeName_,
-   -uid,
+  /* We need to tell ESLint what variables are being exported */
+  /* exported
+  angular,
+  msie,
+  jqLite,
+  jQuery,
+  slice,
+  splice,
+  push,
+  toString,
+  minErrConfig,
+  errorHandlingConfig,
+  isValidObjectMaxDepth,
+  ngMinErr,
+  angularModule,
+  uid,
+  REGEX_STRING_REGEXP,
+  VALIDITY_STATE_PROPERTY,
 
-   -lowercase,
-   -uppercase,
-   -manualLowercase,
-   -manualUppercase,
-   -nodeName_,
-   -isArrayLike,
-   -forEach,
-   -sortedKeys,
-   -forEachSorted,
-   -reverseParams,
-   -nextUid,
-   -setHashKey,
-   -extend,
-   -int,
-   -inherit,
-   -noop,
-   -identity,
-   -valueFn,
-   -isUndefined,
-   -isDefined,
-   -isObject,
-   -isString,
-   -isNumber,
-   -isDate,
-   -isArray,
-   -isFunction,
-   -isRegExp,
-   -isWindow,
-   -isScope,
-   -isFile,
-   -isBoolean,
-   -trim,
-   -isElement,
-   -makeMap,
-   -map,
-   -size,
-   -includes,
-   -indexOf,
-   -arrayRemove,
-   -isLeafNode,
-   -copy,
-   -shallowCopy,
-   -equals,
-   -csp,
-   -concat,
-   -sliceArgs,
-   -bind,
-   -toJsonReplacer,
-   -toJson,
-   -fromJson,
-   -toBoolean,
-   -startingTag,
-   -tryDecodeURIComponent,
-   -parseKeyValue,
-   -toKeyValue,
-   -encodeUriSegment,
-   -encodeUriQuery,
-   -angularInit,
-   -bootstrap,
-   -snake_case,
-   -bindJQuery,
-   -assertArg,
-   -assertArgFn,
-   -assertNotHasOwnProperty,
-   -getter,
-   -getBlockElements,
+  lowercase,
+  uppercase,
+  manualLowercase,
+  manualUppercase,
+  nodeName_,
+  isArrayLike,
+  forEach,
+  forEachSorted,
+  reverseParams,
+  nextUid,
+  setHashKey,
+  extend,
+  toInt,
+  inherit,
+  merge,
+  noop,
+  identity,
+  valueFn,
+  isUndefined,
+  isDefined,
+  isObject,
+  isBlankObject,
+  isString,
+  isNumber,
+  isNumberNaN,
+  isDate,
+  isError,
+  isArray,
+  isFunction,
+  isRegExp,
+  isWindow,
+  isScope,
+  isFile,
+  isFormData,
+  isBlob,
+  isBoolean,
+  isPromiseLike,
+  trim,
+  escapeForRegexp,
+  isElement,
+  makeMap,
+  includes,
+  arrayRemove,
+  copy,
+  simpleCompare,
+  equals,
+  csp,
+  jq,
+  concat,
+  sliceArgs,
+  bind,
+  toJsonReplacer,
+  toJson,
+  fromJson,
+  convertTimezoneToLocal,
+  timezoneToOffset,
+  startingTag,
+  tryDecodeURIComponent,
+  parseKeyValue,
+  toKeyValue,
+  encodeUriSegment,
+  encodeUriQuery,
+  angularInit,
+  bootstrap,
+  getTestability,
+  snake_case,
+  bindJQuery,
+  assertArg,
+  assertArgFn,
+  assertNotHasOwnProperty,
+  getter,
+  getBlockNodes,
+  hasOwnProperty,
+  createMap,
+  stringify,
 
-   */
+  NODE_TYPE_ELEMENT,
+  NODE_TYPE_ATTRIBUTE,
+  NODE_TYPE_TEXT,
+  NODE_TYPE_COMMENT,
+  NODE_TYPE_DOCUMENT,
+  NODE_TYPE_DOCUMENT_FRAGMENT
+*/
 
 ////////////////////////////////////
 
+  /**
+   * @ngdoc module
+   * @name ng
+   * @module ng
+   * @installation
+   * @description
+   *
+   * # ng (core module)
+   * The ng module is loaded by default when an AngularJS application is started. The module itself
+   * contains the essential components for an AngularJS application to function. The table below
+   * lists a high level breakdown of each of the services/factories, filters, directives and testing
+   * components available within this core module.
+   *
+   * <div doc-module-components="ng"></div>
+   */
+
+  var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
+
+// The name of a form control's ValidityState property.
+// This is used so that it's possible for internal tests to create mock ValidityStates.
+  var VALIDITY_STATE_PROPERTY = 'validity';
+
+
+  var hasOwnProperty = Object.prototype.hasOwnProperty;
+
   /**
    * @ngdoc function
    * @name angular.lowercase
-   * @function
+   * @module ng
+   * @kind function
+   *
+   * @deprecated
+   * sinceVersion="1.5.0"
+   * removeVersion="1.7.0"
+   * Use [String.prototype.toLowerCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase) instead.
    *
    * @description Converts the specified string to lowercase.
    * @param {string} string String to be converted to lowercase.
    * @returns {string} Lowercased string.
    */
-  var lowercase = function(string){return isString(string) ? string.toLowerCase() : string;};
-
+  var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
 
   /**
    * @ngdoc function
    * @name angular.uppercase
-   * @function
+   * @module ng
+   * @kind function
+   *
+   * @deprecated
+   * sinceVersion="1.5.0"
+   * removeVersion="1.7.0"
+   * Use [String.prototype.toUpperCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase) instead.
    *
    * @description Converts the specified string to uppercase.
    * @param {string} string String to be converted to uppercase.
    * @returns {string} Uppercased string.
    */
-  var uppercase = function(string){return isString(string) ? string.toUpperCase() : string;};
+  var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
 
 
   var manualLowercase = function(s) {
-    /* jshint bitwise: false */
+    /* eslint-disable no-bitwise */
     return isString(s)
-        ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
-        : s;
+      ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
+      : s;
+    /* eslint-enable */
   };
   var manualUppercase = function(s) {
-    /* jshint bitwise: false */
+    /* eslint-disable no-bitwise */
     return isString(s)
-        ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
-        : s;
+      ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
+      : s;
+    /* eslint-enable */
   };
 
 
 // String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
 // locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
-// with correct but slower alternatives.
+// with correct but slower alternatives. See https://github.com/angular/angular.js/issues/11387
   if ('i' !== 'I'.toLowerCase()) {
     lowercase = manualLowercase;
     uppercase = manualUppercase;
   }
 
 
-  var /** holds major version number for IE or NaN for real browsers */
-          msie,
-      jqLite,           // delay binding since jQuery could be loaded after us.
-      jQuery,           // delay binding
-      slice             = [].slice,
-      push              = [].push,
-      toString          = Object.prototype.toString,
-      ngMinErr          = minErr('ng'),
+  var
+    msie,             // holds major version number for IE, or NaN if UA is not IE.
+    jqLite,           // delay binding since jQuery could be loaded after us.
+    jQuery,           // delay binding
+    slice             = [].slice,
+    splice            = [].splice,
+    push              = [].push,
+    toString          = Object.prototype.toString,
+    getPrototypeOf    = Object.getPrototypeOf,
+    ngMinErr          = minErr('ng'),
 
+    /** @name angular */
+    angular           = window.angular || (window.angular = {}),
+    angularModule,
+    uid               = 0;
 
-      _angular          = window.angular,
-      /** @name angular */
-          angular           = window.angular || (window.angular = {}),
-      angularModule,
-      nodeName_,
-      uid               = ['0', '0', '0'];
-
+// Support: IE 9-11 only
   /**
-   * IE 11 changed the format of the UserAgent string.
-   * See http://msdn.microsoft.com/en-us/library/ms537503.aspx
+   * documentMode is an IE-only property
+   * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
    */
-  msie = int((/msie (\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
-  if (isNaN(msie)) {
-    msie = int((/trident\/.*; rv:(\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
-  }
+  msie = window.document.documentMode;
 
 
   /**
@@ -246,67 +338,97 @@
    *                   String ...)
    */
   function isArrayLike(obj) {
-    if (obj == null || isWindow(obj)) {
-      return false;
-    }
 
-    var length = obj.length;
+    // `null`, `undefined` and `window` are not array-like
+    if (obj == null || isWindow(obj)) return false;
 
-    if (obj.nodeType === 1 && length) {
-      return true;
-    }
+    // arrays, strings and jQuery/jqLite objects are array like
+    // * jqLite is either the jQuery or jqLite constructor function
+    // * we have to check the existence of jqLite first as this method is called
+    //   via the forEach method when constructing the jqLite object in the first place
+    if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true;
+
+    // Support: iOS 8.2 (not reproducible in simulator)
+    // "length" in obj used to prevent JIT error (gh-11508)
+    var length = 'length' in Object(obj) && obj.length;
+
+    // NodeList objects (with `item` method) and
+    // other objects with suitable length characteristics are array-like
+    return isNumber(length) &&
+      (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item === 'function');
 
-    return isString(obj) || isArray(obj) || length === 0 ||
-        typeof length === 'number' && length > 0 && (length - 1) in obj;
   }
 
   /**
    * @ngdoc function
    * @name angular.forEach
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Invokes the `iterator` function once for each item in `obj` collection, which can be either an
-   * object or an array. The `iterator` function is invoked with `iterator(value, key)`, where `value`
-   * is the value of an object property or an array element and `key` is the object property key or
-   * array element index. Specifying a `context` for the function is optional.
+   * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value`
+   * is the value of an object property or an array element, `key` is the object property key or
+   * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional.
    *
-   * Note: this function was previously known as `angular.foreach`.
+   * It is worth noting that `.forEach` does not iterate over inherited properties because it filters
+   * using the `hasOwnProperty` method.
    *
-   <pre>
+   * Unlike ES262's
+   * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18),
+   * providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just
+   * return the value provided.
+   *
+   ```js
    var values = {name: 'misko', gender: 'male'};
    var log = [];
-   angular.forEach(values, function(value, key){
+   angular.forEach(values, function(value, key) {
        this.push(key + ': ' + value);
      }, log);
-   expect(log).toEqual(['name: misko', 'gender:male']);
-   </pre>
+   expect(log).toEqual(['name: misko', 'gender: male']);
+   ```
    *
    * @param {Object|Array} obj Object to iterate over.
    * @param {Function} iterator Iterator function.
    * @param {Object=} context Object to become context (`this`) for the iterator function.
    * @returns {Object|Array} Reference to `obj`.
    */
+
   function forEach(obj, iterator, context) {
-    var key;
+    var key, length;
     if (obj) {
-      if (isFunction(obj)){
+      if (isFunction(obj)) {
         for (key in obj) {
-          // Need to check if hasOwnProperty exists,
-          // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function
-          if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) {
-            iterator.call(context, obj[key], key);
+          if (key !== 'prototype' && key !== 'length' && key !== 'name' && obj.hasOwnProperty(key)) {
+            iterator.call(context, obj[key], key, obj);
+          }
+        }
+      } else if (isArray(obj) || isArrayLike(obj)) {
+        var isPrimitive = typeof obj !== 'object';
+        for (key = 0, length = obj.length; key < length; key++) {
+          if (isPrimitive || key in obj) {
+            iterator.call(context, obj[key], key, obj);
           }
         }
       } else if (obj.forEach && obj.forEach !== forEach) {
-        obj.forEach(iterator, context);
-      } else if (isArrayLike(obj)) {
-        for (key = 0; key < obj.length; key++)
-          iterator.call(context, obj[key], key);
-      } else {
+        obj.forEach(iterator, context, obj);
+      } else if (isBlankObject(obj)) {
+        // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+        for (key in obj) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      } else if (typeof obj.hasOwnProperty === 'function') {
+        // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
         for (key in obj) {
           if (obj.hasOwnProperty(key)) {
-            iterator.call(context, obj[key], key);
+            iterator.call(context, obj[key], key, obj);
+          }
+        }
+      } else {
+        // Slow path for objects which do not have a method `hasOwnProperty`
+        for (key in obj) {
+          if (hasOwnProperty.call(obj, key)) {
+            iterator.call(context, obj[key], key, obj);
           }
         }
       }
@@ -314,19 +436,9 @@
     return obj;
   }
 
-  function sortedKeys(obj) {
-    var keys = [];
-    for (var key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        keys.push(key);
-      }
-    }
-    return keys.sort();
-  }
-
   function forEachSorted(obj, iterator, context) {
-    var keys = sortedKeys(obj);
-    for ( var i = 0; i < keys.length; i++) {
+    var keys = Object.keys(obj).sort();
+    for (var i = 0; i < keys.length; i++) {
       iterator.call(context, obj[keys[i]], keys[i]);
     }
     return keys;
@@ -339,37 +451,21 @@
    * @returns {function(*, string)}
    */
   function reverseParams(iteratorFn) {
-    return function(value, key) { iteratorFn(key, value); };
+    return function(value, key) {iteratorFn(key, value);};
   }
 
   /**
-   * A consistent way of creating unique IDs in angular. The ID is a sequence of alpha numeric
-   * characters such as '012ABC'. The reason why we are not using simply a number counter is that
-   * the number string gets longer over time, and it can also overflow, where as the nextId
-   * will grow much slower, it is a string, and it will never overflow.
+   * A consistent way of creating unique IDs in angular.
    *
-   * @returns an unique alpha-numeric string
+   * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before
+   * we hit number precision issues in JavaScript.
+   *
+   * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M
+   *
+   * @returns {number} an unique alpha-numeric string
    */
   function nextUid() {
-    var index = uid.length;
-    var digit;
-
-    while(index) {
-      index--;
-      digit = uid[index].charCodeAt(0);
-      if (digit == 57 /*'9'*/) {
-        uid[index] = 'A';
-        return uid.join('');
-      }
-      if (digit == 90  /*'Z'*/) {
-        uid[index] = '0';
-      } else {
-        uid[index] = String.fromCharCode(digit + 1);
-        return uid.join('');
-      }
-    }
-    uid.unshift('0');
-    return uid.join('');
+    return ++uid;
   }
 
 
@@ -381,62 +477,136 @@
   function setHashKey(obj, h) {
     if (h) {
       obj.$$hashKey = h;
-    }
-    else {
+    } else {
       delete obj.$$hashKey;
     }
   }
 
+
+  function baseExtend(dst, objs, deep) {
+    var h = dst.$$hashKey;
+
+    for (var i = 0, ii = objs.length; i < ii; ++i) {
+      var obj = objs[i];
+      if (!isObject(obj) && !isFunction(obj)) continue;
+      var keys = Object.keys(obj);
+      for (var j = 0, jj = keys.length; j < jj; j++) {
+        var key = keys[j];
+        var src = obj[key];
+
+        if (deep && isObject(src)) {
+          if (isDate(src)) {
+            dst[key] = new Date(src.valueOf());
+          } else if (isRegExp(src)) {
+            dst[key] = new RegExp(src);
+          } else if (src.nodeName) {
+            dst[key] = src.cloneNode(true);
+          } else if (isElement(src)) {
+            dst[key] = src.clone();
+          } else {
+            if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
+            baseExtend(dst[key], [src], true);
+          }
+        } else {
+          dst[key] = src;
+        }
+      }
+    }
+
+    setHashKey(dst, h);
+    return dst;
+  }
+
   /**
    * @ngdoc function
    * @name angular.extend
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
-   * Extends the destination object `dst` by copying all of the properties from the `src` object(s)
-   * to `dst`. You can specify multiple `src` objects.
+   * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+   * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+   * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
+   *
+   * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
+   * {@link angular.merge} for this.
    *
    * @param {Object} dst Destination object.
    * @param {...Object} src Source object(s).
    * @returns {Object} Reference to `dst`.
    */
   function extend(dst) {
-    var h = dst.$$hashKey;
-    forEach(arguments, function(obj){
-      if (obj !== dst) {
-        forEach(obj, function(value, key){
-          dst[key] = value;
-        });
-      }
-    });
-
-    setHashKey(dst,h);
-    return dst;
+    return baseExtend(dst, slice.call(arguments, 1), false);
   }
 
-  function int(str) {
+
+  /**
+   * @ngdoc function
+   * @name angular.merge
+   * @module ng
+   * @kind function
+   *
+   * @description
+   * Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+   * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+   * by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
+   *
+   * Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
+   * objects, performing a deep copy.
+   *
+   * @deprecated
+   * sinceVersion="1.6.5"
+   * This function is deprecated, but will not be removed in the 1.x lifecycle.
+   * There are edge cases (see {@link angular.merge#known-issues known issues}) that are not
+   * supported by this function. We suggest
+   * using [lodash's merge()](https://lodash.com/docs/4.17.4#merge) instead.
+   *
+   * @knownIssue
+   * This is a list of (known) object types that are not handled correctly by this function:
+   * - [`Blob`](https://developer.mozilla.org/docs/Web/API/Blob)
+   * - [`MediaStream`](https://developer.mozilla.org/docs/Web/API/MediaStream)
+   * - [`CanvasGradient`](https://developer.mozilla.org/docs/Web/API/CanvasGradient)
+   * - AngularJS {@link $rootScope.Scope scopes};
+   *
+   * @param {Object} dst Destination object.
+   * @param {...Object} src Source object(s).
+   * @returns {Object} Reference to `dst`.
+   */
+  function merge(dst) {
+    return baseExtend(dst, slice.call(arguments, 1), true);
+  }
+
+
+
+  function toInt(str) {
     return parseInt(str, 10);
   }
 
+  var isNumberNaN = Number.isNaN || function isNumberNaN(num) {
+    // eslint-disable-next-line no-self-compare
+    return num !== num;
+  };
+
 
   function inherit(parent, extra) {
-    return extend(new (extend(function() {}, {prototype:parent}))(), extra);
+    return extend(Object.create(parent), extra);
   }
 
   /**
    * @ngdoc function
    * @name angular.noop
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * A function that performs no operations. This function can be useful when writing code in the
    * functional style.
-   <pre>
+   ```js
    function foo(callback) {
        var result = calculateResult();
        (callback || angular.noop)(result);
      }
-   </pre>
+   ```
    */
   function noop() {}
   noop.$inject = [];
@@ -445,28 +615,47 @@
   /**
    * @ngdoc function
    * @name angular.identity
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * A function that returns its first argument. This function is useful when writing code in the
    * functional style.
    *
-   <pre>
+   ```js
    function transformer(transformationFn, value) {
-       return (transformationFn || angular.identity)(value);
-     };
-   </pre>
+     return (transformationFn || angular.identity)(value);
+   };
+
+   // E.g.
+   function getResult(fn, input) {
+     return (fn || angular.identity)(input);
+   };
+
+   getResult(function(n) { return n * 2; }, 21);   // returns 42
+   getResult(null, 21);                            // returns 21
+   getResult(undefined, 21);                       // returns 21
+   ```
+   *
+   * @param {*} value to be returned.
+   * @returns {*} the value passed in.
    */
   function identity($) {return $;}
   identity.$inject = [];
 
 
-  function valueFn(value) {return function() {return value;};}
+  function valueFn(value) {return function valueRef() {return value;};}
+
+  function hasCustomToString(obj) {
+    return isFunction(obj.toString) && obj.toString !== toString;
+  }
+
 
   /**
    * @ngdoc function
    * @name angular.isUndefined
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is undefined.
@@ -474,13 +663,14 @@
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is undefined.
    */
-  function isUndefined(value){return typeof value === 'undefined';}
+  function isUndefined(value) {return typeof value === 'undefined';}
 
 
   /**
    * @ngdoc function
    * @name angular.isDefined
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is defined.
@@ -488,28 +678,43 @@
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is defined.
    */
-  function isDefined(value){return typeof value !== 'undefined';}
+  function isDefined(value) {return typeof value !== 'undefined';}
 
 
   /**
    * @ngdoc function
    * @name angular.isObject
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not
-   * considered to be objects.
+   * considered to be objects. Note that JavaScript arrays are objects.
    *
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is an `Object` but not `null`.
    */
-  function isObject(value){return value != null && typeof value === 'object';}
+  function isObject(value) {
+    // http://jsperf.com/isobject4
+    return value !== null && typeof value === 'object';
+  }
+
+
+  /**
+   * Determine if a value is an object with a null prototype
+   *
+   * @returns {boolean} True if `value` is an `Object` with a null prototype
+   */
+  function isBlankObject(value) {
+    return value !== null && typeof value === 'object' && !getPrototypeOf(value);
+  }
 
 
   /**
    * @ngdoc function
    * @name angular.isString
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is a `String`.
@@ -517,27 +722,35 @@
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is a `String`.
    */
-  function isString(value){return typeof value === 'string';}
+  function isString(value) {return typeof value === 'string';}
 
 
   /**
    * @ngdoc function
    * @name angular.isNumber
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is a `Number`.
    *
+   * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
+   *
+   * If you wish to exclude these then you can use the native
+   * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
+   * method.
+   *
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is a `Number`.
    */
-  function isNumber(value){return typeof value === 'number';}
+  function isNumber(value) {return typeof value === 'number';}
 
 
   /**
    * @ngdoc function
    * @name angular.isDate
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a value is a date.
@@ -545,7 +758,7 @@
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is a `Date`.
    */
-  function isDate(value){
+  function isDate(value) {
     return toString.call(value) === '[object Date]';
   }
 
@@ -553,23 +766,40 @@
   /**
    * @ngdoc function
    * @name angular.isArray
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
-   * Determines if a reference is an `Array`.
+   * Determines if a reference is an `Array`. Alias of Array.isArray.
    *
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is an `Array`.
    */
-  function isArray(value) {
-    return toString.call(value) === '[object Array]';
-  }
+  var isArray = Array.isArray;
 
+  /**
+   * @description
+   * Determines if a reference is an `Error`.
+   * Loosely based on https://www.npmjs.com/package/iserror
+   *
+   * @param {*} value Reference to check.
+   * @returns {boolean} True if `value` is an `Error`.
+   */
+  function isError(value) {
+    var tag = toString.call(value);
+    switch (tag) {
+      case '[object Error]': return true;
+      case '[object Exception]': return true;
+      case '[object DOMException]': return true;
+      default: return value instanceof Error;
+    }
+  }
 
   /**
    * @ngdoc function
    * @name angular.isFunction
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is a `Function`.
@@ -577,7 +807,7 @@
    * @param {*} value Reference to check.
    * @returns {boolean} True if `value` is a `Function`.
    */
-  function isFunction(value){return typeof value === 'function';}
+  function isFunction(value) {return typeof value === 'function';}
 
 
   /**
@@ -600,7 +830,7 @@
    * @returns {boolean} True if `obj` is a window obj.
    */
   function isWindow(obj) {
-    return obj && obj.document && obj.location && obj.alert && obj.setInterval;
+    return obj && obj.window === obj;
   }
 
 
@@ -614,30 +844,56 @@
   }
 
 
+  function isFormData(obj) {
+    return toString.call(obj) === '[object FormData]';
+  }
+
+
+  function isBlob(obj) {
+    return toString.call(obj) === '[object Blob]';
+  }
+
+
   function isBoolean(value) {
     return typeof value === 'boolean';
   }
 
 
-  var trim = (function() {
-    // native trim is way faster: http://jsperf.com/angular-trim-test
-    // but IE doesn't have it... :-(
-    // TODO: we should move this into IE/ES5 polyfill
-    if (!String.prototype.trim) {
-      return function(value) {
-        return isString(value) ? value.replace(/^\s\s*/, '').replace(/\s\s*$/, '') : value;
-      };
-    }
-    return function(value) {
-      return isString(value) ? value.trim() : value;
-    };
-  })();
+  function isPromiseLike(obj) {
+    return obj && isFunction(obj.then);
+  }
+
+
+  var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/;
+  function isTypedArray(value) {
+    return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
+  }
+
+  function isArrayBuffer(obj) {
+    return toString.call(obj) === '[object ArrayBuffer]';
+  }
+
+
+  var trim = function(value) {
+    return isString(value) ? value.trim() : value;
+  };
+
+// Copied from:
+// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021
+// Prereq: s is a string.
+  var escapeForRegexp = function(s) {
+    return s
+      .replace(/([-()[\]{}+?*.$^|,:#<!\\])/g, '\\$1')
+      // eslint-disable-next-line no-control-regex
+      .replace(/\x08/g, '\\x08');
+  };
 
 
   /**
    * @ngdoc function
    * @name angular.isElement
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if a reference is a DOM element (or wrapped jQuery element).
@@ -647,116 +903,59 @@
    */
   function isElement(node) {
     return !!(node &&
-        (node.nodeName  // we are a direct element
-            || (node.on && node.find)));  // we have an on and find method part of jQuery API
+      (node.nodeName  // We are a direct element.
+        || (node.prop && node.attr && node.find)));  // We have an on and find method part of jQuery API.
   }
 
   /**
    * @param str 'key1,key2,...'
    * @returns {object} in the form of {key1:true, key2:true, ...}
    */
-  function makeMap(str){
-    var obj = {}, items = str.split(","), i;
-    for ( i = 0; i < items.length; i++ )
-      obj[ items[i] ] = true;
+  function makeMap(str) {
+    var obj = {}, items = str.split(','), i;
+    for (i = 0; i < items.length; i++) {
+      obj[items[i]] = true;
+    }
     return obj;
   }
 
 
-  if (msie < 9) {
-    nodeName_ = function(element) {
-      element = element.nodeName ? element : element[0];
-      return (element.scopeName && element.scopeName != 'HTML')
-          ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName;
-    };
-  } else {
-    nodeName_ = function(element) {
-      return element.nodeName ? element.nodeName : element[0].nodeName;
-    };
+  function nodeName_(element) {
+    return lowercase(element.nodeName || (element[0] && element[0].nodeName));
   }
 
-
-  function map(obj, iterator, context) {
-    var results = [];
-    forEach(obj, function(value, index, list) {
-      results.push(iterator.call(context, value, index, list));
-    });
-    return results;
-  }
-
-
-  /**
-   * @description
-   * Determines the number of elements in an array, the number of properties an object has, or
-   * the length of a string.
-   *
-   * Note: This function is used to augment the Object type in Angular expressions. See
-   * {@link angular.Object} for more information about Angular arrays.
-   *
-   * @param {Object|Array|string} obj Object, array, or string to inspect.
-   * @param {boolean} [ownPropsOnly=false] Count only "own" properties in an object
-   * @returns {number} The size of `obj` or `0` if `obj` is neither an object nor an array.
-   */
-  function size(obj, ownPropsOnly) {
-    var count = 0, key;
-
-    if (isArray(obj) || isString(obj)) {
-      return obj.length;
-    } else if (isObject(obj)){
-      for (key in obj)
-        if (!ownPropsOnly || obj.hasOwnProperty(key))
-          count++;
-    }
-
-    return count;
-  }
-
-
   function includes(array, obj) {
-    return indexOf(array, obj) != -1;
-  }
-
-  function indexOf(array, obj) {
-    if (array.indexOf) return array.indexOf(obj);
-
-    for (var i = 0; i < array.length; i++) {
-      if (obj === array[i]) return i;
-    }
-    return -1;
+    return Array.prototype.indexOf.call(array, obj) !== -1;
   }
 
   function arrayRemove(array, value) {
-    var index = indexOf(array, value);
-    if (index >=0)
+    var index = array.indexOf(value);
+    if (index >= 0) {
       array.splice(index, 1);
-    return value;
-  }
-
-  function isLeafNode (node) {
-    if (node) {
-      switch (node.nodeName) {
-        case "OPTION":
-        case "PRE":
-        case "TITLE":
-          return true;
-      }
     }
-    return false;
+    return index;
   }
 
   /**
    * @ngdoc function
    * @name angular.copy
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Creates a deep copy of `source`, which should be an object or an array.
    *
    * * If no destination is supplied, a copy of the object or array is created.
-   * * If a destination is provided, all of its elements (for array) or properties (for objects)
+   * * If a destination is provided, all of its elements (for arrays) or properties (for objects)
    *   are deleted and then all elements/properties from the source are copied to it.
    * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
-   * * If `source` is identical to 'destination' an exception will be thrown.
+   * * If `source` is identical to `destination` an exception will be thrown.
+   *
+   * <br />
+   * <div class="alert alert-warning">
+   *   Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
+   *   and on `destination`) will be ignored.
+   * </div>
    *
    * @param {*} source The source that will be used to make a copy.
    *                   Can be any type, including primitives, `null`, and `undefined`.
@@ -765,104 +964,198 @@
    * @returns {*} The copy or updated `destination`, if `destination` was specified.
    *
    * @example
-   <doc:example>
-   <doc:source>
-   <div ng-controller="Controller">
+   <example module="copyExample" name="angular-copy">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
    <form novalidate class="simple-form">
-   Name: <input type="text" ng-model="user.name" /><br />
-   E-mail: <input type="email" ng-model="user.email" /><br />
-   Gender: <input type="radio" ng-model="user.gender" value="male" />male
-   <input type="radio" ng-model="user.gender" value="female" />female<br />
+   <label>Name: <input type="text" ng-model="user.name" /></label><br />
+   <label>Age:  <input type="number" ng-model="user.age" /></label><br />
+   Gender: <label><input type="radio" ng-model="user.gender" value="male" />male</label>
+   <label><input type="radio" ng-model="user.gender" value="female" />female</label><br />
    <button ng-click="reset()">RESET</button>
    <button ng-click="update(user)">SAVE</button>
    </form>
    <pre>form = {{user | json}}</pre>
    <pre>master = {{master | json}}</pre>
    </div>
+   </file>
+   <file name="script.js">
+   // Module: copyExample
+   angular.
+   module('copyExample', []).
+   controller('ExampleController', ['$scope', function($scope) {
+          $scope.master = {};
 
-   <script>
-   function Controller($scope) {
-    $scope.master= {};
+          $scope.reset = function() {
+            // Example with 1 argument
+            $scope.user = angular.copy($scope.master);
+          };
 
-    $scope.update = function(user) {
-      // Example with 1 argument
-      $scope.master= angular.copy(user);
-    };
+          $scope.update = function(user) {
+            // Example with 2 arguments
+            angular.copy(user, $scope.master);
+          };
 
-    $scope.reset = function() {
-      // Example with 2 arguments
-      angular.copy($scope.master, $scope.user);
-    };
-
-    $scope.reset();
-  }
-   </script>
-   </doc:source>
-   </doc:example>
+          $scope.reset();
+        }]);
+   </file>
+   </example>
    */
-  function copy(source, destination){
-    if (isWindow(source) || isScope(source)) {
-      throw ngMinErr('cpws',
-          "Can't copy! Making copies of Window or Scope instances is not supported.");
+  function copy(source, destination, maxDepth) {
+    var stackSource = [];
+    var stackDest = [];
+    maxDepth = isValidObjectMaxDepth(maxDepth) ? maxDepth : NaN;
+
+    if (destination) {
+      if (isTypedArray(destination) || isArrayBuffer(destination)) {
+        throw ngMinErr('cpta', 'Can\'t copy! TypedArray destination cannot be mutated.');
+      }
+      if (source === destination) {
+        throw ngMinErr('cpi', 'Can\'t copy! Source and destination are identical.');
+      }
+
+      // Empty the destination object
+      if (isArray(destination)) {
+        destination.length = 0;
+      } else {
+        forEach(destination, function(value, key) {
+          if (key !== '$$hashKey') {
+            delete destination[key];
+          }
+        });
+      }
+
+      stackSource.push(source);
+      stackDest.push(destination);
+      return copyRecurse(source, destination, maxDepth);
     }
 
-    if (!destination) {
-      destination = source;
-      if (source) {
-        if (isArray(source)) {
-          destination = copy(source, []);
-        } else if (isDate(source)) {
-          destination = new Date(source.getTime());
-        } else if (isRegExp(source)) {
-          destination = new RegExp(source.source);
-        } else if (isObject(source)) {
-          destination = copy(source, {});
-        }
+    return copyElement(source, maxDepth);
+
+    function copyRecurse(source, destination, maxDepth) {
+      maxDepth--;
+      if (maxDepth < 0) {
+        return '...';
       }
-    } else {
-      if (source === destination) throw ngMinErr('cpi',
-          "Can't copy! Source and destination are identical.");
+      var h = destination.$$hashKey;
+      var key;
       if (isArray(source)) {
-        destination.length = 0;
-        for ( var i = 0; i < source.length; i++) {
-          destination.push(copy(source[i]));
+        for (var i = 0, ii = source.length; i < ii; i++) {
+          destination.push(copyElement(source[i], maxDepth));
+        }
+      } else if (isBlankObject(source)) {
+        // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+        for (key in source) {
+          destination[key] = copyElement(source[key], maxDepth);
+        }
+      } else if (source && typeof source.hasOwnProperty === 'function') {
+        // Slow path, which must rely on hasOwnProperty
+        for (key in source) {
+          if (source.hasOwnProperty(key)) {
+            destination[key] = copyElement(source[key], maxDepth);
+          }
         }
       } else {
-        var h = destination.$$hashKey;
-        forEach(destination, function(value, key){
-          delete destination[key];
-        });
-        for ( var key in source) {
-          destination[key] = copy(source[key]);
+        // Slowest path --- hasOwnProperty can't be called as a method
+        for (key in source) {
+          if (hasOwnProperty.call(source, key)) {
+            destination[key] = copyElement(source[key], maxDepth);
+          }
         }
-        setHashKey(destination,h);
-      }
-    }
-    return destination;
-  }
-
-  /**
-   * Create a shallow copy of an object
-   */
-  function shallowCopy(src, dst) {
-    dst = dst || {};
-
-    for(var key in src) {
-      // shallowCopy is only ever called by $compile nodeLinkFn, which has control over src
-      // so we don't need to worry about using our custom hasOwnProperty here
-      if (src.hasOwnProperty(key) && key.charAt(0) !== '$' && key.charAt(1) !== '$') {
-        dst[key] = src[key];
       }
+      setHashKey(destination, h);
+      return destination;
     }
 
-    return dst;
+    function copyElement(source, maxDepth) {
+      // Simple values
+      if (!isObject(source)) {
+        return source;
+      }
+
+      // Already copied values
+      var index = stackSource.indexOf(source);
+      if (index !== -1) {
+        return stackDest[index];
+      }
+
+      if (isWindow(source) || isScope(source)) {
+        throw ngMinErr('cpws',
+          'Can\'t copy! Making copies of Window or Scope instances is not supported.');
+      }
+
+      var needsRecurse = false;
+      var destination = copyType(source);
+
+      if (destination === undefined) {
+        destination = isArray(source) ? [] : Object.create(getPrototypeOf(source));
+        needsRecurse = true;
+      }
+
+      stackSource.push(source);
+      stackDest.push(destination);
+
+      return needsRecurse
+        ? copyRecurse(source, destination, maxDepth)
+        : destination;
+    }
+
+    function copyType(source) {
+      switch (toString.call(source)) {
+        case '[object Int8Array]':
+        case '[object Int16Array]':
+        case '[object Int32Array]':
+        case '[object Float32Array]':
+        case '[object Float64Array]':
+        case '[object Uint8Array]':
+        case '[object Uint8ClampedArray]':
+        case '[object Uint16Array]':
+        case '[object Uint32Array]':
+          return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+
+        case '[object ArrayBuffer]':
+          // Support: IE10
+          if (!source.slice) {
+            // If we're in this case we know the environment supports ArrayBuffer
+            /* eslint-disable no-undef */
+            var copied = new ArrayBuffer(source.byteLength);
+            new Uint8Array(copied).set(new Uint8Array(source));
+            /* eslint-enable */
+            return copied;
+          }
+          return source.slice(0);
+
+        case '[object Boolean]':
+        case '[object Number]':
+        case '[object String]':
+        case '[object Date]':
+          return new source.constructor(source.valueOf());
+
+        case '[object RegExp]':
+          var re = new RegExp(source.source, source.toString().match(/[^/]*$/)[0]);
+          re.lastIndex = source.lastIndex;
+          return re;
+
+        case '[object Blob]':
+          return new source.constructor([source], {type: source.type});
+      }
+
+      if (isFunction(source.cloneNode)) {
+        return source.cloneNode(true);
+      }
+    }
   }
 
 
+// eslint-disable-next-line no-self-compare
+  function simpleCompare(a, b) { return a === b || (a !== a && b !== b); }
+
+
   /**
    * @ngdoc function
    * @name angular.equals
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Determines if two objects or two values are equivalent. Supports value types, regular
@@ -874,7 +1167,7 @@
    * * Both objects or values are of the same type and all of their properties are equal by
    *   comparing them with `angular.equals`.
    * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal)
-   * * Both values represent the same regular expression (In JavasScript,
+   * * Both values represent the same regular expression (In JavaScript,
    *   /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual
    *   representation matches).
    *
@@ -886,54 +1179,171 @@
    * @param {*} o1 Object or value to compare.
    * @param {*} o2 Object or value to compare.
    * @returns {boolean} True if arguments are equal.
+   *
+   * @example
+   <example module="equalsExample" name="equalsExample">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <form novalidate>
+   <h3>User 1</h3>
+   Name: <input type="text" ng-model="user1.name">
+   Age: <input type="number" ng-model="user1.age">
+
+   <h3>User 2</h3>
+   Name: <input type="text" ng-model="user2.name">
+   Age: <input type="number" ng-model="user2.age">
+
+   <div>
+   <br/>
+   <input type="button" value="Compare" ng-click="compare()">
+   </div>
+   User 1: <pre>{{user1 | json}}</pre>
+   User 2: <pre>{{user2 | json}}</pre>
+   Equal: <pre>{{result}}</pre>
+   </form>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) {
+          $scope.user1 = {};
+          $scope.user2 = {};
+          $scope.compare = function() {
+            $scope.result = angular.equals($scope.user1, $scope.user2);
+          };
+        }]);
+   </file>
+   </example>
    */
   function equals(o1, o2) {
     if (o1 === o2) return true;
     if (o1 === null || o2 === null) return false;
+    // eslint-disable-next-line no-self-compare
     if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
     var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
-    if (t1 == t2) {
-      if (t1 == 'object') {
-        if (isArray(o1)) {
-          if (!isArray(o2)) return false;
-          if ((length = o1.length) == o2.length) {
-            for(key=0; key<length; key++) {
-              if (!equals(o1[key], o2[key])) return false;
-            }
-            return true;
-          }
-        } else if (isDate(o1)) {
-          return isDate(o2) && o1.getTime() == o2.getTime();
-        } else if (isRegExp(o1) && isRegExp(o2)) {
-          return o1.toString() == o2.toString();
-        } else {
-          if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2)) return false;
-          keySet = {};
-          for(key in o1) {
-            if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+    if (t1 === t2 && t1 === 'object') {
+      if (isArray(o1)) {
+        if (!isArray(o2)) return false;
+        if ((length = o1.length) === o2.length) {
+          for (key = 0; key < length; key++) {
             if (!equals(o1[key], o2[key])) return false;
-            keySet[key] = true;
-          }
-          for(key in o2) {
-            if (!keySet.hasOwnProperty(key) &&
-                key.charAt(0) !== '$' &&
-                o2[key] !== undefined &&
-                !isFunction(o2[key])) return false;
           }
           return true;
         }
+      } else if (isDate(o1)) {
+        if (!isDate(o2)) return false;
+        return simpleCompare(o1.getTime(), o2.getTime());
+      } else if (isRegExp(o1)) {
+        if (!isRegExp(o2)) return false;
+        return o1.toString() === o2.toString();
+      } else {
+        if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+          isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+        keySet = createMap();
+        for (key in o1) {
+          if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+          if (!equals(o1[key], o2[key])) return false;
+          keySet[key] = true;
+        }
+        for (key in o2) {
+          if (!(key in keySet) &&
+            key.charAt(0) !== '$' &&
+            isDefined(o2[key]) &&
+            !isFunction(o2[key])) return false;
+        }
+        return true;
       }
     }
     return false;
   }
 
+  var csp = function() {
+    if (!isDefined(csp.rules)) {
 
-  function csp() {
-    return (document.securityPolicy && document.securityPolicy.isActive) ||
-        (document.querySelector &&
-            !!(document.querySelector('[ng-csp]') || document.querySelector('[data-ng-csp]')));
-  }
 
+      var ngCspElement = (window.document.querySelector('[ng-csp]') ||
+        window.document.querySelector('[data-ng-csp]'));
+
+      if (ngCspElement) {
+        var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
+          ngCspElement.getAttribute('data-ng-csp');
+        csp.rules = {
+          noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1),
+          noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1)
+        };
+      } else {
+        csp.rules = {
+          noUnsafeEval: noUnsafeEval(),
+          noInlineStyle: false
+        };
+      }
+    }
+
+    return csp.rules;
+
+    function noUnsafeEval() {
+      try {
+        // eslint-disable-next-line no-new, no-new-func
+        new Function('');
+        return false;
+      } catch (e) {
+        return true;
+      }
+    }
+  };
+
+  /**
+   * @ngdoc directive
+   * @module ng
+   * @name ngJq
+   *
+   * @element ANY
+   * @param {string=} ngJq the name of the library available under `window`
+   * to be used for angular.element
+   * @description
+   * Use this directive to force the angular.element library.  This should be
+   * used to force either jqLite by leaving ng-jq blank or setting the name of
+   * the jquery variable under window (eg. jQuery).
+   *
+   * Since angular looks for this directive when it is loaded (doesn't wait for the
+   * DOMContentLoaded event), it must be placed on an element that comes before the script
+   * which loads angular. Also, only the first instance of `ng-jq` will be used and all
+   * others ignored.
+   *
+   * @example
+   * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
+   ```html
+   <!doctype html>
+   <html ng-app ng-jq>
+   ...
+   ...
+   </html>
+   ```
+   * @example
+   * This example shows how to use a jQuery based library of a different name.
+   * The library name must be available at the top most 'window'.
+   ```html
+   <!doctype html>
+   <html ng-app ng-jq="jQueryLib">
+   ...
+   ...
+   </html>
+   ```
+   */
+  var jq = function() {
+    if (isDefined(jq.name_)) return jq.name_;
+    var el;
+    var i, ii = ngAttrPrefixes.length, prefix, name;
+    for (i = 0; i < ii; ++i) {
+      prefix = ngAttrPrefixes[i];
+      el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]');
+      if (el) {
+        name = el.getAttribute(prefix + 'jq');
+        break;
+      }
+    }
+
+    return (jq.name_ = name);
+  };
 
   function concat(array1, array2, index) {
     return array1.concat(slice.call(array2, index));
@@ -944,11 +1354,11 @@
   }
 
 
-  /* jshint -W101 */
   /**
    * @ngdoc function
    * @name angular.bind
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for
@@ -961,23 +1371,22 @@
    * @param {...*} args Optional arguments to be prebound to the `fn` function call.
    * @returns {function()} Function that wraps the `fn` with all the specified bindings.
    */
-  /* jshint +W101 */
   function bind(self, fn) {
     var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : [];
     if (isFunction(fn) && !(fn instanceof RegExp)) {
       return curryArgs.length
-          ? function() {
-        return arguments.length
-            ? fn.apply(self, curryArgs.concat(slice.call(arguments, 0)))
+        ? function() {
+          return arguments.length
+            ? fn.apply(self, concat(curryArgs, arguments, 0))
             : fn.apply(self, curryArgs);
-      }
-          : function() {
-        return arguments.length
+        }
+        : function() {
+          return arguments.length
             ? fn.apply(self, arguments)
             : fn.call(self);
-      };
+        };
     } else {
-      // in IE, native methods are not functions so they cannot be bound (note: they don't need to be)
+      // In IE, native methods are not functions so they cannot be bound (note: they don't need to be).
       return fn;
     }
   }
@@ -986,11 +1395,11 @@
   function toJsonReplacer(key, value) {
     var val = value;
 
-    if (typeof key === 'string' && key.charAt(0) === '$') {
+    if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
       val = undefined;
     } else if (isWindow(value)) {
       val = '$WINDOW';
-    } else if (value &&  document === value) {
+    } else if (value &&  window.document === value) {
       val = '$DOCUMENT';
     } else if (isScope(value)) {
       val = '$SCOPE';
@@ -1003,71 +1412,104 @@
   /**
    * @ngdoc function
    * @name angular.toJson
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
-   * Serializes input into a JSON-formatted string. Properties with leading $ characters will be
+   * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be
    * stripped since angular uses this notation internally.
    *
-   * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
-   * @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace.
+   * @param {Object|Array|Date|string|number|boolean} obj Input to be serialized into JSON.
+   * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
+   *    If set to an integer, the JSON output will contain that many spaces per indentation.
    * @returns {string|undefined} JSON-ified string representing `obj`.
+   * @knownIssue
+   *
+   * The Safari browser throws a `RangeError` instead of returning `null` when it tries to stringify a `Date`
+   * object with an invalid date value. The only reliable way to prevent this is to monkeypatch the
+   * `Date.prototype.toJSON` method as follows:
+   *
+   * ```
+   * var _DatetoJSON = Date.prototype.toJSON;
+   * Date.prototype.toJSON = function() {
+ *   try {
+ *     return _DatetoJSON.call(this);
+ *   } catch(e) {
+ *     if (e instanceof RangeError) {
+ *       return null;
+ *     }
+ *     throw e;
+ *   }
+ * };
+   * ```
+   *
+   * See https://github.com/angular/angular.js/pull/14221 for more information.
    */
   function toJson(obj, pretty) {
-    if (typeof obj === 'undefined') return undefined;
-    return JSON.stringify(obj, toJsonReplacer, pretty ? '  ' : null);
+    if (isUndefined(obj)) return undefined;
+    if (!isNumber(pretty)) {
+      pretty = pretty ? 2 : null;
+    }
+    return JSON.stringify(obj, toJsonReplacer, pretty);
   }
 
 
   /**
    * @ngdoc function
    * @name angular.fromJson
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Deserializes a JSON string.
    *
    * @param {string} json JSON string to deserialize.
-   * @returns {Object|Array|Date|string|number} Deserialized thingy.
+   * @returns {Object|Array|string|number} Deserialized JSON string.
    */
   function fromJson(json) {
     return isString(json)
-        ? JSON.parse(json)
-        : json;
+      ? JSON.parse(json)
+      : json;
   }
 
 
-  function toBoolean(value) {
-    if (typeof value === 'function') {
-      value = true;
-    } else if (value && value.length !== 0) {
-      var v = lowercase("" + value);
-      value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]');
-    } else {
-      value = false;
-    }
-    return value;
+  var ALL_COLONS = /:/g;
+  function timezoneToOffset(timezone, fallback) {
+    // Support: IE 9-11 only, Edge 13-15+
+    // IE/Edge do not "understand" colon (`:`) in timezone
+    timezone = timezone.replace(ALL_COLONS, '');
+    var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+    return isNumberNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
   }
 
+
+  function addDateMinutes(date, minutes) {
+    date = new Date(date.getTime());
+    date.setMinutes(date.getMinutes() + minutes);
+    return date;
+  }
+
+
+  function convertTimezoneToLocal(date, timezone, reverse) {
+    reverse = reverse ? -1 : 1;
+    var dateTimezoneOffset = date.getTimezoneOffset();
+    var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+    return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset));
+  }
+
+
   /**
    * @returns {string} Returns the string representation of the element.
    */
   function startingTag(element) {
-    element = jqLite(element).clone();
-    try {
-      // turns out IE does not let you set .html() on elements which
-      // are not allowed to have children. So we just ignore it.
-      element.empty();
-    } catch(e) {}
-    // As Per DOM Standards
-    var TEXT_NODE = 3;
+    element = jqLite(element).clone().empty();
     var elemHtml = jqLite('<div>').append(element).html();
     try {
-      return element[0].nodeType === TEXT_NODE ? lowercase(elemHtml) :
-          elemHtml.
-              match(/^(<[^>]+>)/)[1].
-              replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
-    } catch(e) {
+      return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
+        elemHtml.
+        match(/^(<[^>]+>)/)[1].
+        replace(/^<([\w-]+)/, function(match, nodeName) {return '<' + lowercase(nodeName);});
+    } catch (e) {
       return lowercase(elemHtml);
     }
 
@@ -1087,27 +1529,33 @@
   function tryDecodeURIComponent(value) {
     try {
       return decodeURIComponent(value);
-    } catch(e) {
-      // Ignore any invalid uri component
+    } catch (e) {
+      // Ignore any invalid uri component.
     }
   }
 
 
   /**
    * Parses an escaped url query string into key-value pairs.
-   * @returns Object.<(string|boolean)>
+   * @returns {Object.<string,boolean|Array>}
    */
   function parseKeyValue(/**string*/keyValue) {
-    var obj = {}, key_value, key;
-    forEach((keyValue || "").split('&'), function(keyValue){
-      if ( keyValue ) {
-        key_value = keyValue.split('=');
-        key = tryDecodeURIComponent(key_value[0]);
-        if ( isDefined(key) ) {
-          var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
-          if (!obj[key]) {
+    var obj = {};
+    forEach((keyValue || '').split('&'), function(keyValue) {
+      var splitPoint, key, val;
+      if (keyValue) {
+        key = keyValue = keyValue.replace(/\+/g,'%20');
+        splitPoint = keyValue.indexOf('=');
+        if (splitPoint !== -1) {
+          key = keyValue.substring(0, splitPoint);
+          val = keyValue.substring(splitPoint + 1);
+        }
+        key = tryDecodeURIComponent(key);
+        if (isDefined(key)) {
+          val = isDefined(val) ? tryDecodeURIComponent(val) : true;
+          if (!hasOwnProperty.call(obj, key)) {
             obj[key] = val;
-          } else if(isArray(obj[key])) {
+          } else if (isArray(obj[key])) {
             obj[key].push(val);
           } else {
             obj[key] = [obj[key],val];
@@ -1124,11 +1572,11 @@
       if (isArray(value)) {
         forEach(value, function(arrayValue) {
           parts.push(encodeUriQuery(key, true) +
-              (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
+            (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
         });
       } else {
         parts.push(encodeUriQuery(key, true) +
-            (value === true ? '' : '=' + encodeUriQuery(value, true)));
+          (value === true ? '' : '=' + encodeUriQuery(value, true)));
       }
     });
     return parts.length ? parts.join('&') : '';
@@ -1148,9 +1596,9 @@
    */
   function encodeUriSegment(val) {
     return encodeUriQuery(val, true).
-        replace(/%26/gi, '&').
-        replace(/%3D/gi, '=').
-        replace(/%2B/gi, '+');
+    replace(/%26/gi, '&').
+    replace(/%3D/gi, '=').
+    replace(/%2B/gi, '+');
   }
 
 
@@ -1158,7 +1606,7 @@
    * This method is intended for encoding *key* or *value* parts of query component. We need a custom
    * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
    * encoded per http://tools.ietf.org/html/rfc3986:
-   *    query       = *( pchar / "/" / "?" )
+   *    query         = *( pchar / "/" / "?" )
    *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
    *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
    *    pct-encoded   = "%" HEXDIG HEXDIG
@@ -1167,21 +1615,92 @@
    */
   function encodeUriQuery(val, pctEncodeSpaces) {
     return encodeURIComponent(val).
-        replace(/%40/gi, '@').
-        replace(/%3A/gi, ':').
-        replace(/%24/g, '$').
-        replace(/%2C/gi, ',').
-        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+    replace(/%40/gi, '@').
+    replace(/%3A/gi, ':').
+    replace(/%24/g, '$').
+    replace(/%2C/gi, ',').
+    replace(/%3B/gi, ';').
+    replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
   }
 
+  var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
+
+  function getNgAttribute(element, ngAttr) {
+    var attr, i, ii = ngAttrPrefixes.length;
+    for (i = 0; i < ii; ++i) {
+      attr = ngAttrPrefixes[i] + ngAttr;
+      if (isString(attr = element.getAttribute(attr))) {
+        return attr;
+      }
+    }
+    return null;
+  }
+
+  function allowAutoBootstrap(document) {
+    var script = document.currentScript;
+
+    if (!script) {
+      // Support: IE 9-11 only
+      // IE does not have `document.currentScript`
+      return true;
+    }
+
+    // If the `currentScript` property has been clobbered just return false, since this indicates a probable attack
+    if (!(script instanceof window.HTMLScriptElement || script instanceof window.SVGScriptElement)) {
+      return false;
+    }
+
+    var attributes = script.attributes;
+    var srcs = [attributes.getNamedItem('src'), attributes.getNamedItem('href'), attributes.getNamedItem('xlink:href')];
+
+    return srcs.every(function(src) {
+      if (!src) {
+        return true;
+      }
+      if (!src.value) {
+        return false;
+      }
+
+      var link = document.createElement('a');
+      link.href = src.value;
+
+      if (document.location.origin === link.origin) {
+        // Same-origin resources are always allowed, even for non-whitelisted schemes.
+        return true;
+      }
+      // Disabled bootstrapping unless angular.js was loaded from a known scheme used on the web.
+      // This is to prevent angular.js bundled with browser extensions from being used to bypass the
+      // content security policy in web pages and other browser extensions.
+      switch (link.protocol) {
+        case 'http:':
+        case 'https:':
+        case 'ftp:':
+        case 'blob:':
+        case 'file:':
+        case 'data:':
+          return true;
+        default:
+          return false;
+      }
+    });
+  }
+
+// Cached as it has to run during loading so that document.currentScript is available.
+  var isAutoBootstrapAllowed = allowAutoBootstrap(window.document);
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngApp
+   * @name ngApp
+   * @module ng
    *
    * @element ANY
    * @param {angular.Module} ngApp an optional application
    *   {@link angular.module module} name to load.
+   * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be
+   *   created in "strict-di" mode. This means that the application will fail to invoke functions which
+   *   do not use explicit function annotation (and are thus unsuitable for minification), as described
+   *   in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in
+   *   tracking down the root of these bugs.
    *
    * @description
    *
@@ -1189,13 +1708,20 @@
    * designates the **root element** of the application and is typically placed near the root element
    * of the page - e.g. on the `<body>` or `<html>` tags.
    *
-   * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
-   * found in the document will be used to define the root element to auto-bootstrap as an
-   * application. To run multiple applications in an HTML document you must manually bootstrap them using
-   * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
+   * There are a few things to keep in mind when using `ngApp`:
+   * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
+   *   found in the document will be used to define the root element to auto-bootstrap as an
+   *   application. To run multiple applications in an HTML document you must manually bootstrap them using
+   *   {@link angular.bootstrap} instead.
+   * - AngularJS applications cannot be nested within each other.
+   * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`.
+   *   This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and
+   *   {@link ngRoute.ngView `ngView`}.
+   *   Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
+   *   causing animations to stop working and making the injector inaccessible from outside the app.
    *
    * You can specify an **AngularJS module** to be used as the root module for the application.  This
-   * module will be loaded into the {@link AUTO.$injector} when the application is bootstrapped and
+   * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
    * should contain the application code needed or have dependencies on other modules that will
    * contain the code. See {@link angular.module} for more information.
    *
@@ -1203,12 +1729,13 @@
    * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}`
    * would not be resolved to `3`.
    *
-   * `ngApp` is the easiest, and most common, way to bootstrap an application.
+   * `ngApp` is the easiest, and most common way to bootstrap an application.
    *
-   <example module="ngAppDemo">
+   <example module="ngAppDemo" name="ng-app">
    <file name="index.html">
    <div ng-controller="ngAppDemoController">
    I can add: {{a}} + {{b}} =  {{ a+b }}
+   </div>
    </file>
    <file name="script.js">
    angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) {
@@ -1218,86 +1745,210 @@
    </file>
    </example>
    *
+   * Using `ngStrictDi`, you would see something like this:
+   *
+   <example ng-app-included="true" name="strict-di">
+   <file name="index.html">
+   <div ng-app="ngAppStrictDemo" ng-strict-di>
+   <div ng-controller="GoodController1">
+   I can add: {{a}} + {{b}} =  {{ a+b }}
+
+   <p>This renders because the controller does not fail to
+   instantiate, by using explicit annotation style (see
+   script.js for details)
+   </p>
+   </div>
+
+   <div ng-controller="GoodController2">
+   Name: <input ng-model="name"><br />
+   Hello, {{name}}!
+
+   <p>This renders because the controller does not fail to
+   instantiate, by using explicit annotation style
+   (see script.js for details)
+   </p>
+   </div>
+
+   <div ng-controller="BadController">
+   I can add: {{a}} + {{b}} =  {{ a+b }}
+
+   <p>The controller could not be instantiated, due to relying
+   on automatic function annotations (which are disabled in
+   strict mode). As such, the content of this section is not
+   interpolated, and there should be an error in your web console.
+   </p>
+   </div>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngAppStrictDemo', [])
+   // BadController will fail to instantiate, due to relying on automatic function annotation,
+   // rather than an explicit annotation
+   .controller('BadController', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     })
+   // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated,
+   // due to using explicit annotations using the array style and $inject property, respectively.
+   .controller('GoodController1', ['$scope', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     }])
+   .controller('GoodController2', GoodController2);
+   function GoodController2($scope) {
+       $scope.name = 'World';
+     }
+   GoodController2.$inject = ['$scope'];
+   </file>
+   <file name="style.css">
+   div[ng-controller] {
+       margin-bottom: 1em;
+       -webkit-border-radius: 4px;
+       border-radius: 4px;
+       border: 1px solid;
+       padding: .5em;
+   }
+   div[ng-controller^=Good] {
+       border-color: #d6e9c6;
+       background-color: #dff0d8;
+       color: #3c763d;
+   }
+   div[ng-controller^=Bad] {
+       border-color: #ebccd1;
+       background-color: #f2dede;
+       color: #a94442;
+       margin-bottom: 0;
+   }
+   </file>
+   </example>
    */
   function angularInit(element, bootstrap) {
-    var elements = [element],
-        appElement,
-        module,
-        names = ['ng:app', 'ng-app', 'x-ng-app', 'data-ng-app'],
-        NG_APP_CLASS_REGEXP = /\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;
+    var appElement,
+      module,
+      config = {};
 
-    function append(element) {
-      element && elements.push(element);
-    }
+    // The element `element` has priority over any other element.
+    forEach(ngAttrPrefixes, function(prefix) {
+      var name = prefix + 'app';
 
-    forEach(names, function(name) {
-      names[name] = true;
-      append(document.getElementById(name));
-      name = name.replace(':', '\\:');
-      if (element.querySelectorAll) {
-        forEach(element.querySelectorAll('.' + name), append);
-        forEach(element.querySelectorAll('.' + name + '\\:'), append);
-        forEach(element.querySelectorAll('[' + name + ']'), append);
+      if (!appElement && element.hasAttribute && element.hasAttribute(name)) {
+        appElement = element;
+        module = element.getAttribute(name);
       }
     });
+    forEach(ngAttrPrefixes, function(prefix) {
+      var name = prefix + 'app';
+      var candidate;
 
-    forEach(elements, function(element) {
-      if (!appElement) {
-        var className = ' ' + element.className + ' ';
-        var match = NG_APP_CLASS_REGEXP.exec(className);
-        if (match) {
-          appElement = element;
-          module = (match[2] || '').replace(/\s+/g, ',');
-        } else {
-          forEach(element.attributes, function(attr) {
-            if (!appElement && names[attr.name]) {
-              appElement = element;
-              module = attr.value;
-            }
-          });
-        }
+      if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) {
+        appElement = candidate;
+        module = candidate.getAttribute(name);
       }
     });
     if (appElement) {
-      bootstrap(appElement, module ? [module] : []);
+      if (!isAutoBootstrapAllowed) {
+        window.console.error('Angular: disabling automatic bootstrap. <script> protocol indicates ' +
+          'an extension, document.location.href does not match.');
+        return;
+      }
+      config.strictDi = getNgAttribute(appElement, 'strict-di') !== null;
+      bootstrap(appElement, module ? [module] : [], config);
     }
   }
 
   /**
    * @ngdoc function
    * @name angular.bootstrap
+   * @module ng
    * @description
    * Use this function to manually start up angular application.
    *
-   * See: {@link guide/bootstrap Bootstrap}
+   * For more information, see the {@link guide/bootstrap Bootstrap guide}.
    *
-   * Note that ngScenario-based end-to-end tests cannot use this function to bootstrap manually.
-   * They must use {@link api/ng.directive:ngApp ngApp}.
+   * Angular will detect if it has been loaded into the browser more than once and only allow the
+   * first loaded script to be bootstrapped and will report a warning to the browser console for
+   * each of the subsequent scripts. This prevents strange results in applications, where otherwise
+   * multiple instances of Angular try to work on the DOM.
    *
-   * @param {Element} element DOM element which is the root of angular application.
+   * <div class="alert alert-warning">
+   * **Note:** Protractor based end-to-end tests cannot use this function to bootstrap manually.
+   * They must use {@link ng.directive:ngApp ngApp}.
+   * </div>
+   *
+   * <div class="alert alert-warning">
+   * **Note:** Do not bootstrap the app on an element with a directive that uses {@link ng.$compile#transclusion transclusion},
+   * such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}.
+   * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
+   * causing animations to stop working and making the injector inaccessible from outside the app.
+   * </div>
+   *
+   * ```html
+   * <!doctype html>
+   * <html>
+   * <body>
+   * <div ng-controller="WelcomeController">
+   *   {{greeting}}
+   * </div>
+   *
+   * <script src="angular.js"></script>
+   * <script>
+   *   var app = angular.module('demo', [])
+   *   .controller('WelcomeController', function($scope) {
+ *       $scope.greeting = 'Welcome!';
+ *   });
+   *   angular.bootstrap(document, ['demo']);
+   * </script>
+   * </body>
+   * </html>
+   * ```
+   *
+   * @param {DOMElement} element DOM element which is the root of angular application.
    * @param {Array<String|Function|Array>=} modules an array of modules to load into the application.
    *     Each item in the array should be the name of a predefined module or a (DI annotated)
-   *     function that will be invoked by the injector as a run block.
+   *     function that will be invoked by the injector as a `config` block.
    *     See: {@link angular.module modules}
-   * @returns {AUTO.$injector} Returns the newly created injector for this app.
+   * @param {Object=} config an object for defining configuration options for the application. The
+   *     following keys are supported:
+   *
+   * * `strictDi` - disable automatic function annotation for the application. This is meant to
+   *   assist in finding bugs which break minified code. Defaults to `false`.
+   *
+   * @returns {auto.$injector} Returns the newly created injector for this app.
    */
-  function bootstrap(element, modules) {
+  function bootstrap(element, modules, config) {
+    if (!isObject(config)) config = {};
+    var defaultConfig = {
+      strictDi: false
+    };
+    config = extend(defaultConfig, config);
     var doBootstrap = function() {
       element = jqLite(element);
 
       if (element.injector()) {
-        var tag = (element[0] === document) ? 'document' : startingTag(element);
-        throw ngMinErr('btstrpd', "App Already Bootstrapped with this Element '{0}'", tag);
+        var tag = (element[0] === window.document) ? 'document' : startingTag(element);
+        // Encode angle brackets to prevent input from being sanitized to empty string #8683.
+        throw ngMinErr(
+          'btstrpd',
+          'App already bootstrapped with this element \'{0}\'',
+          tag.replace(/</,'&lt;').replace(/>/,'&gt;'));
       }
 
       modules = modules || [];
       modules.unshift(['$provide', function($provide) {
         $provide.value('$rootElement', element);
       }]);
+
+      if (config.debugInfoEnabled) {
+        // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`.
+        modules.push(['$compileProvider', function($compileProvider) {
+          $compileProvider.debugInfoEnabled(true);
+        }]);
+      }
+
       modules.unshift('ng');
-      var injector = createInjector(modules);
-      injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', '$animate',
-        function(scope, element, compile, injector, animate) {
+      var injector = createInjector(modules, config.strictDi);
+      injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
+        function bootstrapApply(scope, element, compile, injector) {
           scope.$apply(function() {
             element.data('$injector', injector);
             compile(element)(scope);
@@ -1307,8 +1958,14 @@
       return injector;
     };
 
+    var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/;
     var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/;
 
+    if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) {
+      config.debugInfoEnabled = true;
+      window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, '');
+    }
+
     if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) {
       return doBootstrap();
     }
@@ -1318,40 +1975,104 @@
       forEach(extraModules, function(module) {
         modules.push(module);
       });
-      doBootstrap();
+      return doBootstrap();
     };
+
+    if (isFunction(angular.resumeDeferredBootstrap)) {
+      angular.resumeDeferredBootstrap();
+    }
+  }
+
+  /**
+   * @ngdoc function
+   * @name angular.reloadWithDebugInfo
+   * @module ng
+   * @description
+   * Use this function to reload the current application with debug information turned on.
+   * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`.
+   *
+   * See {@link ng.$compileProvider#debugInfoEnabled} for more.
+   */
+  function reloadWithDebugInfo() {
+    window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name;
+    window.location.reload();
+  }
+
+  /**
+   * @name angular.getTestability
+   * @module ng
+   * @description
+   * Get the testability service for the instance of Angular on the given
+   * element.
+   * @param {DOMElement} element DOM element which is the root of angular application.
+   */
+  function getTestability(rootElement) {
+    var injector = angular.element(rootElement).injector();
+    if (!injector) {
+      throw ngMinErr('test',
+        'no injector found for element argument to getTestability');
+    }
+    return injector.get('$$testability');
   }
 
   var SNAKE_CASE_REGEXP = /[A-Z]/g;
-  function snake_case(name, separator){
+  function snake_case(name, separator) {
     separator = separator || '_';
     return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
       return (pos ? separator : '') + letter.toLowerCase();
     });
   }
 
+  var bindJQueryFired = false;
   function bindJQuery() {
+    var originalCleanData;
+
+    if (bindJQueryFired) {
+      return;
+    }
+
     // bind to jQuery if present;
-    jQuery = window.jQuery;
-    // reset to jQuery or default to us.
-    if (jQuery) {
+    var jqName = jq();
+    jQuery = isUndefined(jqName) ? window.jQuery :   // use jQuery (if present)
+      !jqName             ? undefined     :   // use jqLite
+        window[jqName];   // use jQuery specified by `ngJq`
+
+    // Use jQuery if it exists with proper functionality, otherwise default to us.
+    // Angular 1.2+ requires jQuery 1.7+ for on()/off() support.
+    // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older
+    // versions. It will not work for sure with jQuery <1.7, though.
+    if (jQuery && jQuery.fn.on) {
       jqLite = jQuery;
       extend(jQuery.fn, {
         scope: JQLitePrototype.scope,
         isolateScope: JQLitePrototype.isolateScope,
-        controller: JQLitePrototype.controller,
+        controller: /** @type {?} */ (JQLitePrototype).controller,
         injector: JQLitePrototype.injector,
         inheritedData: JQLitePrototype.inheritedData
       });
-      // Method signature:
-      //     jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments)
-      jqLitePatchJQueryRemove('remove', true, true, false);
-      jqLitePatchJQueryRemove('empty', false, false, false);
-      jqLitePatchJQueryRemove('html', false, false, true);
+
+      // All nodes removed from the DOM via various jQuery APIs like .remove()
+      // are passed through jQuery.cleanData. Monkey-patch this method to fire
+      // the $destroy event on all removed nodes.
+      originalCleanData = jQuery.cleanData;
+      jQuery.cleanData = function(elems) {
+        var events;
+        for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+          events = jQuery._data(elem, 'events');
+          if (events && events.$destroy) {
+            jQuery(elem).triggerHandler('$destroy');
+          }
+        }
+        originalCleanData(elems);
+      };
     } else {
       jqLite = JQLite;
     }
+
     angular.element = jqLite;
+
+    // Prevent double-proxying.
+    bindJQueryFired = true;
   }
 
   /**
@@ -1359,7 +2080,7 @@
    */
   function assertArg(arg, name, reason) {
     if (!arg) {
-      throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+      throw ngMinErr('areq', 'Argument \'{0}\' is {1}', (name || '?'), (reason || 'required'));
     }
     return arg;
   }
@@ -1370,7 +2091,7 @@
     }
 
     assertArg(isFunction(arg), name, 'not a function, got ' +
-        (arg && typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
+      (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg));
     return arg;
   }
 
@@ -1381,16 +2102,16 @@
    */
   function assertNotHasOwnProperty(name, context) {
     if (name === 'hasOwnProperty') {
-      throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context);
+      throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
     }
   }
 
   /**
    * Return the value accessible from the object by path. Any undefined traversals are ignored
    * @param {Object} obj starting object
-   * @param {string} path path to traverse
-   * @param {boolean=true} bindFnToScope
-   * @returns value as accessible by path
+   * @param {String} path path to traverse
+   * @param {boolean} [bindFnToScope=true]
+   * @returns {Object} value as accessible by path
    */
 //TODO(misko): this function needs to be removed
   function getter(obj, path, bindFnToScope) {
@@ -1415,30 +2136,74 @@
   /**
    * Return the DOM siblings between the first and last node in the given array.
    * @param {Array} array like object
-   * @returns jQlite object containing the elements
+   * @returns {Array} the inputted object or a jqLite collection containing the nodes
    */
-  function getBlockElements(nodes) {
-    var startNode = nodes[0],
-        endNode = nodes[nodes.length - 1];
-    if (startNode === endNode) {
-      return jqLite(startNode);
+  function getBlockNodes(nodes) {
+    // TODO(perf): update `nodes` instead of creating a new object?
+    var node = nodes[0];
+    var endNode = nodes[nodes.length - 1];
+    var blockNodes;
+
+    for (var i = 1; node !== endNode && (node = node.nextSibling); i++) {
+      if (blockNodes || nodes[i] !== node) {
+        if (!blockNodes) {
+          blockNodes = jqLite(slice.call(nodes, 0, i));
+        }
+        blockNodes.push(node);
+      }
     }
 
-    var element = startNode;
-    var elements = [element];
-
-    do {
-      element = element.nextSibling;
-      if (!element) break;
-      elements.push(element);
-    } while (element !== endNode);
-
-    return jqLite(elements);
+    return blockNodes || nodes;
   }
 
+
   /**
-   * @ngdoc interface
+   * Creates a new object without a prototype. This object is useful for lookup without having to
+   * guard against prototypically inherited properties via hasOwnProperty.
+   *
+   * Related micro-benchmarks:
+   * - http://jsperf.com/object-create2
+   * - http://jsperf.com/proto-map-lookup/2
+   * - http://jsperf.com/for-in-vs-object-keys2
+   *
+   * @returns {Object}
+   */
+  function createMap() {
+    return Object.create(null);
+  }
+
+  function stringify(value) {
+    if (value == null) { // null || undefined
+      return '';
+    }
+    switch (typeof value) {
+      case 'string':
+        break;
+      case 'number':
+        value = '' + value;
+        break;
+      default:
+        if (hasCustomToString(value) && !isArray(value) && !isDate(value)) {
+          value = value.toString();
+        } else {
+          value = toJson(value);
+        }
+    }
+
+    return value;
+  }
+
+  var NODE_TYPE_ELEMENT = 1;
+  var NODE_TYPE_ATTRIBUTE = 2;
+  var NODE_TYPE_TEXT = 3;
+  var NODE_TYPE_COMMENT = 8;
+  var NODE_TYPE_DOCUMENT = 9;
+  var NODE_TYPE_DOCUMENT_FRAGMENT = 11;
+
+  /**
+   * @ngdoc type
    * @name angular.Module
+   * @module ng
    * @description
    *
    * Interface for configuring angular {@link angular.module modules}.
@@ -1465,6 +2230,7 @@
       /**
        * @ngdoc function
        * @name angular.module
+       * @module ng
        * @description
        *
        * The `angular.module` is a global place for creating, registering and retrieving Angular
@@ -1472,16 +2238,16 @@
        * All modules (angular core or 3rd party) that should be available to an application must be
        * registered using this mechanism.
        *
-       * When passed two or more arguments, a new module is created.  If passed only one argument, an
-       * existing module (the name passed as the first argument to `module`) is retrieved.
+       * Passing one argument retrieves an existing {@link angular.Module},
+       * whereas passing more than one argument creates a new {@link angular.Module}
        *
        *
        * # Module
        *
-       * A module is a collection of services, directives, filters, and configuration information.
-       * `angular.module` is used to configure the {@link AUTO.$injector $injector}.
+       * A module is a collection of services, directives, controllers, filters, and configuration information.
+       * `angular.module` is used to configure the {@link auto.$injector $injector}.
        *
-       * <pre>
+       * ```js
        * // Create a new module
        * var myModule = angular.module('myModule', []);
        *
@@ -1489,30 +2255,33 @@
        * myModule.value('appName', 'MyCoolApp');
        *
        * // configure existing services inside initialization blocks.
-       * myModule.config(function($locationProvider) {
+       * myModule.config(['$locationProvider', function($locationProvider) {
      *   // Configure existing providers
      *   $locationProvider.hashPrefix('!');
-     * });
-       * </pre>
+     * }]);
+       * ```
        *
        * Then you can create an injector and load your modules like this:
        *
-       * <pre>
-       * var injector = angular.injector(['ng', 'MyModule'])
-       * </pre>
+       * ```js
+       * var injector = angular.injector(['ng', 'myModule'])
+       * ```
        *
        * However it's more likely that you'll just use
        * {@link ng.directive:ngApp ngApp} or
        * {@link angular.bootstrap} to simplify this process for you.
        *
        * @param {!string} name The name of the module to create or retrieve.
-       * @param {Array.<string>=} requires If specified then new module is being created. If
-       *        unspecified then the the module is being retrieved for further configuration.
-       * @param {Function} configFn Optional configuration function for the module. Same as
-       *        {@link angular.Module#methods_config Module#config()}.
-       * @returns {module} new module with the {@link angular.Module} api.
+       * @param {!Array.<string>=} requires If specified then new module is being created. If
+       *        unspecified then the module is being retrieved for further configuration.
+       * @param {Function=} configFn Optional configuration function for the module. Same as
+       *        {@link angular.Module#config Module#config()}.
+       * @returns {angular.Module} new module with the {@link angular.Module} api.
        */
       return function module(name, requires, configFn) {
+
+        var info = {};
+
         var assertNotHasOwnProperty = function(name, context) {
           if (name === 'hasOwnProperty') {
             throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
@@ -1525,30 +2294,73 @@
         }
         return ensure(modules, name, function() {
           if (!requires) {
-            throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
-                "the module name or forgot to load it. If registering a module ensure that you " +
-                "specify the dependencies as the second argument.", name);
+            throw $injectorMinErr('nomod', 'Module \'{0}\' is not available! You either misspelled ' +
+              'the module name or forgot to load it. If registering a module ensure that you ' +
+              'specify the dependencies as the second argument.', name);
           }
 
           /** @type {!Array.<Array.<*>>} */
           var invokeQueue = [];
 
+          /** @type {!Array.<Function>} */
+          var configBlocks = [];
+
           /** @type {!Array.<Function>} */
           var runBlocks = [];
 
-          var config = invokeLater('$injector', 'invoke');
+          var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
 
           /** @type {angular.Module} */
           var moduleInstance = {
             // Private state
             _invokeQueue: invokeQueue,
+            _configBlocks: configBlocks,
             _runBlocks: runBlocks,
 
+            /**
+             * @ngdoc method
+             * @name angular.Module#info
+             * @module ng
+             *
+             * @param {Object=} info Information about the module
+             * @returns {Object|Module} The current info object for this module if called as a getter,
+             *                          or `this` if called as a setter.
+             *
+             * @description
+             * Read and write custom information about this module.
+             * For example you could put the version of the module in here.
+             *
+             * ```js
+             * angular.module('myModule', []).info({ version: '1.0.0' });
+             * ```
+             *
+             * The version could then be read back out by accessing the module elsewhere:
+             *
+             * ```
+             * var version = angular.module('myModule').info().version;
+             * ```
+             *
+             * You can also retrieve this information during runtime via the
+             * {@link $injector#modules `$injector.modules`} property:
+             *
+             * ```js
+             * var version = $injector.modules['myModule'].info().version;
+             * ```
+             */
+            info: function(value) {
+              if (isDefined(value)) {
+                if (!isObject(value)) throw ngMinErr('aobj', 'Argument \'{0}\' must be an object', 'value');
+                info = value;
+                return this;
+              }
+              return info;
+            },
+
             /**
              * @ngdoc property
              * @name angular.Module#requires
-             * @propertyOf angular.Module
-             * @returns {Array.<string>} List of module names which must be loaded before this module.
+             * @module ng
+             *
              * @description
              * Holds the list of modules which the injector will load before the current module is
              * loaded.
@@ -1558,9 +2370,10 @@
             /**
              * @ngdoc property
              * @name angular.Module#name
-             * @propertyOf angular.Module
-             * @returns {string} Name of the module.
+             * @module ng
+             *
              * @description
+             * Name of the module.
              */
             name: name,
 
@@ -1568,64 +2381,76 @@
             /**
              * @ngdoc method
              * @name angular.Module#provider
-             * @methodOf angular.Module
+             * @module ng
              * @param {string} name service name
              * @param {Function} providerType Construction function for creating new instance of the
              *                                service.
              * @description
-             * See {@link AUTO.$provide#provider $provide.provider()}.
+             * See {@link auto.$provide#provider $provide.provider()}.
              */
-            provider: invokeLater('$provide', 'provider'),
+            provider: invokeLaterAndSetModuleName('$provide', 'provider'),
 
             /**
              * @ngdoc method
              * @name angular.Module#factory
-             * @methodOf angular.Module
+             * @module ng
              * @param {string} name service name
              * @param {Function} providerFunction Function for creating new instance of the service.
              * @description
-             * See {@link AUTO.$provide#factory $provide.factory()}.
+             * See {@link auto.$provide#factory $provide.factory()}.
              */
-            factory: invokeLater('$provide', 'factory'),
+            factory: invokeLaterAndSetModuleName('$provide', 'factory'),
 
             /**
              * @ngdoc method
              * @name angular.Module#service
-             * @methodOf angular.Module
+             * @module ng
              * @param {string} name service name
              * @param {Function} constructor A constructor function that will be instantiated.
              * @description
-             * See {@link AUTO.$provide#service $provide.service()}.
+             * See {@link auto.$provide#service $provide.service()}.
              */
-            service: invokeLater('$provide', 'service'),
+            service: invokeLaterAndSetModuleName('$provide', 'service'),
 
             /**
              * @ngdoc method
              * @name angular.Module#value
-             * @methodOf angular.Module
+             * @module ng
              * @param {string} name service name
              * @param {*} object Service instance object.
              * @description
-             * See {@link AUTO.$provide#value $provide.value()}.
+             * See {@link auto.$provide#value $provide.value()}.
              */
             value: invokeLater('$provide', 'value'),
 
             /**
              * @ngdoc method
              * @name angular.Module#constant
-             * @methodOf angular.Module
+             * @module ng
              * @param {string} name constant name
              * @param {*} object Constant value.
              * @description
-             * Because the constant are fixed, they get applied before other provide methods.
-             * See {@link AUTO.$provide#constant $provide.constant()}.
+             * Because the constants are fixed, they get applied before other provide methods.
+             * See {@link auto.$provide#constant $provide.constant()}.
              */
             constant: invokeLater('$provide', 'constant', 'unshift'),
 
+            /**
+             * @ngdoc method
+             * @name angular.Module#decorator
+             * @module ng
+             * @param {string} name The name of the service to decorate.
+             * @param {Function} decorFn This function will be invoked when the service needs to be
+             *                           instantiated and should return the decorated service instance.
+             * @description
+             * See {@link auto.$provide#decorator $provide.decorator()}.
+             */
+            decorator: invokeLaterAndSetModuleName('$provide', 'decorator', configBlocks),
+
             /**
              * @ngdoc method
              * @name angular.Module#animation
-             * @methodOf angular.Module
+             * @module ng
              * @param {string} name animation name
              * @param {Function} animationFactory Factory function for creating new instance of an
              *                                    animation.
@@ -1635,9 +2460,9 @@
              *
              *
              * Defines an animation hook that can be later used with
-             * {@link ngAnimate.$animate $animate} service and directives that use this service.
+             * {@link $animate $animate} service and directives that use this service.
              *
-             * <pre>
+             * ```js
              * module.animation('.animation-name', function($inject1, $inject2) {
            *   return {
            *     eventName : function(element, done) {
@@ -1649,64 +2474,86 @@
            *     }
            *   }
            * })
-             * </pre>
+             * ```
              *
-             * See {@link ngAnimate.$animateProvider#register $animateProvider.register()} and
+             * See {@link ng.$animateProvider#register $animateProvider.register()} and
              * {@link ngAnimate ngAnimate module} for more information.
              */
-            animation: invokeLater('$animateProvider', 'register'),
+            animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
 
             /**
              * @ngdoc method
              * @name angular.Module#filter
-             * @methodOf angular.Module
-             * @param {string} name Filter name.
+             * @module ng
+             * @param {string} name Filter name - this must be a valid angular expression identifier
              * @param {Function} filterFactory Factory function for creating new instance of filter.
              * @description
              * See {@link ng.$filterProvider#register $filterProvider.register()}.
+             *
+             * <div class="alert alert-warning">
+             * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+             * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+             * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+             * (`myapp_subsection_filterx`).
+             * </div>
              */
-            filter: invokeLater('$filterProvider', 'register'),
+            filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
 
             /**
              * @ngdoc method
              * @name angular.Module#controller
-             * @methodOf angular.Module
+             * @module ng
              * @param {string|Object} name Controller name, or an object map of controllers where the
              *    keys are the names and the values are the constructors.
              * @param {Function} constructor Controller constructor function.
              * @description
              * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
              */
-            controller: invokeLater('$controllerProvider', 'register'),
+            controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
 
             /**
              * @ngdoc method
              * @name angular.Module#directive
-             * @methodOf angular.Module
+             * @module ng
              * @param {string|Object} name Directive name, or an object map of directives where the
              *    keys are the names and the values are the factories.
              * @param {Function} directiveFactory Factory function for creating new instance of
              * directives.
              * @description
-             * See {@link ng.$compileProvider#methods_directive $compileProvider.directive()}.
+             * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
              */
-            directive: invokeLater('$compileProvider', 'directive'),
+            directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
+
+            /**
+             * @ngdoc method
+             * @name angular.Module#component
+             * @module ng
+             * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
+             * @param {Object} options Component definition object (a simplified
+             *    {@link ng.$compile#directive-definition-object directive definition object})
+             *
+             * @description
+             * See {@link ng.$compileProvider#component $compileProvider.component()}.
+             */
+            component: invokeLaterAndSetModuleName('$compileProvider', 'component'),
 
             /**
              * @ngdoc method
              * @name angular.Module#config
-             * @methodOf angular.Module
+             * @module ng
              * @param {Function} configFn Execute this function on module load. Useful for service
              *    configuration.
              * @description
              * Use this method to register work which needs to be performed on module loading.
+             * For more about how to configure services, see
+             * {@link providers#provider-recipe Provider Recipe}.
              */
             config: config,
 
             /**
              * @ngdoc method
              * @name angular.Module#run
-             * @methodOf angular.Module
+             * @module ng
              * @param {Function} initializationFn Execute this function after injector creation.
              *    Useful for application initialization.
              * @description
@@ -1723,7 +2570,7 @@
             config(configFn);
           }
 
-          return  moduleInstance;
+          return moduleInstance;
 
           /**
            * @param {string} provider
@@ -1731,9 +2578,24 @@
            * @param {String=} insertMethod
            * @returns {angular.Module}
            */
-          function invokeLater(provider, method, insertMethod) {
+          function invokeLater(provider, method, insertMethod, queue) {
+            if (!queue) queue = invokeQueue;
             return function() {
-              invokeQueue[insertMethod || 'push']([provider, method, arguments]);
+              queue[insertMethod || 'push']([provider, method, arguments]);
+              return moduleInstance;
+            };
+          }
+
+          /**
+           * @param {string} provider
+           * @param {string} method
+           * @returns {angular.Module}
+           */
+          function invokeLaterAndSetModuleName(provider, method, queue) {
+            if (!queue) queue = invokeQueue;
+            return function(recipeName, factoryFunction) {
+              if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
+              queue.push([provider, method, arguments]);
               return moduleInstance;
             };
           }
@@ -1743,88 +2605,175 @@
 
   }
 
-  /* global
-   angularModule: true,
-   version: true,
+  /* global shallowCopy: true */
 
-   $LocaleProvider,
-   $CompileProvider,
-
-   htmlAnchorDirective,
-   inputDirective,
-   inputDirective,
-   formDirective,
-   scriptDirective,
-   selectDirective,
-   styleDirective,
-   optionDirective,
-   ngBindDirective,
-   ngBindHtmlDirective,
-   ngBindTemplateDirective,
-   ngClassDirective,
-   ngClassEvenDirective,
-   ngClassOddDirective,
-   ngCspDirective,
-   ngCloakDirective,
-   ngControllerDirective,
-   ngFormDirective,
-   ngHideDirective,
-   ngIfDirective,
-   ngIncludeDirective,
-   ngIncludeFillContentDirective,
-   ngInitDirective,
-   ngNonBindableDirective,
-   ngPluralizeDirective,
-   ngRepeatDirective,
-   ngShowDirective,
-   ngStyleDirective,
-   ngSwitchDirective,
-   ngSwitchWhenDirective,
-   ngSwitchDefaultDirective,
-   ngOptionsDirective,
-   ngTranscludeDirective,
-   ngModelDirective,
-   ngListDirective,
-   ngChangeDirective,
-   requiredDirective,
-   requiredDirective,
-   ngValueDirective,
-   ngAttributeAliasDirectives,
-   ngEventDirectives,
-
-   $AnchorScrollProvider,
-   $AnimateProvider,
-   $BrowserProvider,
-   $CacheFactoryProvider,
-   $ControllerProvider,
-   $DocumentProvider,
-   $ExceptionHandlerProvider,
-   $FilterProvider,
-   $InterpolateProvider,
-   $IntervalProvider,
-   $HttpProvider,
-   $HttpBackendProvider,
-   $LocationProvider,
-   $LogProvider,
-   $ParseProvider,
-   $RootScopeProvider,
-   $QProvider,
-   $$SanitizeUriProvider,
-   $SceProvider,
-   $SceDelegateProvider,
-   $SnifferProvider,
-   $TemplateCacheProvider,
-   $TimeoutProvider,
-   $WindowProvider
+  /**
+   * Creates a shallow copy of an object, an array or a primitive.
+   *
+   * Assumes that there are no proto properties for objects.
    */
+  function shallowCopy(src, dst) {
+    if (isArray(src)) {
+      dst = dst || [];
+
+      for (var i = 0, ii = src.length; i < ii; i++) {
+        dst[i] = src[i];
+      }
+    } else if (isObject(src)) {
+      dst = dst || {};
+
+      for (var key in src) {
+        if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+          dst[key] = src[key];
+        }
+      }
+    }
+
+    return dst || src;
+  }
+
+  /* exported toDebugString */
+
+  function serializeObject(obj, maxDepth) {
+    var seen = [];
+
+    // There is no direct way to stringify object until reaching a specific depth
+    // and a very deep object can cause a performance issue, so we copy the object
+    // based on this specific depth and then stringify it.
+    if (isValidObjectMaxDepth(maxDepth)) {
+      // This file is also included in `angular-loader`, so `copy()` might not always be available in
+      // the closure. Therefore, it is lazily retrieved as `angular.copy()` when needed.
+      obj = angular.copy(obj, null, maxDepth);
+    }
+    return JSON.stringify(obj, function(key, val) {
+      val = toJsonReplacer(key, val);
+      if (isObject(val)) {
+
+        if (seen.indexOf(val) >= 0) return '...';
+
+        seen.push(val);
+      }
+      return val;
+    });
+  }
+
+  function toDebugString(obj, maxDepth) {
+    if (typeof obj === 'function') {
+      return obj.toString().replace(/ \{[\s\S]*$/, '');
+    } else if (isUndefined(obj)) {
+      return 'undefined';
+    } else if (typeof obj !== 'string') {
+      return serializeObject(obj, maxDepth);
+    }
+    return obj;
+  }
+
+  /* global angularModule: true,
+  version: true,
+
+  $CompileProvider,
+
+  htmlAnchorDirective,
+  inputDirective,
+  inputDirective,
+  formDirective,
+  scriptDirective,
+  selectDirective,
+  optionDirective,
+  ngBindDirective,
+  ngBindHtmlDirective,
+  ngBindTemplateDirective,
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective,
+  ngCloakDirective,
+  ngControllerDirective,
+  ngFormDirective,
+  ngHideDirective,
+  ngIfDirective,
+  ngIncludeDirective,
+  ngIncludeFillContentDirective,
+  ngInitDirective,
+  ngNonBindableDirective,
+  ngPluralizeDirective,
+  ngRepeatDirective,
+  ngShowDirective,
+  ngStyleDirective,
+  ngSwitchDirective,
+  ngSwitchWhenDirective,
+  ngSwitchDefaultDirective,
+  ngOptionsDirective,
+  ngTranscludeDirective,
+  ngModelDirective,
+  ngListDirective,
+  ngChangeDirective,
+  patternDirective,
+  patternDirective,
+  requiredDirective,
+  requiredDirective,
+  minlengthDirective,
+  minlengthDirective,
+  maxlengthDirective,
+  maxlengthDirective,
+  ngValueDirective,
+  ngModelOptionsDirective,
+  ngAttributeAliasDirectives,
+  ngEventDirectives,
+
+  $AnchorScrollProvider,
+  $AnimateProvider,
+  $CoreAnimateCssProvider,
+  $$CoreAnimateJsProvider,
+  $$CoreAnimateQueueProvider,
+  $$AnimateRunnerFactoryProvider,
+  $$AnimateAsyncRunFactoryProvider,
+  $BrowserProvider,
+  $CacheFactoryProvider,
+  $ControllerProvider,
+  $DateProvider,
+  $DocumentProvider,
+  $$IsDocumentHiddenProvider,
+  $ExceptionHandlerProvider,
+  $FilterProvider,
+  $$ForceReflowProvider,
+  $InterpolateProvider,
+  $IntervalProvider,
+  $HttpProvider,
+  $HttpParamSerializerProvider,
+  $HttpParamSerializerJQLikeProvider,
+  $HttpBackendProvider,
+  $xhrFactoryProvider,
+  $jsonpCallbacksProvider,
+  $LocationProvider,
+  $LogProvider,
+  $$MapProvider,
+  $ParseProvider,
+  $RootScopeProvider,
+  $QProvider,
+  $$QProvider,
+  $$SanitizeUriProvider,
+  $SceProvider,
+  $SceDelegateProvider,
+  $SnifferProvider,
+  $TemplateCacheProvider,
+  $TemplateRequestProvider,
+  $$TestabilityProvider,
+  $TimeoutProvider,
+  $$RAFProvider,
+  $WindowProvider,
+  $$jqLiteProvider,
+  $$CookieReaderProvider
+*/
 
 
   /**
-   * @ngdoc property
+   * @ngdoc object
    * @name angular.version
+   * @module ng
    * @description
-   * An object that contains information about the current AngularJS version. This object has the
-   * following properties:
+   * An object that contains information about the current AngularJS version.
+   *
+   * This object has the following properties:
    *
    * - `full` – `{string}` – Full version string, such as "0.9.18".
    * - `major` – `{number}` – Major version number, such as "0".
@@ -1833,28 +2782,32 @@
    * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
    */
   var version = {
-    full: '1.2.8',    // all of these placeholder strings will be replaced by grunt's
-    major: 1,    // package task
-    minor: 2,
-    dot: 8,
-    codeName: 'interdimensional-cartography'
+    // These placeholder strings will be replaced by grunt's `build` task.
+    // They need to be double- or single-quoted.
+    full: '1.6.6',
+    major: 1,
+    minor: 6,
+    dot: 6,
+    codeName: 'interdimensional-cable'
   };
 
 
-  function publishExternalAPI(angular){
+  function publishExternalAPI(angular) {
     extend(angular, {
+      'errorHandlingConfig': errorHandlingConfig,
       'bootstrap': bootstrap,
       'copy': copy,
       'extend': extend,
+      'merge': merge,
       'equals': equals,
       'element': jqLite,
       'forEach': forEach,
       'injector': createInjector,
-      'noop':noop,
-      'bind':bind,
+      'noop': noop,
+      'bind': bind,
       'toJson': toJson,
       'fromJson': fromJson,
-      'identity':identity,
+      'identity': identity,
       'isUndefined': isUndefined,
       'isDefined': isDefined,
       'isString': isString,
@@ -1867,17 +2820,17 @@
       'isDate': isDate,
       'lowercase': lowercase,
       'uppercase': uppercase,
-      'callbacks': {counter: 0},
+      'callbacks': {$$counter: 0},
+      'getTestability': getTestability,
+      'reloadWithDebugInfo': reloadWithDebugInfo,
       '$$minErr': minErr,
-      '$$csp': csp
+      '$$csp': csp,
+      '$$encodeUriSegment': encodeUriSegment,
+      '$$encodeUriQuery': encodeUriQuery,
+      '$$stringify': stringify
     });
 
     angularModule = setupModuleLoader(window);
-    try {
-      angularModule('ngLocale');
-    } catch (e) {
-      angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
-    }
 
     angularModule('ng', ['ngLocale'], ['$provide',
       function ngModule($provide) {
@@ -1886,86 +2839,120 @@
           $$sanitizeUri: $$SanitizeUriProvider
         });
         $provide.provider('$compile', $CompileProvider).
-            directive({
-              a: htmlAnchorDirective,
-              input: inputDirective,
-              textarea: inputDirective,
-              form: formDirective,
-              script: scriptDirective,
-              select: selectDirective,
-              style: styleDirective,
-              option: optionDirective,
-              ngBind: ngBindDirective,
-              ngBindHtml: ngBindHtmlDirective,
-              ngBindTemplate: ngBindTemplateDirective,
-              ngClass: ngClassDirective,
-              ngClassEven: ngClassEvenDirective,
-              ngClassOdd: ngClassOddDirective,
-              ngCloak: ngCloakDirective,
-              ngController: ngControllerDirective,
-              ngForm: ngFormDirective,
-              ngHide: ngHideDirective,
-              ngIf: ngIfDirective,
-              ngInclude: ngIncludeDirective,
-              ngInit: ngInitDirective,
-              ngNonBindable: ngNonBindableDirective,
-              ngPluralize: ngPluralizeDirective,
-              ngRepeat: ngRepeatDirective,
-              ngShow: ngShowDirective,
-              ngStyle: ngStyleDirective,
-              ngSwitch: ngSwitchDirective,
-              ngSwitchWhen: ngSwitchWhenDirective,
-              ngSwitchDefault: ngSwitchDefaultDirective,
-              ngOptions: ngOptionsDirective,
-              ngTransclude: ngTranscludeDirective,
-              ngModel: ngModelDirective,
-              ngList: ngListDirective,
-              ngChange: ngChangeDirective,
-              required: requiredDirective,
-              ngRequired: requiredDirective,
-              ngValue: ngValueDirective
-            }).
-            directive({
-              ngInclude: ngIncludeFillContentDirective
-            }).
-            directive(ngAttributeAliasDirectives).
-            directive(ngEventDirectives);
+        directive({
+          a: htmlAnchorDirective,
+          input: inputDirective,
+          textarea: inputDirective,
+          form: formDirective,
+          script: scriptDirective,
+          select: selectDirective,
+          option: optionDirective,
+          ngBind: ngBindDirective,
+          ngBindHtml: ngBindHtmlDirective,
+          ngBindTemplate: ngBindTemplateDirective,
+          ngClass: ngClassDirective,
+          ngClassEven: ngClassEvenDirective,
+          ngClassOdd: ngClassOddDirective,
+          ngCloak: ngCloakDirective,
+          ngController: ngControllerDirective,
+          ngForm: ngFormDirective,
+          ngHide: ngHideDirective,
+          ngIf: ngIfDirective,
+          ngInclude: ngIncludeDirective,
+          ngInit: ngInitDirective,
+          ngNonBindable: ngNonBindableDirective,
+          ngPluralize: ngPluralizeDirective,
+          ngRepeat: ngRepeatDirective,
+          ngShow: ngShowDirective,
+          ngStyle: ngStyleDirective,
+          ngSwitch: ngSwitchDirective,
+          ngSwitchWhen: ngSwitchWhenDirective,
+          ngSwitchDefault: ngSwitchDefaultDirective,
+          ngOptions: ngOptionsDirective,
+          ngTransclude: ngTranscludeDirective,
+          ngModel: ngModelDirective,
+          ngList: ngListDirective,
+          ngChange: ngChangeDirective,
+          pattern: patternDirective,
+          ngPattern: patternDirective,
+          required: requiredDirective,
+          ngRequired: requiredDirective,
+          minlength: minlengthDirective,
+          ngMinlength: minlengthDirective,
+          maxlength: maxlengthDirective,
+          ngMaxlength: maxlengthDirective,
+          ngValue: ngValueDirective,
+          ngModelOptions: ngModelOptionsDirective
+        }).
+        directive({
+          ngInclude: ngIncludeFillContentDirective
+        }).
+        directive(ngAttributeAliasDirectives).
+        directive(ngEventDirectives);
         $provide.provider({
           $anchorScroll: $AnchorScrollProvider,
           $animate: $AnimateProvider,
+          $animateCss: $CoreAnimateCssProvider,
+          $$animateJs: $$CoreAnimateJsProvider,
+          $$animateQueue: $$CoreAnimateQueueProvider,
+          $$AnimateRunner: $$AnimateRunnerFactoryProvider,
+          $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider,
           $browser: $BrowserProvider,
           $cacheFactory: $CacheFactoryProvider,
           $controller: $ControllerProvider,
           $document: $DocumentProvider,
+          $$isDocumentHidden: $$IsDocumentHiddenProvider,
           $exceptionHandler: $ExceptionHandlerProvider,
           $filter: $FilterProvider,
+          $$forceReflow: $$ForceReflowProvider,
           $interpolate: $InterpolateProvider,
           $interval: $IntervalProvider,
           $http: $HttpProvider,
+          $httpParamSerializer: $HttpParamSerializerProvider,
+          $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
           $httpBackend: $HttpBackendProvider,
+          $xhrFactory: $xhrFactoryProvider,
+          $jsonpCallbacks: $jsonpCallbacksProvider,
           $location: $LocationProvider,
           $log: $LogProvider,
           $parse: $ParseProvider,
           $rootScope: $RootScopeProvider,
           $q: $QProvider,
+          $$q: $$QProvider,
           $sce: $SceProvider,
           $sceDelegate: $SceDelegateProvider,
           $sniffer: $SnifferProvider,
           $templateCache: $TemplateCacheProvider,
+          $templateRequest: $TemplateRequestProvider,
+          $$testability: $$TestabilityProvider,
           $timeout: $TimeoutProvider,
-          $window: $WindowProvider
+          $window: $WindowProvider,
+          $$rAF: $$RAFProvider,
+          $$jqLite: $$jqLiteProvider,
+          $$Map: $$MapProvider,
+          $$cookieReader: $$CookieReaderProvider
         });
       }
-    ]);
+    ])
+      .info({ angularVersion: '1.6.6' });
   }
 
-  /* global
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-   -JQLitePrototype,
-   -addEventListenerFn,
-   -removeEventListenerFn,
-   -BOOLEAN_ATTR
-   */
+  /* global
+  JQLitePrototype: true,
+  BOOLEAN_ATTR: true,
+  ALIASED_ATTR: true
+*/
 
 //////////////////////////////////
 //JQLite
@@ -1974,37 +2961,46 @@
   /**
    * @ngdoc function
    * @name angular.element
-   * @function
+   * @module ng
+   * @kind function
    *
    * @description
    * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element.
    *
    * If jQuery is available, `angular.element` is an alias for the
    * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element`
-   * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
+   * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or **jqLite**.
    *
-   * <div class="alert alert-success">jqLite is a tiny, API-compatible subset of jQuery that allows
-   * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most
-   * commonly needed functionality with the goal of having a very small footprint.</div>
+   * jqLite is a tiny, API-compatible subset of jQuery that allows
+   * Angular to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most
+   * commonly needed functionality with the goal of having a very small footprint.
    *
-   * To use jQuery, simply load it before `DOMContentLoaded` event fired.
+   * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the
+   * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a
+   * specific version of jQuery if multiple versions exist on the page.
    *
-   * <div class="alert">**Note:** all element references in Angular are always wrapped with jQuery or
-   * jqLite; they are never raw DOM references.</div>
+   * <div class="alert alert-info">**Note:** All element references in Angular are always wrapped with jQuery or
+   * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.</div>
+   *
+   * <div class="alert alert-warning">**Note:** Keep in mind that this function will not find elements
+   * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)`
+   * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.</div>
    *
    * ## Angular's jqLite
    * jqLite provides only the following jQuery methods:
    *
-   * - [`addClass()`](http://api.jquery.com/addClass/)
+   * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
    * - [`after()`](http://api.jquery.com/after/)
    * - [`append()`](http://api.jquery.com/append/)
-   * - [`attr()`](http://api.jquery.com/attr/)
-   * - [`bind()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
+   * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
+   * - [`bind()`](http://api.jquery.com/bind/) (_deprecated_, use [`on()`](http://api.jquery.com/on/)) - Does not support namespaces, selectors or eventData
    * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
    * - [`clone()`](http://api.jquery.com/clone/)
    * - [`contents()`](http://api.jquery.com/contents/)
-   * - [`css()`](http://api.jquery.com/css/)
+   * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`.
+   *   As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing.
    * - [`data()`](http://api.jquery.com/data/)
+   * - [`detach()`](http://api.jquery.com/detach/)
    * - [`empty()`](http://api.jquery.com/empty/)
    * - [`eq()`](http://api.jquery.com/eq/)
    * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
@@ -2012,21 +3008,21 @@
    * - [`html()`](http://api.jquery.com/html/)
    * - [`next()`](http://api.jquery.com/next/) - Does not support selectors
    * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
-   * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors
+   * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter
    * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors
    * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors
    * - [`prepend()`](http://api.jquery.com/prepend/)
    * - [`prop()`](http://api.jquery.com/prop/)
-   * - [`ready()`](http://api.jquery.com/ready/)
+   * - [`ready()`](http://api.jquery.com/ready/) (_deprecated_, use `angular.element(callback)` instead of `angular.element(document).ready(callback)`)
    * - [`remove()`](http://api.jquery.com/remove/)
-   * - [`removeAttr()`](http://api.jquery.com/removeAttr/)
-   * - [`removeClass()`](http://api.jquery.com/removeClass/)
+   * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - Does not support multiple attributes
+   * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
    * - [`removeData()`](http://api.jquery.com/removeData/)
    * - [`replaceWith()`](http://api.jquery.com/replaceWith/)
    * - [`text()`](http://api.jquery.com/text/)
-   * - [`toggleClass()`](http://api.jquery.com/toggleClass/)
-   * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers.
-   * - [`unbind()`](http://api.jquery.com/off/) - Does not support namespaces
+   * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - Does not support a function as first argument
+   * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers
+   * - [`unbind()`](http://api.jquery.com/unbind/) (_deprecated_, use [`off()`](http://api.jquery.com/off/)) - Does not support namespaces or event object as parameter
    * - [`val()`](http://api.jquery.com/val/)
    * - [`wrap()`](http://api.jquery.com/wrap/)
    *
@@ -2044,112 +3040,196 @@
    *   camelCase directive name, then the controller for this directive will be retrieved (e.g.
    *   `'ngModel'`).
    * - `injector()` - retrieves the injector of the current element or its parent.
-   * - `scope()` - retrieves the {@link api/ng.$rootScope.Scope scope} of the current
-   *   element or its parent.
-   * - `isolateScope()` - retrieves an isolate {@link ../api/ng.$rootScope.Scope scope} if one is attached directly to the
+   * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current
+   *   element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to
+   *   be enabled.
+   * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the
    *   current element. This getter should be used only on elements that contain a directive which starts a new isolate
    *   scope. Calling `scope()` on this element always returns the original non-isolate scope.
+   *   Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled.
    * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
    *   parent element is reached.
    *
+   * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See
+   * https://github.com/angular/angular.js/issues/14251 for more information.
+   *
    * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
    * @returns {Object} jQuery object.
    */
 
+  JQLite.expando = 'ng339';
+
   var jqCache = JQLite.cache = {},
-      jqName = JQLite.expando = 'ng-' + new Date().getTime(),
-      jqId = 1,
-      addEventListenerFn = (window.document.addEventListener
-          ? function(element, type, fn) {element.addEventListener(type, fn, false);}
-          : function(element, type, fn) {element.attachEvent('on' + type, fn);}),
-      removeEventListenerFn = (window.document.removeEventListener
-          ? function(element, type, fn) {element.removeEventListener(type, fn, false); }
-          : function(element, type, fn) {element.detachEvent('on' + type, fn); });
+    jqId = 1;
+
+  /*
+ * !!! This is an undocumented "private" function !!!
+ */
+  JQLite._data = function(node) {
+    //jQuery always returns an object on cache miss
+    return this.cache[node[this.expando]] || {};
+  };
 
   function jqNextId() { return ++jqId; }
 
 
-  var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
-  var MOZ_HACK_REGEXP = /^moz([A-Z])/;
+  var DASH_LOWERCASE_REGEXP = /-([a-z])/g;
+  var MS_HACK_REGEXP = /^-ms-/;
+  var MOUSE_EVENT_MAP = { mouseleave: 'mouseout', mouseenter: 'mouseover' };
   var jqLiteMinErr = minErr('jqLite');
 
   /**
-   * Converts snake_case to camelCase.
-   * Also there is special case for Moz prefix starting with upper case letter.
+   * Converts kebab-case to camelCase.
+   * There is also a special case for the ms prefix starting with a lowercase letter.
    * @param name Name to normalize
    */
-  function camelCase(name) {
-    return name.
-        replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
-          return offset ? letter.toUpperCase() : letter;
-        }).
-        replace(MOZ_HACK_REGEXP, 'Moz$1');
+  function cssKebabToCamel(name) {
+    return kebabToCamel(name.replace(MS_HACK_REGEXP, 'ms-'));
   }
 
-/////////////////////////////////////////////
-// jQuery mutation patch
-//
-// In conjunction with bindJQuery intercepts all jQuery's DOM destruction apis and fires a
-// $destroy event on all DOM nodes being removed.
-//
-/////////////////////////////////////////////
+  function fnCamelCaseReplace(all, letter) {
+    return letter.toUpperCase();
+  }
 
-  function jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments) {
-    var originalJqFn = jQuery.fn[name];
-    originalJqFn = originalJqFn.$original || originalJqFn;
-    removePatch.$original = originalJqFn;
-    jQuery.fn[name] = removePatch;
+  /**
+   * Converts kebab-case to camelCase.
+   * @param name Name to normalize
+   */
+  function kebabToCamel(name) {
+    return name
+      .replace(DASH_LOWERCASE_REGEXP, fnCamelCaseReplace);
+  }
 
-    function removePatch(param) {
-      // jshint -W040
-      var list = filterElems && param ? [this.filter(param)] : [this],
-          fireEvent = dispatchThis,
-          set, setIndex, setLength,
-          element, childIndex, childLength, children;
+  var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/;
+  var HTML_REGEXP = /<|&#?\w+;/;
+  var TAG_NAME_REGEXP = /<([\w:-]+)/;
+  var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi;
 
-      if (!getterIfNoArguments || param != null) {
-        while(list.length) {
-          set = list.shift();
-          for(setIndex = 0, setLength = set.length; setIndex < setLength; setIndex++) {
-            element = jqLite(set[setIndex]);
-            if (fireEvent) {
-              element.triggerHandler('$destroy');
-            } else {
-              fireEvent = !fireEvent;
-            }
-            for(childIndex = 0, childLength = (children = element.children()).length;
-                childIndex < childLength;
-                childIndex++) {
-              list.push(jQuery(children[childIndex]));
-            }
-          }
-        }
-      }
-      return originalJqFn.apply(this, arguments);
+  var wrapMap = {
+    'option': [1, '<select multiple="multiple">', '</select>'],
+
+    'thead': [1, '<table>', '</table>'],
+    'col': [2, '<table><colgroup>', '</colgroup></table>'],
+    'tr': [2, '<table><tbody>', '</tbody></table>'],
+    'td': [3, '<table><tbody><tr>', '</tr></tbody></table>'],
+    '_default': [0, '', '']
+  };
+
+  wrapMap.optgroup = wrapMap.option;
+  wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+  wrapMap.th = wrapMap.td;
+
+
+  function jqLiteIsTextNode(html) {
+    return !HTML_REGEXP.test(html);
+  }
+
+  function jqLiteAcceptsData(node) {
+    // The window object can accept data but has no nodeType
+    // Otherwise we are only interested in elements (1) and documents (9)
+    var nodeType = node.nodeType;
+    return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
+  }
+
+  function jqLiteHasData(node) {
+    for (var key in jqCache[node.ng339]) {
+      return true;
     }
+    return false;
   }
 
+  function jqLiteBuildFragment(html, context) {
+    var tmp, tag, wrap,
+      fragment = context.createDocumentFragment(),
+      nodes = [], i;
+
+    if (jqLiteIsTextNode(html)) {
+      // Convert non-html into a text node
+      nodes.push(context.createTextNode(html));
+    } else {
+      // Convert html into DOM nodes
+      tmp = fragment.appendChild(context.createElement('div'));
+      tag = (TAG_NAME_REGEXP.exec(html) || ['', ''])[1].toLowerCase();
+      wrap = wrapMap[tag] || wrapMap._default;
+      tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, '<$1></$2>') + wrap[2];
+
+      // Descend through wrappers to the right content
+      i = wrap[0];
+      while (i--) {
+        tmp = tmp.lastChild;
+      }
+
+      nodes = concat(nodes, tmp.childNodes);
+
+      tmp = fragment.firstChild;
+      tmp.textContent = '';
+    }
+
+    // Remove wrapper from fragment
+    fragment.textContent = '';
+    fragment.innerHTML = ''; // Clear inner HTML
+    forEach(nodes, function(node) {
+      fragment.appendChild(node);
+    });
+
+    return fragment;
+  }
+
+  function jqLiteParseHTML(html, context) {
+    context = context || window.document;
+    var parsed;
+
+    if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
+      return [context.createElement(parsed[1])];
+    }
+
+    if ((parsed = jqLiteBuildFragment(html, context))) {
+      return parsed.childNodes;
+    }
+
+    return [];
+  }
+
+  function jqLiteWrapNode(node, wrapper) {
+    var parent = node.parentNode;
+
+    if (parent) {
+      parent.replaceChild(wrapper, node);
+    }
+
+    wrapper.appendChild(node);
+  }
+
+
+// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
+  var jqLiteContains = window.Node.prototype.contains || /** @this */ function(arg) {
+    // eslint-disable-next-line no-bitwise
+    return !!(this.compareDocumentPosition(arg) & 16);
+  };
+
 /////////////////////////////////////////////
   function JQLite(element) {
     if (element instanceof JQLite) {
       return element;
     }
+
+    var argIsString;
+
+    if (isString(element)) {
+      element = trim(element);
+      argIsString = true;
+    }
     if (!(this instanceof JQLite)) {
-      if (isString(element) && element.charAt(0) != '<') {
-        throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/../api/angular.element');
+      if (argIsString && element.charAt(0) !== '<') {
+        throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');
       }
       return new JQLite(element);
     }
 
-    if (isString(element)) {
-      var div = document.createElement('div');
-      // Read about the NoScope elements here:
-      // http://msdn.microsoft.com/en-us/library/ms533897(VS.85).aspx
-      div.innerHTML = '<div>&#160;</div>' + element; // IE insanity to make NoScope elements work!
-      div.removeChild(div.firstChild); // remove the superfluous div
-      jqLiteAddNodes(this, div.childNodes);
-      var fragment = jqLite(document.createDocumentFragment());
-      fragment.append(this); // detach the elements from the temporary DOM div.
+    if (argIsString) {
+      jqLiteAddNodes(this, jqLiteParseHTML(element));
+    } else if (isFunction(element)) {
+      jqLiteReady(element);
     } else {
       jqLiteAddNodes(this, element);
     }
@@ -2159,111 +3239,129 @@
     return element.cloneNode(true);
   }
 
-  function jqLiteDealoc(element){
-    jqLiteRemoveData(element);
-    for ( var i = 0, children = element.childNodes || []; i < children.length; i++) {
-      jqLiteDealoc(children[i]);
+  function jqLiteDealoc(element, onlyDescendants) {
+    if (!onlyDescendants && jqLiteAcceptsData(element)) jqLite.cleanData([element]);
+
+    if (element.querySelectorAll) {
+      jqLite.cleanData(element.querySelectorAll('*'));
     }
   }
 
   function jqLiteOff(element, type, fn, unsupported) {
     if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
 
-    var events = jqLiteExpandoStore(element, 'events'),
-        handle = jqLiteExpandoStore(element, 'handle');
+    var expandoStore = jqLiteExpandoStore(element);
+    var events = expandoStore && expandoStore.events;
+    var handle = expandoStore && expandoStore.handle;
 
     if (!handle) return; //no listeners registered
 
-    if (isUndefined(type)) {
-      forEach(events, function(eventHandler, type) {
-        removeEventListenerFn(element, type, eventHandler);
+    if (!type) {
+      for (type in events) {
+        if (type !== '$destroy') {
+          element.removeEventListener(type, handle);
+        }
         delete events[type];
-      });
+      }
     } else {
-      forEach(type.split(' '), function(type) {
-        if (isUndefined(fn)) {
-          removeEventListenerFn(element, type, events[type]);
+
+      var removeHandler = function(type) {
+        var listenerFns = events[type];
+        if (isDefined(fn)) {
+          arrayRemove(listenerFns || [], fn);
+        }
+        if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) {
+          element.removeEventListener(type, handle);
           delete events[type];
-        } else {
-          arrayRemove(events[type] || [], fn);
+        }
+      };
+
+      forEach(type.split(' '), function(type) {
+        removeHandler(type);
+        if (MOUSE_EVENT_MAP[type]) {
+          removeHandler(MOUSE_EVENT_MAP[type]);
         }
       });
     }
   }
 
   function jqLiteRemoveData(element, name) {
-    var expandoId = element[jqName],
-        expandoStore = jqCache[expandoId];
+    var expandoId = element.ng339;
+    var expandoStore = expandoId && jqCache[expandoId];
 
     if (expandoStore) {
       if (name) {
-        delete jqCache[expandoId].data[name];
+        delete expandoStore.data[name];
         return;
       }
 
       if (expandoStore.handle) {
-        expandoStore.events.$destroy && expandoStore.handle({}, '$destroy');
+        if (expandoStore.events.$destroy) {
+          expandoStore.handle({}, '$destroy');
+        }
         jqLiteOff(element);
       }
       delete jqCache[expandoId];
-      element[jqName] = undefined; // ie does not allow deletion of attributes on elements.
+      element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
     }
   }
 
-  function jqLiteExpandoStore(element, key, value) {
-    var expandoId = element[jqName],
-        expandoStore = jqCache[expandoId || -1];
 
-    if (isDefined(value)) {
-      if (!expandoStore) {
-        element[jqName] = expandoId = jqNextId();
-        expandoStore = jqCache[expandoId] = {};
-      }
-      expandoStore[key] = value;
-    } else {
-      return expandoStore && expandoStore[key];
+  function jqLiteExpandoStore(element, createIfNecessary) {
+    var expandoId = element.ng339,
+      expandoStore = expandoId && jqCache[expandoId];
+
+    if (createIfNecessary && !expandoStore) {
+      element.ng339 = expandoId = jqNextId();
+      expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined};
     }
+
+    return expandoStore;
   }
 
+
   function jqLiteData(element, key, value) {
-    var data = jqLiteExpandoStore(element, 'data'),
-        isSetter = isDefined(value),
-        keyDefined = !isSetter && isDefined(key),
-        isSimpleGetter = keyDefined && !isObject(key);
+    if (jqLiteAcceptsData(element)) {
+      var prop;
 
-    if (!data && !isSimpleGetter) {
-      jqLiteExpandoStore(element, 'data', data = {});
-    }
+      var isSimpleSetter = isDefined(value);
+      var isSimpleGetter = !isSimpleSetter && key && !isObject(key);
+      var massGetter = !key;
+      var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter);
+      var data = expandoStore && expandoStore.data;
 
-    if (isSetter) {
-      data[key] = value;
-    } else {
-      if (keyDefined) {
-        if (isSimpleGetter) {
-          // don't create data in this case.
-          return data && data[key];
-        } else {
-          extend(data, key);
-        }
+      if (isSimpleSetter) { // data('key', value)
+        data[kebabToCamel(key)] = value;
       } else {
-        return data;
+        if (massGetter) {  // data()
+          return data;
+        } else {
+          if (isSimpleGetter) { // data('key')
+            // don't force creation of expandoStore if it doesn't exist yet
+            return data && data[kebabToCamel(key)];
+          } else { // mass-setter: data({key1: val1, key2: val2})
+            for (prop in key) {
+              data[kebabToCamel(prop)] = key[prop];
+            }
+          }
+        }
       }
     }
   }
 
   function jqLiteHasClass(element, selector) {
     if (!element.getAttribute) return false;
-    return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
-        indexOf( " " + selector + " " ) > -1);
+    return ((' ' + (element.getAttribute('class') || '') + ' ').replace(/[\n\t]/g, ' ').
+    indexOf(' ' + selector + ' ') > -1);
   }
 
   function jqLiteRemoveClass(element, cssClasses) {
     if (cssClasses && element.setAttribute) {
       forEach(cssClasses.split(' '), function(cssClass) {
         element.setAttribute('class', trim(
-            (" " + (element.getAttribute('class') || '') + " ")
-                .replace(/[\n\t]/g, " ")
-                .replace(" " + trim(cssClass) + " ", " "))
+          (' ' + (element.getAttribute('class') || '') + ' ')
+            .replace(/[\n\t]/g, ' ')
+            .replace(' ' + trim(cssClass) + ' ', ' '))
         );
       });
     }
@@ -2272,7 +3370,7 @@
   function jqLiteAddClass(element, cssClasses) {
     if (cssClasses && element.setAttribute) {
       var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
-          .replace(/[\n\t]/g, " ");
+        .replace(/[\n\t]/g, ' ');
 
       forEach(cssClasses.split(' '), function(cssClass) {
         cssClass = trim(cssClass);
@@ -2285,76 +3383,113 @@
     }
   }
 
+
   function jqLiteAddNodes(root, elements) {
+    // THIS CODE IS VERY HOT. Don't make changes without benchmarking.
+
     if (elements) {
-      elements = (!elements.nodeName && isDefined(elements.length) && !isWindow(elements))
-          ? elements
-          : [ elements ];
-      for(var i=0; i < elements.length; i++) {
-        root.push(elements[i]);
+
+      // if a Node (the most common case)
+      if (elements.nodeType) {
+        root[root.length++] = elements;
+      } else {
+        var length = elements.length;
+
+        // if an Array or NodeList and not a Window
+        if (typeof length === 'number' && elements.window !== elements) {
+          if (length) {
+            for (var i = 0; i < length; i++) {
+              root[root.length++] = elements[i];
+            }
+          }
+        } else {
+          root[root.length++] = elements;
+        }
       }
     }
   }
 
+
   function jqLiteController(element, name) {
-    return jqLiteInheritedData(element, '$' + (name || 'ngController' ) + 'Controller');
+    return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
   }
 
   function jqLiteInheritedData(element, name, value) {
-    element = jqLite(element);
-
     // if element is the document object work with the html element instead
     // this makes $(document).scope() possible
-    if(element[0].nodeType == 9) {
-      element = element.find('html');
+    if (element.nodeType === NODE_TYPE_DOCUMENT) {
+      element = element.documentElement;
     }
     var names = isArray(name) ? name : [name];
 
-    while (element.length) {
-
+    while (element) {
       for (var i = 0, ii = names.length; i < ii; i++) {
-        if ((value = element.data(names[i])) !== undefined) return value;
+        if (isDefined(value = jqLite.data(element, names[i]))) return value;
       }
-      element = element.parent();
+
+      // If dealing with a document fragment node with a host element, and no parent, use the host
+      // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
+      // to lookup parent controllers.
+      element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host);
     }
   }
 
   function jqLiteEmpty(element) {
-    for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
-      jqLiteDealoc(childNodes[i]);
-    }
+    jqLiteDealoc(element, true);
     while (element.firstChild) {
       element.removeChild(element.firstChild);
     }
   }
 
+  function jqLiteRemove(element, keepData) {
+    if (!keepData) jqLiteDealoc(element);
+    var parent = element.parentNode;
+    if (parent) parent.removeChild(element);
+  }
+
+
+  function jqLiteDocumentLoaded(action, win) {
+    win = win || window;
+    if (win.document.readyState === 'complete') {
+      // Force the action to be run async for consistent behavior
+      // from the action's point of view
+      // i.e. it will definitely not be in a $apply
+      win.setTimeout(action);
+    } else {
+      // No need to unbind this handler as load is only ever called once
+      jqLite(win).on('load', action);
+    }
+  }
+
+  function jqLiteReady(fn) {
+    function trigger() {
+      window.document.removeEventListener('DOMContentLoaded', trigger);
+      window.removeEventListener('load', trigger);
+      fn();
+    }
+
+    // check if document is already loaded
+    if (window.document.readyState === 'complete') {
+      window.setTimeout(fn);
+    } else {
+      // We can not use jqLite since we are not done loading and jQuery could be loaded later.
+
+      // Works for modern browsers and IE9
+      window.document.addEventListener('DOMContentLoaded', trigger);
+
+      // Fallback to window.onload for others
+      window.addEventListener('load', trigger);
+    }
+  }
+
 //////////////////////////////////////////
 // Functions which are declared directly.
 //////////////////////////////////////////
   var JQLitePrototype = JQLite.prototype = {
-    ready: function(fn) {
-      var fired = false;
-
-      function trigger() {
-        if (fired) return;
-        fired = true;
-        fn();
-      }
-
-      // check if document already is loaded
-      if (document.readyState === 'complete'){
-        setTimeout(trigger);
-      } else {
-        this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
-        // we can not use jqLite since we are not done loading and jQuery could be loaded later.
-        // jshint -W064
-        JQLite(window).on('load', trigger); // fallback to window.onload for others
-        // jshint +W064
-      }
-    },
+    ready: jqLiteReady,
     toString: function() {
       var value = [];
-      forEach(this, function(e){ value.push('' + e);});
+      forEach(this, function(e) { value.push('' + e);});
       return '[' + value.join(', ') + ']';
     },
 
@@ -2379,92 +3514,106 @@
   });
   var BOOLEAN_ELEMENTS = {};
   forEach('input,select,option,textarea,button,form,details'.split(','), function(value) {
-    BOOLEAN_ELEMENTS[uppercase(value)] = true;
+    BOOLEAN_ELEMENTS[value] = true;
   });
+  var ALIASED_ATTR = {
+    'ngMinlength': 'minlength',
+    'ngMaxlength': 'maxlength',
+    'ngMin': 'min',
+    'ngMax': 'max',
+    'ngPattern': 'pattern',
+    'ngStep': 'step'
+  };
 
   function getBooleanAttrName(element, name) {
     // check dom last since we will most likely fail on name
     var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
 
     // booleanAttr is here twice to minimize DOM access
-    return booleanAttr && BOOLEAN_ELEMENTS[element.nodeName] && booleanAttr;
+    return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
   }
 
+  function getAliasedAttrName(name) {
+    return ALIASED_ATTR[name];
+  }
+
+  forEach({
+    data: jqLiteData,
+    removeData: jqLiteRemoveData,
+    hasData: jqLiteHasData,
+    cleanData: function jqLiteCleanData(nodes) {
+      for (var i = 0, ii = nodes.length; i < ii; i++) {
+        jqLiteRemoveData(nodes[i]);
+      }
+    }
+  }, function(fn, name) {
+    JQLite[name] = fn;
+  });
+
   forEach({
     data: jqLiteData,
     inheritedData: jqLiteInheritedData,
 
     scope: function(element) {
       // Can't use jqLiteData here directly so we stay compatible with jQuery!
-      return jqLite(element).data('$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
+      return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
     },
 
     isolateScope: function(element) {
       // Can't use jqLiteData here directly so we stay compatible with jQuery!
-      return jqLite(element).data('$isolateScope') || jqLite(element).data('$isolateScopeNoTemplate');
+      return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
     },
 
-    controller: jqLiteController ,
+    controller: jqLiteController,
 
     injector: function(element) {
       return jqLiteInheritedData(element, '$injector');
     },
 
-    removeAttr: function(element,name) {
+    removeAttr: function(element, name) {
       element.removeAttribute(name);
     },
 
     hasClass: jqLiteHasClass,
 
     css: function(element, name, value) {
-      name = camelCase(name);
+      name = cssKebabToCamel(name);
 
       if (isDefined(value)) {
         element.style[name] = value;
       } else {
-        var val;
-
-        if (msie <= 8) {
-          // this is some IE specific weirdness that jQuery 1.6.4 does not sure why
-          val = element.currentStyle && element.currentStyle[name];
-          if (val === '') val = 'auto';
-        }
-
-        val = val || element.style[name];
-
-        if (msie <= 8) {
-          // jquery weirdness :-/
-          val = (val === '') ? undefined : val;
-        }
-
-        return  val;
+        return element.style[name];
       }
     },
 
-    attr: function(element, name, value){
+    attr: function(element, name, value) {
+      var ret;
+      var nodeType = element.nodeType;
+      if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT ||
+        !element.getAttribute) {
+        return;
+      }
+
       var lowercasedName = lowercase(name);
-      if (BOOLEAN_ATTR[lowercasedName]) {
-        if (isDefined(value)) {
-          if (!!value) {
-            element[name] = true;
-            element.setAttribute(name, lowercasedName);
-          } else {
-            element[name] = false;
-            element.removeAttribute(lowercasedName);
-          }
+      var isBooleanAttr = BOOLEAN_ATTR[lowercasedName];
+
+      if (isDefined(value)) {
+        // setter
+
+        if (value === null || (value === false && isBooleanAttr)) {
+          element.removeAttribute(name);
         } else {
-          return (element[name] ||
-              (element.attributes.getNamedItem(name)|| noop).specified)
-              ? lowercasedName
-              : undefined;
+          element.setAttribute(name, isBooleanAttr ? lowercasedName : value);
         }
-      } else if (isDefined(value)) {
-        element.setAttribute(name, value);
-      } else if (element.getAttribute) {
-        // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code
-        // some elements (e.g. Document) don't have get attribute, so return undefined
-        var ret = element.getAttribute(name, 2);
-        // normalize non-existing attributes to undefined (as jQuery)
+      } else {
+        // getter
+
+        ret = element.getAttribute(name);
+
+        if (isBooleanAttr && ret !== null) {
+          ret = lowercasedName;
+        }
+        // Normalize non-existing attributes to undefined (as jQuery).
         return ret === null ? undefined : ret;
       }
     },
@@ -2478,36 +3627,28 @@
     },
 
     text: (function() {
-      var NODE_TYPE_TEXT_PROPERTY = [];
-      if (msie < 9) {
-        NODE_TYPE_TEXT_PROPERTY[1] = 'innerText';    /** Element **/
-        NODE_TYPE_TEXT_PROPERTY[3] = 'nodeValue';    /** Text **/
-      } else {
-        NODE_TYPE_TEXT_PROPERTY[1] =                 /** Element **/
-            NODE_TYPE_TEXT_PROPERTY[3] = 'textContent';  /** Text **/
-      }
       getText.$dv = '';
       return getText;
 
       function getText(element, value) {
-        var textProp = NODE_TYPE_TEXT_PROPERTY[element.nodeType];
         if (isUndefined(value)) {
-          return textProp ? element[textProp] : '';
+          var nodeType = element.nodeType;
+          return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : '';
         }
-        element[textProp] = value;
+        element.textContent = value;
       }
     })(),
 
     val: function(element, value) {
       if (isUndefined(value)) {
-        if (nodeName_(element) === 'SELECT' && element.multiple) {
+        if (element.multiple && nodeName_(element) === 'select') {
           var result = [];
-          forEach(element.options, function (option) {
+          forEach(element.options, function(option) {
             if (option.selected) {
               result.push(option.value || option.text);
             }
           });
-          return result.length === 0 ? null : result;
+          return result;
         }
         return element.value;
       }
@@ -2518,29 +3659,28 @@
       if (isUndefined(value)) {
         return element.innerHTML;
       }
-      for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
-        jqLiteDealoc(childNodes[i]);
-      }
+      jqLiteDealoc(element, true);
       element.innerHTML = value;
     },
 
     empty: jqLiteEmpty
-  }, function(fn, name){
+  }, function(fn, name) {
     /**
      * Properties: writes return selection, reads return first value
      */
     JQLite.prototype[name] = function(arg1, arg2) {
       var i, key;
+      var nodeCount = this.length;
 
       // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it
       // in a way that survives minification.
       // jqLiteEmpty takes no arguments but is a setter.
       if (fn !== jqLiteEmpty &&
-          (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) {
+        (isUndefined((fn.length === 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) {
         if (isObject(arg1)) {
 
           // we are a write, but the object properties are the key/values
-          for (i = 0; i < this.length; i++) {
+          for (i = 0; i < nodeCount; i++) {
             if (fn === jqLiteData) {
               // data() takes the whole object in jQuery
               fn(this[i], arg1);
@@ -2554,9 +3694,10 @@
           return this;
         } else {
           // we are a read, so read the first child.
+          // TODO: do we still need this?
           var value = fn.$dv;
           // Only if we have $dv do we iterate over all, otherwise it is just the first element.
-          var jj = (value === undefined) ? Math.min(this.length, 1) : this.length;
+          var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount;
           for (var j = 0; j < jj; j++) {
             var nodeValue = fn(this[j], arg1, arg2);
             value = value ? value + nodeValue : nodeValue;
@@ -2565,7 +3706,7 @@
         }
       } else {
         // we are a write, so apply to all children
-        for (i = 0; i < this.length; i++) {
+        for (i = 0; i < nodeCount; i++) {
           fn(this[i], arg1, arg2);
         }
         // return self for chaining
@@ -2575,61 +3716,73 @@
   });
 
   function createEventHandler(element, events) {
-    var eventHandler = function (event, type) {
-      if (!event.preventDefault) {
-        event.preventDefault = function() {
-          event.returnValue = false; //ie
-        };
-      }
-
-      if (!event.stopPropagation) {
-        event.stopPropagation = function() {
-          event.cancelBubble = true; //ie
-        };
-      }
-
-      if (!event.target) {
-        event.target = event.srcElement || document;
-      }
-
-      if (isUndefined(event.defaultPrevented)) {
-        var prevent = event.preventDefault;
-        event.preventDefault = function() {
-          event.defaultPrevented = true;
-          prevent.call(event);
-        };
-        event.defaultPrevented = false;
-      }
-
+    var eventHandler = function(event, type) {
+      // jQuery specific api
       event.isDefaultPrevented = function() {
-        return event.defaultPrevented || event.returnValue === false;
+        return event.defaultPrevented;
       };
 
+      var eventFns = events[type || event.type];
+      var eventFnsLength = eventFns ? eventFns.length : 0;
+
+      if (!eventFnsLength) return;
+
+      if (isUndefined(event.immediatePropagationStopped)) {
+        var originalStopImmediatePropagation = event.stopImmediatePropagation;
+        event.stopImmediatePropagation = function() {
+          event.immediatePropagationStopped = true;
+
+          if (event.stopPropagation) {
+            event.stopPropagation();
+          }
+
+          if (originalStopImmediatePropagation) {
+            originalStopImmediatePropagation.call(event);
+          }
+        };
+      }
+
+      event.isImmediatePropagationStopped = function() {
+        return event.immediatePropagationStopped === true;
+      };
+
+      // Some events have special handlers that wrap the real handler
+      var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
+
       // Copy event handlers in case event handlers array is modified during execution.
-      var eventHandlersCopy = shallowCopy(events[type || event.type] || []);
+      if ((eventFnsLength > 1)) {
+        eventFns = shallowCopy(eventFns);
+      }
 
-      forEach(eventHandlersCopy, function(fn) {
-        fn.call(element, event);
-      });
-
-      // Remove monkey-patched methods (IE),
-      // as they would cause memory leaks in IE8.
-      if (msie <= 8) {
-        // IE7/8 does not allow to delete property on native object
-        event.preventDefault = null;
-        event.stopPropagation = null;
-        event.isDefaultPrevented = null;
-      } else {
-        // It shouldn't affect normal browsers (native methods are defined on prototype).
-        delete event.preventDefault;
-        delete event.stopPropagation;
-        delete event.isDefaultPrevented;
+      for (var i = 0; i < eventFnsLength; i++) {
+        if (!event.isImmediatePropagationStopped()) {
+          handlerWrapper(element, event, eventFns[i]);
+        }
       }
     };
+
+    // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all
+    //       events on `element`
     eventHandler.elem = element;
     return eventHandler;
   }
 
+  function defaultHandlerWrapper(element, event, handler) {
+    handler.call(element, event);
+  }
+
+  function specialMouseHandlerWrapper(target, event, handler) {
+    // Refer to jQuery's implementation of mouseenter & mouseleave
+    // Read about mouseenter and mouseleave:
+    // http://www.quirksmode.org/js/events_mouse.html#link8
+    var related = event.relatedTarget;
+    // For mousenter/leave call the handler if related is outside the target.
+    // NB: No relatedTarget if the mouse left/entered the browser window
+    if (!related || (related !== target && !jqLiteContains.call(target, related))) {
+      handler.call(target, event);
+    }
+  }
+
 //////////////////////////////////////////
 // Functions iterating traversal.
 // These functions chain results into a single
@@ -2638,68 +3791,49 @@
   forEach({
     removeData: jqLiteRemoveData,
 
-    dealoc: jqLiteDealoc,
-
-    on: function onFn(element, type, fn, unsupported){
+    on: function jqLiteOn(element, type, fn, unsupported) {
       if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters');
 
-      var events = jqLiteExpandoStore(element, 'events'),
-          handle = jqLiteExpandoStore(element, 'handle');
+      // Do not add event handlers to non-elements because they will not be cleaned up.
+      if (!jqLiteAcceptsData(element)) {
+        return;
+      }
 
-      if (!events) jqLiteExpandoStore(element, 'events', events = {});
-      if (!handle) jqLiteExpandoStore(element, 'handle', handle = createEventHandler(element, events));
+      var expandoStore = jqLiteExpandoStore(element, true);
+      var events = expandoStore.events;
+      var handle = expandoStore.handle;
 
-      forEach(type.split(' '), function(type){
+      if (!handle) {
+        handle = expandoStore.handle = createEventHandler(element, events);
+      }
+
+      // http://jsperf.com/string-indexof-vs-split
+      var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type];
+      var i = types.length;
+
+      var addHandler = function(type, specialHandlerWrapper, noEventListener) {
         var eventFns = events[type];
 
         if (!eventFns) {
-          if (type == 'mouseenter' || type == 'mouseleave') {
-            var contains = document.body.contains || document.body.compareDocumentPosition ?
-                function( a, b ) {
-                  // jshint bitwise: false
-                  var adown = a.nodeType === 9 ? a.documentElement : a,
-                      bup = b && b.parentNode;
-                  return a === bup || !!( bup && bup.nodeType === 1 && (
-                      adown.contains ?
-                          adown.contains( bup ) :
-                          a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-                      ));
-                } :
-                function( a, b ) {
-                  if ( b ) {
-                    while ( (b = b.parentNode) ) {
-                      if ( b === a ) {
-                        return true;
-                      }
-                    }
-                  }
-                  return false;
-                };
-
-            events[type] = [];
-
-            // Refer to jQuery's implementation of mouseenter & mouseleave
-            // Read about mouseenter and mouseleave:
-            // http://www.quirksmode.org/js/events_mouse.html#link8
-            var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"};
-
-            onFn(element, eventmap[type], function(event) {
-              var target = this, related = event.relatedTarget;
-              // For mousenter/leave call the handler if related is outside the target.
-              // NB: No relatedTarget if the mouse left/entered the browser window
-              if ( !related || (related !== target && !contains(target, related)) ){
-                handle(event, type);
-              }
-            });
-
-          } else {
-            addEventListenerFn(element, type, handle);
-            events[type] = [];
+          eventFns = events[type] = [];
+          eventFns.specialHandlerWrapper = specialHandlerWrapper;
+          if (type !== '$destroy' && !noEventListener) {
+            element.addEventListener(type, handle);
           }
-          eventFns = events[type];
         }
+
         eventFns.push(fn);
-      });
+      };
+
+      while (i--) {
+        type = types[i];
+        if (MOUSE_EVENT_MAP[type]) {
+          addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper);
+          addHandler(type, undefined, true);
+        } else {
+          addHandler(type);
+        }
+      }
     },
 
     off: jqLiteOff,
@@ -2720,7 +3854,7 @@
     replaceWith: function(element, replaceNode) {
       var index, parent = element.parentNode;
       jqLiteDealoc(element);
-      forEach(new JQLite(replaceNode), function(node){
+      forEach(new JQLite(replaceNode), function(node) {
         if (index) {
           parent.insertBefore(node, index.nextSibling);
         } else {
@@ -2732,83 +3866,85 @@
 
     children: function(element) {
       var children = [];
-      forEach(element.childNodes, function(element){
-        if (element.nodeType === 1)
+      forEach(element.childNodes, function(element) {
+        if (element.nodeType === NODE_TYPE_ELEMENT) {
           children.push(element);
+        }
       });
       return children;
     },
 
     contents: function(element) {
-      return element.childNodes || [];
+      return element.contentDocument || element.childNodes || [];
     },
 
     append: function(element, node) {
-      forEach(new JQLite(node), function(child){
-        if (element.nodeType === 1 || element.nodeType === 11) {
-          element.appendChild(child);
-        }
-      });
+      var nodeType = element.nodeType;
+      if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return;
+
+      node = new JQLite(node);
+
+      for (var i = 0, ii = node.length; i < ii; i++) {
+        var child = node[i];
+        element.appendChild(child);
+      }
     },
 
     prepend: function(element, node) {
-      if (element.nodeType === 1) {
+      if (element.nodeType === NODE_TYPE_ELEMENT) {
         var index = element.firstChild;
-        forEach(new JQLite(node), function(child){
+        forEach(new JQLite(node), function(child) {
           element.insertBefore(child, index);
         });
       }
     },
 
     wrap: function(element, wrapNode) {
-      wrapNode = jqLite(wrapNode)[0];
-      var parent = element.parentNode;
-      if (parent) {
-        parent.replaceChild(wrapNode, element);
-      }
-      wrapNode.appendChild(element);
+      jqLiteWrapNode(element, jqLite(wrapNode).eq(0).clone()[0]);
     },
 
-    remove: function(element) {
-      jqLiteDealoc(element);
-      var parent = element.parentNode;
-      if (parent) parent.removeChild(element);
+    remove: jqLiteRemove,
+
+    detach: function(element) {
+      jqLiteRemove(element, true);
     },
 
     after: function(element, newElement) {
       var index = element, parent = element.parentNode;
-      forEach(new JQLite(newElement), function(node){
-        parent.insertBefore(node, index.nextSibling);
-        index = node;
-      });
+
+      if (parent) {
+        newElement = new JQLite(newElement);
+
+        for (var i = 0, ii = newElement.length; i < ii; i++) {
+          var node = newElement[i];
+          parent.insertBefore(node, index.nextSibling);
+          index = node;
+        }
+      }
     },
 
     addClass: jqLiteAddClass,
     removeClass: jqLiteRemoveClass,
 
     toggleClass: function(element, selector, condition) {
-      if (isUndefined(condition)) {
-        condition = !jqLiteHasClass(element, selector);
+      if (selector) {
+        forEach(selector.split(' '), function(className) {
+          var classCondition = condition;
+          if (isUndefined(classCondition)) {
+            classCondition = !jqLiteHasClass(element, className);
+          }
+          (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className);
+        });
       }
-      (condition ? jqLiteAddClass : jqLiteRemoveClass)(element, selector);
     },
 
     parent: function(element) {
       var parent = element.parentNode;
-      return parent && parent.nodeType !== 11 ? parent : null;
+      return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null;
     },
 
     next: function(element) {
-      if (element.nextElementSibling) {
-        return element.nextElementSibling;
-      }
-
-      // IE8 doesn't have nextElementSibling
-      var elm = element.nextSibling;
-      while (elm != null && elm.nodeType !== 1) {
-        elm = elm.nextSibling;
-      }
-      return elm;
+      return element.nextElementSibling;
     },
 
     find: function(element, selector) {
@@ -2821,27 +3957,50 @@
 
     clone: jqLiteClone,
 
-    triggerHandler: function(element, eventName, eventData) {
-      var eventFns = (jqLiteExpandoStore(element, 'events') || {})[eventName];
+    triggerHandler: function(element, event, extraParameters) {
 
-      eventData = eventData || [];
+      var dummyEvent, eventFnsCopy, handlerArgs;
+      var eventName = event.type || event;
+      var expandoStore = jqLiteExpandoStore(element);
+      var events = expandoStore && expandoStore.events;
+      var eventFns = events && events[eventName];
 
-      var event = [{
-        preventDefault: noop,
-        stopPropagation: noop
-      }];
+      if (eventFns) {
+        // Create a dummy event to pass to the handlers
+        dummyEvent = {
+          preventDefault: function() { this.defaultPrevented = true; },
+          isDefaultPrevented: function() { return this.defaultPrevented === true; },
+          stopImmediatePropagation: function() { this.immediatePropagationStopped = true; },
+          isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; },
+          stopPropagation: noop,
+          type: eventName,
+          target: element
+        };
 
-      forEach(eventFns, function(fn) {
-        fn.apply(element, event.concat(eventData));
-      });
+        // If a custom event was provided then extend our dummy event with it
+        if (event.type) {
+          dummyEvent = extend(dummyEvent, event);
+        }
+
+        // Copy event handlers in case event handlers array is modified during execution.
+        eventFnsCopy = shallowCopy(eventFns);
+        handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
+
+        forEach(eventFnsCopy, function(fn) {
+          if (!dummyEvent.isImmediatePropagationStopped()) {
+            fn.apply(element, handlerArgs);
+          }
+        });
+      }
     }
-  }, function(fn, name){
+  }, function(fn, name) {
     /**
      * chaining functions
      */
     JQLite.prototype[name] = function(arg1, arg2, arg3) {
       var value;
-      for(var i=0; i < this.length; i++) {
+
+      for (var i = 0, ii = this.length; i < ii; i++) {
         if (isUndefined(value)) {
           value = fn(this[i], arg1, arg2, arg3);
           if (isDefined(value)) {
@@ -2854,12 +4013,34 @@
       }
       return isDefined(value) ? value : this;
     };
-
-    // bind legacy bind/unbind to on/off
-    JQLite.prototype.bind = JQLite.prototype.on;
-    JQLite.prototype.unbind = JQLite.prototype.off;
   });
 
+// bind legacy bind/unbind to on/off
+  JQLite.prototype.bind = JQLite.prototype.on;
+  JQLite.prototype.unbind = JQLite.prototype.off;
+
+
+// Provider for private $$jqLite service
+  /** @this */
+  function $$jqLiteProvider() {
+    this.$get = function $$jqLite() {
+      return extend(JQLite, {
+        hasClass: function(node, classes) {
+          if (node.attr) node = node[0];
+          return jqLiteHasClass(node, classes);
+        },
+        addClass: function(node, classes) {
+          if (node.attr) node = node[0];
+          return jqLiteAddClass(node, classes);
+        },
+        removeClass: function(node, classes) {
+          if (node.attr) node = node[0];
+          return jqLiteRemoveClass(node, classes);
+        }
+      });
+    };
+  }
+
   /**
    * Computes a hash of an 'obj'.
    * Hash of a:
@@ -2872,90 +4053,126 @@
    * @returns {string} hash string such that the same input will have the same hash string.
    *         The resulting string key is in 'type:hashKey' format.
    */
-  function hashKey(obj) {
-    var objType = typeof obj,
-        key;
+  function hashKey(obj, nextUidFn) {
+    var key = obj && obj.$$hashKey;
 
-    if (objType == 'object' && obj !== null) {
-      if (typeof (key = obj.$$hashKey) == 'function') {
-        // must invoke on object to keep the right this
+    if (key) {
+      if (typeof key === 'function') {
         key = obj.$$hashKey();
-      } else if (key === undefined) {
-        key = obj.$$hashKey = nextUid();
       }
-    } else {
-      key = obj;
+      return key;
     }
 
-    return objType + ':' + key;
+    var objType = typeof obj;
+    if (objType === 'function' || (objType === 'object' && obj !== null)) {
+      key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)();
+    } else {
+      key = objType + ':' + obj;
+    }
+
+    return key;
   }
 
-  /**
-   * HashMap which can use objects as keys
-   */
-  function HashMap(array){
-    forEach(array, this.put, this);
+// A minimal ES2015 Map implementation.
+// Should be bug/feature equivalent to the native implementations of supported browsers
+// (for the features required in Angular).
+// See https://kangax.github.io/compat-table/es6/#test-Map
+  var nanKey = Object.create(null);
+  function NgMapShim() {
+    this._keys = [];
+    this._values = [];
+    this._lastKey = NaN;
+    this._lastIndex = -1;
   }
-  HashMap.prototype = {
-    /**
-     * Store key value pair
-     * @param key key to store can be any type
-     * @param value value to store can be any type
-     */
-    put: function(key, value) {
-      this[hashKey(key)] = value;
+  NgMapShim.prototype = {
+    _idx: function(key) {
+      if (key === this._lastKey) {
+        return this._lastIndex;
+      }
+      this._lastKey = key;
+      this._lastIndex = this._keys.indexOf(key);
+      return this._lastIndex;
+    },
+    _transformKey: function(key) {
+      return isNumberNaN(key) ? nanKey : key;
     },
-
-    /**
-     * @param key
-     * @returns the value for the key
-     */
     get: function(key) {
-      return this[hashKey(key)];
+      key = this._transformKey(key);
+      var idx = this._idx(key);
+      if (idx !== -1) {
+        return this._values[idx];
+      }
     },
+    set: function(key, value) {
+      key = this._transformKey(key);
+      var idx = this._idx(key);
+      if (idx === -1) {
+        idx = this._lastIndex = this._keys.length;
+      }
+      this._keys[idx] = key;
+      this._values[idx] = value;
 
-    /**
-     * Remove the key/value pair
-     * @param key
-     */
-    remove: function(key) {
-      var value = this[key = hashKey(key)];
-      delete this[key];
-      return value;
+      // Support: IE11
+      // Do not `return this` to simulate the partial IE11 implementation
+    },
+    delete: function(key) {
+      key = this._transformKey(key);
+      var idx = this._idx(key);
+      if (idx === -1) {
+        return false;
+      }
+      this._keys.splice(idx, 1);
+      this._values.splice(idx, 1);
+      this._lastKey = NaN;
+      this._lastIndex = -1;
+      return true;
     }
   };
 
+// For now, always use `NgMapShim`, even if `window.Map` is available. Some native implementations
+// are still buggy (often in subtle ways) and can cause hard-to-debug failures. When native `Map`
+// implementations get more stable, we can reconsider switching to `window.Map` (when available).
+  var NgMap = NgMapShim;
+
+  var $$MapProvider = [/** @this */function() {
+    this.$get = [function() {
+      return NgMap;
+    }];
+  }];
+
   /**
    * @ngdoc function
+   * @module ng
    * @name angular.injector
-   * @function
+   * @kind function
    *
    * @description
-   * Creates an injector function that can be used for retrieving services as well as for
+   * Creates an injector object that can be used for retrieving services as well as for
    * dependency injection (see {@link guide/di dependency injection}).
    *
-
    * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
-   *        {@link angular.module}. The `ng` module must be explicitly added.
-   * @returns {function()} Injector function. See {@link AUTO.$injector $injector}.
+   *     {@link angular.module}. The `ng` module must be explicitly added.
+   * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which
+   *     disallows argument name annotation inference.
+   * @returns {injector} Injector object. See {@link auto.$injector $injector}.
    *
    * @example
    * Typical usage
-   * <pre>
+   * ```js
    *   // create an injector
    *   var $injector = angular.injector(['ng']);
    *
    *   // use the injector to kick off your application
    *   // use the type inference to auto inject arguments, or use implicit injection
-   *   $injector.invoke(function($rootScope, $compile, $document){
+   *   $injector.invoke(function($rootScope, $compile, $document) {
  *     $compile($document)($rootScope);
  *     $rootScope.$digest();
  *   });
-   * </pre>
+   * ```
    *
    * Sometimes you want to get access to the injector of a currently running Angular app
    * from outside Angular. Perhaps, you want to inject and compile some markup after the
-   * application has been bootstrapped. You can do this using extra `injector()` added
+   * application has been bootstrapped. You can do this using the extra `injector()` added
    * to JQuery/jqLite elements. See {@link angular.element}.
    *
    * *This is fairly rare but could be the case if a third party library is injecting the
@@ -2965,7 +4182,7 @@
    * directive is added to the end of the document body by JQuery. We then compile and link
    * it into the current AngularJS scope.
    *
-   * <pre>
+   * ```js
    * var $div = $('<div ng-controller="MyCtrl">{{content.label}}</div>');
    * $(document.body).append($div);
    *
@@ -2973,37 +4190,65 @@
  *   var scope = angular.element($div).scope();
  *   $compile($div)(scope);
  * });
-   * </pre>
+   * ```
    */
 
 
   /**
-   * @ngdoc overview
-   * @name AUTO
+   * @ngdoc module
+   * @name auto
+   * @installation
    * @description
    *
-   * Implicit module which gets automatically added to each {@link AUTO.$injector $injector}.
+   * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
    */
 
-  var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m;
+  var ARROW_ARG = /^([^(]+?)=>/;
+  var FN_ARGS = /^[^(]*\(\s*([^)]*)\)/m;
   var FN_ARG_SPLIT = /,/;
   var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
   var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
   var $injectorMinErr = minErr('$injector');
-  function annotate(fn) {
-    var $inject,
-        fnText,
-        argDecl,
-        last;
 
-    if (typeof fn == 'function') {
+  function stringifyFn(fn) {
+    return Function.prototype.toString.call(fn);
+  }
+
+  function extractArgs(fn) {
+    var fnText = stringifyFn(fn).replace(STRIP_COMMENTS, ''),
+      args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS);
+    return args;
+  }
+
+  function anonFn(fn) {
+    // For anonymous functions, showing at the very least the function signature can help in
+    // debugging.
+    var args = extractArgs(fn);
+    if (args) {
+      return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
+    }
+    return 'fn';
+  }
+
+  function annotate(fn, strictDi, name) {
+    var $inject,
+      argDecl,
+      last;
+
+    if (typeof fn === 'function') {
       if (!($inject = fn.$inject)) {
         $inject = [];
         if (fn.length) {
-          fnText = fn.toString().replace(STRIP_COMMENTS, '');
-          argDecl = fnText.match(FN_ARGS);
-          forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg){
-            arg.replace(FN_ARG, function(all, underscore, name){
+          if (strictDi) {
+            if (!isString(name) || !name) {
+              name = fn.name || anonFn(fn);
+            }
+            throw $injectorMinErr('strictdi',
+              '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
+          }
+          argDecl = extractArgs(fn);
+          forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
+            arg.replace(FN_ARG, function(all, underscore, name) {
               $inject.push(name);
             });
           });
@@ -3023,32 +4268,31 @@
 ///////////////////////////////////////
 
   /**
-   * @ngdoc object
-   * @name AUTO.$injector
-   * @function
+   * @ngdoc service
+   * @name $injector
    *
    * @description
    *
    * `$injector` is used to retrieve object instances as defined by
-   * {@link AUTO.$provide provider}, instantiate types, invoke methods,
+   * {@link auto.$provide provider}, instantiate types, invoke methods,
    * and load modules.
    *
    * The following always holds true:
    *
-   * <pre>
+   * ```js
    *   var $injector = angular.injector();
    *   expect($injector.get('$injector')).toBe($injector);
-   *   expect($injector.invoke(function($injector){
+   *   expect($injector.invoke(function($injector) {
  *     return $injector;
- *   }).toBe($injector);
-   * </pre>
+ *   })).toBe($injector);
+   * ```
    *
    * # Injection Function Annotation
    *
    * JavaScript does not have annotations, and annotations are needed for dependency injection. The
    * following are all valid ways of annotating function with injection arguments and are equivalent.
    *
-   * <pre>
+   * ```js
    *   // inferred (only works if code not minified/obfuscated)
    *   $injector.invoke(function(serviceA){});
    *
@@ -3059,43 +4303,66 @@
    *
    *   // inline
    *   $injector.invoke(['serviceA', function(serviceA){}]);
-   * </pre>
+   * ```
    *
    * ## Inference
    *
    * In JavaScript calling `toString()` on a function returns the function definition. The definition
-   * can then be parsed and the function arguments can be extracted. *NOTE:* This does not work with
-   * minification, and obfuscation tools since these tools change the argument names.
+   * can then be parsed and the function arguments can be extracted. This method of discovering
+   * annotations is disallowed when the injector is in strict mode.
+   * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the
+   * argument names.
    *
    * ## `$inject` Annotation
-   * By adding a `$inject` property onto a function the injection parameters can be specified.
+   * By adding an `$inject` property onto a function the injection parameters can be specified.
    *
    * ## Inline
    * As an array of injection names, where the last item in the array is the function to call.
    */
 
+  /**
+   * @ngdoc property
+   * @name $injector#modules
+   * @type {Object}
+   * @description
+   * A hash containing all the modules that have been loaded into the
+   * $injector.
+   *
+   * You can use this property to find out information about a module via the
+   * {@link angular.Module#info `myModule.info(...)`} method.
+   *
+   * For example:
+   *
+   * ```
+   * var info = $injector.modules['ngAnimate'].info();
+   * ```
+   *
+   * **Do not use this property to attempt to modify the modules after the application
+   * has been bootstrapped.**
+   */
+
+
   /**
    * @ngdoc method
-   * @name AUTO.$injector#get
-   * @methodOf AUTO.$injector
+   * @name $injector#get
    *
    * @description
    * Return an instance of the service.
    *
    * @param {string} name The name of the instance to retrieve.
+   * @param {string=} caller An optional string to provide the origin of the function call for error messages.
    * @return {*} The instance.
    */
 
   /**
    * @ngdoc method
-   * @name AUTO.$injector#invoke
-   * @methodOf AUTO.$injector
+   * @name $injector#invoke
    *
    * @description
    * Invoke the method and supply the method arguments from the `$injector`.
    *
-   * @param {!function} fn The function to invoke. Function parameters are injected according to the
-   *   {@link guide/di $inject Annotation} rules.
+   * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
+   *   injected according to the {@link guide/di $inject Annotation} rules.
    * @param {Object=} self The `this` for the invoked method.
    * @param {Object=} locals Optional object. If preset then any argument names are read from this
    *                         object first, before the `$injector` is consulted.
@@ -3104,26 +4371,24 @@
 
   /**
    * @ngdoc method
-   * @name AUTO.$injector#has
-   * @methodOf AUTO.$injector
+   * @name $injector#has
    *
    * @description
-   * Allows the user to query if the particular service exist.
+   * Allows the user to query if the particular service exists.
    *
-   * @param {string} Name of the service to query.
-   * @returns {boolean} returns true if injector has given service.
+   * @param {string} name Name of the service to query.
+   * @returns {boolean} `true` if injector has given service.
    */
 
   /**
    * @ngdoc method
-   * @name AUTO.$injector#instantiate
-   * @methodOf AUTO.$injector
+   * @name $injector#instantiate
    * @description
-   * Create a new instance of JS type. The method takes a constructor function invokes the new
-   * operator and supplies all of the arguments to the constructor function as specified by the
+   * Create a new instance of JS type. The method takes a constructor function, invokes the new
+   * operator, and supplies all of the arguments to the constructor function as specified by the
    * constructor annotation.
    *
-   * @param {function} Type Annotated constructor function.
+   * @param {Function} Type Annotated constructor function.
    * @param {Object=} locals Optional object. If preset then any argument names are read from this
    * object first, before the `$injector` is consulted.
    * @returns {Object} new instance of `Type`.
@@ -3131,8 +4396,7 @@
 
   /**
    * @ngdoc method
-   * @name AUTO.$injector#annotate
-   * @methodOf AUTO.$injector
+   * @name $injector#annotate
    *
    * @description
    * Returns an array of service names which the function is requesting for injection. This API is
@@ -3145,7 +4409,7 @@
    * The simplest form is to extract the dependencies from the arguments of the function. This is done
    * by converting the function into a string using `toString()` method and extracting the argument
    * names.
-   * <pre>
+   * ```js
    *   // Given
    *   function MyController($scope, $route) {
  *     // ...
@@ -3153,7 +4417,9 @@
    *
    *   // Then
    *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
-   * </pre>
+   * ```
+   *
+   * You can disallow this method by using strict injection mode.
    *
    * This method does not work with code minification / obfuscation. For this reason the following
    * annotation strategies are supported.
@@ -3162,7 +4428,7 @@
    *
    * If a function has an `$inject` property and its value is an array of strings, then the strings
    * represent names of services to be injected into the function.
-   * <pre>
+   * ```js
    *   // Given
    *   var MyController = function(obfuscatedScope, obfuscatedRoute) {
  *     // ...
@@ -3172,7 +4438,7 @@
    *
    *   // Then
    *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
-   * </pre>
+   * ```
    *
    * # The array notation
    *
@@ -3180,7 +4446,7 @@
    * is very inconvenient. In these situations using the array notation to specify the dependencies in
    * a way that survives minification is a better choice:
    *
-   * <pre>
+   * ```js
    *   // We wish to write this (not minification / obfuscation safe)
    *   injector.invoke(function($compile, $rootScope) {
  *     // ...
@@ -3202,25 +4468,26 @@
    *   expect(injector.annotate(
    *      ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}])
    *    ).toEqual(['$compile', '$rootScope']);
-   * </pre>
+   * ```
    *
-   * @param {function|Array.<string|Function>} fn Function for which dependent service names need to
+   * @param {Function|Array.<string|Function>} fn Function for which dependent service names need to
    * be retrieved as described above.
    *
+   * @param {boolean=} [strictDi=false] Disallow argument name annotation inference.
+   *
    * @returns {Array.<string>} The names of the services which the function requires.
    */
 
 
 
-
   /**
-   * @ngdoc object
-   * @name AUTO.$provide
+   * @ngdoc service
+   * @name $provide
    *
    * @description
    *
-   * The {@link AUTO.$provide $provide} service has a number of methods for registering components
-   * with the {@link AUTO.$injector $injector}. Many of these functions are also exposed on
+   * The {@link auto.$provide $provide} service has a number of methods for registering components
+   * with the {@link auto.$injector $injector}. Many of these functions are also exposed on
    * {@link angular.Module}.
    *
    * An Angular **service** is a singleton object created by a **service factory**.  These **service
@@ -3228,38 +4495,39 @@
    * The **service providers** are constructor functions. When instantiated they must contain a
    * property called `$get`, which holds the **service factory** function.
    *
-   * When you request a service, the {@link AUTO.$injector $injector} is responsible for finding the
+   * When you request a service, the {@link auto.$injector $injector} is responsible for finding the
    * correct **service provider**, instantiating it and then calling its `$get` **service factory**
    * function to get the instance of the **service**.
    *
    * Often services have no configuration options and there is no need to add methods to the service
    * provider.  The provider will be no more than a constructor function with a `$get` property. For
-   * these cases the {@link AUTO.$provide $provide} service has additional helper methods to register
+   * these cases the {@link auto.$provide $provide} service has additional helper methods to register
    * services without specifying a provider.
    *
-   * * {@link AUTO.$provide#methods_provider provider(provider)} - registers a **service provider** with the
-   *     {@link AUTO.$injector $injector}
-   * * {@link AUTO.$provide#methods_constant constant(obj)} - registers a value/object that can be accessed by
+   * * {@link auto.$provide#provider provider(name, provider)} - registers a **service provider** with the
+   *     {@link auto.$injector $injector}
+   * * {@link auto.$provide#constant constant(name, obj)} - registers a value/object that can be accessed by
    *     providers and services.
-   * * {@link AUTO.$provide#methods_value value(obj)} - registers a value/object that can only be accessed by
+   * * {@link auto.$provide#value value(name, obj)} - registers a value/object that can only be accessed by
    *     services, not providers.
-   * * {@link AUTO.$provide#methods_factory factory(fn)} - registers a service **factory function**, `fn`,
+   * * {@link auto.$provide#factory factory(name, fn)} - registers a service **factory function**
    *     that will be wrapped in a **service provider** object, whose `$get` property will contain the
    *     given factory function.
-   * * {@link AUTO.$provide#methods_service service(class)} - registers a **constructor function**, `class` that
+   * * {@link auto.$provide#service service(name, Fn)} - registers a **constructor function**
    *     that will be wrapped in a **service provider** object, whose `$get` property will instantiate
    *      a new object using the given constructor function.
+   * * {@link auto.$provide#decorator decorator(name, decorFn)} - registers a **decorator function** that
+   *      will be able to modify or replace the implementation of another service.
    *
    * See the individual methods for more information and examples.
    */
 
   /**
    * @ngdoc method
-   * @name AUTO.$provide#provider
-   * @methodOf AUTO.$provide
+   * @name $provide#provider
    * @description
    *
-   * Register a **provider function** with the {@link AUTO.$injector $injector}. Provider functions
+   * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions
    * are constructor functions, whose instances are responsible for "providing" a factory for a
    * service.
    *
@@ -3279,20 +4547,18 @@
    * @param {(Object|function())} provider If the provider is:
    *
    *   - `Object`: then it should have a `$get` method. The `$get` method will be invoked using
-   *               {@link AUTO.$injector#invoke $injector.invoke()} when an instance needs to be
-   *               created.
+   *     {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created.
    *   - `Constructor`: a new instance of the provider will be created using
-   *               {@link AUTO.$injector#instantiate $injector.instantiate()}, then treated as
-   *               `object`.
+   *     {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`.
    *
    * @returns {Object} registered provider instance
 
    * @example
    *
    * The following example shows how to create a simple event tracking service and register it using
-   * {@link AUTO.$provide#methods_provider $provide.provider()}.
+   * {@link auto.$provide#provider $provide.provider()}.
    *
-   * <pre>
+   * ```js
    *  // Define the eventTracker provider
    *  function EventTrackerProvider() {
  *    var trackingUrl = '/track';
@@ -3349,97 +4615,110 @@
  *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
  *    }));
  *  });
-   * </pre>
+   * ```
    */
 
   /**
    * @ngdoc method
-   * @name AUTO.$provide#factory
-   * @methodOf AUTO.$provide
+   * @name $provide#factory
    * @description
    *
    * Register a **service factory**, which will be called to return the service instance.
    * This is short for registering a service where its provider consists of only a `$get` property,
    * which is the given service factory function.
-   * You should use {@link AUTO.$provide#factory $provide.factory(getFn)} if you do not need to
+   * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to
    * configure your service in a provider.
    *
    * @param {string} name The name of the instance.
-   * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand
-   *                            for `$provide.provider(name, {$get: $getFn})`.
+   * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
+   *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
    * @returns {Object} registered provider instance
    *
    * @example
    * Here is an example of registering a service
-   * <pre>
+   * ```js
    *   $provide.factory('ping', ['$http', function($http) {
  *     return function ping() {
  *       return $http.send('/ping');
  *     };
  *   }]);
-   * </pre>
+   * ```
    * You would then inject and use this service like this:
-   * <pre>
+   * ```js
    *   someModule.controller('Ctrl', ['ping', function(ping) {
  *     ping();
  *   }]);
-   * </pre>
+   * ```
    */
 
 
   /**
    * @ngdoc method
-   * @name AUTO.$provide#service
-   * @methodOf AUTO.$provide
+   * @name $provide#service
    * @description
    *
    * Register a **service constructor**, which will be invoked with `new` to create the service
    * instance.
-   * This is short for registering a service where its provider's `$get` property is the service
-   * constructor function that will be used to instantiate the service instance.
+   * This is short for registering a service where its provider's `$get` property is a factory
+   * function that returns an instance instantiated by the injector from the service constructor
+   * function.
    *
-   * You should use {@link AUTO.$provide#methods_service $provide.service(class)} if you define your service
-   * as a type/class. This is common when using {@link http://coffeescript.org CoffeeScript}.
+   * Internally it looks a bit like this:
+   *
+   * ```
+   * {
+ *   $get: function() {
+ *     return $injector.instantiate(constructor);
+ *   }
+ * }
+   * ```
+   *
+   *
+   * You should use {@link auto.$provide#service $provide.service(class)} if you define your service
+   * as a type/class.
    *
    * @param {string} name The name of the instance.
-   * @param {Function} constructor A class (constructor function) that will be instantiated.
+   * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
+   *     that will be instantiated.
    * @returns {Object} registered provider instance
    *
    * @example
    * Here is an example of registering a service using
-   * {@link AUTO.$provide#methods_service $provide.service(class)} that is defined as a CoffeeScript class.
-   * <pre>
-   *   class Ping
-   *     constructor: (@$http) ->
-   *     send: () =>
-   *       @$http.get('/ping')
+   * {@link auto.$provide#service $provide.service(class)}.
+   * ```js
+   *   var Ping = function($http) {
+ *     this.$http = $http;
+ *   };
    *
-   *   $provide.service('ping', ['$http', Ping])
-   * </pre>
+   *   Ping.$inject = ['$http'];
+   *
+   *   Ping.prototype.send = function() {
+ *     return this.$http.get('/ping');
+ *   };
+   *   $provide.service('ping', Ping);
+   * ```
    * You would then inject and use this service like this:
-   * <pre>
-   *   someModule.controller 'Ctrl', ['ping', (ping) ->
-   *     ping.send()
-   *   ]
-   * </pre>
+   * ```js
+   *   someModule.controller('Ctrl', ['ping', function(ping) {
+ *     ping.send();
+ *   }]);
+   * ```
    */
 
 
   /**
    * @ngdoc method
-   * @name AUTO.$provide#value
-   * @methodOf AUTO.$provide
+   * @name $provide#value
    * @description
    *
-   * Register a **value service** with the {@link AUTO.$injector $injector}, such as a string, a
-   * number, an array, an object or a function.  This is short for registering a service where its
+   * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a
+   * number, an array, an object or a function. This is short for registering a service where its
    * provider's `$get` property is a factory function that takes no arguments and returns the **value
-   * service**.
+   * service**. That also means it is not possible to inject other services into a value service.
    *
    * Value services are similar to constant services, except that they cannot be injected into a
    * module configuration function (see {@link angular.Module#config}) but they can be overridden by
-   * an Angular
-   * {@link AUTO.$provide#decorator decorator}.
+   * an Angular {@link auto.$provide#decorator decorator}.
    *
    * @param {string} name The name of the instance.
    * @param {*} value The value.
@@ -3447,7 +4726,7 @@
    *
    * @example
    * Here are some examples of creating value services.
-   * <pre>
+   * ```js
    *   $provide.value('ADMIN_USER', 'admin');
    *
    *   $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 });
@@ -3455,20 +4734,22 @@
    *   $provide.value('halfOf', function(value) {
  *     return value / 2;
  *   });
-   * </pre>
+   * ```
    */
 
 
   /**
    * @ngdoc method
-   * @name AUTO.$provide#constant
-   * @methodOf AUTO.$provide
+   * @name $provide#constant
    * @description
    *
-   * Register a **constant service**, such as a string, a number, an array, an object or a function,
-   * with the {@link AUTO.$injector $injector}. Unlike {@link AUTO.$provide#value value} it can be
+   * Register a **constant service** with the {@link auto.$injector $injector}, such as a string,
+   * a number, an array, an object or a function. Like the {@link auto.$provide#value value}, it is not
+   * possible to inject other services into a constant.
+   *
+   * But unlike {@link auto.$provide#value value}, a constant can be
    * injected into a module configuration function (see {@link angular.Module#config}) and it cannot
-   * be overridden by an Angular {@link AUTO.$provide#decorator decorator}.
+   * be overridden by an Angular {@link auto.$provide#decorator decorator}.
    *
    * @param {string} name The name of the constant.
    * @param {*} value The constant value.
@@ -3476,7 +4757,7 @@
    *
    * @example
    * Here a some examples of creating constants:
-   * <pre>
+   * ```js
    *   $provide.constant('SHARD_HEIGHT', 306);
    *
    *   $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']);
@@ -3484,70 +4765,81 @@
    *   $provide.constant('double', function(value) {
  *     return value * 2;
  *   });
-   * </pre>
+   * ```
    */
 
 
   /**
    * @ngdoc method
-   * @name AUTO.$provide#decorator
-   * @methodOf AUTO.$provide
+   * @name $provide#decorator
    * @description
    *
-   * Register a **service decorator** with the {@link AUTO.$injector $injector}. A service decorator
-   * intercepts the creation of a service, allowing it to override or modify the behaviour of the
-   * service. The object returned by the decorator may be the original service, or a new service
-   * object which replaces or wraps and delegates to the original service.
+   * Register a **decorator function** with the {@link auto.$injector $injector}. A decorator function
+   * intercepts the creation of a service, allowing it to override or modify the behavior of the
+   * service. The return value of the decorator function may be the original service, or a new service
+   * that replaces (or wraps and delegates to) the original service.
+   *
+   * You can find out more about using decorators in the {@link guide/decorators} guide.
    *
    * @param {string} name The name of the service to decorate.
-   * @param {function()} decorator This function will be invoked when the service needs to be
-   *    instantiated and should return the decorated service instance. The function is called using
-   *    the {@link AUTO.$injector#invoke injector.invoke} method and is therefore fully injectable.
+   * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
+   *    provided and should return the decorated service instance. The function is called using
+   *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
    *    Local injection arguments:
    *
-   *    * `$delegate` - The original service instance, which can be monkey patched, configured,
+   *    * `$delegate` - The original service instance, which can be replaced, monkey patched, configured,
    *      decorated or delegated to.
    *
    * @example
    * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting
    * calls to {@link ng.$log#error $log.warn()}.
-   * <pre>
-   *   $provider.decorator('$log', ['$delegate', function($delegate) {
+   * ```js
+   *   $provide.decorator('$log', ['$delegate', function($delegate) {
  *     $delegate.warn = $delegate.error;
  *     return $delegate;
  *   }]);
-   * </pre>
+   * ```
    */
 
 
-  function createInjector(modulesToLoad) {
+  function createInjector(modulesToLoad, strictDi) {
+    strictDi = (strictDi === true);
     var INSTANTIATING = {},
-        providerSuffix = 'Provider',
-        path = [],
-        loadedModules = new HashMap(),
-        providerCache = {
-          $provide: {
-            provider: supportObject(provider),
-            factory: supportObject(factory),
-            service: supportObject(service),
-            value: supportObject(value),
-            constant: supportObject(constant),
-            decorator: decorator
+      providerSuffix = 'Provider',
+      path = [],
+      loadedModules = new NgMap(),
+      providerCache = {
+        $provide: {
+          provider: supportObject(provider),
+          factory: supportObject(factory),
+          service: supportObject(service),
+          value: supportObject(value),
+          constant: supportObject(constant),
+          decorator: decorator
+        }
+      },
+      providerInjector = (providerCache.$injector =
+        createInternalInjector(providerCache, function(serviceName, caller) {
+          if (angular.isString(caller)) {
+            path.push(caller);
           }
-        },
-        providerInjector = (providerCache.$injector =
-            createInternalInjector(providerCache, function() {
-              throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
-            })),
-        instanceCache = {},
-        instanceInjector = (instanceCache.$injector =
-            createInternalInjector(instanceCache, function(servicename) {
-              var provider = providerInjector.get(servicename + providerSuffix);
-              return instanceInjector.invoke(provider.$get, provider);
-            }));
+          throw $injectorMinErr('unpr', 'Unknown provider: {0}', path.join(' <- '));
+        })),
+      instanceCache = {},
+      protoInstanceInjector =
+        createInternalInjector(instanceCache, function(serviceName, caller) {
+          var provider = providerInjector.get(serviceName + providerSuffix, caller);
+          return instanceInjector.invoke(
+            provider.$get, provider, undefined, serviceName);
+        }),
+      instanceInjector = protoInstanceInjector;
 
-
-    forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
+    providerCache['$injector' + providerSuffix] = { $get: valueFn(protoInstanceInjector) };
+    instanceInjector.modules = providerInjector.modules = createMap();
+    var runBlocks = loadModules(modulesToLoad);
+    instanceInjector = protoInstanceInjector.get('$injector');
+    instanceInjector.strictDi = strictDi;
+    forEach(runBlocks, function(fn) { if (fn) instanceInjector.invoke(fn); });
 
     return instanceInjector;
 
@@ -3571,12 +4863,26 @@
         provider_ = providerInjector.instantiate(provider_);
       }
       if (!provider_.$get) {
-        throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name);
+        throw $injectorMinErr('pget', 'Provider \'{0}\' must define $get factory method.', name);
       }
-      return providerCache[name + providerSuffix] = provider_;
+      return (providerCache[name + providerSuffix] = provider_);
     }
 
-    function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }
+    function enforceReturnValue(name, factory) {
+      return /** @this */ function enforcedReturnValue() {
+        var result = instanceInjector.invoke(factory, this);
+        if (isUndefined(result)) {
+          throw $injectorMinErr('undef', 'Provider \'{0}\' must return a value from $get factory method.', name);
+        }
+        return result;
+      };
+    }
+
+    function factory(name, factoryFn, enforce) {
+      return provider(name, {
+        $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn
+      });
+    }
 
     function service(name, constructor) {
       return factory(name, ['$injector', function($injector) {
@@ -3584,7 +4890,7 @@
       }]);
     }
 
-    function value(name, val) { return factory(name, valueFn(val)); }
+    function value(name, val) { return factory(name, valueFn(val), false); }
 
     function constant(name, value) {
       assertNotHasOwnProperty(name, 'constant');
@@ -3594,7 +4900,7 @@
 
     function decorator(serviceName, decorFn) {
       var origProvider = providerInjector.get(serviceName + providerSuffix),
-          orig$get = origProvider.$get;
+        orig$get = origProvider.$get;
 
       origProvider.$get = function() {
         var origInstance = instanceInjector.invoke(orig$get, origProvider);
@@ -3605,23 +4911,30 @@
     ////////////////////////////////////
     // Module Loading
     ////////////////////////////////////
-    function loadModules(modulesToLoad){
-      var runBlocks = [], moduleFn, invokeQueue, i, ii;
+    function loadModules(modulesToLoad) {
+      assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array');
+      var runBlocks = [], moduleFn;
       forEach(modulesToLoad, function(module) {
         if (loadedModules.get(module)) return;
-        loadedModules.put(module, true);
+        loadedModules.set(module, true);
+
+        function runInvokeQueue(queue) {
+          var i, ii;
+          for (i = 0, ii = queue.length; i < ii; i++) {
+            var invokeArgs = queue[i],
+              provider = providerInjector.get(invokeArgs[0]);
+
+            provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
+          }
+        }
 
         try {
           if (isString(module)) {
             moduleFn = angularModule(module);
+            instanceInjector.modules[module] = moduleFn;
             runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
-
-            for(invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) {
-              var invokeArgs = invokeQueue[i],
-                  provider = providerInjector.get(invokeArgs[0]);
-
-              provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
-            }
+            runInvokeQueue(moduleFn._invokeQueue);
+            runInvokeQueue(moduleFn._configBlocks);
           } else if (isFunction(module)) {
             runBlocks.push(providerInjector.invoke(module));
           } else if (isArray(module)) {
@@ -3633,16 +4946,16 @@
           if (isArray(module)) {
             module = module[module.length - 1];
           }
-          if (e.message && e.stack && e.stack.indexOf(e.message) == -1) {
+          if (e.message && e.stack && e.stack.indexOf(e.message) === -1) {
             // Safari & FF's stack traces don't contain error.message content
             // unlike those of Chrome and IE
             // So if stack doesn't contain message, we create a new string that contains both.
             // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here.
-            /* jshint -W022 */
+            // eslint-disable-next-line no-ex-assign
             e = e.message + '\n' + e.stack;
           }
-          throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}",
-              module, e.stack || e.message || e);
+          throw $injectorMinErr('modulerr', 'Failed to instantiate module {0} due to:\n{1}',
+            module, e.stack || e.message || e);
         }
       });
       return runBlocks;
@@ -3654,17 +4967,19 @@
 
     function createInternalInjector(cache, factory) {
 
-      function getService(serviceName) {
+      function getService(serviceName, caller) {
         if (cache.hasOwnProperty(serviceName)) {
           if (cache[serviceName] === INSTANTIATING) {
-            throw $injectorMinErr('cdep', 'Circular dependency found: {0}', path.join(' <- '));
+            throw $injectorMinErr('cdep', 'Circular dependency found: {0}',
+              serviceName + ' <- ' + path.join(' <- '));
           }
           return cache[serviceName];
         } else {
           try {
             path.unshift(serviceName);
             cache[serviceName] = INSTANTIATING;
-            return cache[serviceName] = factory(serviceName);
+            cache[serviceName] = factory(serviceName, caller);
+            return cache[serviceName];
           } catch (err) {
             if (cache[serviceName] === INSTANTIATING) {
               delete cache[serviceName];
@@ -3676,52 +4991,76 @@
         }
       }
 
-      function invoke(fn, self, locals){
-        var args = [],
-            $inject = annotate(fn),
-            length, i,
-            key;
 
-        for(i = 0, length = $inject.length; i < length; i++) {
-          key = $inject[i];
+      function injectionArgs(fn, locals, serviceName) {
+        var args = [],
+          $inject = createInjector.$$annotate(fn, strictDi, serviceName);
+
+        for (var i = 0, length = $inject.length; i < length; i++) {
+          var key = $inject[i];
           if (typeof key !== 'string') {
             throw $injectorMinErr('itkn',
-                'Incorrect injection token! Expected service name as string, got {0}', key);
+              'Incorrect injection token! Expected service name as string, got {0}', key);
           }
-          args.push(
-              locals && locals.hasOwnProperty(key)
-                  ? locals[key]
-                  : getService(key)
-          );
+          args.push(locals && locals.hasOwnProperty(key) ? locals[key] :
+            getService(key, serviceName));
         }
-        if (!fn.$inject) {
-          // this means that we must be an array.
-          fn = fn[length];
-        }
-
-        // http://jsperf.com/angularjs-invoke-apply-vs-switch
-        // #5388
-        return fn.apply(self, args);
+        return args;
       }
 
-      function instantiate(Type, locals) {
-        var Constructor = function() {},
-            instance, returnedValue;
+      function isClass(func) {
+        // Support: IE 9-11 only
+        // IE 9-11 do not support classes and IE9 leaks with the code below.
+        if (msie || typeof func !== 'function') {
+          return false;
+        }
+        var result = func.$$ngIsClass;
+        if (!isBoolean(result)) {
+          // Support: Edge 12-13 only
+          // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+          result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func));
+        }
+        return result;
+      }
 
+      function invoke(fn, self, locals, serviceName) {
+        if (typeof locals === 'string') {
+          serviceName = locals;
+          locals = null;
+        }
+
+        var args = injectionArgs(fn, locals, serviceName);
+        if (isArray(fn)) {
+          fn = fn[fn.length - 1];
+        }
+
+        if (!isClass(fn)) {
+          // http://jsperf.com/angularjs-invoke-apply-vs-switch
+          // #5388
+          return fn.apply(self, args);
+        } else {
+          args.unshift(null);
+          return new (Function.prototype.bind.apply(fn, args))();
+        }
+      }
+
+
+      function instantiate(Type, locals, serviceName) {
         // Check if Type is annotated and use just the given function at n-1 as parameter
         // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
-        Constructor.prototype = (isArray(Type) ? Type[Type.length - 1] : Type).prototype;
-        instance = new Constructor();
-        returnedValue = invoke(Type, instance, locals);
-
-        return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
+        var ctor = (isArray(Type) ? Type[Type.length - 1] : Type);
+        var args = injectionArgs(Type, locals, serviceName);
+        // Empty object at position 0 is ignored for invocation with `new`, but required.
+        args.unshift(null);
+        return new (Function.prototype.bind.apply(ctor, args))();
       }
 
+
       return {
         invoke: invoke,
         instantiate: instantiate,
         get: getService,
-        annotate: annotate,
+        annotate: createInjector.$$annotate,
         has: function(name) {
           return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
         }
@@ -3729,100 +5068,275 @@
     }
   }
 
+  createInjector.$$annotate = annotate;
+
   /**
-   * @ngdoc function
-   * @name ng.$anchorScroll
-   * @requires $window
-   * @requires $location
-   * @requires $rootScope
+   * @ngdoc provider
+   * @name $anchorScrollProvider
+   * @this
    *
    * @description
-   * When called, it checks current value of `$location.hash()` and scroll to related element,
-   * according to rules specified in
-   * {@link http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document Html5 spec}.
-   *
-   * It also watches the `$location.hash()` and scrolls whenever it changes to match any anchor.
-   * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`.
-   *
-   * @example
-   <example>
-   <file name="index.html">
-   <div id="scrollArea" ng-controller="ScrollCtrl">
-   <a ng-click="gotoBottom()">Go to bottom</a>
-   <a id="bottom"></a> You're at the bottom!
-   </div>
-   </file>
-   <file name="script.js">
-   function ScrollCtrl($scope, $location, $anchorScroll) {
-         $scope.gotoBottom = function (){
-           // set the location.hash to the id of
-           // the element you wish to scroll to.
-           $location.hash('bottom');
-           
-           // call $anchorScroll()
-           $anchorScroll();
-         }
-       }
-   </file>
-   <file name="style.css">
-   #scrollArea {
-         height: 350px;
-         overflow: auto;
-       }
-
-   #bottom {
-         display: block;
-         margin-top: 2000px;
-       }
-   </file>
-   </example>
+   * Use `$anchorScrollProvider` to disable automatic scrolling whenever
+   * {@link ng.$location#hash $location.hash()} changes.
    */
   function $AnchorScrollProvider() {
 
     var autoScrollingEnabled = true;
 
+    /**
+     * @ngdoc method
+     * @name $anchorScrollProvider#disableAutoScrolling
+     *
+     * @description
+     * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
+     * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
+     * Use this method to disable automatic scrolling.
+     *
+     * If automatic scrolling is disabled, one must explicitly call
+     * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
+     * current hash.
+     */
     this.disableAutoScrolling = function() {
       autoScrollingEnabled = false;
     };
 
+    /**
+     * @ngdoc service
+     * @name $anchorScroll
+     * @kind function
+     * @requires $window
+     * @requires $location
+     * @requires $rootScope
+     *
+     * @description
+     * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
+     * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
+     * in the
+     * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#an-indicated-part-of-the-document).
+     *
+     * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
+     * match any anchor whenever it changes. This can be disabled by calling
+     * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}.
+     *
+     * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
+     * vertical scroll-offset (either fixed or dynamic).
+     *
+     * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
+     *                       {@link ng.$location#hash $location.hash()} will be used.
+     *
+     * @property {(number|function|jqLite)} yOffset
+     * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
+     * positioned elements at the top of the page, such as navbars, headers etc.
+     *
+     * `yOffset` can be specified in various ways:
+     * - **number**: A fixed number of pixels to be used as offset.<br /><br />
+     * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return
+     *   a number representing the offset (in pixels).<br /><br />
+     * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from
+     *   the top of the page to the element's bottom will be used as offset.<br />
+     *   **Note**: The element will be taken into account only as long as its `position` is set to
+     *   `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust
+     *   their height and/or positioning according to the viewport's size.
+     *
+     * <br />
+     * <div class="alert alert-warning">
+     * In order for `yOffset` to work properly, scrolling should take place on the document's root and
+     * not some child element.
+     * </div>
+     *
+     * @example
+     <example module="anchorScrollExample" name="anchor-scroll">
+     <file name="index.html">
+     <div id="scrollArea" ng-controller="ScrollController">
+     <a ng-click="gotoBottom()">Go to bottom</a>
+     <a id="bottom"></a> You're at the bottom!
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('anchorScrollExample', [])
+     .controller('ScrollController', ['$scope', '$location', '$anchorScroll',
+     function($scope, $location, $anchorScroll) {
+               $scope.gotoBottom = function() {
+                 // set the location.hash to the id of
+                 // the element you wish to scroll to.
+                 $location.hash('bottom');
+
+                 // call $anchorScroll()
+                 $anchorScroll();
+               };
+             }]);
+     </file>
+     <file name="style.css">
+     #scrollArea {
+           height: 280px;
+           overflow: auto;
+         }
+
+     #bottom {
+           display: block;
+           margin-top: 2000px;
+         }
+     </file>
+     </example>
+     *
+     * <hr />
+     * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value).
+     * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details.
+     *
+     * @example
+     <example module="anchorScrollOffsetExample" name="anchor-scroll-offset">
+     <file name="index.html">
+     <div class="fixed-header" ng-controller="headerCtrl">
+     <a href="" ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
+     Go to anchor {{x}}
+     </a>
+     </div>
+     <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
+     Anchor {{x}} of 5
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('anchorScrollOffsetExample', [])
+     .run(['$anchorScroll', function($anchorScroll) {
+             $anchorScroll.yOffset = 50;   // always scroll by 50 extra pixels
+           }])
+     .controller('headerCtrl', ['$anchorScroll', '$location', '$scope',
+     function($anchorScroll, $location, $scope) {
+               $scope.gotoAnchor = function(x) {
+                 var newHash = 'anchor' + x;
+                 if ($location.hash() !== newHash) {
+                   // set the $location.hash to `newHash` and
+                   // $anchorScroll will automatically scroll to it
+                   $location.hash('anchor' + x);
+                 } else {
+                   // call $anchorScroll() explicitly,
+                   // since $location.hash hasn't changed
+                   $anchorScroll();
+                 }
+               };
+             }
+     ]);
+     </file>
+     <file name="style.css">
+     body {
+           padding-top: 50px;
+         }
+
+     .anchor {
+           border: 2px dashed DarkOrchid;
+           padding: 10px 10px 200px 10px;
+         }
+
+     .fixed-header {
+           background-color: rgba(0, 0, 0, 0.2);
+           height: 50px;
+           position: fixed;
+           top: 0; left: 0; right: 0;
+         }
+
+     .fixed-header > a {
+           display: inline-block;
+           margin: 5px 15px;
+         }
+     </file>
+     </example>
+     */
     this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
       var document = $window.document;
 
-      // helper function to get first anchor from a NodeList
-      // can't use filter.filter, as it accepts only instances of Array
-      // and IE can't convert NodeList to an array using [].slice
-      // TODO(vojta): use filter if we change it to accept lists as well
+      // Helper function to get first anchor from a NodeList
+      // (using `Array#some()` instead of `angular#forEach()` since it's more performant
+      //  and working in all supported browsers.)
       function getFirstAnchor(list) {
         var result = null;
-        forEach(list, function(element) {
-          if (!result && lowercase(element.nodeName) === 'a') result = element;
+        Array.prototype.some.call(list, function(element) {
+          if (nodeName_(element) === 'a') {
+            result = element;
+            return true;
+          }
         });
         return result;
       }
 
-      function scroll() {
-        var hash = $location.hash(), elm;
+      function getYOffset() {
+
+        var offset = scroll.yOffset;
+
+        if (isFunction(offset)) {
+          offset = offset();
+        } else if (isElement(offset)) {
+          var elem = offset[0];
+          var style = $window.getComputedStyle(elem);
+          if (style.position !== 'fixed') {
+            offset = 0;
+          } else {
+            offset = elem.getBoundingClientRect().bottom;
+          }
+        } else if (!isNumber(offset)) {
+          offset = 0;
+        }
+
+        return offset;
+      }
+
+      function scrollTo(elem) {
+        if (elem) {
+          elem.scrollIntoView();
+
+          var offset = getYOffset();
+
+          if (offset) {
+            // `offset` is the number of pixels we should scroll UP in order to align `elem` properly.
+            // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the
+            // top of the viewport.
+            //
+            // IF the number of pixels from the top of `elem` to the end of the page's content is less
+            // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some
+            // way down the page.
+            //
+            // This is often the case for elements near the bottom of the page.
+            //
+            // In such cases we do not need to scroll the whole `offset` up, just the difference between
+            // the top of the element and the offset, which is enough to align the top of `elem` at the
+            // desired position.
+            var elemTop = elem.getBoundingClientRect().top;
+            $window.scrollBy(0, elemTop - offset);
+          }
+        } else {
+          $window.scrollTo(0, 0);
+        }
+      }
+
+      function scroll(hash) {
+        // Allow numeric hashes
+        hash = isString(hash) ? hash : isNumber(hash) ? hash.toString() : $location.hash();
+        var elm;
 
         // empty hash, scroll to the top of the page
-        if (!hash) $window.scrollTo(0, 0);
+        if (!hash) scrollTo(null);
 
         // element with given id
-        else if ((elm = document.getElementById(hash))) elm.scrollIntoView();
+        else if ((elm = document.getElementById(hash))) scrollTo(elm);
 
         // first anchor with given name :-D
-        else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) elm.scrollIntoView();
+        else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm);
 
-        // no element and hash == 'top', scroll to the top of the page
-        else if (hash === 'top') $window.scrollTo(0, 0);
+        // no element and hash === 'top', scroll to the top of the page
+        else if (hash === 'top') scrollTo(null);
       }
 
       // does not scroll when user clicks on anchor link that is currently on
       // (no url change, no $location.hash() change), browser native does scroll
       if (autoScrollingEnabled) {
         $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
-            function autoScrollWatchAction() {
+          function autoScrollWatchAction(newVal, oldVal) {
+            // skip the initial scroll if $location.hash is empty
+            if (newVal === oldVal && newVal === '') return;
+
+            jqLiteDocumentLoaded(function() {
               $rootScope.$evalAsync(scroll);
             });
+          });
       }
 
       return scroll;
@@ -3830,236 +5344,981 @@
   }
 
   var $animateMinErr = minErr('$animate');
+  var ELEMENT_NODE = 1;
+  var NG_ANIMATE_CLASSNAME = 'ng-animate';
+
+  function mergeClasses(a,b) {
+    if (!a && !b) return '';
+    if (!a) return b;
+    if (!b) return a;
+    if (isArray(a)) a = a.join(' ');
+    if (isArray(b)) b = b.join(' ');
+    return a + ' ' + b;
+  }
+
+  function extractElementNode(element) {
+    for (var i = 0; i < element.length; i++) {
+      var elm = element[i];
+      if (elm.nodeType === ELEMENT_NODE) {
+        return elm;
+      }
+    }
+  }
+
+  function splitClasses(classes) {
+    if (isString(classes)) {
+      classes = classes.split(' ');
+    }
+
+    // Use createMap() to prevent class assumptions involving property names in
+    // Object.prototype
+    var obj = createMap();
+    forEach(classes, function(klass) {
+      // sometimes the split leaves empty string values
+      // incase extra spaces were applied to the options
+      if (klass.length) {
+        obj[klass] = true;
+      }
+    });
+    return obj;
+  }
+
+// if any other type of options value besides an Object value is
+// passed into the $animate.method() animation then this helper code
+// will be run which will ignore it. While this patch is not the
+// greatest solution to this, a lot of existing plugins depend on
+// $animate to either call the callback (< 1.2) or return a promise
+// that can be changed. This helper function ensures that the options
+// are wiped clean incase a callback function is provided.
+  function prepareAnimateOptions(options) {
+    return isObject(options)
+      ? options
+      : {};
+  }
+
+  var $$CoreAnimateJsProvider = /** @this */ function() {
+    this.$get = noop;
+  };
+
+// this is prefixed with Core since it conflicts with
+// the animateQueueProvider defined in ngAnimate/animateQueue.js
+  var $$CoreAnimateQueueProvider = /** @this */ function() {
+    var postDigestQueue = new NgMap();
+    var postDigestElements = [];
+
+    this.$get = ['$$AnimateRunner', '$rootScope',
+      function($$AnimateRunner,   $rootScope) {
+        return {
+          enabled: noop,
+          on: noop,
+          off: noop,
+          pin: noop,
+
+          push: function(element, event, options, domOperation) {
+            if (domOperation) {
+              domOperation();
+            }
+
+            options = options || {};
+            if (options.from) {
+              element.css(options.from);
+            }
+            if (options.to) {
+              element.css(options.to);
+            }
+
+            if (options.addClass || options.removeClass) {
+              addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
+            }
+
+            var runner = new $$AnimateRunner();
+
+            // since there are no animations to run the runner needs to be
+            // notified that the animation call is complete.
+            runner.complete();
+            return runner;
+          }
+        };
+
+
+        function updateData(data, classes, value) {
+          var changed = false;
+          if (classes) {
+            classes = isString(classes) ? classes.split(' ') :
+              isArray(classes) ? classes : [];
+            forEach(classes, function(className) {
+              if (className) {
+                changed = true;
+                data[className] = value;
+              }
+            });
+          }
+          return changed;
+        }
+
+        function handleCSSClassChanges() {
+          forEach(postDigestElements, function(element) {
+            var data = postDigestQueue.get(element);
+            if (data) {
+              var existing = splitClasses(element.attr('class'));
+              var toAdd = '';
+              var toRemove = '';
+              forEach(data, function(status, className) {
+                var hasClass = !!existing[className];
+                if (status !== hasClass) {
+                  if (status) {
+                    toAdd += (toAdd.length ? ' ' : '') + className;
+                  } else {
+                    toRemove += (toRemove.length ? ' ' : '') + className;
+                  }
+                }
+              });
+
+              forEach(element, function(elm) {
+                if (toAdd) {
+                  jqLiteAddClass(elm, toAdd);
+                }
+                if (toRemove) {
+                  jqLiteRemoveClass(elm, toRemove);
+                }
+              });
+              postDigestQueue.delete(element);
+            }
+          });
+          postDigestElements.length = 0;
+        }
+
+
+        function addRemoveClassesPostDigest(element, add, remove) {
+          var data = postDigestQueue.get(element) || {};
+
+          var classesAdded = updateData(data, add, true);
+          var classesRemoved = updateData(data, remove, false);
+
+          if (classesAdded || classesRemoved) {
+
+            postDigestQueue.set(element, data);
+            postDigestElements.push(element);
+
+            if (postDigestElements.length === 1) {
+              $rootScope.$$postDigest(handleCSSClassChanges);
+            }
+          }
+        }
+      }];
+  };
 
   /**
-   * @ngdoc object
-   * @name ng.$animateProvider
+   * @ngdoc provider
+   * @name $animateProvider
    *
    * @description
    * Default implementation of $animate that doesn't perform any animations, instead just
-   * synchronously performs DOM
-   * updates and calls done() callbacks.
+   * synchronously performs DOM updates and resolves the returned runner promise.
    *
-   * In order to enable animations the ngAnimate module has to be loaded.
+   * In order to enable animations the `ngAnimate` module has to be loaded.
    *
-   * To see the functional implementation check out src/ngAnimate/animate.js
+   * To see the functional implementation check out `src/ngAnimate/animate.js`.
    */
-  var $AnimateProvider = ['$provide', function($provide) {
-
-
-    this.$$selectors = {};
+  var $AnimateProvider = ['$provide', /** @this */ function($provide) {
+    var provider = this;
+    var classNameFilter = null;
+    var customFilter = null;
 
+    this.$$registeredAnimations = Object.create(null);
 
     /**
-     * @ngdoc function
-     * @name ng.$animateProvider#register
-     * @methodOf ng.$animateProvider
+     * @ngdoc method
+     * @name $animateProvider#register
      *
      * @description
      * Registers a new injectable animation factory function. The factory function produces the
      * animation object which contains callback functions for each event that is expected to be
      * animated.
      *
-     *   * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction`
-     *   must be called once the element animation is complete. If a function is returned then the
-     *   animation service will use this function to cancel the animation whenever a cancel event is
-     *   triggered.
+     *   * `eventFn`: `function(element, ... , doneFunction, options)`
+     *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
+     *   on the type of animation additional arguments will be injected into the animation function. The
+     *   list below explains the function signatures for the different animation methods:
      *
+     *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
+     *   - addClass: function(element, addedClasses, doneFunction, options)
+     *   - removeClass: function(element, removedClasses, doneFunction, options)
+     *   - enter, leave, move: function(element, doneFunction, options)
+     *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
      *
-     *<pre>
+     *   Make sure to trigger the `doneFunction` once the animation is fully complete.
+     *
+     * ```js
      *   return {
-     *     eventFn : function(element, done) {
-     *       //code to run the animation
-     *       //once complete, then run done()
-     *       return function cancellationFunction() {
-     *         //code to cancel the animation
-     *       }
-     *     }
-     *   }
-     *</pre>
+   *     //enter, leave, move signature
+   *     eventFn : function(element, done, options) {
+   *       //code to run the animation
+   *       //once complete, then run done()
+   *       return function endFunction(wasCancelled) {
+   *         //code to cancel the animation
+   *       }
+   *     }
+   *   }
+     * ```
      *
-     * @param {string} name The name of the animation.
-     * @param {function} factory The factory function that will be executed to return the animation
+     * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
+     * @param {Function} factory The factory function that will be executed to return the animation
      *                           object.
      */
     this.register = function(name, factory) {
+      if (name && name.charAt(0) !== '.') {
+        throw $animateMinErr('notcsel', 'Expecting class selector starting with \'.\' got \'{0}\'.', name);
+      }
+
       var key = name + '-animation';
-      if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel',
-          "Expecting class selector starting with '.' got '{0}'.", name);
-      this.$$selectors[name.substr(1)] = key;
+      provider.$$registeredAnimations[name.substr(1)] = key;
       $provide.factory(key, factory);
     };
 
     /**
-     * @ngdoc function
-     * @name ng.$animateProvider#classNameFilter
-     * @methodOf ng.$animateProvider
+     * @ngdoc method
+     * @name $animateProvider#customFilter
+     *
+     * @description
+     * Sets and/or returns the custom filter function that is used to "filter" animations, i.e.
+     * determine if an animation is allowed or not. When no filter is specified (the default), no
+     * animation will be blocked. Setting the `customFilter` value will only allow animations for
+     * which the filter function's return value is truthy.
+     *
+     * This allows to easily create arbitrarily complex rules for filtering animations, such as
+     * allowing specific events only, or enabling animations on specific subtrees of the DOM, etc.
+     * Filtering animations can also boost performance for low-powered devices, as well as
+     * applications containing a lot of structural operations.
+     *
+     * <div class="alert alert-success">
+     *   **Best Practice:**
+     *   Keep the filtering function as lean as possible, because it will be called for each DOM
+     *   action (e.g. insertion, removal, class change) performed by "animation-aware" directives.
+     *   See {@link guide/animations#which-directives-support-animations- here} for a list of built-in
+     *   directives that support animations.
+     *   Performing computationally expensive or time-consuming operations on each call of the
+     *   filtering function can make your animations sluggish.
+     * </div>
+     *
+     * **Note:** If present, `customFilter` will be checked before
+     * {@link $animateProvider#classNameFilter classNameFilter}.
+     *
+     * @param {Function=} filterFn - The filter function which will be used to filter all animations.
+     *   If a falsy value is returned, no animation will be performed. The function will be called
+     *   with the following arguments:
+     *   - **node** `{DOMElement}` - The DOM element to be animated.
+     *   - **event** `{String}` - The name of the animation event (e.g. `enter`, `leave`, `addClass`
+     *     etc).
+     *   - **options** `{Object}` - A collection of options/styles used for the animation.
+     * @return {Function} The current filter function or `null` if there is none set.
+     */
+    this.customFilter = function(filterFn) {
+      if (arguments.length === 1) {
+        customFilter = isFunction(filterFn) ? filterFn : null;
+      }
+
+      return customFilter;
+    };
+
+    /**
+     * @ngdoc method
+     * @name $animateProvider#classNameFilter
      *
      * @description
      * Sets and/or returns the CSS class regular expression that is checked when performing
      * an animation. Upon bootstrap the classNameFilter value is not set at all and will
-     * therefore enable $animate to attempt to perform an animation on any element.
-     * When setting the classNameFilter value, animations will only be performed on elements
+     * therefore enable $animate to attempt to perform an animation on any element that is triggered.
+     * When setting the `classNameFilter` value, animations will only be performed on elements
      * that successfully match the filter expression. This in turn can boost performance
      * for low-powered devices as well as applications containing a lot of structural operations.
+     *
+     * **Note:** If present, `classNameFilter` will be checked after
+     * {@link $animateProvider#customFilter customFilter}. If `customFilter` is present and returns
+     * false, `classNameFilter` will not be checked.
+     *
      * @param {RegExp=} expression The className expression which will be checked against all animations
      * @return {RegExp} The current CSS className expression value. If null then there is no expression value
      */
     this.classNameFilter = function(expression) {
-      if(arguments.length === 1) {
-        this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
+      if (arguments.length === 1) {
+        classNameFilter = (expression instanceof RegExp) ? expression : null;
+        if (classNameFilter) {
+          var reservedRegex = new RegExp('[(\\s|\\/)]' + NG_ANIMATE_CLASSNAME + '[(\\s|\\/)]');
+          if (reservedRegex.test(classNameFilter.toString())) {
+            classNameFilter = null;
+            throw $animateMinErr('nongcls', '$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
+          }
+        }
       }
-      return this.$$classNameFilter;
+      return classNameFilter;
     };
 
-    this.$get = ['$timeout', function($timeout) {
+    this.$get = ['$$animateQueue', function($$animateQueue) {
+      function domInsert(element, parentElement, afterElement) {
+        // if for some reason the previous element was removed
+        // from the dom sometime before this code runs then let's
+        // just stick to using the parent element as the anchor
+        if (afterElement) {
+          var afterNode = extractElementNode(afterElement);
+          if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
+            afterElement = null;
+          }
+        }
+        if (afterElement) {
+          afterElement.after(element);
+        } else {
+          parentElement.prepend(element);
+        }
+      }
 
       /**
+       * @ngdoc service
+       * @name $animate
+       * @description The $animate service exposes a series of DOM utility methods that provide support
+       * for animation hooks. The default behavior is the application of DOM operations, however,
+       * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
+       * to ensure that animation runs with the triggered DOM operation.
        *
-       * @ngdoc object
-       * @name ng.$animate
-       * @description The $animate service provides rudimentary DOM manipulation functions to
-       * insert, remove and move elements within the DOM, as well as adding and removing classes.
-       * This service is the core service used by the ngAnimate $animator service which provides
-       * high-level animation hooks for CSS and JavaScript.
+       * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't
+       * included and only when it is active then the animation hooks that `$animate` triggers will be
+       * functional. Once active then all structural `ng-` directives will trigger animations as they perform
+       * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
+       * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
        *
-       * $animate is available in the AngularJS core, however, the ngAnimate module must be included
-       * to enable full out animation support. Otherwise, $animate will only perform simple DOM
-       * manipulation operations.
+       * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
        *
-       * To learn more about enabling animation support, click here to visit the {@link ngAnimate
-       * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service
-       * page}.
+       * To learn more about enabling animation support, click here to visit the
+       * {@link ngAnimate ngAnimate module page}.
        */
       return {
+        // we don't call it directly since non-existant arguments may
+        // be interpreted as null within the sub enabled function
 
         /**
          *
-         * @ngdoc function
-         * @name ng.$animate#enter
-         * @methodOf ng.$animate
-         * @function
-         * @description Inserts the element into the DOM either after the `after` element or within
-         *   the `parent` element. Once complete, the done() callback will be fired (if provided).
-         * @param {jQuery/jqLite element} element the element which will be inserted into the DOM
-         * @param {jQuery/jqLite element} parent the parent element which will append the element as
-         *   a child (if the after element is not present)
-         * @param {jQuery/jqLite element} after the sibling element which will append the element
-         *   after itself
-         * @param {function=} done callback function that will be called after the element has been
-         *   inserted into the DOM
+         * @ngdoc method
+         * @name $animate#on
+         * @kind function
+         * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
+         *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
+         *    is fired with the following params:
+         *
+         * ```js
+         * $animate.on('enter', container,
+         *    function callback(element, phase) {
+       *      // cool we detected an enter animation within the container
+       *    }
+         * );
+         * ```
+         *
+         * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
+         * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
+         *     as well as among its children
+         * @param {Function} callback the callback function that will be fired when the listener is triggered
+         *
+         * The arguments present in the callback function are:
+         * * `element` - The captured DOM element that the animation was fired on.
+         * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
          */
-        enter : function(element, parent, after, done) {
-          if (after) {
-            after.after(element);
-          } else {
-            if (!parent || !parent[0]) {
-              parent = after.parent();
-            }
-            parent.append(element);
+        on: $$animateQueue.on,
+
+        /**
+         *
+         * @ngdoc method
+         * @name $animate#off
+         * @kind function
+         * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
+         * can be used in three different ways depending on the arguments:
+         *
+         * ```js
+         * // remove all the animation event listeners listening for `enter`
+         * $animate.off('enter');
+         *
+         * // remove listeners for all animation events from the container element
+         * $animate.off(container);
+         *
+         * // remove all the animation event listeners listening for `enter` on the given element and its children
+         * $animate.off('enter', container);
+         *
+         * // remove the event listener function provided by `callback` that is set
+         * // to listen for `enter` on the given `container` as well as its children
+         * $animate.off('enter', container, callback);
+         * ```
+         *
+         * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move,
+         * addClass, removeClass, etc...), or the container element. If it is the element, all other
+         * arguments are ignored.
+         * @param {DOMElement=} container the container element the event listener was placed on
+         * @param {Function=} callback the callback function that was registered as the listener
+         */
+        off: $$animateQueue.off,
+
+        /**
+         * @ngdoc method
+         * @name $animate#pin
+         * @kind function
+         * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
+         *    outside of the DOM structure of the Angular application. By doing so, any animation triggered via `$animate` can be issued on the
+         *    element despite being outside the realm of the application or within another application. Say for example if the application
+         *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
+         *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
+         *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
+         *
+         *    Note that this feature is only active when the `ngAnimate` module is used.
+         *
+         * @param {DOMElement} element the external element that will be pinned
+         * @param {DOMElement} parentElement the host parent element that will be associated with the external element
+         */
+        pin: $$animateQueue.pin,
+
+        /**
+         *
+         * @ngdoc method
+         * @name $animate#enabled
+         * @kind function
+         * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
+         * function can be called in four ways:
+         *
+         * ```js
+         * // returns true or false
+         * $animate.enabled();
+         *
+         * // changes the enabled state for all animations
+         * $animate.enabled(false);
+         * $animate.enabled(true);
+         *
+         * // returns true or false if animations are enabled for an element
+         * $animate.enabled(element);
+         *
+         * // changes the enabled state for an element and its children
+         * $animate.enabled(element, true);
+         * $animate.enabled(element, false);
+         * ```
+         *
+         * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
+         * @param {boolean=} enabled whether or not the animations will be enabled for the element
+         *
+         * @return {boolean} whether or not animations are enabled
+         */
+        enabled: $$animateQueue.enabled,
+
+        /**
+         * @ngdoc method
+         * @name $animate#cancel
+         * @kind function
+         * @description Cancels the provided animation.
+         *
+         * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
+         */
+        cancel: function(runner) {
+          if (runner.end) {
+            runner.end();
           }
-          done && $timeout(done, 0, false);
         },
 
         /**
          *
-         * @ngdoc function
-         * @name ng.$animate#leave
-         * @methodOf ng.$animate
-         * @function
-         * @description Removes the element from the DOM. Once complete, the done() callback will be
-         *   fired (if provided).
-         * @param {jQuery/jqLite element} element the element which will be removed from the DOM
-         * @param {function=} done callback function that will be called after the element has been
-         *   removed from the DOM
+         * @ngdoc method
+         * @name $animate#enter
+         * @kind function
+         * @description Inserts the element into the DOM either after the `after` element (if provided) or
+         *   as the first child within the `parent` element and then triggers an animation.
+         *   A promise is returned that will be resolved during the next digest once the animation
+         *   has completed.
+         *
+         * @param {DOMElement} element the element which will be inserted into the DOM
+         * @param {DOMElement} parent the parent element which will append the element as
+         *   a child (so long as the after element is not present)
+         * @param {DOMElement=} after the sibling element after which the element will be appended
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
          */
-        leave : function(element, done) {
-          element.remove();
-          done && $timeout(done, 0, false);
+        enter: function(element, parent, after, options) {
+          parent = parent && jqLite(parent);
+          after = after && jqLite(after);
+          parent = parent || after.parent();
+          domInsert(element, parent, after);
+          return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
         },
 
         /**
          *
-         * @ngdoc function
-         * @name ng.$animate#move
-         * @methodOf ng.$animate
-         * @function
-         * @description Moves the position of the provided element within the DOM to be placed
-         * either after the `after` element or inside of the `parent` element. Once complete, the
-         * done() callback will be fired (if provided).
+         * @ngdoc method
+         * @name $animate#move
+         * @kind function
+         * @description Inserts (moves) the element into its new position in the DOM either after
+         *   the `after` element (if provided) or as the first child within the `parent` element
+         *   and then triggers an animation. A promise is returned that will be resolved
+         *   during the next digest once the animation has completed.
          *
-         * @param {jQuery/jqLite element} element the element which will be moved around within the
-         *   DOM
-         * @param {jQuery/jqLite element} parent the parent element where the element will be
-         *   inserted into (if the after element is not present)
-         * @param {jQuery/jqLite element} after the sibling element where the element will be
-         *   positioned next to
-         * @param {function=} done the callback function (if provided) that will be fired after the
-         *   element has been moved to its new position
+         * @param {DOMElement} element the element which will be moved into the new DOM position
+         * @param {DOMElement} parent the parent element which will append the element as
+         *   a child (so long as the after element is not present)
+         * @param {DOMElement=} after the sibling element after which the element will be appended
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
          */
-        move : function(element, parent, after, done) {
-          // Do not remove element before insert. Removing will cause data associated with the
-          // element to be dropped. Insert will implicitly do the remove.
-          this.enter(element, parent, after, done);
+        move: function(element, parent, after, options) {
+          parent = parent && jqLite(parent);
+          after = after && jqLite(after);
+          parent = parent || after.parent();
+          domInsert(element, parent, after);
+          return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
         },
 
         /**
+         * @ngdoc method
+         * @name $animate#leave
+         * @kind function
+         * @description Triggers an animation and then removes the element from the DOM.
+         * When the function is called a promise is returned that will be resolved during the next
+         * digest once the animation has completed.
          *
-         * @ngdoc function
-         * @name ng.$animate#addClass
-         * @methodOf ng.$animate
-         * @function
-         * @description Adds the provided className CSS class value to the provided element. Once
-         * complete, the done() callback will be fired (if provided).
-         * @param {jQuery/jqLite element} element the element which will have the className value
-         *   added to it
-         * @param {string} className the CSS class which will be added to the element
-         * @param {function=} done the callback function (if provided) that will be fired after the
-         *   className value has been added to the element
+         * @param {DOMElement} element the element which will be removed from the DOM
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
          */
-        addClass : function(element, className, done) {
-          className = isString(className) ?
-              className :
-              isArray(className) ? className.join(' ') : '';
-          forEach(element, function (element) {
-            jqLiteAddClass(element, className);
+        leave: function(element, options) {
+          return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
+            element.remove();
           });
-          done && $timeout(done, 0, false);
         },
 
         /**
+         * @ngdoc method
+         * @name $animate#addClass
+         * @kind function
          *
-         * @ngdoc function
-         * @name ng.$animate#removeClass
-         * @methodOf ng.$animate
-         * @function
-         * @description Removes the provided className CSS class value from the provided element.
-         * Once complete, the done() callback will be fired (if provided).
-         * @param {jQuery/jqLite element} element the element which will have the className value
-         *   removed from it
-         * @param {string} className the CSS class which will be removed from the element
-         * @param {function=} done the callback function (if provided) that will be fired after the
-         *   className value has been removed from the element
+         * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
+         *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
+         *   animation if element already contains the CSS class or if the class is removed at a later step.
+         *   Note that class-based animations are treated differently compared to structural animations
+         *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+         *   depending if CSS or JavaScript animations are used.
+         *
+         * @param {DOMElement} element the element which the CSS classes will be applied to
+         * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
          */
-        removeClass : function(element, className, done) {
-          className = isString(className) ?
-              className :
-              isArray(className) ? className.join(' ') : '';
-          forEach(element, function (element) {
-            jqLiteRemoveClass(element, className);
-          });
-          done && $timeout(done, 0, false);
+        addClass: function(element, className, options) {
+          options = prepareAnimateOptions(options);
+          options.addClass = mergeClasses(options.addclass, className);
+          return $$animateQueue.push(element, 'addClass', options);
         },
 
-        enabled : noop
+        /**
+         * @ngdoc method
+         * @name $animate#removeClass
+         * @kind function
+         *
+         * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
+         *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
+         *   animation if element does not contain the CSS class or if the class is added at a later step.
+         *   Note that class-based animations are treated differently compared to structural animations
+         *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+         *   depending if CSS or JavaScript animations are used.
+         *
+         * @param {DOMElement} element the element which the CSS classes will be applied to
+         * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
+         */
+        removeClass: function(element, className, options) {
+          options = prepareAnimateOptions(options);
+          options.removeClass = mergeClasses(options.removeClass, className);
+          return $$animateQueue.push(element, 'removeClass', options);
+        },
+
+        /**
+         * @ngdoc method
+         * @name $animate#setClass
+         * @kind function
+         *
+         * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
+         *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
+         *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
+         *    passed. Note that class-based animations are treated differently compared to structural animations
+         *    (like enter, move and leave) since the CSS classes may be added/removed at different points
+         *    depending if CSS or JavaScript animations are used.
+         *
+         * @param {DOMElement} element the element which the CSS classes will be applied to
+         * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
+         * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
+         */
+        setClass: function(element, add, remove, options) {
+          options = prepareAnimateOptions(options);
+          options.addClass = mergeClasses(options.addClass, add);
+          options.removeClass = mergeClasses(options.removeClass, remove);
+          return $$animateQueue.push(element, 'setClass', options);
+        },
+
+        /**
+         * @ngdoc method
+         * @name $animate#animate
+         * @kind function
+         *
+         * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
+         * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take
+         * on the provided styles. For example, if a transition animation is set for the given className, then the provided `from` and
+         * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding
+         * style in `to`, the style in `from` is applied immediately, and no animation is run.
+         * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate`
+         * method (or as part of the `options` parameter):
+         *
+         * ```js
+         * ngModule.animation('.my-inline-animation', function() {
+       *   return {
+       *     animate : function(element, from, to, done, options) {
+       *       //animation
+       *       done();
+       *     }
+       *   }
+       * });
+         * ```
+         *
+         * @param {DOMElement} element the element which the CSS styles will be applied to
+         * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
+         * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
+         * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
+         *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
+         *    (Note that if no animation is detected then this value will not be applied to the element.)
+         * @param {object=} options an optional collection of options/styles that will be applied to the element.
+         *   The object can have the following properties:
+         *
+         *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+         *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+         *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+         *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+         *
+         * @return {Promise} the animation callback promise
+         */
+        animate: function(element, from, to, className, options) {
+          options = prepareAnimateOptions(options);
+          options.from = options.from ? extend(options.from, from) : from;
+          options.to   = options.to   ? extend(options.to, to)     : to;
+
+          className = className || 'ng-inline-animate';
+          options.tempClasses = mergeClasses(options.tempClasses, className);
+          return $$animateQueue.push(element, 'animate', options);
+        }
       };
     }];
   }];
 
+  var $$AnimateAsyncRunFactoryProvider = /** @this */ function() {
+    this.$get = ['$$rAF', function($$rAF) {
+      var waitQueue = [];
+
+      function waitForTick(fn) {
+        waitQueue.push(fn);
+        if (waitQueue.length > 1) return;
+        $$rAF(function() {
+          for (var i = 0; i < waitQueue.length; i++) {
+            waitQueue[i]();
+          }
+          waitQueue = [];
+        });
+      }
+
+      return function() {
+        var passed = false;
+        waitForTick(function() {
+          passed = true;
+        });
+        return function(callback) {
+          if (passed) {
+            callback();
+          } else {
+            waitForTick(callback);
+          }
+        };
+      };
+    }];
+  };
+
+  var $$AnimateRunnerFactoryProvider = /** @this */ function() {
+    this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$$isDocumentHidden', '$timeout',
+      function($q,   $sniffer,   $$animateAsyncRun,   $$isDocumentHidden,   $timeout) {
+
+        var INITIAL_STATE = 0;
+        var DONE_PENDING_STATE = 1;
+        var DONE_COMPLETE_STATE = 2;
+
+        AnimateRunner.chain = function(chain, callback) {
+          var index = 0;
+
+          next();
+          function next() {
+            if (index === chain.length) {
+              callback(true);
+              return;
+            }
+
+            chain[index](function(response) {
+              if (response === false) {
+                callback(false);
+                return;
+              }
+              index++;
+              next();
+            });
+          }
+        };
+
+        AnimateRunner.all = function(runners, callback) {
+          var count = 0;
+          var status = true;
+          forEach(runners, function(runner) {
+            runner.done(onProgress);
+          });
+
+          function onProgress(response) {
+            status = status && response;
+            if (++count === runners.length) {
+              callback(status);
+            }
+          }
+        };
+
+        function AnimateRunner(host) {
+          this.setHost(host);
+
+          var rafTick = $$animateAsyncRun();
+          var timeoutTick = function(fn) {
+            $timeout(fn, 0, false);
+          };
+
+          this._doneCallbacks = [];
+          this._tick = function(fn) {
+            if ($$isDocumentHidden()) {
+              timeoutTick(fn);
+            } else {
+              rafTick(fn);
+            }
+          };
+          this._state = 0;
+        }
+
+        AnimateRunner.prototype = {
+          setHost: function(host) {
+            this.host = host || {};
+          },
+
+          done: function(fn) {
+            if (this._state === DONE_COMPLETE_STATE) {
+              fn();
+            } else {
+              this._doneCallbacks.push(fn);
+            }
+          },
+
+          progress: noop,
+
+          getPromise: function() {
+            if (!this.promise) {
+              var self = this;
+              this.promise = $q(function(resolve, reject) {
+                self.done(function(status) {
+                  if (status === false) {
+                    reject();
+                  } else {
+                    resolve();
+                  }
+                });
+              });
+            }
+            return this.promise;
+          },
+
+          then: function(resolveHandler, rejectHandler) {
+            return this.getPromise().then(resolveHandler, rejectHandler);
+          },
+
+          'catch': function(handler) {
+            return this.getPromise()['catch'](handler);
+          },
+
+          'finally': function(handler) {
+            return this.getPromise()['finally'](handler);
+          },
+
+          pause: function() {
+            if (this.host.pause) {
+              this.host.pause();
+            }
+          },
+
+          resume: function() {
+            if (this.host.resume) {
+              this.host.resume();
+            }
+          },
+
+          end: function() {
+            if (this.host.end) {
+              this.host.end();
+            }
+            this._resolve(true);
+          },
+
+          cancel: function() {
+            if (this.host.cancel) {
+              this.host.cancel();
+            }
+            this._resolve(false);
+          },
+
+          complete: function(response) {
+            var self = this;
+            if (self._state === INITIAL_STATE) {
+              self._state = DONE_PENDING_STATE;
+              self._tick(function() {
+                self._resolve(response);
+              });
+            }
+          },
+
+          _resolve: function(response) {
+            if (this._state !== DONE_COMPLETE_STATE) {
+              forEach(this._doneCallbacks, function(fn) {
+                fn(response);
+              });
+              this._doneCallbacks.length = 0;
+              this._state = DONE_COMPLETE_STATE;
+            }
+          }
+        };
+
+        return AnimateRunner;
+      }];
+  };
+
+  /* exported $CoreAnimateCssProvider */
+
+  /**
+   * @ngdoc service
+   * @name $animateCss
+   * @kind object
+   * @this
+   *
+   * @description
+   * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included,
+   * then the `$animateCss` service will actually perform animations.
+   *
+   * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}.
+   */
+  var $CoreAnimateCssProvider = function() {
+    this.$get = ['$$rAF', '$q', '$$AnimateRunner', function($$rAF, $q, $$AnimateRunner) {
+
+      return function(element, initialOptions) {
+        // all of the animation functions should create
+        // a copy of the options data, however, if a
+        // parent service has already created a copy then
+        // we should stick to using that
+        var options = initialOptions || {};
+        if (!options.$$prepared) {
+          options = copy(options);
+        }
+
+        // there is no point in applying the styles since
+        // there is no animation that goes on at all in
+        // this version of $animateCss.
+        if (options.cleanupStyles) {
+          options.from = options.to = null;
+        }
+
+        if (options.from) {
+          element.css(options.from);
+          options.from = null;
+        }
+
+        var closed, runner = new $$AnimateRunner();
+        return {
+          start: run,
+          end: run
+        };
+
+        function run() {
+          $$rAF(function() {
+            applyAnimationContents();
+            if (!closed) {
+              runner.complete();
+            }
+            closed = true;
+          });
+          return runner;
+        }
+
+        function applyAnimationContents() {
+          if (options.addClass) {
+            element.addClass(options.addClass);
+            options.addClass = null;
+          }
+          if (options.removeClass) {
+            element.removeClass(options.removeClass);
+            options.removeClass = null;
+          }
+          if (options.to) {
+            element.css(options.to);
+            options.to = null;
+          }
+        }
+      };
+    }];
+  };
+
+  /* global stripHash: true */
+
   /**
    * ! This is a private undocumented service !
    *
-   * @name ng.$browser
+   * @name $browser
    * @requires $log
    * @description
    * This object has two goals:
@@ -4074,18 +6333,16 @@
   /**
    * @param {object} window The global window object.
    * @param {object} document jQuery wrapped document.
-   * @param {function()} XHR XMLHttpRequest constructor.
-   * @param {object} $log console.log or an object with the same interface.
+   * @param {object} $log window.console or an object with the same interface.
    * @param {object} $sniffer $sniffer service
    */
   function Browser(window, document, $log, $sniffer) {
     var self = this,
-        rawDocument = document[0],
-        location = window.location,
-        history = window.history,
-        setTimeout = window.setTimeout,
-        clearTimeout = window.clearTimeout,
-        pendingDeferIds = {};
+      location = window.location,
+      history = window.history,
+      setTimeout = window.setTimeout,
+      clearTimeout = window.clearTimeout,
+      pendingDeferIds = {};
 
     self.isMock = false;
 
@@ -4106,7 +6363,7 @@
       } finally {
         outstandingRequestCount--;
         if (outstandingRequestCount === 0) {
-          while(outstandingRequestCallbacks.length) {
+          while (outstandingRequestCallbacks.length) {
             try {
               outstandingRequestCallbacks.pop()();
             } catch (e) {
@@ -4117,6 +6374,11 @@
       }
     }
 
+    function getHash(url) {
+      var index = url.indexOf('#');
+      return index === -1 ? '' : url.substr(index);
+    }
+
     /**
      * @private
      * Note: this method is used only by scenario runner
@@ -4124,11 +6386,6 @@
      * @param {function()} callback Function that will be called when no outstanding request
      */
     self.notifyWhenNoOutstandingRequests = function(callback) {
-      // force browser to execute all pollFns - this is needed so that cookies and other pollers fire
-      // at some deterministic time in respect to the test runner's actions. Leaving things up to the
-      // regular poller would result in flaky tests.
-      forEach(pollFns, function(pollFn){ pollFn(); });
-
       if (outstandingRequestCount === 0) {
         callback();
       } else {
@@ -4136,56 +6393,26 @@
       }
     };
 
-    //////////////////////////////////////////////////////////////
-    // Poll Watcher API
-    //////////////////////////////////////////////////////////////
-    var pollFns = [],
-        pollTimeout;
-
-    /**
-     * @name ng.$browser#addPollFn
-     * @methodOf ng.$browser
-     *
-     * @param {function()} fn Poll function to add
-     *
-     * @description
-     * Adds a function to the list of functions that poller periodically executes,
-     * and starts polling if not started yet.
-     *
-     * @returns {function()} the added function
-     */
-    self.addPollFn = function(fn) {
-      if (isUndefined(pollTimeout)) startPoller(100, setTimeout);
-      pollFns.push(fn);
-      return fn;
-    };
-
-    /**
-     * @param {number} interval How often should browser call poll functions (ms)
-     * @param {function()} setTimeout Reference to a real or fake `setTimeout` function.
-     *
-     * @description
-     * Configures the poller to run in the specified intervals, using the specified
-     * setTimeout fn and kicks it off.
-     */
-    function startPoller(interval, setTimeout) {
-      (function check() {
-        forEach(pollFns, function(pollFn){ pollFn(); });
-        pollTimeout = setTimeout(check, interval);
-      })();
-    }
-
     //////////////////////////////////////////////////////////////
     // URL API
     //////////////////////////////////////////////////////////////
 
-    var lastBrowserUrl = location.href,
-        baseElement = document.find('base'),
-        newLocation = null;
+    var cachedState, lastHistoryState,
+      lastBrowserUrl = location.href,
+      baseElement = document.find('base'),
+      pendingLocation = null,
+      getCurrentState = !$sniffer.history ? noop : function getCurrentState() {
+        try {
+          return history.state;
+        } catch (e) {
+          // MSIE can reportedly throw when there is no state (UNCONFIRMED).
+        }
+      };
+
+    cacheState();
 
     /**
-     * @name ng.$browser#url
-     * @methodOf ng.$browser
+     * @name $browser#url
      *
      * @description
      * GETTER:
@@ -4201,59 +6428,125 @@
      * {@link ng.$location $location service} to change url.
      *
      * @param {string} url New url (when used as setter)
-     * @param {boolean=} replace Should new url replace current history record ?
+     * @param {boolean=} replace Should new url replace current history record?
+     * @param {object=} state object to use with pushState/replaceState
      */
-    self.url = function(url, replace) {
+    self.url = function(url, replace, state) {
+      // In modern browsers `history.state` is `null` by default; treating it separately
+      // from `undefined` would cause `$browser.url('/foo')` to change `history.state`
+      // to undefined via `pushState`. Instead, let's change `undefined` to `null` here.
+      if (isUndefined(state)) {
+        state = null;
+      }
+
       // Android Browser BFCache causes location, history reference to become stale.
       if (location !== window.location) location = window.location;
       if (history !== window.history) history = window.history;
 
       // setter
       if (url) {
-        if (lastBrowserUrl == url) return;
+        var sameState = lastHistoryState === state;
+
+        // Don't change anything if previous and current URLs and states match. This also prevents
+        // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
+        // See https://github.com/angular/angular.js/commit/ffb2701
+        if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
+          return self;
+        }
+        var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
         lastBrowserUrl = url;
-        if ($sniffer.history) {
-          if (replace) history.replaceState(null, '', url);
-          else {
-            history.pushState(null, '', url);
-            // Crazy Opera Bug: http://my.opera.com/community/forums/topic.dml?id=1185462
-            baseElement.attr('href', baseElement.attr('href'));
-          }
+        lastHistoryState = state;
+        // Don't use history API if only the hash changed
+        // due to a bug in IE10/IE11 which leads
+        // to not firing a `hashchange` nor `popstate` event
+        // in some cases (see #9143).
+        if ($sniffer.history && (!sameBase || !sameState)) {
+          history[replace ? 'replaceState' : 'pushState'](state, '', url);
+          cacheState();
         } else {
-          newLocation = url;
+          if (!sameBase) {
+            pendingLocation = url;
+          }
           if (replace) {
             location.replace(url);
-          } else {
+          } else if (!sameBase) {
             location.href = url;
+          } else {
+            location.hash = getHash(url);
           }
+          if (location.href !== url) {
+            pendingLocation = url;
+          }
+        }
+        if (pendingLocation) {
+          pendingLocation = url;
         }
         return self;
         // getter
       } else {
-        // - newLocation is a workaround for an IE7-9 issue with location.replace and location.href
-        //   methods not updating location.href synchronously.
+        // - pendingLocation is needed as browsers don't allow to read out
+        //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
+        //   https://openradar.appspot.com/22186109).
         // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
-        return newLocation || location.href.replace(/%27/g,"'");
+        return pendingLocation || location.href.replace(/%27/g,'\'');
       }
     };
 
-    var urlChangeListeners = [],
-        urlChangeInit = false;
+    /**
+     * @name $browser#state
+     *
+     * @description
+     * This method is a getter.
+     *
+     * Return history.state or null if history.state is undefined.
+     *
+     * @returns {object} state
+     */
+    self.state = function() {
+      return cachedState;
+    };
 
-    function fireUrlChange() {
-      newLocation = null;
-      if (lastBrowserUrl == self.url()) return;
+    var urlChangeListeners = [],
+      urlChangeInit = false;
+
+    function cacheStateAndFireUrlChange() {
+      pendingLocation = null;
+      fireStateOrUrlChange();
+    }
+
+    // This variable should be used *only* inside the cacheState function.
+    var lastCachedState = null;
+    function cacheState() {
+      // This should be the only place in $browser where `history.state` is read.
+      cachedState = getCurrentState();
+      cachedState = isUndefined(cachedState) ? null : cachedState;
+
+      // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
+      if (equals(cachedState, lastCachedState)) {
+        cachedState = lastCachedState;
+      }
+
+      lastCachedState = cachedState;
+      lastHistoryState = cachedState;
+    }
+
+    function fireStateOrUrlChange() {
+      var prevLastHistoryState = lastHistoryState;
+      cacheState();
+
+      if (lastBrowserUrl === self.url() && prevLastHistoryState === cachedState) {
+        return;
+      }
 
       lastBrowserUrl = self.url();
+      lastHistoryState = cachedState;
       forEach(urlChangeListeners, function(listener) {
-        listener(self.url());
+        listener(self.url(), cachedState);
       });
     }
 
     /**
-     * @name ng.$browser#onUrlChange
-     * @methodOf ng.$browser
-     * @TODO(vojta): refactor to use node's syntax for events
+     * @name $browser#onUrlChange
      *
      * @description
      * Register callback function that will be called, when url changes.
@@ -4274,17 +6567,16 @@
      * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous.
      */
     self.onUrlChange = function(callback) {
+      // TODO(vojta): refactor to use node's syntax for events
       if (!urlChangeInit) {
-        // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera)
-        // don't fire popstate when user change the address bar and don't fire hashchange when url
+        // We listen on both (hashchange/popstate) when available, as some browsers don't
+        // fire popstate when user changes the address bar and don't fire hashchange when url
         // changed by push/replaceState
 
         // html5 history api - popstate event
-        if ($sniffer.history) jqLite(window).on('popstate', fireUrlChange);
+        if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange);
         // hashchange event
-        if ($sniffer.hashchange) jqLite(window).on('hashchange', fireUrlChange);
-        // polling
-        else self.addPollFn(fireUrlChange);
+        jqLite(window).on('hashchange', cacheStateAndFireUrlChange);
 
         urlChangeInit = true;
       }
@@ -4293,105 +6585,43 @@
       return callback;
     };
 
+    /**
+     * @private
+     * Remove popstate and hashchange handler from window.
+     *
+     * NOTE: this api is intended for use only by $rootScope.
+     */
+    self.$$applicationDestroyed = function() {
+      jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
+    };
+
+    /**
+     * Checks whether the url has changed outside of Angular.
+     * Needs to be exported to be able to check for changes that have been done in sync,
+     * as hashchange/popstate events fire in async.
+     */
+    self.$$checkUrlChange = fireStateOrUrlChange;
+
     //////////////////////////////////////////////////////////////
     // Misc API
     //////////////////////////////////////////////////////////////
 
     /**
-     * @name ng.$browser#baseHref
-     * @methodOf ng.$browser
+     * @name $browser#baseHref
      *
      * @description
      * Returns current <base href>
      * (always relative - without domain)
      *
-     * @returns {string=} current <base href>
+     * @returns {string} The current base href
      */
     self.baseHref = function() {
       var href = baseElement.attr('href');
-      return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
+      return href ? href.replace(/^(https?:)?\/\/[^/]*/, '') : '';
     };
 
-    //////////////////////////////////////////////////////////////
-    // Cookies API
-    //////////////////////////////////////////////////////////////
-    var lastCookies = {};
-    var lastCookieString = '';
-    var cookiePath = self.baseHref();
-
     /**
-     * @name ng.$browser#cookies
-     * @methodOf ng.$browser
-     *
-     * @param {string=} name Cookie name
-     * @param {string=} value Cookie value
-     *
-     * @description
-     * The cookies method provides a 'private' low level access to browser cookies.
-     * It is not meant to be used directly, use the $cookie service instead.
-     *
-     * The return values vary depending on the arguments that the method was called with as follows:
-     *
-     * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify
-     *   it
-     * - cookies(name, value) -> set name to value, if value is undefined delete the cookie
-     * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that
-     *   way)
-     *
-     * @returns {Object} Hash of all cookies (if called without any parameter)
-     */
-    self.cookies = function(name, value) {
-      /* global escape: false, unescape: false */
-      var cookieLength, cookieArray, cookie, i, index;
-
-      if (name) {
-        if (value === undefined) {
-          rawDocument.cookie = escape(name) + "=;path=" + cookiePath +
-              ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
-        } else {
-          if (isString(value)) {
-            cookieLength = (rawDocument.cookie = escape(name) + '=' + escape(value) +
-                ';path=' + cookiePath).length + 1;
-
-            // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
-            // - 300 cookies
-            // - 20 cookies per unique domain
-            // - 4096 bytes per cookie
-            if (cookieLength > 4096) {
-              $log.warn("Cookie '"+ name +
-                  "' possibly not set or overflowed because it was too large ("+
-                  cookieLength + " > 4096 bytes)!");
-            }
-          }
-        }
-      } else {
-        if (rawDocument.cookie !== lastCookieString) {
-          lastCookieString = rawDocument.cookie;
-          cookieArray = lastCookieString.split("; ");
-          lastCookies = {};
-
-          for (i = 0; i < cookieArray.length; i++) {
-            cookie = cookieArray[i];
-            index = cookie.indexOf('=');
-            if (index > 0) { //ignore nameless cookies
-              name = unescape(cookie.substring(0, index));
-              // the first value that is seen for a cookie is the most
-              // specific one.  values for the same cookie name that
-              // follow are for less specific paths.
-              if (lastCookies[name] === undefined) {
-                lastCookies[name] = unescape(cookie.substring(index + 1));
-              }
-            }
-          }
-        }
-        return lastCookies;
-      }
-    };
-
-
-    /**
-     * @name ng.$browser#defer
-     * @methodOf ng.$browser
+     * @name $browser#defer
      * @param {function()} fn A function, who's execution should be deferred.
      * @param {number=} [delay=0] of milliseconds to defer the function execution.
      * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`.
@@ -4417,8 +6647,7 @@
 
 
     /**
-     * @name ng.$browser#defer.cancel
-     * @methodOf ng.$browser.defer
+     * @name $browser#defer.cancel
      *
      * @description
      * Cancels a deferred task identified with `deferId`.
@@ -4439,21 +6668,24 @@
 
   }
 
-  function $BrowserProvider(){
+  /** @this */
+  function $BrowserProvider() {
     this.$get = ['$window', '$log', '$sniffer', '$document',
-      function( $window,   $log,   $sniffer,   $document){
+      function($window, $log, $sniffer, $document) {
         return new Browser($window, $document, $log, $sniffer);
       }];
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$cacheFactory
+   * @ngdoc service
+   * @name $cacheFactory
+   * @this
    *
    * @description
-   * Factory that constructs cache objects and gives access to them.
+   * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to
+   * them.
    *
-   * <pre>
+   * ```js
    *
    *  var cache = $cacheFactory('cacheId');
    *  expect($cacheFactory.get('cacheId')).toBe(cache);
@@ -4465,7 +6697,7 @@
    *  // We've specified no options on creation
    *  expect(cache.info()).toEqual({id: 'cacheId', size: 2});
    *
-   * </pre>
+   * ```
    *
    *
    * @param {string} cacheId Name or id of the newly created cache.
@@ -4483,6 +6715,48 @@
    * - `{void}` `removeAll()` — Removes all cached values.
    * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory.
    *
+   * @example
+   <example module="cacheExampleApp" name="cache-factory">
+   <file name="index.html">
+   <div ng-controller="CacheController">
+   <input ng-model="newCacheKey" placeholder="Key">
+   <input ng-model="newCacheValue" placeholder="Value">
+   <button ng-click="put(newCacheKey, newCacheValue)">Cache</button>
+
+   <p ng-if="keys.length">Cached Values</p>
+   <div ng-repeat="key in keys">
+   <span ng-bind="key"></span>
+   <span>: </span>
+   <b ng-bind="cache.get(key)"></b>
+   </div>
+
+   <p>Cache Info</p>
+   <div ng-repeat="(key, value) in cache.info()">
+   <span ng-bind="key"></span>
+   <span>: </span>
+   <b ng-bind="value"></b>
+   </div>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('cacheExampleApp', []).
+   controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) {
+           $scope.keys = [];
+           $scope.cache = $cacheFactory('cacheId');
+           $scope.put = function(key, value) {
+             if (angular.isUndefined($scope.cache.get(key))) {
+               $scope.keys.push(key);
+             }
+             $scope.cache.put(key, angular.isUndefined(value) ? null : value);
+           };
+         }]);
+   </file>
+   <file name="style.css">
+   p {
+         margin: 10px 0 3px;
+       }
+   </file>
+   </example>
    */
   function $CacheFactoryProvider() {
 
@@ -4491,25 +6765,84 @@
 
       function cacheFactory(cacheId, options) {
         if (cacheId in caches) {
-          throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId);
+          throw minErr('$cacheFactory')('iid', 'CacheId \'{0}\' is already taken!', cacheId);
         }
 
         var size = 0,
-            stats = extend({}, options, {id: cacheId}),
-            data = {},
-            capacity = (options && options.capacity) || Number.MAX_VALUE,
-            lruHash = {},
-            freshEnd = null,
-            staleEnd = null;
+          stats = extend({}, options, {id: cacheId}),
+          data = createMap(),
+          capacity = (options && options.capacity) || Number.MAX_VALUE,
+          lruHash = createMap(),
+          freshEnd = null,
+          staleEnd = null;
 
-        return caches[cacheId] = {
+        /**
+         * @ngdoc type
+         * @name $cacheFactory.Cache
+         *
+         * @description
+         * A cache object used to store and retrieve data, primarily used by
+         * {@link $http $http} and the {@link ng.directive:script script} directive to cache
+         * templates and other data.
+         *
+         * ```js
+         *  angular.module('superCache')
+         *    .factory('superCache', ['$cacheFactory', function($cacheFactory) {
+       *      return $cacheFactory('super-cache');
+       *    }]);
+         * ```
+         *
+         * Example test:
+         *
+         * ```js
+         *  it('should behave like a cache', inject(function(superCache) {
+       *    superCache.put('key', 'value');
+       *    superCache.put('another key', 'another value');
+       *
+       *    expect(superCache.info()).toEqual({
+       *      id: 'super-cache',
+       *      size: 2
+       *    });
+       *
+       *    superCache.remove('another key');
+       *    expect(superCache.get('another key')).toBeUndefined();
+       *
+       *    superCache.removeAll();
+       *    expect(superCache.info()).toEqual({
+       *      id: 'super-cache',
+       *      size: 0
+       *    });
+       *  }));
+         * ```
+         */
+        return (caches[cacheId] = {
 
+          /**
+           * @ngdoc method
+           * @name $cacheFactory.Cache#put
+           * @kind function
+           *
+           * @description
+           * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be
+           * retrieved later, and incrementing the size of the cache if the key was not already
+           * present in the cache. If behaving like an LRU cache, it will also remove stale
+           * entries from the set.
+           *
+           * It will not insert undefined values into the cache.
+           *
+           * @param {string} key the key under which the cached data is stored.
+           * @param {*} value the value to store alongside the key. If it is undefined, the key
+           *    will not be stored.
+           * @returns {*} the value stored.
+           */
           put: function(key, value) {
-            var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
-
-            refresh(lruEntry);
-
             if (isUndefined(value)) return;
+            if (capacity < Number.MAX_VALUE) {
+              var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
+
+              refresh(lruEntry);
+            }
+
             if (!(key in data)) size++;
             data[key] = value;
 
@@ -4520,41 +6853,85 @@
             return value;
           },
 
-
+          /**
+           * @ngdoc method
+           * @name $cacheFactory.Cache#get
+           * @kind function
+           *
+           * @description
+           * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object.
+           *
+           * @param {string} key the key of the data to be retrieved
+           * @returns {*} the value stored.
+           */
           get: function(key) {
-            var lruEntry = lruHash[key];
+            if (capacity < Number.MAX_VALUE) {
+              var lruEntry = lruHash[key];
 
-            if (!lruEntry) return;
+              if (!lruEntry) return;
 
-            refresh(lruEntry);
+              refresh(lruEntry);
+            }
 
             return data[key];
           },
 
 
+          /**
+           * @ngdoc method
+           * @name $cacheFactory.Cache#remove
+           * @kind function
+           *
+           * @description
+           * Removes an entry from the {@link $cacheFactory.Cache Cache} object.
+           *
+           * @param {string} key the key of the entry to be removed
+           */
           remove: function(key) {
-            var lruEntry = lruHash[key];
+            if (capacity < Number.MAX_VALUE) {
+              var lruEntry = lruHash[key];
 
-            if (!lruEntry) return;
+              if (!lruEntry) return;
 
-            if (lruEntry == freshEnd) freshEnd = lruEntry.p;
-            if (lruEntry == staleEnd) staleEnd = lruEntry.n;
-            link(lruEntry.n,lruEntry.p);
+              if (lruEntry === freshEnd) freshEnd = lruEntry.p;
+              if (lruEntry === staleEnd) staleEnd = lruEntry.n;
+              link(lruEntry.n,lruEntry.p);
+
+              delete lruHash[key];
+            }
+
+            if (!(key in data)) return;
 
-            delete lruHash[key];
             delete data[key];
             size--;
           },
 
 
+          /**
+           * @ngdoc method
+           * @name $cacheFactory.Cache#removeAll
+           * @kind function
+           *
+           * @description
+           * Clears the cache object of any entries.
+           */
           removeAll: function() {
-            data = {};
+            data = createMap();
             size = 0;
-            lruHash = {};
+            lruHash = createMap();
             freshEnd = staleEnd = null;
           },
 
 
+          /**
+           * @ngdoc method
+           * @name $cacheFactory.Cache#destroy
+           * @kind function
+           *
+           * @description
+           * Destroys the {@link $cacheFactory.Cache Cache} object entirely,
+           * removing it from the {@link $cacheFactory $cacheFactory} set.
+           */
           destroy: function() {
             data = null;
             stats = null;
@@ -4563,20 +6940,36 @@
           },
 
 
+          /**
+           * @ngdoc method
+           * @name $cacheFactory.Cache#info
+           * @kind function
+           *
+           * @description
+           * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}.
+           *
+           * @returns {object} an object with the following properties:
+           *   <ul>
+           *     <li>**id**: the id of the cache instance</li>
+           *     <li>**size**: the number of entries kept in the cache instance</li>
+           *     <li>**...**: any additional properties from the options object when creating the
+           *       cache.</li>
+           *   </ul>
+           */
           info: function() {
             return extend({}, stats, {size: size});
           }
-        };
+        });
 
 
         /**
          * makes the `entry` the freshEnd of the LRU linked list
          */
         function refresh(entry) {
-          if (entry != freshEnd) {
+          if (entry !== freshEnd) {
             if (!staleEnd) {
               staleEnd = entry;
-            } else if (staleEnd == entry) {
+            } else if (staleEnd === entry) {
               staleEnd = entry.n;
             }
 
@@ -4592,7 +6985,7 @@
          * bidirectionally links two entries of the LRU linked list
          */
         function link(nextEntry, prevEntry) {
-          if (nextEntry != prevEntry) {
+          if (nextEntry !== prevEntry) {
             if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify
             if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify
           }
@@ -4602,11 +6995,10 @@
 
       /**
        * @ngdoc method
-       * @name ng.$cacheFactory#info
-       * @methodOf ng.$cacheFactory
+       * @name $cacheFactory#info
        *
        * @description
-       * Get information about all the of the caches that have been created
+       * Get information about all the caches that have been created
        *
        * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info`
        */
@@ -4621,8 +7013,7 @@
 
       /**
        * @ngdoc method
-       * @name ng.$cacheFactory#get
-       * @methodOf ng.$cacheFactory
+       * @name $cacheFactory#get
        *
        * @description
        * Get access to a cache object by the `cacheId` used when it was created.
@@ -4640,8 +7031,9 @@
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$templateCache
+   * @ngdoc service
+   * @name $templateCache
+   * @this
    *
    * @description
    * The first time a template is used, it is loaded in the template cache for quick retrieval. You
@@ -4649,38 +7041,37 @@
    * `$templateCache` service directly.
    *
    * Adding via the `script` tag:
-   * <pre>
-   * <html ng-app>
-   * <head>
-   * <script type="text/ng-template" id="templateId.html">
-   *   This is the content of the template
-   * </script>
-   * </head>
-   *   ...
-   * </html>
-   * </pre>
+   *
+   * ```html
+   *   <script type="text/ng-template" id="templateId.html">
+   *     <p>This is the content of the template</p>
+   *   </script>
+   * ```
    *
    * **Note:** the `script` tag containing the template does not need to be included in the `head` of
-   * the document, but it must be below the `ng-app` definition.
+   * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE,
+   * element with ng-app attribute), otherwise the template will be ignored.
    *
-   * Adding via the $templateCache service:
+   * Adding via the `$templateCache` service:
    *
-   * <pre>
+   * ```js
    * var myApp = angular.module('myApp', []);
    * myApp.run(function($templateCache) {
  *   $templateCache.put('templateId.html', 'This is the content of the template');
  * });
-   * </pre>
+   * ```
    *
-   * To retrieve the template later, simply use it in your HTML:
-   * <pre>
-   * <div ng-include=" 'templateId.html' "></div>
-   * </pre>
+   * To retrieve the template later, simply use it in your component:
+   * ```js
+   * myApp.component('myComponent', {
+ *    templateUrl: 'templateId.html'
+ * });
+   * ```
    *
-   * or get it via Javascript:
-   * <pre>
+   * or get it via the `$templateCache` service:
+   * ```js
    * $templateCache.get('templateId.html')
-   * </pre>
+   * ```
    *
    * See {@link ng.$cacheFactory $cacheFactory}.
    *
@@ -4691,35 +7082,46 @@
     }];
   }
 
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables like document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
   /* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
-   *
-   * DOM-related variables:
-   *
-   * - "node" - DOM Node
-   * - "element" - DOM Element or Node
-   * - "$node" or "$element" - jqLite-wrapped node or element
-   *
-   *
-   * Compiler related stuff:
-   *
-   * - "linkFn" - linking fn of a single directive
-   * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
-   * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
-   * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
-   */
+ *
+ * DOM-related variables:
+ *
+ * - "node" - DOM Node
+ * - "element" - DOM Element or Node
+ * - "$node" or "$element" - jqLite-wrapped node or element
+ *
+ *
+ * Compiler related stuff:
+ *
+ * - "linkFn" - linking fn of a single directive
+ * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
+ * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
+ * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
+ */
 
 
   /**
-   * @ngdoc function
-   * @name ng.$compile
-   * @function
+   * @ngdoc service
+   * @name $compile
+   * @kind function
    *
    * @description
    * Compiles an HTML string or DOM into a template and produces a template function, which
    * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together.
    *
    * The compilation is a process of walking the DOM tree and matching DOM elements to
-   * {@link ng.$compileProvider#methods_directive directives}.
+   * {@link ng.$compileProvider#directive directives}.
    *
    * <div class="alert alert-warning">
    * **Note:** This document is an in-depth reference of all directive options.
@@ -4732,8 +7134,9 @@
    * There are many different options for a directive.
    *
    * The difference resides in the return value of the factory function.
-   * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
-   * or just the `postLink` function (all other properties will have the default values).
+   * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
+   * that defines the directive properties, or just the `postLink` function (all other properties will have
+   * the default values).
    *
    * <div class="alert alert-success">
    * **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -4741,40 +7144,43 @@
    *
    * Here's an example directive declared with a Directive Definition Object:
    *
-   * <pre>
+   * ```js
    *   var myModule = angular.module(...);
    *
    *   myModule.directive('directiveName', function factory(injectables) {
  *     var directiveDefinitionObject = {
- *       priority: 0,
- *       template: '<div></div>', // or // function(tElement, tAttrs) { ... },
+ *       {@link $compile#-priority- priority}: 0,
+ *       {@link $compile#-template- template}: '<div></div>', // or // function(tElement, tAttrs) { ... },
  *       // or
- *       // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... },
- *       replace: false,
- *       transclude: false,
- *       restrict: 'A',
- *       scope: false,
- *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
- *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
- *       compile: function compile(tElement, tAttrs, transclude) {
+ *       // {@link $compile#-templateurl- templateUrl}: 'directive.html', // or // function(tElement, tAttrs) { ... },
+ *       {@link $compile#-transclude- transclude}: false,
+ *       {@link $compile#-restrict- restrict}: 'A',
+ *       {@link $compile#-templatenamespace- templateNamespace}: 'html',
+ *       {@link $compile#-scope- scope}: false,
+ *       {@link $compile#-controller- controller}: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
+ *       {@link $compile#-controlleras- controllerAs}: 'stringIdentifier',
+ *       {@link $compile#-bindtocontroller- bindToController}: false,
+ *       {@link $compile#-require- require}: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
+ *       {@link $compile#-multielement- multiElement}: false,
+ *       {@link $compile#-compile- compile}: function compile(tElement, tAttrs, transclude) {
  *         return {
- *           pre: function preLink(scope, iElement, iAttrs, controller) { ... },
- *           post: function postLink(scope, iElement, iAttrs, controller) { ... }
+ *            {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
+ *            {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
  *         }
  *         // or
  *         // return function postLink( ... ) { ... }
  *       },
  *       // or
- *       // link: {
- *       //  pre: function preLink(scope, iElement, iAttrs, controller) { ... },
- *       //  post: function postLink(scope, iElement, iAttrs, controller) { ... }
+ *       // {@link $compile#-link- link}: {
+ *       //  {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
+ *       //  {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
  *       // }
  *       // or
- *       // link: function postLink( ... ) { ... }
+ *       // {@link $compile#-link- link}: function postLink( ... ) { ... }
  *     };
  *     return directiveDefinitionObject;
  *   });
-   * </pre>
+   * ```
    *
    * <div class="alert alert-warning">
    * **Note:** Any unspecified options will use the default value. You can see the default values below.
@@ -4782,7 +7188,7 @@
    *
    * Therefore the above can be simplified as:
    *
-   * <pre>
+   * ```js
    *   var myModule = angular.module(...);
    *
    *   myModule.directive('directiveName', function factory(injectables) {
@@ -4793,14 +7199,141 @@
  *     // or
  *     // return function postLink(scope, iElement, iAttrs) { ... }
  *   });
-   * </pre>
+   * ```
    *
+   * ### Life-cycle hooks
+   * Directive controllers can provide the following methods that are called by Angular at points in the life-cycle of the
+   * directive:
+   * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+   *   had their bindings initialized (and before the pre &amp; post linking functions for the directives on
+   *   this element). This is a good place to put initialization code for your controller.
+   * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+   *   `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+   *   object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+   *   component such as cloning the bound value to prevent accidental mutation of the outer value. Note that this will
+   *   also be called when your bindings are initialized.
+   * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
+   *   changes. Any actions that you wish to take in response to the changes that you detect must be
+   *   invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
+   *   could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
+   *   be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
+   *   if detecting changes, you must store the previous value(s) for comparison to the current values.
+   * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+   *   external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+   *   the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+   *   components will have their `$onDestroy()` hook called before child components.
+   * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+   *   function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+   *   Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+   *   they are waiting for their template to load asynchronously and their own compilation and linking has been
+   *   suspended until that occurs.
+   *
+   * #### Comparison with Angular 2 life-cycle hooks
+   * Angular 2 also uses life-cycle hooks for its components. While the Angular 1 life-cycle hooks are similar there are
+   * some differences that you should be aware of, especially when it comes to moving your code from Angular 1 to Angular 2:
+   *
+   * * Angular 1 hooks are prefixed with `$`, such as `$onInit`. Angular 2 hooks are prefixed with `ng`, such as `ngOnInit`.
+   * * Angular 1 hooks can be defined on the controller prototype or added to the controller inside its constructor.
+   *   In Angular 2 you can only define hooks on the prototype of the Component class.
+   * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in Angular 1 than you would to
+   *   `ngDoCheck` in Angular 2
+   * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
+   *   propagated throughout the application.
+   *   Angular 2 does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
+   *   error or do nothing depending upon the state of `enableProdMode()`.
+   *
+   * #### Life-cycle hook examples
+   *
+   * This example shows how you can check for mutations to a Date object even though the identity of the object
+   * has not changed.
+   *
+   * <example name="doCheckDateExample" module="do-check-module">
+   *   <file name="app.js">
+   *     angular.module('do-check-module', [])
+   *       .component('app', {
+ *         template:
+ *           'Month: <input ng-model="$ctrl.month" ng-change="$ctrl.updateDate()">' +
+ *           'Date: {{ $ctrl.date }}' +
+ *           '<test date="$ctrl.date"></test>',
+ *         controller: function() {
+ *           this.date = new Date();
+ *           this.month = this.date.getMonth();
+ *           this.updateDate = function() {
+ *             this.date.setMonth(this.month);
+ *           };
+ *         }
+ *       })
+   *       .component('test', {
+ *         bindings: { date: '<' },
+ *         template:
+ *           '<pre>{{ $ctrl.log | json }}</pre>',
+ *         controller: function() {
+ *           var previousValue;
+ *           this.log = [];
+ *           this.$doCheck = function() {
+ *             var currentValue = this.date && this.date.valueOf();
+ *             if (previousValue !== currentValue) {
+ *               this.log.push('doCheck: date mutated: ' + this.date);
+ *               previousValue = currentValue;
+ *             }
+ *           };
+ *         }
+ *       });
+   *   </file>
+   *   <file name="index.html">
+   *     <app></app>
+   *   </file>
+   * </example>
+   *
+   * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
+   * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
+   * arrays or objects can have a negative impact on your application performance)
+   *
+   * <example name="doCheckArrayExample" module="do-check-module">
+   *   <file name="index.html">
+   *     <div ng-init="items = []">
+   *       <button ng-click="items.push(items.length)">Add Item</button>
+   *       <button ng-click="items = []">Reset Items</button>
+   *       <pre>{{ items }}</pre>
+   *       <test items="items"></test>
+   *     </div>
+   *   </file>
+   *   <file name="app.js">
+   *      angular.module('do-check-module', [])
+   *        .component('test', {
+ *          bindings: { items: '<' },
+ *          template:
+ *            '<pre>{{ $ctrl.log | json }}</pre>',
+ *          controller: function() {
+ *            this.log = [];
+ *
+ *            this.$doCheck = function() {
+ *              if (this.items_ref !== this.items) {
+ *                this.log.push('doCheck: items changed');
+ *                this.items_ref = this.items;
+ *              }
+ *              if (!angular.equals(this.items_clone, this.items)) {
+ *                this.log.push('doCheck: items mutated');
+ *                this.items_clone = angular.copy(this.items);
+ *              }
+ *            };
+ *          }
+ *        });
+   *   </file>
+   * </example>
    *
    *
    * ### Directive Definition Object
    *
-   * The directive definition object provides instructions to the {@link ../api/ng.$compile
-   * compiler}. The attributes are:
+   * The directive definition object provides instructions to the {@link ng.$compile
+ * compiler}. The attributes are:
+   *
+   * #### `multiElement`
+   * When this property is set to true (default is `false`), the HTML compiler will collect DOM nodes between
+   * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them
+   * together as the directive elements. It is recommended that this feature be used on directives
+   * which are not strictly behavioral (such as {@link ngClick}), and which
+   * do not manipulate or replace child nodes (such as {@link ngInclude}).
    *
    * #### `priority`
    * When there are multiple directives defined on a single DOM element, sometimes it
@@ -4813,150 +7346,276 @@
    * #### `terminal`
    * If set to true then the current `priority` will be the last set of directives
    * which will execute (any directives at the current priority will still execute
-   * as the order of execution on same `priority` is undefined).
+   * as the order of execution on same `priority` is undefined). Note that expressions
+   * and other directives used in the directive's template will also be excluded from execution.
    *
    * #### `scope`
-   * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the
-   * same element request a new scope, only one new scope is created. The new scope rule does not
-   * apply for the root of the template since the root of the template always gets a new scope.
+   * The scope property can be `false`, `true`, or an object:
    *
-   * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from
-   * normal scope in that it does not prototypically inherit from the parent scope. This is useful
-   * when creating reusable components, which should not accidentally read or modify data in the
-   * parent scope.
+   * * **`false` (default):** No scope will be created for the directive. The directive will use its
+   * parent's scope.
    *
-   * The 'isolate' scope takes an object hash which defines a set of local scope properties
-   * derived from the parent scope. These local properties are useful for aliasing values for
-   * templates. Locals definition is a hash of local scope property to its source:
+   * * **`true`:** A new child scope that prototypically inherits from its parent will be created for
+   * the directive's element. If multiple directives on the same element request a new scope,
+   * only one new scope is created.
+   *
+   * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's template.
+   * The 'isolate' scope differs from normal scope in that it does not prototypically
+   * inherit from its parent scope. This is useful when creating reusable components, which should not
+   * accidentally read or modify data in the parent scope. Note that an isolate scope
+   * directive without a `template` or `templateUrl` will not apply the isolate scope
+   * to its children elements.
+   *
+   * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the
+   * directive's element. These local properties are useful for aliasing values for templates. The keys in
+   * the object hash map to the name of the property on the isolate scope; the values define how the property
+   * is bound to the parent scope, via matching attributes on the directive's element:
    *
    * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is
-   *   always a string since DOM attributes are strings. If no `attr` name is specified  then the
-   *   attribute name is assumed to be the same as the local name.
-   *   Given `<widget my-attr="hello {{name}}">` and widget definition
-   *   of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect
-   *   the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the
-   *   `localName` property on the widget scope. The `name` is read from the parent scope (not
-   *   component scope).
+   *   always a string since DOM attributes are strings. If no `attr` name is specified then the
+   *   attribute name is assumed to be the same as the local name. Given `<my-component
+   *   my-attr="hello {{name}}">` and the isolate scope definition `scope: { localName:'@myAttr' }`,
+   *   the directive's scope property `localName` will reflect the interpolated value of `hello
+   *   {{name}}`. As the `name` attribute changes so will the `localName` property on the directive's
+   *   scope. The `name` is read from the parent scope (not the directive's scope).
    *
-   * * `=` or `=attr` - set up bi-directional binding between a local scope property and the
-   *   parent scope property of name defined via the value of the `attr` attribute. If no `attr`
-   *   name is specified then the attribute name is assumed to be the same as the local name.
-   *   Given `<widget my-attr="parentModel">` and widget definition of
-   *   `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the
+   * * `=` or `=attr` - set up a bidirectional binding between a local scope property and an expression
+   *   passed via the attribute `attr`. The expression is evaluated in the context of the parent scope.
+   *   If no `attr` name is specified then the attribute name is assumed to be the same as the local
+   *   name. Given `<my-component my-attr="parentModel">` and the isolate scope definition `scope: {
+ *   localModel: '=myAttr' }`, the property `localModel` on the directive's scope will reflect the
+   *   value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in
+   *   `localModel` and vice versa. Optional attributes should be marked as such with a question mark:
+   *   `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't
+   *   optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`})
+   *   will be thrown upon discovering changes to the local value, since it will be impossible to sync
+   *   them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
+   *   method is used for tracking changes, and the equality check is based on object identity.
+   *   However, if an object literal or an array literal is passed as the binding expression, the
+   *   equality check is done by value (using the {@link angular.equals} function). It's also possible
+   *   to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection
+ *   `$watchCollection`}: use `=*` or `=*attr` (`=*?` or `=*?attr` if the attribute is optional).
+   *
+   * * `<` or `<attr` - set up a one-way (one-directional) binding between a local scope property and an
+   *   expression passed via the attribute `attr`. The expression is evaluated in the context of the
+   *   parent scope. If no `attr` name is specified then the attribute name is assumed to be the same as the
+   *   local name. You can also make the binding optional by adding `?`: `<?` or `<?attr`.
+   *
+   *   For example, given `<my-component my-attr="parentModel">` and directive definition of
+   *   `scope: { localModel:'<myAttr' }`, then the isolated scope property `localModel` will reflect the
    *   value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected
-   *   in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent
-   *   scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You
-   *   can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional.
+   *   in `localModel`, but changes in `localModel` will not reflect in `parentModel`. There are however
+   *   two caveats:
+   *     1. one-way binding does not copy the value from the parent to the isolate scope, it simply
+   *     sets the same value. That means if your bound value is an object, changes to its properties
+   *     in the isolated scope will be reflected in the parent scope (because both reference the same object).
+   *     2. one-way binding watches changes to the **identity** of the parent value. That means the
+   *     {@link ng.$rootScope.Scope#$watch `$watch`} on the parent value only fires if the reference
+   *     to the value has changed. In most cases, this should not be of concern, but can be important
+   *     to know if you one-way bind to an object, and then replace that object in the isolated scope.
+   *     If you now change a property of the object in your parent scope, the change will not be
+   *     propagated to the isolated scope, because the identity of the object on the parent scope
+   *     has not changed. Instead you must assign a new object.
    *
-   * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope.
-   *   If no `attr` name is specified then the attribute name is assumed to be the same as the
-   *   local name. Given `<widget my-attr="count = count + value">` and widget definition of
-   *   `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to
-   *   a function wrapper for the `count = count + value` expression. Often it's desirable to
-   *   pass data from the isolated scope via an expression and to the parent scope, this can be
-   *   done by passing a map of local variable names and values into the expression wrapper fn.
-   *   For example, if the expression is `increment(amount)` then we can specify the amount value
-   *   by calling the `localFn` as `localFn({amount: 22})`.
+   *   One-way binding is useful if you do not plan to propagate changes to your isolated scope bindings
+   *   back to the parent. However, it does not make this completely impossible.
    *
+   * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. If
+   *   no `attr` name is specified then the attribute name is assumed to be the same as the local name.
+   *   Given `<my-component my-attr="count = count + value">` and the isolate scope definition `scope: {
+ *   localFn:'&myAttr' }`, the isolate scope property `localFn` will point to a function wrapper for
+   *   the `count = count + value` expression. Often it's desirable to pass data from the isolated scope
+   *   via an expression to the parent scope. This can be done by passing a map of local variable names
+   *   and values into the expression wrapper fn. For example, if the expression is `increment(amount)`
+   *   then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`.
+   *
+   * In general it's possible to apply more than one directive to one element, but there might be limitations
+   * depending on the type of scope required by the directives. The following points will help explain these limitations.
+   * For simplicity only two directives are taken into account, but it is also applicable for several directives:
+   *
+   * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope
+   * * **child scope** + **no scope** =>  Both directives will share one single child scope
+   * * **child scope** + **child scope** =>  Both directives will share one single child scope
+   * * **isolated scope** + **no scope** =>  The isolated directive will use it's own created isolated scope. The other directive will use
+   * its parent's scope
+   * * **isolated scope** + **child scope** =>  **Won't work!** Only one scope can be related to one element. Therefore these directives cannot
+   * be applied to the same element.
+   * * **isolated scope** + **isolated scope**  =>  **Won't work!** Only one scope can be related to one element. Therefore these directives
+   * cannot be applied to the same element.
+   *
+   *
+   * #### `bindToController`
+   * This property is used to bind scope properties directly to the controller. It can be either
+   * `true` or an object hash with the same format as the `scope` property.
+   *
+   * When an isolate scope is used for a directive (see above), `bindToController: true` will
+   * allow a component to have its properties bound to the controller, rather than to scope.
+   *
+   * After the controller is instantiated, the initial values of the isolate scope bindings will be bound to the controller
+   * properties. You can access these bindings once they have been initialized by providing a controller method called
+   * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings
+   * initialized.
+   *
+   * <div class="alert alert-warning">
+   * **Deprecation warning:** if `$compileProcvider.preAssignBindingsEnabled(true)` was called, bindings for non-ES6 class
+   * controllers are bound to `this` before the controller constructor is called but this use is now deprecated. Please
+   * place initialization code that relies upon bindings inside a `$onInit` method on the controller, instead.
+   * </div>
+   *
+   * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
+   * This will set up the scope bindings to the controller directly. Note that `scope` can still be used
+   * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate
+   * scope (useful for component directives).
+   *
+   * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`.
    *
    *
    * #### `controller`
    * Controller constructor function. The controller is instantiated before the
-   * pre-linking phase and it is shared with other directives (see
+   * pre-linking phase and can be accessed by other directives (see
    * `require` attribute). This allows the directives to communicate with each other and augment
    * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals:
    *
    * * `$scope` - Current scope associated with the element
    * * `$element` - Current element
    * * `$attrs` - Current attributes object for the element
-   * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope.
-   *    The scope can be overridden by an optional first argument.
-   *   `function([scope], cloneLinkingFn)`.
-   *
+   * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope:
+   *   `function([scope], cloneLinkingFn, futureParentElement, slotName)`:
+   *    * `scope`: (optional) override the scope.
+   *    * `cloneLinkingFn`: (optional) argument to create clones of the original transcluded content.
+   *    * `futureParentElement` (optional):
+   *        * defines the parent to which the `cloneLinkingFn` will add the cloned elements.
+   *        * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`.
+   *        * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements)
+   *          and when the `cloneLinkingFn` is passed,
+   *          as those elements need to created and cloned in a special way when they are defined outside their
+   *          usual containers (e.g. like `<svg>`).
+   *        * See also the `directive.templateNamespace` property.
+   *    * `slotName`: (optional) the name of the slot to transclude. If falsy (e.g. `null`, `undefined` or `''`)
+   *      then the default transclusion is provided.
+   *    The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
+   *    `true` if the specified slot contains content (i.e. one or more DOM nodes).
    *
    * #### `require`
    * Require another directive and inject its controller as the fourth argument to the linking function. The
-   * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
-   * injected argument will be an array in corresponding order. If no such directive can be
-   * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with:
+   * `require` property can be a string, an array or an object:
+   * * a **string** containing the name of the directive to pass to the linking function
+   * * an **array** containing the names of directives to pass to the linking function. The argument passed to the
+   * linking function will be an array of controllers in the same order as the names in the `require` property
+   * * an **object** whose property values are the names of the directives to pass to the linking function. The argument
+   * passed to the linking function will also be an object with matching keys, whose values will hold the corresponding
+   * controllers.
+   *
+   * If the `require` property is an object and `bindToController` is truthy, then the required controllers are
+   * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers
+   * have been constructed but before `$onInit` is called.
+   * If the name of the required controller is the same as the local name (the key), the name can be
+   * omitted. For example, `{parentDir: '^^'}` is equivalent to `{parentDir: '^^parentDir'}`.
+   * See the {@link $compileProvider#component} helper for an example of how this can be used.
+   * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is
+   * raised (unless no link function is specified and the required controllers are not being bound to the directive
+   * controller, in which case error checking is skipped). The name can be prefixed with:
    *
    * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
    * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
-   * * `^` - Locate the required controller by searching the element's parents. Throw an error if not found.
-   * * `?^` - Attempt to locate the required controller by searching the element's parents or pass `null` to the
-   *   `link` fn if not found.
+   * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found.
+   * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found.
+   * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass
+   *   `null` to the `link` fn if not found.
+   * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass
+   *   `null` to the `link` fn if not found.
    *
    *
    * #### `controllerAs`
-   * Controller alias at the directive scope. An alias for the controller so it
-   * can be referenced at the directive template. The directive needs to define a scope for this
-   * configuration to be used. Useful in the case when directive is used as component.
+   * Identifier name for a reference to the controller in the directive's scope.
+   * This allows the controller to be referenced from the directive template. This is especially
+   * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible
+   * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the
+   * `controllerAs` reference might overwrite a property that already exists on the parent scope.
    *
    *
    * #### `restrict`
    * String of subset of `EACM` which restricts the directive to a specific directive
-   * declaration style. If omitted, the default (attributes only) is used.
+   * declaration style. If omitted, the defaults (elements and attributes) are used.
    *
-   * * `E` - Element name: `<my-directive></my-directive>`
+   * * `E` - Element name (default): `<my-directive></my-directive>`
    * * `A` - Attribute (default): `<div my-directive="exp"></div>`
    * * `C` - Class: `<div class="my-directive: exp;"></div>`
    * * `M` - Comment: `<!-- directive: my-directive exp -->`
    *
    *
-   * #### `template`
-   * replace the current element with the contents of the HTML. The replacement process
-   * migrates all of the attributes / classes from the old element to the new one. See the
-   * {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive
-   * Directives Guide} for an example.
+   * #### `templateNamespace`
+   * String representing the document type used by the markup in the template.
+   * AngularJS needs this information as those elements need to be created and cloned
+   * in a special way when they are defined outside their usual containers like `<svg>` and `<math>`.
    *
-   * You can specify `template` as a string representing the template or as a function which takes
-   * two arguments `tElement` and `tAttrs` (described in the `compile` function api below) and
-   * returns a string value representing the template.
+   * * `html` - All root nodes in the template are HTML. Root nodes may also be
+   *   top-level elements such as `<svg>` or `<math>`.
+   * * `svg` - The root nodes in the template are SVG elements (excluding `<math>`).
+   * * `math` - The root nodes in the template are MathML elements (excluding `<svg>`).
+   *
+   * If no `templateNamespace` is specified, then the namespace is considered to be `html`.
+   *
+   * #### `template`
+   * HTML markup that may:
+   * * Replace the contents of the directive's element (default).
+   * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
+   * * Wrap the contents of the directive's element (if `transclude` is true).
+   *
+   * Value may be:
+   *
+   * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
+   * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
+   *   function api below) and returns a string value.
    *
    *
    * #### `templateUrl`
-   * Same as `template` but the template is loaded from the specified URL. Because
-   * the template loading is asynchronous the compilation/linking is suspended until the template
-   * is loaded.
+   * This is similar to `template` but the template is loaded from the specified URL, asynchronously.
+   *
+   * Because template loading is asynchronous the compiler will suspend compilation of directives on that element
+   * for later when the template has been resolved.  In the meantime it will continue to compile and link
+   * sibling and parent elements as though this element had not contained any directives.
+   *
+   * The compiler does not suspend the entire compilation to wait for templates to be loaded because this
+   * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the
+   * case when only one deeply nested directive has `templateUrl`.
+   *
+   * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache}
    *
    * You can specify `templateUrl` as a string representing the URL or as a function which takes two
    * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns
    * a string value representing the url.  In either case, the template URL is passed through {@link
-   * ../api/ng.$sce#methods_getTrustedResourceUrl $sce.getTrustedResourceUrl}.
+    * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
    *
    *
-   * #### `replace`
-   * specify where the template should be inserted. Defaults to `false`.
+   * #### `replace` ([*DEPRECATED*!], will be removed in next major release - i.e. v2.0)
+   * specify what the template should replace. Defaults to `false`.
    *
-   * * `true` - the template will replace the current element.
-   * * `false` - the template will replace the contents of the current element.
+   * * `true` - the template will replace the directive's element.
+   * * `false` - the template will replace the contents of the directive's element.
    *
+   * The replacement process migrates all of the attributes / classes from the old element to the new
+   * one. See the {@link guide/directive#template-expanding-directive
+ * Directives Guide} for an example.
+   *
+   * There are very few scenarios where element replacement is required for the application function,
+   * the main one being reusable custom components that are used within SVG contexts
+   * (because SVG doesn't work with custom elements in the DOM tree).
    *
    * #### `transclude`
-   * compile the content of the element and make it available to the directive.
-   * Typically used with {@link ../api/ng.directive:ngTransclude
-   * ngTransclude}. The advantage of transclusion is that the linking function receives a
-   * transclusion function which is pre-bound to the correct scope. In a typical setup the widget
-   * creates an `isolate` scope, but the transclusion is not a child, but a sibling of the `isolate`
-   * scope. This makes it possible for the widget to have private state, and the transclusion to
-   * be bound to the parent (pre-`isolate`) scope.
-   *
-   * * `true` - transclude the content of the directive.
-   * * `'element'` - transclude the whole element including any directives defined at lower priority.
+   * Extract the contents of the element where the directive appears and make it available to the directive.
+   * The contents are compiled and provided to the directive as a **transclusion function**. See the
+   * {@link $compile#transclusion Transclusion} section below.
    *
    *
    * #### `compile`
    *
-   * <pre>
+   * ```js
    *   function compile(tElement, tAttrs, transclude) { ... }
-   * </pre>
+   * ```
    *
    * The compile function deals with transforming the template DOM. Since most directives do not do
-   * template transformation, it is not used often. Examples that require compile functions are
-   * directives that transform template DOM, such as {@link
-   * ../api/ng.directive:ngRepeat ngRepeat}, or load the contents
-   * asynchronously, such as {@link ../api/ngRoute.directive:ngView ngView}. The
-   * compile function takes the following arguments.
+   * template transformation, it is not used often. The compile function takes the following arguments:
    *
    *   * `tElement` - template element - The element where the directive has been declared. It is
    *     safe to do template transformation on the element and child elements only.
@@ -4972,8 +7631,18 @@
    * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration
    * should be done in a linking function rather than in a compile function.
    * </div>
+
+   * <div class="alert alert-warning">
+   * **Note:** The compile function cannot handle directives that recursively use themselves in their
+   * own templates or compile functions. Compiling these directives results in an infinite loop and
+   * stack overflow errors.
    *
-   * <div class="alert alert-error">
+   * This can be avoided by manually using $compile in the postLink function to imperatively compile
+   * a directive's template instead of relying on automatic template compilation via `template` or
+   * `templateUrl` declaration or manual compilation inside the compile function.
+   * </div>
+   *
+   * <div class="alert alert-danger">
    * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
    *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
    *   to the link function instead.
@@ -4992,16 +7661,16 @@
    * #### `link`
    * This property is used only if the `compile` property is not defined.
    *
-   * <pre>
+   * ```js
    *   function link(scope, iElement, iAttrs, controller, transcludeFn) { ... }
-   * </pre>
+   * ```
    *
    * The link function is responsible for registering DOM listeners as well as updating the DOM. It is
    * executed after the template has been cloned. This is where most of the directive logic will be
    * put.
    *
-   *   * `scope` - {@link ../api/ng.$rootScope.Scope Scope} - The scope to be used by the
-   *     directive for registering {@link ../api/ng.$rootScope.Scope#methods_$watch watches}.
+   *   * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the
+   *     directive for registering {@link ng.$rootScope.Scope#$watch watches}.
    *
    *   * `iElement` - instance element - The element where the directive is to be used. It is safe to
    *     manipulate the children of the element only in `postLink` function since the children have
@@ -5010,15 +7679,23 @@
    *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
    *     between all directive linking functions.
    *
-   *   * `controller` - a controller instance - A controller instance if at least one directive on the
-   *     element defines a controller. The controller is shared among all the directives, which allows
-   *     the directives to use the controllers as a communication channel.
+   *   * `controller` - the directive's required controller instance(s) - Instances are shared
+   *     among all directives, which allows the directives to use the controllers as a communication
+   *     channel. The exact value depends on the directive's `require` property:
+   *       * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one
+   *       * `string`: the controller instance
+   *       * `array`: array of controller instances
+   *
+   *     If a required controller cannot be found, and it is optional, the instance is `null`,
+   *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
+   *
+   *     Note that you can also require the directive's own controller - it will be made available like
+   *     any other controller.
    *
    *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
-   *     The scope can be overridden by an optional first argument. This is the same as the `$transclude`
-   *     parameter of directive controllers.
-   *     `function([scope], cloneLinkingFn)`.
-   *
+   *     This is the same as the `$transclude` parameter of directive controllers,
+   *     see {@link ng.$compile#-controller- the controller section for details}.
+   *     `function([scope], cloneLinkingFn, futureParentElement)`.
    *
    * #### Pre-linking function
    *
@@ -5027,18 +7704,166 @@
    *
    * #### Post-linking function
    *
-   * Executed after the child elements are linked. It is safe to do DOM transformation in the post-linking function.
+   * Executed after the child elements are linked.
+   *
+   * Note that child elements that contain `templateUrl` directives will not have been compiled
+   * and linked since they are waiting for their template to load asynchronously and their own
+   * compilation and linking has been suspended until that occurs.
+   *
+   * It is safe to do DOM transformation in the post-linking function on elements that are not waiting
+   * for their async templates to be resolved.
+   *
+   *
+   * ### Transclusion
+   *
+   * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and
+   * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
+   * scope from where they were taken.
+   *
+   * Transclusion is used (often with {@link ngTransclude}) to insert the
+   * original contents of a directive's element into a specified place in the template of the directive.
+   * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded
+   * content has access to the properties on the scope from which it was taken, even if the directive
+   * has isolated scope.
+   * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}.
+   *
+   * This makes it possible for the widget to have private state for its template, while the transcluded
+   * content has access to its originating scope.
+   *
+   * <div class="alert alert-warning">
+   * **Note:** When testing an element transclude directive you must not place the directive at the root of the
+   * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
+ * Testing Transclusion Directives}.
+   * </div>
+   *
+   * There are three kinds of transclusion depending upon whether you want to transclude just the contents of the
+   * directive's element, the entire element or multiple parts of the element contents:
+   *
+   * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
+   * * `'element'` - transclude the whole of the directive's element including any directives on this
+   *   element that defined at a lower priority than this directive. When used, the `template`
+   *   property is ignored.
+   * * **`{...}` (an object hash):** - map elements of the content onto transclusion "slots" in the template.
+   *
+   * **Mult-slot transclusion** is declared by providing an object for the `transclude` property.
+   *
+   * This object is a map where the keys are the name of the slot to fill and the value is an element selector
+   * used to match the HTML to the slot. The element selector should be in normalized form (e.g. `myElement`)
+   * and will match the standard element variants (e.g. `my-element`, `my:element`, `data-my-element`, etc).
+   *
+   * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+   *
+   * If the element selector is prefixed with a `?` then that slot is optional.
+   *
+   * For example, the transclude object `{ slotA: '?myCustomElement' }` maps `<my-custom-element>` elements to
+   * the `slotA` slot, which can be accessed via the `$transclude` function or via the {@link ngTransclude} directive.
+   *
+   * Slots that are not marked as optional (`?`) will trigger a compile time error if there are no matching elements
+   * in the transclude content. If you wish to know if an optional slot was filled with content, then you can call
+   * `$transclude.isSlotFilled(slotName)` on the transclude function passed to the directive's link function and
+   * injectable into the directive's controller.
+   *
+   *
+   * #### Transclusion Functions
+   *
+   * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion
+   * function** to the directive's `link` function and `controller`. This transclusion function is a special
+   * **linking function** that will return the compiled contents linked to a new transclusion scope.
+   *
+   * <div class="alert alert-info">
+   * If you are just using {@link ngTransclude} then you don't need to worry about this function, since
+   * ngTransclude will deal with it for us.
+   * </div>
+   *
+   * If you want to manually control the insertion and removal of the transcluded content in your directive
+   * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery
+   * object that contains the compiled DOM, which is linked to the correct transclusion scope.
+   *
+   * When you call a transclusion function you can pass in a **clone attach function**. This function accepts
+   * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded
+   * content and the `scope` is the newly created transclusion scope, which the clone will be linked to.
+   *
+   * <div class="alert alert-info">
+   * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function
+   * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope.
+   * </div>
+   *
+   * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone
+   * attach function**:
+   *
+   * ```js
+   * var transcludedContent, transclusionScope;
+   *
+   * $transclude(function(clone, scope) {
+ *   element.append(clone);
+ *   transcludedContent = clone;
+ *   transclusionScope = scope;
+ * });
+   * ```
+   *
+   * Later, if you want to remove the transcluded content from your DOM then you should also destroy the
+   * associated transclusion scope:
+   *
+   * ```js
+   * transcludedContent.remove();
+   * transclusionScope.$destroy();
+   * ```
+   *
+   * <div class="alert alert-info">
+   * **Best Practice**: if you intend to add and remove transcluded content manually in your directive
+   * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it),
+   * then you are also responsible for calling `$destroy` on the transclusion scope.
+   * </div>
+   *
+   * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat}
+   * automatically destroy their transcluded clones as necessary so you do not need to worry about this if
+   * you are simply using {@link ngTransclude} to inject the transclusion into your directive.
+   *
+   *
+   * #### Transclusion Scopes
+   *
+   * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion
+   * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed
+   * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it
+   * was taken.
+   *
+   * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look
+   * like this:
+   *
+   * ```html
+   * <div ng-app>
+   *   <div isolate>
+   *     <div transclusion>
+   *     </div>
+   *   </div>
+   * </div>
+   * ```
+   *
+   * The `$parent` scope hierarchy will look like this:
+   *
+   ```
+   - $rootScope
+   - isolate
+   - transclusion
+   ```
+   *
+   * but the scopes will inherit prototypically from different scopes to their `$parent`.
+   *
+   ```
+   - $rootScope
+   - transclusion
+   - isolate
+   ```
+   *
    *
-   * <a name="Attributes"></a>
    * ### Attributes
    *
-   * The {@link ../api/ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
+   * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
    * `link()` or `compile()` functions. It has a variety of uses.
    *
-   * accessing *Normalized attribute names:*
-   * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'.
-   * the attributes object allows for normalized access to
-   *   the attributes.
+   * * *Accessing normalized attribute names:* Directives like 'ngBind' can be expressed in many ways:
+   *   'ng:bind', `data-ng-bind`, or 'x-ng-bind'. The attributes object allows for normalized access
+   *   to the attributes.
    *
    * * *Directive inter-communication:* All directives share the same instance of the attributes
    *   object which allows the directives to use the attributes object as inter directive
@@ -5052,7 +7877,7 @@
    *   the only way to easily get the actual value because during the linking phase the interpolation
    *   hasn't been evaluated yet and so the value is at this time set to `undefined`.
    *
-   * <pre>
+   * ```js
    * function linkingFn(scope, elm, attrs, ctrl) {
  *   // get the attribute value
  *   console.log(attrs.ngModel);
@@ -5065,19 +7890,19 @@
  *     console.log('ngModel has changed value to ' + value);
  *   });
  * }
-   * </pre>
+   * ```
    *
-   * Below is an example using `$compileProvider`.
+   * ## Example
    *
    * <div class="alert alert-warning">
    * **Note**: Typically directives are registered with `module.directive`. The example below is
    * to illustrate how `$compile` works.
    * </div>
    *
-   <doc:example module="compile">
-   <doc:source>
+   <example module="compileExample" name="compile">
+   <file name="index.html">
    <script>
-   angular.module('compile', [], function($compileProvider) {
+   angular.module('compileExample', [], function($compileProvider) {
         // configure new 'compile' directive by passing a directive
         // factory function. The factory function injects the '$compile'
         $compileProvider.directive('compile', function($compile) {
@@ -5101,47 +7926,77 @@
               }
             );
           };
-        })
-      });
-
-   function Ctrl($scope) {
+        });
+      })
+   .controller('GreeterController', ['$scope', function($scope) {
         $scope.name = 'Angular';
         $scope.html = 'Hello {{name}}';
-      }
+      }]);
    </script>
-   <div ng-controller="Ctrl">
-   <input ng-model="name"> <br>
-   <textarea ng-model="html"></textarea> <br>
+   <div ng-controller="GreeterController">
+   <input ng-model="name"> <br/>
+   <textarea ng-model="html"></textarea> <br/>
    <div compile="html"></div>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should auto compile', function() {
-       expect(element('div[compile]').text()).toBe('Hello Angular');
-       input('html').enter('{{name}}!');
-       expect(element('div[compile]').text()).toBe('Angular!');
+       var textarea = $('textarea');
+       var output = $('div[compile]');
+       // The initial state reads 'Hello Angular'.
+       expect(output.getText()).toBe('Hello Angular');
+       textarea.clear();
+       textarea.sendKeys('{{name}}!');
+       expect(output.getText()).toBe('Angular!');
      });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
 
    *
    *
    * @param {string|DOMElement} element Element or HTML string to compile into a template function.
-   * @param {function(angular.Scope[, cloneAttachFn]} transclude function available to directives.
-   * @param {number} maxPriority only apply directives lower then given priority (Only effects the
+   * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
+   *
+   * <div class="alert alert-danger">
+   * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
+   *   e.g. will not use the right outer scope. Please pass the transclude function as a
+   *   `parentBoundTranscludeFn` to the link function instead.
+   * </div>
+   *
+   * @param {number} maxPriority only apply directives lower than given priority (Only effects the
    *                 root element(s), not their children)
-   * @returns {function(scope[, cloneAttachFn])} a link function which is used to bind template
+   * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template
    * (a DOM element/tree) to a scope. Where:
    *
    *  * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to.
    *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
    *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
    *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
-   *  called as: <br> `cloneAttachFn(clonedElement, scope)` where:
+   *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
    *
    *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
    *      * `scope` - is the current scope with which the linking function is working with.
    *
+   *  * `options` - An optional object hash with linking options. If `options` is provided, then the following
+   *  keys may be used to control linking behavior:
+   *
+   *      * `parentBoundTranscludeFn` - the transclude function made available to
+   *        directives; if given, it will be passed through to the link functions of
+   *        directives found in `element` during compilation.
+   *      * `transcludeControllers` - an object hash with keys that map controller names
+   *        to a hash with the key `instance`, which maps to the controller instance;
+   *        if given, it will make the controllers available to directives on the compileNode:
+   *        ```
+   *        {
+ *          parent: {
+ *            instance: parentControllerInstance
+ *          }
+ *        }
+   *        ```
+   *      * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add
+   *        the cloned elements; only needed for transcludes that are allowed to contain non html
+   *        elements (e.g. SVG elements). See also the directive.controller property.
+   *
    * Calling the linking function returns the element of the template. It is either the original
    * element passed in, or the clone of the element if the `cloneAttachFn` is provided.
    *
@@ -5152,14 +8007,14 @@
    *
    * - If you are not asking the linking function to clone the template, create the DOM element(s)
    *   before you send them to the compiler and keep this reference around.
-   *   <pre>
+   *   ```js
    *     var element = $compile('<p>{{total}}</p>')(scope);
-   *   </pre>
+   *   ```
    *
    * - if on the other hand, you need the element to be cloned, the view reference from the original
    *   example would not point to the clone, but rather to the original template that was cloned. In
    *   this case, you can access the clone via the cloneAttachFn:
-   *   <pre>
+   *   ```js
    *     var templateElement = angular.element('<p>{{total}}</p>'),
    *         scope = ....;
    *
@@ -5168,39 +8023,154 @@
  *     });
    *
    *     //now we have reference to the cloned DOM via `clonedElement`
-   *   </pre>
+   *   ```
    *
    *
    * For information on how the compiler works, see the
    * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide.
+   *
+   * @knownIssue
+   *
+   * ### Double Compilation
+   *
+   Double compilation occurs when an already compiled part of the DOM gets
+   compiled again. This is an undesired effect and can lead to misbehaving directives, performance issues,
+   and memory leaks. Refer to the Compiler Guide {@link guide/compiler#double-compilation-and-how-to-avoid-it
+   section on double compilation} for an in-depth explanation and ways to avoid it.
+   *
    */
 
   var $compileMinErr = minErr('$compile');
 
+  function UNINITIALIZED_VALUE() {}
+  var _UNINITIALIZED_VALUE = new UNINITIALIZED_VALUE();
+
   /**
-   * @ngdoc service
-   * @name ng.$compileProvider
-   * @function
+   * @ngdoc provider
+   * @name $compileProvider
    *
    * @description
    */
   $CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider'];
+  /** @this */
   function $CompileProvider($provide, $$sanitizeUriProvider) {
     var hasDirectives = {},
-        Suffix = 'Directive',
-        COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\d\w\-_]+)\s+(.*)$/,
-        CLASS_DIRECTIVE_REGEXP = /(([\d\w\-_]+)(?:\:([^;]+))?;?)/;
+      Suffix = 'Directive',
+      COMMENT_DIRECTIVE_REGEXP = /^\s*directive:\s*([\w-]+)\s+(.*)$/,
+      CLASS_DIRECTIVE_REGEXP = /(([\w-]+)(?::([^;]+))?;?)/,
+      ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'),
+      REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/;
 
     // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes
     // The assumption is that future DOM event attribute names will begin with
     // 'on' and be composed of only English letters.
     var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/;
+    var bindingCache = createMap();
+
+    function parseIsolateBindings(scope, directiveName, isController) {
+      var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/;
+
+      var bindings = createMap();
+
+      forEach(scope, function(definition, scopeName) {
+        if (definition in bindingCache) {
+          bindings[scopeName] = bindingCache[definition];
+          return;
+        }
+        var match = definition.match(LOCAL_REGEXP);
+
+        if (!match) {
+          throw $compileMinErr('iscp',
+            'Invalid {3} for directive \'{0}\'.' +
+            ' Definition: {... {1}: \'{2}\' ...}',
+            directiveName, scopeName, definition,
+            (isController ? 'controller bindings definition' :
+              'isolate scope definition'));
+        }
+
+        bindings[scopeName] = {
+          mode: match[1][0],
+          collection: match[2] === '*',
+          optional: match[3] === '?',
+          attrName: match[4] || scopeName
+        };
+        if (match[4]) {
+          bindingCache[definition] = bindings[scopeName];
+        }
+      });
+
+      return bindings;
+    }
+
+    function parseDirectiveBindings(directive, directiveName) {
+      var bindings = {
+        isolateScope: null,
+        bindToController: null
+      };
+      if (isObject(directive.scope)) {
+        if (directive.bindToController === true) {
+          bindings.bindToController = parseIsolateBindings(directive.scope,
+            directiveName, true);
+          bindings.isolateScope = {};
+        } else {
+          bindings.isolateScope = parseIsolateBindings(directive.scope,
+            directiveName, false);
+        }
+      }
+      if (isObject(directive.bindToController)) {
+        bindings.bindToController =
+          parseIsolateBindings(directive.bindToController, directiveName, true);
+      }
+      if (bindings.bindToController && !directive.controller) {
+        // There is no controller
+        throw $compileMinErr('noctrl',
+          'Cannot bind to controller without directive \'{0}\'s controller.',
+          directiveName);
+      }
+      return bindings;
+    }
+
+    function assertValidDirectiveName(name) {
+      var letter = name.charAt(0);
+      if (!letter || letter !== lowercase(letter)) {
+        throw $compileMinErr('baddir', 'Directive/Component name \'{0}\' is invalid. The first character must be a lowercase letter', name);
+      }
+      if (name !== name.trim()) {
+        throw $compileMinErr('baddir',
+          'Directive/Component name \'{0}\' is invalid. The name should not contain leading or trailing whitespaces',
+          name);
+      }
+    }
+
+    function getDirectiveRequire(directive) {
+      var require = directive.require || (directive.controller && directive.name);
+
+      if (!isArray(require) && isObject(require)) {
+        forEach(require, function(value, key) {
+          var match = value.match(REQUIRE_PREFIX_REGEXP);
+          var name = value.substring(match[0].length);
+          if (!name) require[key] = match[0] + key;
+        });
+      }
+
+      return require;
+    }
+
+    function getDirectiveRestrict(restrict, name) {
+      if (restrict && !(isString(restrict) && /[EACM]/.test(restrict))) {
+        throw $compileMinErr('badrestrict',
+          'Restrict property \'{0}\' of directive \'{1}\' is invalid',
+          restrict,
+          name);
+      }
+
+      return restrict || 'EA';
+    }
 
     /**
-     * @ngdoc function
-     * @name ng.$compileProvider#directive
-     * @methodOf ng.$compileProvider
-     * @function
+     * @ngdoc method
+     * @name $compileProvider#directive
+     * @kind function
      *
      * @description
      * Register a new directive with the compiler.
@@ -5208,13 +8178,15 @@
      * @param {string|Object} name Name of the directive in camel-case (i.e. <code>ngBind</code> which
      *    will match as <code>ng-bind</code>), or an object map of directives where the keys are the
      *    names and the values are the factories.
-     * @param {function|Array} directiveFactory An injectable directive factory function. See
-     *    {@link guide/directive} for more info.
+     * @param {Function|Array} directiveFactory An injectable directive factory function. See the
+     *    {@link guide/directive directive guide} and the {@link $compile compile API} for more info.
      * @returns {ng.$compileProvider} Self for chaining.
      */
     this.directive = function registerDirective(name, directiveFactory) {
+      assertArg(name, 'name');
       assertNotHasOwnProperty(name, 'directive');
       if (isString(name)) {
+        assertValidDirectiveName(name);
         assertArg(directiveFactory, 'directiveFactory');
         if (!hasDirectives.hasOwnProperty(name)) {
           hasDirectives[name] = [];
@@ -5232,8 +8204,9 @@
                   directive.priority = directive.priority || 0;
                   directive.index = index;
                   directive.name = directive.name || name;
-                  directive.require = directive.require || (directive.controller && directive.name);
-                  directive.restrict = directive.restrict || 'A';
+                  directive.require = getDirectiveRequire(directive);
+                  directive.restrict = getDirectiveRestrict(directive.restrict, name);
+                  directive.$$moduleName = directiveFactory.$$moduleName;
                   directives.push(directive);
                 } catch (e) {
                   $exceptionHandler(e);
@@ -5249,18 +8222,164 @@
       return this;
     };
 
+    /**
+     * @ngdoc method
+     * @name $compileProvider#component
+     * @module ng
+     * @param {string|Object} name Name of the component in camelCase (i.e. `myComp` which will match `<my-comp>`),
+     *    or an object map of components where the keys are the names and the values are the component definition objects.
+     * @param {Object} options Component definition object (a simplified
+     *    {@link ng.$compile#directive-definition-object directive definition object}),
+     *    with the following properties (all optional):
+     *
+     *    - `controller` – `{(string|function()=}` – controller constructor function that should be
+     *      associated with newly created scope or the name of a {@link ng.$compile#-controller-
+   *      registered controller} if passed as a string. An empty `noop` function by default.
+     *    - `controllerAs` – `{string=}` – identifier name for to reference the controller in the component's scope.
+     *      If present, the controller will be published to scope under the `controllerAs` name.
+     *      If not present, this will default to be `$ctrl`.
+     *    - `template` – `{string=|function()=}` – html template as a string or a function that
+     *      returns an html template as a string which should be used as the contents of this component.
+     *      Empty string by default.
+     *
+     *      If `template` is a function, then it is {@link auto.$injector#invoke injected} with
+     *      the following locals:
+     *
+     *      - `$element` - Current element
+     *      - `$attrs` - Current attributes object for the element
+     *
+     *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
+     *      template that should be used  as the contents of this component.
+     *
+     *      If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with
+     *      the following locals:
+     *
+     *      - `$element` - Current element
+     *      - `$attrs` - Current attributes object for the element
+     *
+     *    - `bindings` – `{object=}` – defines bindings between DOM attributes and component properties.
+     *      Component properties are always bound to the component controller and not to the scope.
+     *      See {@link ng.$compile#-bindtocontroller- `bindToController`}.
+     *    - `transclude` – `{boolean=}` – whether {@link $compile#transclusion content transclusion} is enabled.
+     *      Disabled by default.
+     *    - `require` - `{Object<string, string>=}` - requires the controllers of other directives and binds them to
+     *      this component's controller. The object keys specify the property names under which the required
+     *      controllers (object values) will be bound. See {@link ng.$compile#-require- `require`}.
+     *    - `$...` – additional properties to attach to the directive factory function and the controller
+     *      constructor function. (This is used by the component router to annotate)
+     *
+     * @returns {ng.$compileProvider} the compile provider itself, for chaining of function calls.
+     * @description
+     * Register a **component definition** with the compiler. This is a shorthand for registering a special
+     * type of directive, which represents a self-contained UI component in your application. Such components
+     * are always isolated (i.e. `scope: {}`) and are always restricted to elements (i.e. `restrict: 'E'`).
+     *
+     * Component definitions are very simple and do not require as much configuration as defining general
+     * directives. Component definitions usually consist only of a template and a controller backing it.
+     *
+     * In order to make the definition easier, components enforce best practices like use of `controllerAs`,
+     * `bindToController`. They always have **isolate scope** and are restricted to elements.
+     *
+     * Here are a few examples of how you would usually define components:
+     *
+     * ```js
+     *   var myMod = angular.module(...);
+     *   myMod.component('myComp', {
+   *     template: '<div>My name is {{$ctrl.name}}</div>',
+   *     controller: function() {
+   *       this.name = 'shahar';
+   *     }
+   *   });
+     *
+     *   myMod.component('myComp', {
+   *     template: '<div>My name is {{$ctrl.name}}</div>',
+   *     bindings: {name: '@'}
+   *   });
+     *
+     *   myMod.component('myComp', {
+   *     templateUrl: 'views/my-comp.html',
+   *     controller: 'MyCtrl',
+   *     controllerAs: 'ctrl',
+   *     bindings: {name: '@'}
+   *   });
+     *
+     * ```
+     * For more examples, and an in-depth guide, see the {@link guide/component component guide}.
+     *
+     * <br />
+     * See also {@link ng.$compileProvider#directive $compileProvider.directive()}.
+     */
+    this.component = function registerComponent(name, options) {
+      if (!isString(name)) {
+        forEach(name, reverseParams(bind(this, registerComponent)));
+        return this;
+      }
+
+      var controller = options.controller || function() {};
+
+      function factory($injector) {
+        function makeInjectable(fn) {
+          if (isFunction(fn) || isArray(fn)) {
+            return /** @this */ function(tElement, tAttrs) {
+              return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs});
+            };
+          } else {
+            return fn;
+          }
+        }
+
+        var template = (!options.template && !options.templateUrl ? '' : options.template);
+        var ddo = {
+          controller: controller,
+          controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
+          template: makeInjectable(template),
+          templateUrl: makeInjectable(options.templateUrl),
+          transclude: options.transclude,
+          scope: {},
+          bindToController: options.bindings || {},
+          restrict: 'E',
+          require: options.require
+        };
+
+        // Copy annotations (starting with $) over to the DDO
+        forEach(options, function(val, key) {
+          if (key.charAt(0) === '$') ddo[key] = val;
+        });
+
+        return ddo;
+      }
+
+      // TODO(pete) remove the following `forEach` before we release 1.6.0
+      // The component-router@0.2.0 looks for the annotations on the controller constructor
+      // Nothing in Angular looks for annotations on the factory function but we can't remove
+      // it from 1.5.x yet.
+
+      // Copy any annotation properties (starting with $) over to the factory and controller constructor functions
+      // These could be used by libraries such as the new component router
+      forEach(options, function(val, key) {
+        if (key.charAt(0) === '$') {
+          factory[key] = val;
+          // Don't try to copy over annotations to named controller
+          if (isFunction(controller)) controller[key] = val;
+        }
+      });
+
+      factory.$inject = ['$injector'];
+
+      return this.directive(name, factory);
+    };
+
 
     /**
-     * @ngdoc function
-     * @name ng.$compileProvider#aHrefSanitizationWhitelist
-     * @methodOf ng.$compileProvider
-     * @function
+     * @ngdoc method
+     * @name $compileProvider#aHrefSanitizationWhitelist
+     * @kind function
      *
      * @description
      * Retrieves or overrides the default regular expression that is used for whitelisting of safe
      * urls during a[href] sanitization.
      *
-     * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+     * The sanitization is a security measure aimed at preventing XSS attacks via html links.
      *
      * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
      * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
@@ -5282,10 +8401,9 @@
 
 
     /**
-     * @ngdoc function
-     * @name ng.$compileProvider#imgSrcSanitizationWhitelist
-     * @methodOf ng.$compileProvider
-     * @function
+     * @ngdoc method
+     * @name $compileProvider#imgSrcSanitizationWhitelist
+     * @kind function
      *
      * @description
      * Retrieves or overrides the default regular expression that is used for whitelisting of safe
@@ -5311,26 +8429,273 @@
       }
     };
 
-    this.$get = [
-      '$injector', '$interpolate', '$exceptionHandler', '$http', '$templateCache', '$parse',
-      '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri',
-      function($injector,   $interpolate,   $exceptionHandler,   $http,   $templateCache,   $parse,
-               $controller,   $rootScope,   $document,   $sce,   $animate,   $$sanitizeUri) {
+    /**
+     * @ngdoc method
+     * @name  $compileProvider#debugInfoEnabled
+     *
+     * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the
+     * current debugInfoEnabled state
+     * @returns {*} current value if used as getter or itself (chaining) if used as setter
+     *
+     * @kind function
+     *
+     * @description
+     * Call this method to enable/disable various debug runtime information in the compiler such as adding
+     * binding information and a reference to the current scope on to DOM elements.
+     * If enabled, the compiler will add the following to DOM elements that have been bound to the scope
+     * * `ng-binding` CSS class
+     * * `$binding` data property containing an array of the binding expressions
+     *
+     * You may want to disable this in production for a significant performance boost. See
+     * {@link guide/production#disabling-debug-data Disabling Debug Data} for more.
+     *
+     * The default value is true.
+     */
+    var debugInfoEnabled = true;
+    this.debugInfoEnabled = function(enabled) {
+      if (isDefined(enabled)) {
+        debugInfoEnabled = enabled;
+        return this;
+      }
+      return debugInfoEnabled;
+    };
+
+    /**
+     * @ngdoc method
+     * @name  $compileProvider#preAssignBindingsEnabled
+     *
+     * @param {boolean=} enabled update the preAssignBindingsEnabled state if provided, otherwise just return the
+     * current preAssignBindingsEnabled state
+     * @returns {*} current value if used as getter or itself (chaining) if used as setter
+     *
+     * @kind function
+     *
+     * @description
+     * Call this method to enable/disable whether directive controllers are assigned bindings before
+     * calling the controller's constructor.
+     * If enabled (true), the compiler assigns the value of each of the bindings to the
+     * properties of the controller object before the constructor of this object is called.
+     *
+     * If disabled (false), the compiler calls the constructor first before assigning bindings.
+     *
+     * The default value is false.
+     *
+     * @deprecated
+     * sinceVersion="1.6.0"
+     * removeVersion="1.7.0"
+     *
+     * This method and the option to assign the bindings before calling the controller's constructor
+     * will be removed in v1.7.0.
+     */
+    var preAssignBindingsEnabled = false;
+    this.preAssignBindingsEnabled = function(enabled) {
+      if (isDefined(enabled)) {
+        preAssignBindingsEnabled = enabled;
+        return this;
+      }
+      return preAssignBindingsEnabled;
+    };
+
+    /**
+     * @ngdoc method
+     * @name  $compileProvider#strictComponentBindingsEnabled
+     *
+     * @param {boolean=} enabled update the strictComponentBindingsEnabled state if provided, otherwise just return the
+     * current strictComponentBindingsEnabled state
+     * @returns {*} current value if used as getter or itself (chaining) if used as setter
+     *
+     * @kind function
+     *
+     * @description
+     * Call this method to enable/disable strict component bindings check. If enabled, the compiler will enforce that
+     * for all bindings of a component that are not set as optional with `?`, an attribute needs to be provided
+     * on the component's HTML tag.
+     *
+     * The default value is false.
+     */
+    var strictComponentBindingsEnabled = false;
+    this.strictComponentBindingsEnabled = function(enabled) {
+      if (isDefined(enabled)) {
+        strictComponentBindingsEnabled = enabled;
+        return this;
+      }
+      return strictComponentBindingsEnabled;
+    };
+
+    var TTL = 10;
+    /**
+     * @ngdoc method
+     * @name $compileProvider#onChangesTtl
+     * @description
+     *
+     * Sets the number of times `$onChanges` hooks can trigger new changes before giving up and
+     * assuming that the model is unstable.
+     *
+     * The current default is 10 iterations.
+     *
+     * In complex applications it's possible that dependencies between `$onChanges` hooks and bindings will result
+     * in several iterations of calls to these hooks. However if an application needs more than the default 10
+     * iterations to stabilize then you should investigate what is causing the model to continuously change during
+     * the `$onChanges` hook execution.
+     *
+     * Increasing the TTL could have performance implications, so you should not change it without proper justification.
+     *
+     * @param {number} limit The number of `$onChanges` hook iterations.
+     * @returns {number|object} the current limit (or `this` if called as a setter for chaining)
+     */
+    this.onChangesTtl = function(value) {
+      if (arguments.length) {
+        TTL = value;
+        return this;
+      }
+      return TTL;
+    };
+
+    var commentDirectivesEnabledConfig = true;
+    /**
+     * @ngdoc method
+     * @name $compileProvider#commentDirectivesEnabled
+     * @description
+     *
+     * It indicates to the compiler
+     * whether or not directives on comments should be compiled.
+     * Defaults to `true`.
+     *
+     * Calling this function with false disables the compilation of directives
+     * on comments for the whole application.
+     * This results in a compilation performance gain,
+     * as the compiler doesn't have to check comments when looking for directives.
+     * This should however only be used if you are sure that no comment directives are used in
+     * the application (including any 3rd party directives).
+     *
+     * @param {boolean} enabled `false` if the compiler may ignore directives on comments
+     * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
+     */
+    this.commentDirectivesEnabled = function(value) {
+      if (arguments.length) {
+        commentDirectivesEnabledConfig = value;
+        return this;
+      }
+      return commentDirectivesEnabledConfig;
+    };
+
+
+    var cssClassDirectivesEnabledConfig = true;
+    /**
+     * @ngdoc method
+     * @name $compileProvider#cssClassDirectivesEnabled
+     * @description
+     *
+     * It indicates to the compiler
+     * whether or not directives on element classes should be compiled.
+     * Defaults to `true`.
+     *
+     * Calling this function with false disables the compilation of directives
+     * on element classes for the whole application.
+     * This results in a compilation performance gain,
+     * as the compiler doesn't have to check element classes when looking for directives.
+     * This should however only be used if you are sure that no class directives are used in
+     * the application (including any 3rd party directives).
+     *
+     * @param {boolean} enabled `false` if the compiler may ignore directives on element classes
+     * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
+     */
+    this.cssClassDirectivesEnabled = function(value) {
+      if (arguments.length) {
+        cssClassDirectivesEnabledConfig = value;
+        return this;
+      }
+      return cssClassDirectivesEnabledConfig;
+    };
+
+    this.$get = [
+      '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
+      '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri',
+      function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
+               $controller,   $rootScope,   $sce,   $animate,   $$sanitizeUri) {
+
+        var SIMPLE_ATTR_NAME = /^\w/;
+        var specialAttrHolder = window.document.createElement('div');
+
+
+        var commentDirectivesEnabled = commentDirectivesEnabledConfig;
+        var cssClassDirectivesEnabled = cssClassDirectivesEnabledConfig;
+
+
+        var onChangesTtl = TTL;
+        // The onChanges hooks should all be run together in a single digest
+        // When changes occur, the call to trigger their hooks will be added to this queue
+        var onChangesQueue;
+
+        // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest
+        function flushOnChangesQueue() {
+          try {
+            if (!(--onChangesTtl)) {
+              // We have hit the TTL limit so reset everything
+              onChangesQueue = undefined;
+              throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL);
+            }
+            // We must run this hook in an apply since the $$postDigest runs outside apply
+            $rootScope.$apply(function() {
+              var errors = [];
+              for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
+                try {
+                  onChangesQueue[i]();
+                } catch (e) {
+                  errors.push(e);
+                }
+              }
+              // Reset the queue to trigger a new schedule next time there is a change
+              onChangesQueue = undefined;
+              if (errors.length) {
+                throw errors;
+              }
+            });
+          } finally {
+            onChangesTtl++;
+          }
+        }
+
+
+        function Attributes(element, attributesToCopy) {
+          if (attributesToCopy) {
+            var keys = Object.keys(attributesToCopy);
+            var i, l, key;
+
+            for (i = 0, l = keys.length; i < l; i++) {
+              key = keys[i];
+              this[key] = attributesToCopy[key];
+            }
+          } else {
+            this.$attr = {};
+          }
 
-        var Attributes = function(element, attr) {
           this.$$element = element;
-          this.$attr = attr || {};
-        };
+        }
 
         Attributes.prototype = {
+          /**
+           * @ngdoc method
+           * @name $compile.directive.Attributes#$normalize
+           * @kind function
+           *
+           * @description
+           * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
+           * `data-`) to its normalized, camelCase form.
+           *
+           * Also there is special case for Moz prefix starting with upper case letter.
+           *
+           * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+           *
+           * @param {string} name Name to normalize
+           */
           $normalize: directiveNormalize,
 
 
           /**
-           * @ngdoc function
-           * @name ng.$compile.directive.Attributes#$addClass
-           * @methodOf ng.$compile.directive.Attributes
-           * @function
+           * @ngdoc method
+           * @name $compile.directive.Attributes#$addClass
+           * @kind function
            *
            * @description
            * Adds the CSS class value specified by the classVal parameter to the element. If animations
@@ -5338,17 +8703,16 @@
            *
            * @param {string} classVal The className value that will be added to the element
            */
-          $addClass : function(classVal) {
-            if(classVal && classVal.length > 0) {
+          $addClass: function(classVal) {
+            if (classVal && classVal.length > 0) {
               $animate.addClass(this.$$element, classVal);
             }
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$compile.directive.Attributes#$removeClass
-           * @methodOf ng.$compile.directive.Attributes
-           * @function
+           * @ngdoc method
+           * @name $compile.directive.Attributes#$removeClass
+           * @kind function
            *
            * @description
            * Removes the CSS class value specified by the classVal parameter from the element. If
@@ -5356,17 +8720,16 @@
            *
            * @param {string} classVal The className value that will be removed from the element
            */
-          $removeClass : function(classVal) {
-            if(classVal && classVal.length > 0) {
+          $removeClass: function(classVal) {
+            if (classVal && classVal.length > 0) {
               $animate.removeClass(this.$$element, classVal);
             }
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$compile.directive.Attributes#$updateClass
-           * @methodOf ng.$compile.directive.Attributes
-           * @function
+           * @ngdoc method
+           * @name $compile.directive.Attributes#$updateClass
+           * @kind function
            *
            * @description
            * Adds and removes the appropriate CSS class values to the element based on the difference
@@ -5375,9 +8738,16 @@
            * @param {string} newClasses The current CSS className value
            * @param {string} oldClasses The former CSS className value
            */
-          $updateClass : function(newClasses, oldClasses) {
-            this.$removeClass(tokenDifference(oldClasses, newClasses));
-            this.$addClass(tokenDifference(newClasses, oldClasses));
+          $updateClass: function(newClasses, oldClasses) {
+            var toAdd = tokenDifference(newClasses, oldClasses);
+            if (toAdd && toAdd.length) {
+              $animate.addClass(this.$$element, toAdd);
+            }
+
+            var toRemove = tokenDifference(oldClasses, newClasses);
+            if (toRemove && toRemove.length) {
+              $animate.removeClass(this.$$element, toRemove);
+            }
           },
 
           /**
@@ -5394,13 +8764,18 @@
             //is set through this function since it may cause $updateClass to
             //become unstable.
 
-            var booleanKey = getBooleanAttrName(this.$$element[0], key),
-                normalizedVal,
-                nodeName;
+            var node = this.$$element[0],
+              booleanKey = getBooleanAttrName(node, key),
+              aliasedKey = getAliasedAttrName(key),
+              observer = key,
+              nodeName;
 
             if (booleanKey) {
               this.$$element.prop(key, value);
               attrName = booleanKey;
+            } else if (aliasedKey) {
+              this[aliasedKey] = value;
+              observer = aliasedKey;
             }
 
             this[key] = value;
@@ -5417,37 +8792,76 @@
 
             nodeName = nodeName_(this.$$element);
 
-            // sanitize a[href] and img[src] values
-            if ((nodeName === 'A' && key === 'href') ||
-                (nodeName === 'IMG' && key === 'src')) {
+            if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) ||
+              (nodeName === 'img' && key === 'src')) {
+              // sanitize a[href] and img[src] values
               this[key] = value = $$sanitizeUri(value, key === 'src');
+            } else if (nodeName === 'img' && key === 'srcset' && isDefined(value)) {
+              // sanitize img[srcset] values
+              var result = '';
+
+              // first check if there are spaces because it's not the same pattern
+              var trimmedSrcset = trim(value);
+              //                (   999x   ,|   999w   ,|   ,|,   )
+              var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/;
+              var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/;
+
+              // split srcset into tuple of uri and descriptor except for the last item
+              var rawUris = trimmedSrcset.split(pattern);
+
+              // for each tuples
+              var nbrUrisWith2parts = Math.floor(rawUris.length / 2);
+              for (var i = 0; i < nbrUrisWith2parts; i++) {
+                var innerIdx = i * 2;
+                // sanitize the uri
+                result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
+                // add the descriptor
+                result += (' ' + trim(rawUris[innerIdx + 1]));
+              }
+
+              // split the last item into uri and descriptor
+              var lastTuple = trim(rawUris[i * 2]).split(/\s/);
+
+              // sanitize the last uri
+              result += $$sanitizeUri(trim(lastTuple[0]), true);
+
+              // and add the last descriptor if any
+              if (lastTuple.length === 2) {
+                result += (' ' + trim(lastTuple[1]));
+              }
+              this[key] = value = result;
             }
 
             if (writeAttr !== false) {
-              if (value === null || value === undefined) {
+              if (value === null || isUndefined(value)) {
                 this.$$element.removeAttr(attrName);
               } else {
-                this.$$element.attr(attrName, value);
+                if (SIMPLE_ATTR_NAME.test(attrName)) {
+                  this.$$element.attr(attrName, value);
+                } else {
+                  setSpecialAttr(this.$$element[0], attrName, value);
+                }
               }
             }
 
             // fire observers
             var $$observers = this.$$observers;
-            $$observers && forEach($$observers[key], function(fn) {
-              try {
-                fn(value);
-              } catch (e) {
-                $exceptionHandler(e);
-              }
-            });
+            if ($$observers) {
+              forEach($$observers[observer], function(fn) {
+                try {
+                  fn(value);
+                } catch (e) {
+                  $exceptionHandler(e);
+                }
+              });
+            }
           },
 
 
           /**
-           * @ngdoc function
-           * @name ng.$compile.directive.Attributes#$observe
-           * @methodOf ng.$compile.directive.Attributes
-           * @function
+           * @ngdoc method
+           * @name $compile.directive.Attributes#$observe
+           * @kind function
            *
            * @description
            * Observes an interpolated attribute.
@@ -5459,34 +8873,95 @@
            * @param {string} key Normalized key. (ie ngAttribute) .
            * @param {function(interpolatedValue)} fn Function that will be called whenever
            the interpolated value of the attribute changes.
-           *        See the {@link guide/directive#Attributes Directives} guide for more info.
-           * @returns {function()} the `fn` parameter.
+           *        See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation
+       *        guide} for more info.
+           * @returns {function()} Returns a deregistration function for this observer.
            */
           $observe: function(key, fn) {
             var attrs = this,
-                $$observers = (attrs.$$observers || (attrs.$$observers = {})),
-                listeners = ($$observers[key] || ($$observers[key] = []));
+              $$observers = (attrs.$$observers || (attrs.$$observers = createMap())),
+              listeners = ($$observers[key] || ($$observers[key] = []));
 
             listeners.push(fn);
             $rootScope.$evalAsync(function() {
-              if (!listeners.$$inter) {
+              if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) {
                 // no one registered attribute interpolation function, so lets call it manually
                 fn(attrs[key]);
               }
             });
-            return fn;
+
+            return function() {
+              arrayRemove(listeners, fn);
+            };
           }
         };
 
+        function setSpecialAttr(element, attrName, value) {
+          // Attributes names that do not start with letters (such as `(click)`) cannot be set using `setAttribute`
+          // so we have to jump through some hoops to get such an attribute
+          // https://github.com/angular/angular.js/pull/13318
+          specialAttrHolder.innerHTML = '<span ' + attrName + '>';
+          var attributes = specialAttrHolder.firstChild.attributes;
+          var attribute = attributes[0];
+          // We have to remove the attribute from its container element before we can add it to the destination element
+          attributes.removeNamedItem(attribute.name);
+          attribute.value = value;
+          element.attributes.setNamedItem(attribute);
+        }
+
+        function safeAddClass($element, className) {
+          try {
+            $element.addClass(className);
+          } catch (e) {
+            // ignore, since it means that we are trying to set class on
+            // SVG element, where class name is read-only.
+          }
+        }
+
+
         var startSymbol = $interpolate.startSymbol(),
-            endSymbol = $interpolate.endSymbol(),
-            denormalizeTemplate = (startSymbol == '{{' || endSymbol  == '}}')
-                ? identity
-                : function denormalizeTemplate(template) {
+          endSymbol = $interpolate.endSymbol(),
+          denormalizeTemplate = (startSymbol === '{{' && endSymbol  === '}}')
+            ? identity
+            : function denormalizeTemplate(template) {
               return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
             },
-            NG_ATTR_BINDING = /^ngAttr[A-Z]/;
+          NG_ATTR_BINDING = /^ngAttr[A-Z]/;
+        var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/;
 
+        compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) {
+          var bindings = $element.data('$binding') || [];
+
+          if (isArray(binding)) {
+            bindings = bindings.concat(binding);
+          } else {
+            bindings.push(binding);
+          }
+
+          $element.data('$binding', bindings);
+        } : noop;
+
+        compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) {
+          safeAddClass($element, 'ng-binding');
+        } : noop;
+
+        compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) {
+          var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope';
+          $element.data(dataName, scope);
+        } : noop;
+
+        compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) {
+          safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope');
+        } : noop;
+
+        compile.$$createComment = function(directiveName, comment) {
+          var content = '';
+          if (debugInfoEnabled) {
+            content = ' ' + (directiveName || '') + ': ';
+            if (comment) content += comment + ' ';
+          }
+          return window.document.createComment(content);
+        };
 
         return compile;
 
@@ -5499,50 +8974,84 @@
             // modify it.
             $compileNodes = jqLite($compileNodes);
           }
-          // We can not compile top level text elements since text nodes can be merged and we will
-          // not be able to attach scope data to them, so we will wrap them in <span>
-          forEach($compileNodes, function(node, index){
-            if (node.nodeType == 3 /* text node */ && node.nodeValue.match(/\S+/) /* non-empty */ ) {
-              $compileNodes[index] = node = jqLite(node).wrap('<span></span>').parent()[0];
-            }
-          });
           var compositeLinkFn =
-              compileNodes($compileNodes, transcludeFn, $compileNodes,
-                  maxPriority, ignoreDirective, previousCompileContext);
-          safeAddClass($compileNodes, 'ng-scope');
-          return function publicLinkFn(scope, cloneConnectFn, transcludeControllers){
+            compileNodes($compileNodes, transcludeFn, $compileNodes,
+              maxPriority, ignoreDirective, previousCompileContext);
+          compile.$$addScopeClass($compileNodes);
+          var namespace = null;
+          return function publicLinkFn(scope, cloneConnectFn, options) {
+            if (!$compileNodes) {
+              throw $compileMinErr('multilink', 'This element has already been linked.');
+            }
             assertArg(scope, 'scope');
-            // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
-            // and sometimes changes the structure of the DOM.
-            var $linkNode = cloneConnectFn
-                ? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!!
-                : $compileNodes;
 
-            forEach(transcludeControllers, function(instance, name) {
-              $linkNode.data('$' + name + 'Controller', instance);
-            });
+            if (previousCompileContext && previousCompileContext.needsNewScope) {
+              // A parent directive did a replace and a directive on this element asked
+              // for transclusion, which caused us to lose a layer of element on which
+              // we could hold the new transclusion scope, so we will create it manually
+              // here.
+              scope = scope.$parent.$new();
+            }
 
-            // Attach scope only to non-text nodes.
-            for(var i = 0, ii = $linkNode.length; i<ii; i++) {
-              var node = $linkNode[i],
-                  nodeType = node.nodeType;
-              if (nodeType === 1 /* element */ || nodeType === 9 /* document */) {
-                $linkNode.eq(i).data('$scope', scope);
+            options = options || {};
+            var parentBoundTranscludeFn = options.parentBoundTranscludeFn,
+              transcludeControllers = options.transcludeControllers,
+              futureParentElement = options.futureParentElement;
+
+            // When `parentBoundTranscludeFn` is passed, it is a
+            // `controllersBoundTransclude` function (it was previously passed
+            // as `transclude` to directive.link) so we must unwrap it to get
+            // its `boundTranscludeFn`
+            if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) {
+              parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude;
+            }
+
+            if (!namespace) {
+              namespace = detectNamespaceForChildElements(futureParentElement);
+            }
+            var $linkNode;
+            if (namespace !== 'html') {
+              // When using a directive with replace:true and templateUrl the $compileNodes
+              // (or a child element inside of them)
+              // might change, so we need to recreate the namespace adapted compileNodes
+              // for call to the link function.
+              // Note: This will already clone the nodes...
+              $linkNode = jqLite(
+                wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
+              );
+            } else if (cloneConnectFn) {
+              // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
+              // and sometimes changes the structure of the DOM.
+              $linkNode = JQLitePrototype.clone.call($compileNodes);
+            } else {
+              $linkNode = $compileNodes;
+            }
+
+            if (transcludeControllers) {
+              for (var controllerName in transcludeControllers) {
+                $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance);
               }
             }
 
+            compile.$$addScopeInfo($linkNode, scope);
+
             if (cloneConnectFn) cloneConnectFn($linkNode, scope);
-            if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode);
+            if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
+
+            if (!cloneConnectFn) {
+              $compileNodes = compositeLinkFn = null;
+            }
             return $linkNode;
           };
         }
 
-        function safeAddClass($element, className) {
-          try {
-            $element.addClass(className);
-          } catch(e) {
-            // ignore, since it means that we are trying to set class on
-            // SVG element, where class name is read-only.
+        function detectNamespaceForChildElements(parentElement) {
+          // TODO: Make this detect MathML as well...
+          var node = parentElement && parentElement[0];
+          if (!node) {
+            return 'html';
+          } else {
+            return nodeName_(node) !== 'foreignobject' && toString.call(node).match(/SVG/) ? 'svg' : 'html';
           }
         }
 
@@ -5553,44 +9062,61 @@
          * function, which is the a linking function for the node.
          *
          * @param {NodeList} nodeList an array of nodes or NodeList to compile
-         * @param {function(angular.Scope[, cloneAttachFn]} transcludeFn A linking function, where the
+         * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the
          *        scope argument is auto-generated to the new child of the transcluded parent scope.
          * @param {DOMElement=} $rootElement If the nodeList is the root of the compilation tree then
          *        the rootElement must be set the jqLite collection of the compile root. This is
          *        needed so that the jqLite collection items can be replaced with widgets.
          * @param {number=} maxPriority Max directive priority.
-         * @returns {?function} A composite linking function of all of the matched directives or null.
+         * @returns {Function} A composite linking function of all of the matched directives or null.
          */
         function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective,
                               previousCompileContext) {
           var linkFns = [],
-              attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound;
+            // `nodeList` can be either an element's `.childNodes` (live NodeList)
+            // or a jqLite/jQuery collection or an array
+            notLiveList = isArray(nodeList) || (nodeList instanceof jqLite),
+            attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound;
+
 
           for (var i = 0; i < nodeList.length; i++) {
             attrs = new Attributes();
 
-            // we must always refer to nodeList[i] since the nodes can be replaced underneath us.
+            // Support: IE 11 only
+            // Workaround for #11781 and #14924
+            if (msie === 11) {
+              mergeConsecutiveTextNodes(nodeList, i, notLiveList);
+            }
+
+            // We must always refer to `nodeList[i]` hereafter,
+            // since the nodes can be replaced underneath us.
             directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined,
-                ignoreDirective);
+              ignoreDirective);
 
             nodeLinkFn = (directives.length)
-                ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
+              ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
                 null, [], [], previousCompileContext)
-                : null;
+              : null;
 
             if (nodeLinkFn && nodeLinkFn.scope) {
-              safeAddClass(jqLite(nodeList[i]), 'ng-scope');
+              compile.$$addScopeClass(attrs.$$element);
             }
 
             childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
-                !(childNodes = nodeList[i].childNodes) ||
-                !childNodes.length)
-                ? null
-                : compileNodes(childNodes,
-                nodeLinkFn ? nodeLinkFn.transclude : transcludeFn);
+              !(childNodes = nodeList[i].childNodes) ||
+              !childNodes.length)
+              ? null
+              : compileNodes(childNodes,
+                nodeLinkFn ? (
+                  (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement)
+                  && nodeLinkFn.transclude) : transcludeFn);
+
+            if (nodeLinkFn || childLinkFn) {
+              linkFns.push(i, nodeLinkFn, childLinkFn);
+              linkFnFound = true;
+              nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn;
+            }
 
-            linkFns.push(nodeLinkFn, childLinkFn);
-            linkFnFound = linkFnFound || nodeLinkFn || childLinkFn;
             //use the previous context only for the first element in the virtual group
             previousCompileContext = null;
           }
@@ -5598,60 +9124,115 @@
           // return a linking function if we have found anything, null otherwise
           return linkFnFound ? compositeLinkFn : null;
 
-          function compositeLinkFn(scope, nodeList, $rootElement, boundTranscludeFn) {
-            var nodeLinkFn, childLinkFn, node, $node, childScope, childTranscludeFn, i, ii, n;
+          function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
+            var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn;
+            var stableNodeList;
 
-            // copy nodeList so that linking doesn't break due to live list updates.
-            var nodeListLength = nodeList.length,
-                stableNodeList = new Array(nodeListLength);
-            for (i = 0; i < nodeListLength; i++) {
-              stableNodeList[i] = nodeList[i];
+
+            if (nodeLinkFnFound) {
+              // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our
+              // offsets don't get screwed up
+              var nodeListLength = nodeList.length;
+              stableNodeList = new Array(nodeListLength);
+
+              // create a sparse array by only copying the elements which have a linkFn
+              for (i = 0; i < linkFns.length; i += 3) {
+                idx = linkFns[i];
+                stableNodeList[idx] = nodeList[idx];
+              }
+            } else {
+              stableNodeList = nodeList;
             }
 
-            for(i = 0, n = 0, ii = linkFns.length; i < ii; n++) {
-              node = stableNodeList[n];
+            for (i = 0, ii = linkFns.length; i < ii;) {
+              node = stableNodeList[linkFns[i++]];
               nodeLinkFn = linkFns[i++];
               childLinkFn = linkFns[i++];
-              $node = jqLite(node);
 
               if (nodeLinkFn) {
                 if (nodeLinkFn.scope) {
                   childScope = scope.$new();
-                  $node.data('$scope', childScope);
+                  compile.$$addScopeInfo(jqLite(node), childScope);
                 } else {
                   childScope = scope;
                 }
-                childTranscludeFn = nodeLinkFn.transclude;
-                if (childTranscludeFn || (!boundTranscludeFn && transcludeFn)) {
-                  nodeLinkFn(childLinkFn, childScope, node, $rootElement,
-                      createBoundTranscludeFn(scope, childTranscludeFn || transcludeFn)
-                  );
+
+                if (nodeLinkFn.transcludeOnThisElement) {
+                  childBoundTranscludeFn = createBoundTranscludeFn(
+                    scope, nodeLinkFn.transclude, parentBoundTranscludeFn);
+
+                } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
+                  childBoundTranscludeFn = parentBoundTranscludeFn;
+
+                } else if (!parentBoundTranscludeFn && transcludeFn) {
+                  childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn);
+
                 } else {
-                  nodeLinkFn(childLinkFn, childScope, node, $rootElement, boundTranscludeFn);
+                  childBoundTranscludeFn = null;
                 }
+
+                nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn);
+
               } else if (childLinkFn) {
-                childLinkFn(scope, node.childNodes, undefined, boundTranscludeFn);
+                childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn);
               }
             }
           }
         }
 
-        function createBoundTranscludeFn(scope, transcludeFn) {
-          return function boundTranscludeFn(transcludedScope, cloneFn, controllers) {
-            var scopeCreated = false;
+        function mergeConsecutiveTextNodes(nodeList, idx, notLiveList) {
+          var node = nodeList[idx];
+          var parent = node.parentNode;
+          var sibling;
+
+          if (node.nodeType !== NODE_TYPE_TEXT) {
+            return;
+          }
+
+          while (true) {
+            sibling = parent ? node.nextSibling : nodeList[idx + 1];
+            if (!sibling || sibling.nodeType !== NODE_TYPE_TEXT) {
+              break;
+            }
+
+            node.nodeValue = node.nodeValue + sibling.nodeValue;
+
+            if (sibling.parentNode) {
+              sibling.parentNode.removeChild(sibling);
+            }
+            if (notLiveList && sibling === nodeList[idx + 1]) {
+              nodeList.splice(idx + 1, 1);
+            }
+          }
+        }
+
+        function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
+          function boundTranscludeFn(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
 
             if (!transcludedScope) {
-              transcludedScope = scope.$new();
+              transcludedScope = scope.$new(false, containingScope);
               transcludedScope.$$transcluded = true;
-              scopeCreated = true;
             }
 
-            var clone = transcludeFn(transcludedScope, cloneFn, controllers);
-            if (scopeCreated) {
-              clone.on('$destroy', bind(transcludedScope, transcludedScope.$destroy));
+            return transcludeFn(transcludedScope, cloneFn, {
+              parentBoundTranscludeFn: previousBoundTranscludeFn,
+              transcludeControllers: controllers,
+              futureParentElement: futureParentElement
+            });
+          }
+
+          // We need  to attach the transclusion slots onto the `boundTranscludeFn`
+          // so that they are available inside the `controllersBoundTransclude` function
+          var boundSlots = boundTranscludeFn.$$slots = createMap();
+          for (var slotName in transcludeFn.$$slots) {
+            if (transcludeFn.$$slots[slotName]) {
+              boundSlots[slotName] = createBoundTranscludeFn(scope, transcludeFn.$$slots[slotName], previousBoundTranscludeFn);
+            } else {
+              boundSlots[slotName] = null;
             }
-            return clone;
-          };
+          }
+
+          return boundTranscludeFn;
         }
 
         /**
@@ -5666,54 +9247,75 @@
          */
         function collectDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
           var nodeType = node.nodeType,
-              attrsMap = attrs.$attr,
-              match,
-              className;
+            attrsMap = attrs.$attr,
+            match,
+            nodeName,
+            className;
+
+          switch (nodeType) {
+            case NODE_TYPE_ELEMENT: /* Element */
+
+              nodeName = nodeName_(node);
 
-          switch(nodeType) {
-            case 1: /* Element */
               // use the node name: <directive>
               addDirective(directives,
-                  directiveNormalize(nodeName_(node).toLowerCase()), 'E', maxPriority, ignoreDirective);
+                directiveNormalize(nodeName), 'E', maxPriority, ignoreDirective);
 
               // iterate over the attributes
-              for (var attr, name, nName, ngAttrName, value, nAttrs = node.attributes,
-                       j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
+              for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes,
+                     j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
                 var attrStartName = false;
                 var attrEndName = false;
 
                 attr = nAttrs[j];
-                if (!msie || msie >= 8 || attr.specified) {
-                  name = attr.name;
-                  // support ngAttr attribute binding
-                  ngAttrName = directiveNormalize(name);
-                  if (NG_ATTR_BINDING.test(ngAttrName)) {
-                    name = snake_case(ngAttrName.substr(6), '-');
-                  }
+                name = attr.name;
+                value = attr.value;
 
-                  var directiveNName = ngAttrName.replace(/(Start|End)$/, '');
-                  if (ngAttrName === directiveNName + 'Start') {
-                    attrStartName = name;
-                    attrEndName = name.substr(0, name.length - 5) + 'end';
-                    name = name.substr(0, name.length - 6);
-                  }
+                // support ngAttr attribute binding
+                ngAttrName = directiveNormalize(name);
+                isNgAttr = NG_ATTR_BINDING.test(ngAttrName);
+                if (isNgAttr) {
+                  name = name.replace(PREFIX_REGEXP, '')
+                    .substr(8).replace(/_(.)/g, function(match, letter) {
+                      return letter.toUpperCase();
+                    });
+                }
 
-                  nName = directiveNormalize(name.toLowerCase());
-                  attrsMap[nName] = name;
-                  attrs[nName] = value = trim(attr.value);
+                var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE);
+                if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) {
+                  attrStartName = name;
+                  attrEndName = name.substr(0, name.length - 5) + 'end';
+                  name = name.substr(0, name.length - 6);
+                }
+
+                nName = directiveNormalize(name.toLowerCase());
+                attrsMap[nName] = name;
+                if (isNgAttr || !attrs.hasOwnProperty(nName)) {
+                  attrs[nName] = value;
                   if (getBooleanAttrName(node, nName)) {
                     attrs[nName] = true; // presence means true
                   }
-                  addAttrInterpolateDirective(node, directives, value, nName);
-                  addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
-                      attrEndName);
                 }
+                addAttrInterpolateDirective(node, directives, value, nName, isNgAttr);
+                addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
+                  attrEndName);
+              }
+
+              if (nodeName === 'input' && node.getAttribute('type') === 'hidden') {
+                // Hidden input elements can have strange behaviour when navigating back to the page
+                // This tells the browser not to try to cache and reinstate previous values
+                node.setAttribute('autocomplete', 'off');
               }
 
               // use class as directive
+              if (!cssClassDirectivesEnabled) break;
               className = node.className;
+              if (isObject(className)) {
+                // Maybe SVGAnimatedString
+                className = className.animVal;
+              }
               if (isString(className) && className !== '') {
-                while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
+                while ((match = CLASS_DIRECTIVE_REGEXP.exec(className))) {
                   nName = directiveNormalize(match[2]);
                   if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) {
                     attrs[nName] = trim(match[3]);
@@ -5722,23 +9324,12 @@
                 }
               }
               break;
-            case 3: /* Text Node */
+            case NODE_TYPE_TEXT: /* Text Node */
               addTextInterpolateDirective(directives, node.nodeValue);
               break;
-            case 8: /* Comment */
-              try {
-                match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
-                if (match) {
-                  nName = directiveNormalize(match[1]);
-                  if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
-                    attrs[nName] = trim(match[2]);
-                  }
-                }
-              } catch (e) {
-                // turns out that under some circumstances IE9 throws errors when one attempts to read
-                // comment's node value.
-                // Just ignore it and continue. (Can't seem to reproduce in test case.)
-              }
+            case NODE_TYPE_COMMENT: /* Comment */
+              if (!commentDirectivesEnabled) break;
+              collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
               break;
           }
 
@@ -5746,8 +9337,26 @@
           return directives;
         }
 
+        function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
+          // function created because of performance, try/catch disables
+          // the optimization of the whole function #14848
+          try {
+            var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+            if (match) {
+              var nName = directiveNormalize(match[1]);
+              if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+                attrs[nName] = trim(match[2]);
+              }
+            }
+          } catch (e) {
+            // turns out that under some circumstances IE9 throws errors when one attempts to read
+            // comment's node value.
+            // Just ignore it and continue. (Can't seem to reproduce in test case.)
+          }
+        }
+
         /**
-         * Given a node with an directive-start it collects all of the siblings until it finds
+         * Given a node with a directive-start it collects all of the siblings until it finds
          * directive-end.
          * @param node
          * @param attrStart
@@ -5758,14 +9367,13 @@
           var nodes = [];
           var depth = 0;
           if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) {
-            var startNode = node;
             do {
               if (!node) {
                 throw $compileMinErr('uterdir',
-                    "Unterminated attribute, found '{0}' but no matching '{1}' found.",
-                    attrStart, attrEnd);
+                  'Unterminated attribute, found \'{0}\' but no matching \'{1}\' found.',
+                  attrStart, attrEnd);
               }
-              if (node.nodeType == 1 /** Element **/) {
+              if (node.nodeType === NODE_TYPE_ELEMENT) {
                 if (node.hasAttribute(attrStart)) depth++;
                 if (node.hasAttribute(attrEnd)) depth--;
               }
@@ -5788,12 +9396,41 @@
          * @returns {Function}
          */
         function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) {
-          return function(scope, element, attrs, controllers, transcludeFn) {
+          return function groupedElementsLink(scope, element, attrs, controllers, transcludeFn) {
             element = groupScan(element[0], attrStart, attrEnd);
             return linkFn(scope, element, attrs, controllers, transcludeFn);
           };
         }
 
+        /**
+         * A function generator that is used to support both eager and lazy compilation
+         * linking function.
+         * @param eager
+         * @param $compileNodes
+         * @param transcludeFn
+         * @param maxPriority
+         * @param ignoreDirective
+         * @param previousCompileContext
+         * @returns {Function}
+         */
+        function compilationGenerator(eager, $compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext) {
+          var compiled;
+
+          if (eager) {
+            return compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
+          }
+          return /** @this */ function lazyCompilation() {
+            if (!compiled) {
+              compiled = compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
+
+              // Null out all of these references in order to make them eligible for garbage collection
+              // since this is a potentially long lived closure
+              $compileNodes = transcludeFn = previousCompileContext = null;
+            }
+            return compiled.apply(this, arguments);
+          };
+        }
+
         /**
          * Once the directives have been collected, their compile functions are executed. This method
          * is responsible for inlining directive templates as well as terminating the application
@@ -5803,7 +9440,7 @@
          *        this needs to be pre-sorted by priority order.
          * @param {Node} compileNode The raw DOM node to apply the compile functions to
          * @param {Object} templateAttrs The shared attribute function
-         * @param {function(angular.Scope[, cloneAttachFn]} transcludeFn A linking function, where the
+         * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the
          *                                                  scope argument is auto-generated to the new
          *                                                  child of the transcluded parent scope.
          * @param {JQLite} jqCollection If we are working on the root of the compile tree then this
@@ -5815,7 +9452,7 @@
          * @param {Array.<Function>} postLinkFns
          * @param {Object} previousCompileContext Context used for previous compilation of the current
          *                                        node
-         * @returns linkFn
+         * @returns {Function} linkFn
          */
         function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn,
                                        jqCollection, originalReplaceDirective, preLinkFns, postLinkFns,
@@ -5823,24 +9460,27 @@
           previousCompileContext = previousCompileContext || {};
 
           var terminalPriority = -Number.MAX_VALUE,
-              newScopeDirective,
-              controllerDirectives = previousCompileContext.controllerDirectives,
-              newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
-              templateDirective = previousCompileContext.templateDirective,
-              nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
-              hasTranscludeDirective = false,
-              hasElementTranscludeDirective = false,
-              $compileNode = templateAttrs.$$element = jqLite(compileNode),
-              directive,
-              directiveName,
-              $template,
-              replaceDirective = originalReplaceDirective,
-              childTranscludeFn = transcludeFn,
-              linkFn,
-              directiveValue;
+            newScopeDirective = previousCompileContext.newScopeDirective,
+            controllerDirectives = previousCompileContext.controllerDirectives,
+            newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
+            templateDirective = previousCompileContext.templateDirective,
+            nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
+            hasTranscludeDirective = false,
+            hasTemplate = false,
+            hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective,
+            $compileNode = templateAttrs.$$element = jqLite(compileNode),
+            directive,
+            directiveName,
+            $template,
+            replaceDirective = originalReplaceDirective,
+            childTranscludeFn = transcludeFn,
+            linkFn,
+            didScanForMultipleTransclusion = false,
+            mightHaveMultipleTransclusionError = false,
+            directiveValue;
 
           // executes all directives on the current element
-          for(var i = 0, ii = directives.length; i < ii; i++) {
+          for (var i = 0, ii = directives.length; i < ii; i++) {
             directive = directives[i];
             var attrStart = directive.$$start;
             var attrEnd = directive.$$end;
@@ -5855,90 +9495,195 @@
               break; // prevent further processing of directives
             }
 
-            if (directiveValue = directive.scope) {
-              newScopeDirective = newScopeDirective || directive;
+            directiveValue = directive.scope;
+
+            if (directiveValue) {
 
               // skip the check for directives with async templates, we'll check the derived sync
               // directive when the template arrives
               if (!directive.templateUrl) {
-                assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
-                    $compileNode);
                 if (isObject(directiveValue)) {
+                  // This directive is trying to add an isolated scope.
+                  // Check that there is no scope of any kind already
+                  assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective,
+                    directive, $compileNode);
                   newIsolateScopeDirective = directive;
+                } else {
+                  // This directive is trying to add a child scope.
+                  // Check that there is no isolated scope already
+                  assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
+                    $compileNode);
                 }
               }
+
+              newScopeDirective = newScopeDirective || directive;
             }
 
             directiveName = directive.name;
 
+            // If we encounter a condition that can result in transclusion on the directive,
+            // then scan ahead in the remaining directives for others that may cause a multiple
+            // transclusion error to be thrown during the compilation process.  If a matching directive
+            // is found, then we know that when we encounter a transcluded directive, we need to eagerly
+            // compile the `transclude` function rather than doing it lazily in order to throw
+            // exceptions at the correct time
+            if (!didScanForMultipleTransclusion && ((directive.replace && (directive.templateUrl || directive.template))
+                || (directive.transclude && !directive.$$tlb))) {
+              var candidateDirective;
+
+              for (var scanningIndex = i + 1; (candidateDirective = directives[scanningIndex++]);) {
+                if ((candidateDirective.transclude && !candidateDirective.$$tlb)
+                  || (candidateDirective.replace && (candidateDirective.templateUrl || candidateDirective.template))) {
+                  mightHaveMultipleTransclusionError = true;
+                  break;
+                }
+              }
+
+              didScanForMultipleTransclusion = true;
+            }
+
             if (!directive.templateUrl && directive.controller) {
-              directiveValue = directive.controller;
-              controllerDirectives = controllerDirectives || {};
-              assertNoDuplicate("'" + directiveName + "' controller",
-                  controllerDirectives[directiveName], directive, $compileNode);
+              controllerDirectives = controllerDirectives || createMap();
+              assertNoDuplicate('\'' + directiveName + '\' controller',
+                controllerDirectives[directiveName], directive, $compileNode);
               controllerDirectives[directiveName] = directive;
             }
 
-            if (directiveValue = directive.transclude) {
+            directiveValue = directive.transclude;
+
+            if (directiveValue) {
               hasTranscludeDirective = true;
 
               // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
-              // This option should only be used by directives that know how to how to safely handle element transclusion,
+              // This option should only be used by directives that know how to safely handle element transclusion,
               // where the transcluded nodes are added or replaced after linking.
               if (!directive.$$tlb) {
                 assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode);
                 nonTlbTranscludeDirective = directive;
               }
 
-              if (directiveValue == 'element') {
+              if (directiveValue === 'element') {
                 hasElementTranscludeDirective = true;
                 terminalPriority = directive.priority;
-                $template = groupScan(compileNode, attrStart, attrEnd);
+                $template = $compileNode;
                 $compileNode = templateAttrs.$$element =
-                    jqLite(document.createComment(' ' + directiveName + ': ' +
-                        templateAttrs[directiveName] + ' '));
+                  jqLite(compile.$$createComment(directiveName, templateAttrs[directiveName]));
                 compileNode = $compileNode[0];
-                replaceWith(jqCollection, jqLite(sliceArgs($template)), compileNode);
+                replaceWith(jqCollection, sliceArgs($template), compileNode);
 
-                childTranscludeFn = compile($template, transcludeFn, terminalPriority,
-                    replaceDirective && replaceDirective.name, {
-                      // Don't pass in:
-                      // - controllerDirectives - otherwise we'll create duplicates controllers
-                      // - newIsolateScopeDirective or templateDirective - combining templates with
-                      //   element transclusion doesn't make sense.
-                      //
-                      // We need only nonTlbTranscludeDirective so that we prevent putting transclusion
-                      // on the same element more than once.
-                      nonTlbTranscludeDirective: nonTlbTranscludeDirective
-                    });
+                // Support: Chrome < 50
+                // https://github.com/angular/angular.js/issues/14041
+
+                // In the versions of V8 prior to Chrome 50, the document fragment that is created
+                // in the `replaceWith` function is improperly garbage collected despite still
+                // being referenced by the `parentNode` property of all of the child nodes.  By adding
+                // a reference to the fragment via a different property, we can avoid that incorrect
+                // behavior.
+                // TODO: remove this line after Chrome 50 has been released
+                $template[0].$$parentNode = $template[0].parentNode;
+
+                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority,
+                  replaceDirective && replaceDirective.name, {
+                    // Don't pass in:
+                    // - controllerDirectives - otherwise we'll create duplicates controllers
+                    // - newIsolateScopeDirective or templateDirective - combining templates with
+                    //   element transclusion doesn't make sense.
+                    //
+                    // We need only nonTlbTranscludeDirective so that we prevent putting transclusion
+                    // on the same element more than once.
+                    nonTlbTranscludeDirective: nonTlbTranscludeDirective
+                  });
               } else {
-                $template = jqLite(jqLiteClone(compileNode)).contents();
+
+                var slots = createMap();
+
+                if (!isObject(directiveValue)) {
+                  $template = jqLite(jqLiteClone(compileNode)).contents();
+                } else {
+
+                  // We have transclusion slots,
+                  // collect them up, compile them and store their transclusion functions
+                  $template = [];
+
+                  var slotMap = createMap();
+                  var filledSlots = createMap();
+
+                  // Parse the element selectors
+                  forEach(directiveValue, function(elementSelector, slotName) {
+                    // If an element selector starts with a ? then it is optional
+                    var optional = (elementSelector.charAt(0) === '?');
+                    elementSelector = optional ? elementSelector.substring(1) : elementSelector;
+
+                    slotMap[elementSelector] = slotName;
+
+                    // We explicitly assign `null` since this implies that a slot was defined but not filled.
+                    // Later when calling boundTransclusion functions with a slot name we only error if the
+                    // slot is `undefined`
+                    slots[slotName] = null;
+
+                    // filledSlots contains `true` for all slots that are either optional or have been
+                    // filled. This is used to check that we have not missed any required slots
+                    filledSlots[slotName] = optional;
+                  });
+
+                  // Add the matching elements into their slot
+                  forEach($compileNode.contents(), function(node) {
+                    var slotName = slotMap[directiveNormalize(nodeName_(node))];
+                    if (slotName) {
+                      filledSlots[slotName] = true;
+                      slots[slotName] = slots[slotName] || [];
+                      slots[slotName].push(node);
+                    } else {
+                      $template.push(node);
+                    }
+                  });
+
+                  // Check for required slots that were not filled
+                  forEach(filledSlots, function(filled, slotName) {
+                    if (!filled) {
+                      throw $compileMinErr('reqslot', 'Required transclusion slot `{0}` was not filled.', slotName);
+                    }
+                  });
+
+                  for (var slotName in slots) {
+                    if (slots[slotName]) {
+                      // Only define a transclusion function if the slot was filled
+                      slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn);
+                    }
+                  }
+                }
+
                 $compileNode.empty(); // clear contents
-                childTranscludeFn = compile($template, transcludeFn);
+                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, undefined,
+                  undefined, { needsNewScope: directive.$$isolateScope || directive.$$newScope});
+                childTranscludeFn.$$slots = slots;
               }
             }
 
             if (directive.template) {
+              hasTemplate = true;
               assertNoDuplicate('template', templateDirective, directive, $compileNode);
               templateDirective = directive;
 
               directiveValue = (isFunction(directive.template))
-                  ? directive.template($compileNode, templateAttrs)
-                  : directive.template;
+                ? directive.template($compileNode, templateAttrs)
+                : directive.template;
 
               directiveValue = denormalizeTemplate(directiveValue);
 
               if (directive.replace) {
                 replaceDirective = directive;
-                $template = jqLite('<div>' +
-                    trim(directiveValue) +
-                    '</div>').contents();
+                if (jqLiteIsTextNode(directiveValue)) {
+                  $template = [];
+                } else {
+                  $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue)));
+                }
                 compileNode = $template[0];
 
-                if ($template.length != 1 || compileNode.nodeType !== 1) {
+                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
                   throw $compileMinErr('tplrt',
-                      "Template for directive '{0}' must have exactly one root element. {1}",
-                      directiveName, '');
+                    'Template for directive \'{0}\' must have exactly one root element. {1}',
+                    directiveName, '');
                 }
 
                 replaceWith(jqCollection, $compileNode, compileNode);
@@ -5953,8 +9698,11 @@
                 var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs);
                 var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1));
 
-                if (newIsolateScopeDirective) {
-                  markDirectivesAsIsolate(templateDirectives);
+                if (newIsolateScopeDirective || newScopeDirective) {
+                  // The original directive caused the current element to be replaced but this element
+                  // also needs to have a new scope, so we need to tell the template directives
+                  // that they would need to get their scope from further up, if they require transclusion
+                  markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective);
                 }
                 directives = directives.concat(templateDirectives).concat(unprocessedDirectives);
                 mergeTemplateAttributes(templateAttrs, newTemplateAttrs);
@@ -5966,6 +9714,7 @@
             }
 
             if (directive.templateUrl) {
+              hasTemplate = true;
               assertNoDuplicate('template', templateDirective, directive, $compileNode);
               templateDirective = directive;
 
@@ -5973,21 +9722,24 @@
                 replaceDirective = directive;
               }
 
+              // eslint-disable-next-line no-func-assign
               nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
-                  templateAttrs, jqCollection, childTranscludeFn, preLinkFns, postLinkFns, {
-                    controllerDirectives: controllerDirectives,
-                    newIsolateScopeDirective: newIsolateScopeDirective,
-                    templateDirective: templateDirective,
-                    nonTlbTranscludeDirective: nonTlbTranscludeDirective
-                  });
+                templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
+                  controllerDirectives: controllerDirectives,
+                  newScopeDirective: (newScopeDirective !== directive) && newScopeDirective,
+                  newIsolateScopeDirective: newIsolateScopeDirective,
+                  templateDirective: templateDirective,
+                  nonTlbTranscludeDirective: nonTlbTranscludeDirective
+                });
               ii = directives.length;
             } else if (directive.compile) {
               try {
                 linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn);
+                var context = directive.$$originalDirective || directive;
                 if (isFunction(linkFn)) {
-                  addLinkFns(null, linkFn, attrStart, attrEnd);
+                  addLinkFns(null, bind(context, linkFn), attrStart, attrEnd);
                 } else if (linkFn) {
-                  addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd);
+                  addLinkFns(bind(context, linkFn.pre), bind(context, linkFn.post), attrStart, attrEnd);
                 }
               } catch (e) {
                 $exceptionHandler(e, startingTag($compileNode));
@@ -6002,7 +9754,11 @@
           }
 
           nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
-          nodeLinkFn.transclude = hasTranscludeDirective && childTranscludeFn;
+          nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
+          nodeLinkFn.templateOnThisElement = hasTemplate;
+          nodeLinkFn.transclude = childTranscludeFn;
+
+          previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
 
           // might be normal or delayed nodeLinkFn depending on if templateUrl is present
           return nodeLinkFn;
@@ -6013,6 +9769,7 @@
             if (pre) {
               if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
               pre.require = directive.require;
+              pre.directiveName = directiveName;
               if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
                 pre = cloneAndAnnotateFn(pre, {isolateScope: true});
               }
@@ -6021,6 +9778,7 @@
             if (post) {
               if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
               post.require = directive.require;
+              post.directiveName = directiveName;
               if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
                 post = cloneAndAnnotateFn(post, {isolateScope: true});
               }
@@ -6028,180 +9786,135 @@
             }
           }
 
-
-          function getControllers(require, $element, elementControllers) {
-            var value, retrievalMethod = 'data', optional = false;
-            if (isString(require)) {
-              while((value = require.charAt(0)) == '^' || value == '?') {
-                require = require.substr(1);
-                if (value == '^') {
-                  retrievalMethod = 'inheritedData';
-                }
-                optional = optional || value == '?';
-              }
-              value = null;
-
-              if (elementControllers && retrievalMethod === 'data') {
-                value = elementControllers[require];
-              }
-              value = value || $element[retrievalMethod]('$' + require + 'Controller');
-
-              if (!value && !optional) {
-                throw $compileMinErr('ctreq',
-                    "Controller '{0}', required by directive '{1}', can't be found!",
-                    require, directiveName);
-              }
-              return value;
-            } else if (isArray(require)) {
-              value = [];
-              forEach(require, function(require) {
-                value.push(getControllers(require, $element, elementControllers));
-              });
-            }
-            return value;
-          }
-
-
           function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
-            var attrs, $element, i, ii, linkFn, controller, isolateScope, elementControllers = {}, transcludeFn;
+            var i, ii, linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element,
+              attrs, scopeBindingInfo;
 
             if (compileNode === linkNode) {
               attrs = templateAttrs;
+              $element = templateAttrs.$$element;
             } else {
-              attrs = shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr));
+              $element = jqLite(linkNode);
+              attrs = new Attributes($element, templateAttrs);
+            }
+
+            controllerScope = scope;
+            if (newIsolateScopeDirective) {
+              isolateScope = scope.$new(true);
+            } else if (newScopeDirective) {
+              controllerScope = scope.$parent;
+            }
+
+            if (boundTranscludeFn) {
+              // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn`
+              // is later passed as `parentBoundTranscludeFn` to `publicLinkFn`
+              transcludeFn = controllersBoundTransclude;
+              transcludeFn.$$boundTransclude = boundTranscludeFn;
+              // expose the slots on the `$transclude` function
+              transcludeFn.isSlotFilled = function(slotName) {
+                return !!boundTranscludeFn.$$slots[slotName];
+              };
+            }
+
+            if (controllerDirectives) {
+              elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective);
             }
-            $element = attrs.$$element;
 
             if (newIsolateScopeDirective) {
-              var LOCAL_REGEXP = /^\s*([@=&])(\??)\s*(\w*)\s*$/;
-              var $linkNode = jqLite(linkNode);
-
-              isolateScope = scope.$new(true);
-
-              if (templateDirective && (templateDirective === newIsolateScopeDirective.$$originalDirective)) {
-                $linkNode.data('$isolateScope', isolateScope) ;
-              } else {
-                $linkNode.data('$isolateScopeNoTemplate', isolateScope);
+              // Initialize isolate scope bindings for new isolate scope directive.
+              compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective ||
+                templateDirective === newIsolateScopeDirective.$$originalDirective)));
+              compile.$$addScopeClass($element, true);
+              isolateScope.$$isolateBindings =
+                newIsolateScopeDirective.$$isolateBindings;
+              scopeBindingInfo = initializeDirectiveBindings(scope, attrs, isolateScope,
+                isolateScope.$$isolateBindings,
+                newIsolateScopeDirective);
+              if (scopeBindingInfo.removeWatches) {
+                isolateScope.$on('$destroy', scopeBindingInfo.removeWatches);
               }
-
-
-
-              safeAddClass($linkNode, 'ng-isolate-scope');
-
-              forEach(newIsolateScopeDirective.scope, function(definition, scopeName) {
-                var match = definition.match(LOCAL_REGEXP) || [],
-                    attrName = match[3] || scopeName,
-                    optional = (match[2] == '?'),
-                    mode = match[1], // @, =, or &
-                    lastValue,
-                    parentGet, parentSet, compare;
-
-                isolateScope.$$isolateBindings[scopeName] = mode + attrName;
-
-                switch (mode) {
-
-                  case '@':
-                    attrs.$observe(attrName, function(value) {
-                      isolateScope[scopeName] = value;
-                    });
-                    attrs.$$observers[attrName].$$scope = scope;
-                    if( attrs[attrName] ) {
-                      // If the attribute has been provided then we trigger an interpolation to ensure
-                      // the value is there for use in the link fn
-                      isolateScope[scopeName] = $interpolate(attrs[attrName])(scope);
-                    }
-                    break;
-
-                  case '=':
-                    if (optional && !attrs[attrName]) {
-                      return;
-                    }
-                    parentGet = $parse(attrs[attrName]);
-                    if (parentGet.literal) {
-                      compare = equals;
-                    } else {
-                      compare = function(a,b) { return a === b; };
-                    }
-                    parentSet = parentGet.assign || function() {
-                      // reset the change, or we will throw this exception on every $digest
-                      lastValue = isolateScope[scopeName] = parentGet(scope);
-                      throw $compileMinErr('nonassign',
-                          "Expression '{0}' used with directive '{1}' is non-assignable!",
-                          attrs[attrName], newIsolateScopeDirective.name);
-                    };
-                    lastValue = isolateScope[scopeName] = parentGet(scope);
-                    isolateScope.$watch(function parentValueWatch() {
-                      var parentValue = parentGet(scope);
-                      if (!compare(parentValue, isolateScope[scopeName])) {
-                        // we are out of sync and need to copy
-                        if (!compare(parentValue, lastValue)) {
-                          // parent changed and it has precedence
-                          isolateScope[scopeName] = parentValue;
-                        } else {
-                          // if the parent can be assigned then do so
-                          parentSet(scope, parentValue = isolateScope[scopeName]);
-                        }
-                      }
-                      return lastValue = parentValue;
-                    }, null, parentGet.literal);
-                    break;
-
-                  case '&':
-                    parentGet = $parse(attrs[attrName]);
-                    isolateScope[scopeName] = function(locals) {
-                      return parentGet(scope, locals);
-                    };
-                    break;
-
-                  default:
-                    throw $compileMinErr('iscp',
-                        "Invalid isolate scope definition for directive '{0}'." +
-                            " Definition: {... {1}: '{2}' ...}",
-                        newIsolateScopeDirective.name, scopeName, definition);
-                }
-              });
             }
-            transcludeFn = boundTranscludeFn && controllersBoundTransclude;
-            if (controllerDirectives) {
-              forEach(controllerDirectives, function(directive) {
-                var locals = {
-                  $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
-                  $element: $element,
-                  $attrs: attrs,
-                  $transclude: transcludeFn
-                }, controllerInstance;
 
-                controller = directive.controller;
-                if (controller == '@') {
-                  controller = attrs[directive.name];
+            // Initialize bindToController bindings
+            for (var name in elementControllers) {
+              var controllerDirective = controllerDirectives[name];
+              var controller = elementControllers[name];
+              var bindings = controllerDirective.$$bindings.bindToController;
+
+              if (preAssignBindingsEnabled) {
+                if (bindings) {
+                  controller.bindingInfo =
+                    initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+                } else {
+                  controller.bindingInfo = {};
                 }
 
-                controllerInstance = $controller(controller, locals);
-                // For directives with element transclusion the element is a comment,
-                // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
-                // clean up (http://bugs.jquery.com/ticket/8335).
-                // Instead, we save the controllers for the element in a local hash and attach to .data
-                // later, once we have the actual element.
-                elementControllers[directive.name] = controllerInstance;
-                if (!hasElementTranscludeDirective) {
-                  $element.data('$' + directive.name + 'Controller', controllerInstance);
+                var controllerResult = controller();
+                if (controllerResult !== controller.instance) {
+                  // If the controller constructor has a return value, overwrite the instance
+                  // from setupControllers
+                  controller.instance = controllerResult;
+                  $element.data('$' + controllerDirective.name + 'Controller', controllerResult);
+                  if (controller.bindingInfo.removeWatches) {
+                    controller.bindingInfo.removeWatches();
+                  }
+                  controller.bindingInfo =
+                    initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
                 }
-
-                if (directive.controllerAs) {
-                  locals.$scope[directive.controllerAs] = controllerInstance;
-                }
-              });
+              } else {
+                controller.instance = controller();
+                $element.data('$' + controllerDirective.name + 'Controller', controller.instance);
+                controller.bindingInfo =
+                  initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+              }
             }
 
+            // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy
+            forEach(controllerDirectives, function(controllerDirective, name) {
+              var require = controllerDirective.require;
+              if (controllerDirective.bindToController && !isArray(require) && isObject(require)) {
+                extend(elementControllers[name].instance, getControllers(name, require, $element, elementControllers));
+              }
+            });
+
+            // Handle the init and destroy lifecycle hooks on all controllers that have them
+            forEach(elementControllers, function(controller) {
+              var controllerInstance = controller.instance;
+              if (isFunction(controllerInstance.$onChanges)) {
+                try {
+                  controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
+                } catch (e) {
+                  $exceptionHandler(e);
+                }
+              }
+              if (isFunction(controllerInstance.$onInit)) {
+                try {
+                  controllerInstance.$onInit();
+                } catch (e) {
+                  $exceptionHandler(e);
+                }
+              }
+              if (isFunction(controllerInstance.$doCheck)) {
+                controllerScope.$watch(function() { controllerInstance.$doCheck(); });
+                controllerInstance.$doCheck();
+              }
+              if (isFunction(controllerInstance.$onDestroy)) {
+                controllerScope.$on('$destroy', function callOnDestroyHook() {
+                  controllerInstance.$onDestroy();
+                });
+              }
+            });
+
             // PRELINKING
-            for(i = 0, ii = preLinkFns.length; i < ii; i++) {
-              try {
-                linkFn = preLinkFns[i];
-                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
-                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
-              } catch (e) {
-                $exceptionHandler(e, startingTag($element));
-              }
+            for (i = 0, ii = preLinkFns.length; i < ii; i++) {
+              linkFn = preLinkFns[i];
+              invokeLinkFn(linkFn,
+                linkFn.isolateScope ? isolateScope : scope,
+                $element,
+                attrs,
+                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+                transcludeFn
+              );
             }
 
             // RECURSION
@@ -6211,25 +9924,38 @@
             if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) {
               scopeToChild = isolateScope;
             }
-            childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
-
-            // POSTLINKING
-            for(i = postLinkFns.length - 1; i >= 0; i--) {
-              try {
-                linkFn = postLinkFns[i];
-                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
-                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
-              } catch (e) {
-                $exceptionHandler(e, startingTag($element));
-              }
+            if (childLinkFn) {
+              childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
             }
 
-            // This is the function that is injected as `$transclude`.
-            function controllersBoundTransclude(scope, cloneAttachFn) {
-              var transcludeControllers;
+            // POSTLINKING
+            for (i = postLinkFns.length - 1; i >= 0; i--) {
+              linkFn = postLinkFns[i];
+              invokeLinkFn(linkFn,
+                linkFn.isolateScope ? isolateScope : scope,
+                $element,
+                attrs,
+                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+                transcludeFn
+              );
+            }
 
-              // no scope passed
-              if (arguments.length < 2) {
+            // Trigger $postLink lifecycle hooks
+            forEach(elementControllers, function(controller) {
+              var controllerInstance = controller.instance;
+              if (isFunction(controllerInstance.$postLink)) {
+                controllerInstance.$postLink();
+              }
+            });
+
+            // This is the function that is injected as `$transclude`.
+            // Note: all arguments are optional!
+            function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement, slotName) {
+              var transcludeControllers;
+              // No scope passed in:
+              if (!isScope(scope)) {
+                slotName = futureParentElement;
+                futureParentElement = cloneAttachFn;
                 cloneAttachFn = scope;
                 scope = undefined;
               }
@@ -6237,16 +9963,111 @@
               if (hasElementTranscludeDirective) {
                 transcludeControllers = elementControllers;
               }
-
-              return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers);
+              if (!futureParentElement) {
+                futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element;
+              }
+              if (slotName) {
+                // slotTranscludeFn can be one of three things:
+                //  * a transclude function - a filled slot
+                //  * `null` - an optional slot that was not filled
+                //  * `undefined` - a slot that was not declared (i.e. invalid)
+                var slotTranscludeFn = boundTranscludeFn.$$slots[slotName];
+                if (slotTranscludeFn) {
+                  return slotTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+                } else if (isUndefined(slotTranscludeFn)) {
+                  throw $compileMinErr('noslot',
+                    'No parent directive that requires a transclusion with slot name "{0}". ' +
+                    'Element: {1}',
+                    slotName, startingTag($element));
+                }
+              } else {
+                return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+              }
             }
           }
         }
 
-        function markDirectivesAsIsolate(directives) {
-          // mark all directives as needing isolate scope.
+        function getControllers(directiveName, require, $element, elementControllers) {
+          var value;
+
+          if (isString(require)) {
+            var match = require.match(REQUIRE_PREFIX_REGEXP);
+            var name = require.substring(match[0].length);
+            var inheritType = match[1] || match[3];
+            var optional = match[2] === '?';
+
+            //If only parents then start at the parent element
+            if (inheritType === '^^') {
+              $element = $element.parent();
+              //Otherwise attempt getting the controller from elementControllers in case
+              //the element is transcluded (and has no data) and to avoid .data if possible
+            } else {
+              value = elementControllers && elementControllers[name];
+              value = value && value.instance;
+            }
+
+            if (!value) {
+              var dataName = '$' + name + 'Controller';
+              value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+            }
+
+            if (!value && !optional) {
+              throw $compileMinErr('ctreq',
+                'Controller \'{0}\', required by directive \'{1}\', can\'t be found!',
+                name, directiveName);
+            }
+          } else if (isArray(require)) {
+            value = [];
+            for (var i = 0, ii = require.length; i < ii; i++) {
+              value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+            }
+          } else if (isObject(require)) {
+            value = {};
+            forEach(require, function(controller, property) {
+              value[property] = getControllers(directiveName, controller, $element, elementControllers);
+            });
+          }
+
+          return value || null;
+        }
+
+        function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective) {
+          var elementControllers = createMap();
+          for (var controllerKey in controllerDirectives) {
+            var directive = controllerDirectives[controllerKey];
+            var locals = {
+              $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+              $element: $element,
+              $attrs: attrs,
+              $transclude: transcludeFn
+            };
+
+            var controller = directive.controller;
+            if (controller === '@') {
+              controller = attrs[directive.name];
+            }
+
+            var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+            // For directives with element transclusion the element is a comment.
+            // In this case .data will not attach any data.
+            // Instead, we save the controllers for the element in a local hash and attach to .data
+            // later, once we have the actual element.
+            elementControllers[directive.name] = controllerInstance;
+            $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
+          }
+          return elementControllers;
+        }
+
+        // Depending upon the context in which a directive finds itself it might need to have a new isolated
+        // or child scope created. For instance:
+        // * if the directive has been pulled into a template because another directive with a higher priority
+        // asked for element transclusion
+        // * if the directive itself asks for transclusion but it is at the root of a template and the original
+        // element was replaced. See https://github.com/angular/angular.js/issues/12936
+        function markDirectiveScope(directives, isolateScope, newScope) {
           for (var j = 0, jj = directives.length; j < jj; j++) {
-            directives[j] = inherit(directives[j], {$$isolateScope: true});
+            directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope});
           }
         }
 
@@ -6262,32 +10083,58 @@
          *   * `A': attribute
          *   * `C`: class
          *   * `M`: comment
-         * @returns true if directive was added.
+         * @returns {boolean} true if directive was added.
          */
         function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName,
                               endAttrName) {
           if (name === ignoreDirective) return null;
           var match = null;
           if (hasDirectives.hasOwnProperty(name)) {
-            for(var directive, directives = $injector.get(name + Suffix),
-                    i = 0, ii = directives.length; i<ii; i++) {
-              try {
-                directive = directives[i];
-                if ( (maxPriority === undefined || maxPriority > directive.priority) &&
-                    directive.restrict.indexOf(location) != -1) {
-                  if (startAttrName) {
-                    directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
-                  }
-                  tDirectives.push(directive);
-                  match = directive;
+            for (var directive, directives = $injector.get(name + Suffix),
+                   i = 0, ii = directives.length; i < ii; i++) {
+              directive = directives[i];
+              if ((isUndefined(maxPriority) || maxPriority > directive.priority) &&
+                directive.restrict.indexOf(location) !== -1) {
+                if (startAttrName) {
+                  directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
                 }
-              } catch(e) { $exceptionHandler(e); }
+                if (!directive.$$bindings) {
+                  var bindings = directive.$$bindings =
+                    parseDirectiveBindings(directive, directive.name);
+                  if (isObject(bindings.isolateScope)) {
+                    directive.$$isolateBindings = bindings.isolateScope;
+                  }
+                }
+                tDirectives.push(directive);
+                match = directive;
+              }
             }
           }
           return match;
         }
 
 
+        /**
+         * looks up the directive and returns true if it is a multi-element directive,
+         * and therefore requires DOM nodes between -start and -end markers to be grouped
+         * together.
+         *
+         * @param {string} name name of the directive to look up.
+         * @returns true if directive was registered as multi-element.
+         */
+        function directiveIsMultiElement(name) {
+          if (hasDirectives.hasOwnProperty(name)) {
+            for (var directive, directives = $injector.get(name + Suffix),
+                   i = 0, ii = directives.length; i < ii; i++) {
+              directive = directives[i];
+              if (directive.multiElement) {
+                return true;
+              }
+            }
+          }
+          return false;
+        }
+
         /**
          * When the element is replaced with HTML template then the new attributes
          * on the template need to be merged with the existing attributes in the DOM.
@@ -6298,14 +10145,17 @@
          */
         function mergeTemplateAttributes(dst, src) {
           var srcAttr = src.$attr,
-              dstAttr = dst.$attr,
-              $element = dst.$$element;
+            dstAttr = dst.$attr;
 
           // reapply the old attributes to the new element
           forEach(dst, function(value, key) {
-            if (key.charAt(0) != '$') {
-              if (src[key]) {
-                value += (key === 'style' ? ';' : ' ') + src[key];
+            if (key.charAt(0) !== '$') {
+              if (src[key] && src[key] !== value) {
+                if (value.length) {
+                  value += (key === 'style' ? ';' : ' ') + src[key];
+                } else {
+                  value = src[key];
+                }
               }
               dst.$set(key, value, true, srcAttr[key]);
             }
@@ -6313,18 +10163,16 @@
 
           // copy the new attributes on the old attrs object
           forEach(src, function(value, key) {
-            if (key == 'class') {
-              safeAddClass($element, value);
-              dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
-            } else if (key == 'style') {
-              $element.attr('style', $element.attr('style') + ';' + value);
-              dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
-              // `dst` will never contain hasOwnProperty as DOM parser won't let it.
-              // You will get an "InvalidCharacterError: DOM Exception 5" error if you
-              // have an attribute like "has-own-property" or "data-has-own-property", etc.
-            } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
+            // Check if we already set this attribute in the loop above.
+            // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+            // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+            // have an attribute like "has-own-property" or "data-has-own-property", etc.
+            if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
               dst[key] = value;
-              dstAttr[key] = srcAttr[key];
+
+              if (key !== 'class' && key !== 'style') {
+                dstAttr[key] = srcAttr[key];
+              }
             }
           });
         }
@@ -6333,97 +10181,118 @@
         function compileTemplateUrl(directives, $compileNode, tAttrs,
                                     $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) {
           var linkQueue = [],
-              afterTemplateNodeLinkFn,
-              afterTemplateChildLinkFn,
-              beforeTemplateCompileNode = $compileNode[0],
-              origAsyncDirective = directives.shift(),
-          // The fact that we have to copy and patch the directive seems wrong!
-              derivedSyncDirective = extend({}, origAsyncDirective, {
-                templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
-              }),
-              templateUrl = (isFunction(origAsyncDirective.templateUrl))
-                  ? origAsyncDirective.templateUrl($compileNode, tAttrs)
-                  : origAsyncDirective.templateUrl;
+            afterTemplateNodeLinkFn,
+            afterTemplateChildLinkFn,
+            beforeTemplateCompileNode = $compileNode[0],
+            origAsyncDirective = directives.shift(),
+            derivedSyncDirective = inherit(origAsyncDirective, {
+              templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
+            }),
+            templateUrl = (isFunction(origAsyncDirective.templateUrl))
+              ? origAsyncDirective.templateUrl($compileNode, tAttrs)
+              : origAsyncDirective.templateUrl,
+            templateNamespace = origAsyncDirective.templateNamespace;
 
           $compileNode.empty();
 
-          $http.get($sce.getTrustedResourceUrl(templateUrl), {cache: $templateCache}).
-              success(function(content) {
-                var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
+          $templateRequest(templateUrl)
+            .then(function(content) {
+              var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
 
-                content = denormalizeTemplate(content);
+              content = denormalizeTemplate(content);
 
-                if (origAsyncDirective.replace) {
-                  $template = jqLite('<div>' + trim(content) + '</div>').contents();
-                  compileNode = $template[0];
-
-                  if ($template.length != 1 || compileNode.nodeType !== 1) {
-                    throw $compileMinErr('tplrt',
-                        "Template for directive '{0}' must have exactly one root element. {1}",
-                        origAsyncDirective.name, templateUrl);
-                  }
-
-                  tempTemplateAttrs = {$attr: {}};
-                  replaceWith($rootElement, $compileNode, compileNode);
-                  var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
-
-                  if (isObject(origAsyncDirective.scope)) {
-                    markDirectivesAsIsolate(templateDirectives);
-                  }
-                  directives = templateDirectives.concat(directives);
-                  mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
+              if (origAsyncDirective.replace) {
+                if (jqLiteIsTextNode(content)) {
+                  $template = [];
                 } else {
-                  compileNode = beforeTemplateCompileNode;
-                  $compileNode.html(content);
+                  $template = removeComments(wrapTemplate(templateNamespace, trim(content)));
+                }
+                compileNode = $template[0];
+
+                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
+                  throw $compileMinErr('tplrt',
+                    'Template for directive \'{0}\' must have exactly one root element. {1}',
+                    origAsyncDirective.name, templateUrl);
                 }
 
-                directives.unshift(derivedSyncDirective);
+                tempTemplateAttrs = {$attr: {}};
+                replaceWith($rootElement, $compileNode, compileNode);
+                var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
 
-                afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs,
-                    childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
-                    previousCompileContext);
-                forEach($rootElement, function(node, i) {
-                  if (node == compileNode) {
-                    $rootElement[i] = $compileNode[0];
-                  }
-                });
-                afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
+                if (isObject(origAsyncDirective.scope)) {
+                  // the original directive that caused the template to be loaded async required
+                  // an isolate scope
+                  markDirectiveScope(templateDirectives, true);
+                }
+                directives = templateDirectives.concat(directives);
+                mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
+              } else {
+                compileNode = beforeTemplateCompileNode;
+                $compileNode.html(content);
+              }
 
+              directives.unshift(derivedSyncDirective);
 
-                while(linkQueue.length) {
-                  var scope = linkQueue.shift(),
-                      beforeTemplateLinkNode = linkQueue.shift(),
-                      linkRootElement = linkQueue.shift(),
-                      boundTranscludeFn = linkQueue.shift(),
-                      linkNode = $compileNode[0];
+              afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs,
+                childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
+                previousCompileContext);
+              forEach($rootElement, function(node, i) {
+                if (node === compileNode) {
+                  $rootElement[i] = $compileNode[0];
+                }
+              });
+              afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
 
-                  if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
+              while (linkQueue.length) {
+                var scope = linkQueue.shift(),
+                  beforeTemplateLinkNode = linkQueue.shift(),
+                  linkRootElement = linkQueue.shift(),
+                  boundTranscludeFn = linkQueue.shift(),
+                  linkNode = $compileNode[0];
+
+                if (scope.$$destroyed) continue;
+
+                if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
+                  var oldClasses = beforeTemplateLinkNode.className;
+
+                  if (!(previousCompileContext.hasElementTranscludeDirective &&
+                      origAsyncDirective.replace)) {
                     // it was cloned therefore we have to clone as well.
                     linkNode = jqLiteClone(compileNode);
-                    replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
                   }
-                  if (afterTemplateNodeLinkFn.transclude) {
-                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude);
-                  } else {
-                    childBoundTranscludeFn = boundTranscludeFn;
-                  }
-                  afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement,
-                      childBoundTranscludeFn);
+                  replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
+
+                  // Copy in CSS classes from original node
+                  safeAddClass(jqLite(linkNode), oldClasses);
                 }
-                linkQueue = null;
-              }).
-              error(function(response, code, headers, config) {
-                throw $compileMinErr('tpload', 'Failed to load template: {0}', config.url);
-              });
+                if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+                  childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+                } else {
+                  childBoundTranscludeFn = boundTranscludeFn;
+                }
+                afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement,
+                  childBoundTranscludeFn);
+              }
+              linkQueue = null;
+            }).catch(function(error) {
+            if (isError(error)) {
+              $exceptionHandler(error);
+            }
+          });
 
           return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
+            var childBoundTranscludeFn = boundTranscludeFn;
+            if (scope.$$destroyed) return;
             if (linkQueue) {
-              linkQueue.push(scope);
-              linkQueue.push(node);
-              linkQueue.push(rootElement);
-              linkQueue.push(boundTranscludeFn);
+              linkQueue.push(scope,
+                node,
+                rootElement,
+                childBoundTranscludeFn);
             } else {
-              afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, boundTranscludeFn);
+              if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+                childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+              }
+              afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn);
             }
           };
         }
@@ -6439,11 +10308,18 @@
           return a.index - b.index;
         }
 
-
         function assertNoDuplicate(what, previousDirective, directive, element) {
+
+          function wrapModuleNameIfDefined(moduleName) {
+            return moduleName ?
+              (' (module: ' + moduleName + ')') :
+              '';
+          }
+
           if (previousDirective) {
-            throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
-                previousDirective.name, directive.name, what, startingTag(element));
+            throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
+              previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName),
+              directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element));
           }
         }
 
@@ -6453,46 +10329,84 @@
           if (interpolateFn) {
             directives.push({
               priority: 0,
-              compile: valueFn(function textInterpolateLinkFn(scope, node) {
-                var parent = node.parent(),
-                    bindings = parent.data('$binding') || [];
-                bindings.push(interpolateFn);
-                safeAddClass(parent.data('$binding', bindings), 'ng-binding');
-                scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
-                  node[0].nodeValue = value;
-                });
-              })
+              compile: function textInterpolateCompileFn(templateNode) {
+                var templateNodeParent = templateNode.parent(),
+                  hasCompileParent = !!templateNodeParent.length;
+
+                // When transcluding a template that has bindings in the root
+                // we don't have a parent and thus need to add the class during linking fn.
+                if (hasCompileParent) compile.$$addBindingClass(templateNodeParent);
+
+                return function textInterpolateLinkFn(scope, node) {
+                  var parent = node.parent();
+                  if (!hasCompileParent) compile.$$addBindingClass(parent);
+                  compile.$$addBindingInfo(parent, interpolateFn.expressions);
+                  scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
+                    node[0].nodeValue = value;
+                  });
+                };
+              }
             });
           }
         }
 
 
+        function wrapTemplate(type, template) {
+          type = lowercase(type || 'html');
+          switch (type) {
+            case 'svg':
+            case 'math':
+              var wrapper = window.document.createElement('div');
+              wrapper.innerHTML = '<' + type + '>' + template + '</' + type + '>';
+              return wrapper.childNodes[0].childNodes;
+            default:
+              return template;
+          }
+        }
+
+
         function getTrustedContext(node, attrNormalizedName) {
-          if (attrNormalizedName == "srcdoc") {
+          if (attrNormalizedName === 'srcdoc') {
             return $sce.HTML;
           }
           var tag = nodeName_(node);
-          // maction[xlink:href] can source SVG.  It's not limited to <maction>.
-          if (attrNormalizedName == "xlinkHref" ||
-              (tag == "FORM" && attrNormalizedName == "action") ||
-              (tag != "IMG" && (attrNormalizedName == "src" ||
-                  attrNormalizedName == "ngSrc"))) {
+          // All tags with src attributes require a RESOURCE_URL value, except for
+          // img and various html5 media tags.
+          if (attrNormalizedName === 'src' || attrNormalizedName === 'ngSrc') {
+            if (['img', 'video', 'audio', 'source', 'track'].indexOf(tag) === -1) {
+              return $sce.RESOURCE_URL;
+            }
+            // maction[xlink:href] can source SVG.  It's not limited to <maction>.
+          } else if (attrNormalizedName === 'xlinkHref' ||
+            (tag === 'form' && attrNormalizedName === 'action') ||
+            // links can be stylesheets or imports, which can run script in the current origin
+            (tag === 'link' && attrNormalizedName === 'href')
+          ) {
             return $sce.RESOURCE_URL;
           }
         }
 
 
-        function addAttrInterpolateDirective(node, directives, value, name) {
-          var interpolateFn = $interpolate(value, true);
+        function addAttrInterpolateDirective(node, directives, value, name, isNgAttr) {
+          var trustedContext = getTrustedContext(node, name);
+          var mustHaveExpression = !isNgAttr;
+          var allOrNothing = ALL_OR_NOTHING_ATTRS[name] || isNgAttr;
+
+          var interpolateFn = $interpolate(value, mustHaveExpression, trustedContext, allOrNothing);
 
           // no interpolation found -> ignore
           if (!interpolateFn) return;
 
+          if (name === 'multiple' && nodeName_(node) === 'select') {
+            throw $compileMinErr('selmulti',
+              'Binding to the \'multiple\' attribute is not supported. Element: {0}',
+              startingTag(node));
+          }
 
-          if (name === "multiple" && nodeName_(node) === "SELECT") {
-            throw $compileMinErr("selmulti",
-                "Binding to the 'multiple' attribute is not supported. Element: {0}",
-                startingTag(node));
+          if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
+            throw $compileMinErr('nodomevents',
+              'Interpolations for HTML DOM event attributes are disallowed.  Please use the ' +
+              'ng- versions (such as ng-click instead of onclick) instead.');
           }
 
           directives.push({
@@ -6500,40 +10414,42 @@
             compile: function() {
               return {
                 pre: function attrInterpolatePreLinkFn(scope, element, attr) {
-                  var $$observers = (attr.$$observers || (attr.$$observers = {}));
+                  var $$observers = (attr.$$observers || (attr.$$observers = createMap()));
 
-                  if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
-                    throw $compileMinErr('nodomevents',
-                        "Interpolations for HTML DOM event attributes are disallowed.  Please use the " +
-                            "ng- versions (such as ng-click instead of onclick) instead.");
+                  // If the attribute has changed since last $interpolate()ed
+                  var newValue = attr[name];
+                  if (newValue !== value) {
+                    // we need to interpolate again since the attribute value has been updated
+                    // (e.g. by another directive's compile function)
+                    // ensure unset/empty values make interpolateFn falsy
+                    interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing);
+                    value = newValue;
                   }
 
-                  // we need to interpolate again, in case the attribute value has been updated
-                  // (e.g. by another directive's compile function)
-                  interpolateFn = $interpolate(attr[name], true, getTrustedContext(node, name));
-
                   // if attribute was updated so that there is no interpolation going on we don't want to
                   // register any observers
                   if (!interpolateFn) return;
 
-                  // TODO(i): this should likely be attr.$set(name, iterpolateFn(scope) so that we reset the
-                  // actual attr value
+                  // initialize attr object so that it's ready in case we need the value for isolate
+                  // scope initialization, otherwise the value would not be available from isolate
+                  // directive's linking fn during linking phase
                   attr[name] = interpolateFn(scope);
+
                   ($$observers[name] || ($$observers[name] = [])).$$inter = true;
                   (attr.$$observers && attr.$$observers[name].$$scope || scope).
-                      $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
-                        //special case for class attribute addition + removal
-                        //so that class changes can tap into the animation
-                        //hooks provided by the $animate service. Be sure to
-                        //skip animations when the first digest occurs (when
-                        //both the new and the old values are the same) since
-                        //the CSS classes are the non-interpolated values
-                        if(name === 'class' && newValue != oldValue) {
-                          attr.$updateClass(newValue, oldValue);
-                        } else {
-                          attr.$set(name, newValue);
-                        }
-                      });
+                  $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
+                    //special case for class attribute addition + removal
+                    //so that class changes can tap into the animation
+                    //hooks provided by the $animate service. Be sure to
+                    //skip animations when the first digest occurs (when
+                    //both the new and the old values are the same) since
+                    //the CSS classes are the non-interpolated values
+                    if (name === 'class' && newValue !== oldValue) {
+                      attr.$updateClass(newValue, oldValue);
+                    } else {
+                      attr.$set(name, newValue);
+                    }
+                  });
                 }
               };
             }
@@ -6553,16 +10469,16 @@
          */
         function replaceWith($rootElement, elementsToRemove, newNode) {
           var firstElementToRemove = elementsToRemove[0],
-              removeCount = elementsToRemove.length,
-              parent = firstElementToRemove.parentNode,
-              i, ii;
+            removeCount = elementsToRemove.length,
+            parent = firstElementToRemove.parentNode,
+            i, ii;
 
           if ($rootElement) {
-            for(i = 0, ii = $rootElement.length; i < ii; i++) {
-              if ($rootElement[i] == firstElementToRemove) {
+            for (i = 0, ii = $rootElement.length; i < ii; i++) {
+              if ($rootElement[i] === firstElementToRemove) {
                 $rootElement[i++] = newNode;
                 for (var j = i, j2 = j + removeCount - 1,
-                         jj = $rootElement.length;
+                       jj = $rootElement.length;
                      j < jj; j++, j2++) {
                   if (j2 < jj) {
                     $rootElement[j] = $rootElement[j2];
@@ -6571,6 +10487,13 @@
                   }
                 }
                 $rootElement.length -= removeCount - 1;
+
+                // If the replaced element is also the jQuery .context then replace it
+                // .context is a deprecated jQuery api, so we should set it only when jQuery set it
+                // http://api.jquery.com/context/
+                if ($rootElement.context === firstElementToRemove) {
+                  $rootElement.context = newNode;
+                }
                 break;
               }
             }
@@ -6579,16 +10502,34 @@
           if (parent) {
             parent.replaceChild(newNode, firstElementToRemove);
           }
-          var fragment = document.createDocumentFragment();
-          fragment.appendChild(firstElementToRemove);
-          newNode[jqLite.expando] = firstElementToRemove[jqLite.expando];
-          for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
-            var element = elementsToRemove[k];
-            jqLite(element).remove(); // must do this way to clean up expando
-            fragment.appendChild(element);
-            delete elementsToRemove[k];
+
+          // Append all the `elementsToRemove` to a fragment. This will...
+          // - remove them from the DOM
+          // - allow them to still be traversed with .nextSibling
+          // - allow a single fragment.qSA to fetch all elements being removed
+          var fragment = window.document.createDocumentFragment();
+          for (i = 0; i < removeCount; i++) {
+            fragment.appendChild(elementsToRemove[i]);
           }
 
+          if (jqLite.hasData(firstElementToRemove)) {
+            // Copy over user data (that includes Angular's $scope etc.). Don't copy private
+            // data here because there's no public interface in jQuery to do that and copying over
+            // event listeners (which is the main use of private data) wouldn't work anyway.
+            jqLite.data(newNode, jqLite.data(firstElementToRemove));
+
+            // Remove $destroy event listeners from `firstElementToRemove`
+            jqLite(firstElementToRemove).off('$destroy');
+          }
+
+          // Cleanup any data/listeners on the elements and children.
+          // This includes invoking the $destroy event on any elements with listeners.
+          jqLite.cleanData(fragment.querySelectorAll('*'));
+
+          // Update the jqLite collection to only contain the `newNode`
+          for (i = 1; i < removeCount; i++) {
+            delete elementsToRemove[i];
+          }
           elementsToRemove[0] = newNode;
           elementsToRemove.length = 1;
         }
@@ -6597,51 +10538,244 @@
         function cloneAndAnnotateFn(fn, annotation) {
           return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
         }
+
+
+        function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) {
+          try {
+            linkFn(scope, $element, attrs, controllers, transcludeFn);
+          } catch (e) {
+            $exceptionHandler(e, startingTag($element));
+          }
+        }
+
+        function strictBindingsCheck(attrName, directiveName) {
+          if (strictComponentBindingsEnabled) {
+            throw $compileMinErr('missingattr',
+              'Attribute \'{0}\' of \'{1}\' is non-optional and must be set!',
+              attrName, directiveName);
+          }
+        }
+
+        // Set up $watches for isolate scope and controller bindings.
+        function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) {
+          var removeWatchCollection = [];
+          var initialChanges = {};
+          var changes;
+
+          forEach(bindings, function initializeBinding(definition, scopeName) {
+            var attrName = definition.attrName,
+              optional = definition.optional,
+              mode = definition.mode, // @, =, <, or &
+              lastValue,
+              parentGet, parentSet, compare, removeWatch;
+
+            switch (mode) {
+
+              case '@':
+                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+                  strictBindingsCheck(attrName, directive.name);
+                  destination[scopeName] = attrs[attrName] = undefined;
+
+                }
+                removeWatch = attrs.$observe(attrName, function(value) {
+                  if (isString(value) || isBoolean(value)) {
+                    var oldValue = destination[scopeName];
+                    recordChanges(scopeName, value, oldValue);
+                    destination[scopeName] = value;
+                  }
+                });
+                attrs.$$observers[attrName].$$scope = scope;
+                lastValue = attrs[attrName];
+                if (isString(lastValue)) {
+                  // If the attribute has been provided then we trigger an interpolation to ensure
+                  // the value is there for use in the link fn
+                  destination[scopeName] = $interpolate(lastValue)(scope);
+                } else if (isBoolean(lastValue)) {
+                  // If the attributes is one of the BOOLEAN_ATTR then Angular will have converted
+                  // the value to boolean rather than a string, so we special case this situation
+                  destination[scopeName] = lastValue;
+                }
+                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
+                removeWatchCollection.push(removeWatch);
+                break;
+
+              case '=':
+                if (!hasOwnProperty.call(attrs, attrName)) {
+                  if (optional) break;
+                  strictBindingsCheck(attrName, directive.name);
+                  attrs[attrName] = undefined;
+                }
+                if (optional && !attrs[attrName]) break;
+
+                parentGet = $parse(attrs[attrName]);
+                if (parentGet.literal) {
+                  compare = equals;
+                } else {
+                  compare = simpleCompare;
+                }
+                parentSet = parentGet.assign || function() {
+                  // reset the change, or we will throw this exception on every $digest
+                  lastValue = destination[scopeName] = parentGet(scope);
+                  throw $compileMinErr('nonassign',
+                    'Expression \'{0}\' in attribute \'{1}\' used with directive \'{2}\' is non-assignable!',
+                    attrs[attrName], attrName, directive.name);
+                };
+                lastValue = destination[scopeName] = parentGet(scope);
+                var parentValueWatch = function parentValueWatch(parentValue) {
+                  if (!compare(parentValue, destination[scopeName])) {
+                    // we are out of sync and need to copy
+                    if (!compare(parentValue, lastValue)) {
+                      // parent changed and it has precedence
+                      destination[scopeName] = parentValue;
+                    } else {
+                      // if the parent can be assigned then do so
+                      parentSet(scope, parentValue = destination[scopeName]);
+                    }
+                  }
+                  lastValue = parentValue;
+                  return lastValue;
+                };
+                parentValueWatch.$stateful = true;
+                if (definition.collection) {
+                  removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch);
+                } else {
+                  removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
+                }
+                removeWatchCollection.push(removeWatch);
+                break;
+
+              case '<':
+                if (!hasOwnProperty.call(attrs, attrName)) {
+                  if (optional) break;
+                  strictBindingsCheck(attrName, directive.name);
+                  attrs[attrName] = undefined;
+                }
+                if (optional && !attrs[attrName]) break;
+
+                parentGet = $parse(attrs[attrName]);
+                var deepWatch = parentGet.literal;
+
+                var initialValue = destination[scopeName] = parentGet(scope);
+                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
+
+                removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) {
+                  if (oldValue === newValue) {
+                    if (oldValue === initialValue || (deepWatch && equals(oldValue, initialValue))) {
+                      return;
+                    }
+                    oldValue = initialValue;
+                  }
+                  recordChanges(scopeName, newValue, oldValue);
+                  destination[scopeName] = newValue;
+                }, deepWatch);
+
+                removeWatchCollection.push(removeWatch);
+                break;
+
+              case '&':
+                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+                  strictBindingsCheck(attrName, directive.name);
+                }
+                // Don't assign Object.prototype method to scope
+                parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop;
+
+                // Don't assign noop to destination if expression is not valid
+                if (parentGet === noop && optional) break;
+
+                destination[scopeName] = function(locals) {
+                  return parentGet(scope, locals);
+                };
+                break;
+            }
+          });
+
+          function recordChanges(key, currentValue, previousValue) {
+            if (isFunction(destination.$onChanges) && !simpleCompare(currentValue, previousValue)) {
+              // If we have not already scheduled the top level onChangesQueue handler then do so now
+              if (!onChangesQueue) {
+                scope.$$postDigest(flushOnChangesQueue);
+                onChangesQueue = [];
+              }
+              // If we have not already queued a trigger of onChanges for this controller then do so now
+              if (!changes) {
+                changes = {};
+                onChangesQueue.push(triggerOnChangesHook);
+              }
+              // If the has been a change on this property already then we need to reuse the previous value
+              if (changes[key]) {
+                previousValue = changes[key].previousValue;
+              }
+              // Store this change
+              changes[key] = new SimpleChange(previousValue, currentValue);
+            }
+          }
+
+          function triggerOnChangesHook() {
+            destination.$onChanges(changes);
+            // Now clear the changes so that we schedule onChanges when more changes arrive
+            changes = undefined;
+          }
+
+          return {
+            initialChanges: initialChanges,
+            removeWatches: removeWatchCollection.length && function removeWatches() {
+              for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) {
+                removeWatchCollection[i]();
+              }
+            }
+          };
+        }
       }];
   }
 
-  var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i;
+  function SimpleChange(previous, current) {
+    this.previousValue = previous;
+    this.currentValue = current;
+  }
+  SimpleChange.prototype.isFirstChange = function() { return this.previousValue === _UNINITIALIZED_VALUE; };
+
+
+  var PREFIX_REGEXP = /^((?:x|data)[:\-_])/i;
+  var SPECIAL_CHARS_REGEXP = /[:\-_]+(.)/g;
+
   /**
    * Converts all accepted directives format into proper directive name.
-   * All of these will become 'myDirective':
-   *   my:Directive
-   *   my-directive
-   *   x-my-directive
-   *   data-my:directive
-   *
-   * Also there is special case for Moz prefix starting with upper case letter.
    * @param name Name to normalize
    */
   function directiveNormalize(name) {
-    return camelCase(name.replace(PREFIX_REGEXP, ''));
+    return name
+      .replace(PREFIX_REGEXP, '')
+      .replace(SPECIAL_CHARS_REGEXP, fnCamelCaseReplace);
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$compile.directive.Attributes
+   * @ngdoc type
+   * @name $compile.directive.Attributes
    *
    * @description
    * A shared object between directive compile / linking functions which contains normalized DOM
    * element attributes. The values reflect current binding state `{{ }}`. The normalization is
    * needed since all of these are treated as equivalent in Angular:
    *
+   * ```
    *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
+   * ```
    */
 
   /**
    * @ngdoc property
-   * @name ng.$compile.directive.Attributes#$attr
-   * @propertyOf ng.$compile.directive.Attributes
-   * @returns {object} A map of DOM element attribute names to the normalized name. This is
-   *                   needed to do reverse lookup from normalized name back to actual name.
+   * @name $compile.directive.Attributes#$attr
+   *
+   * @description
+   * A map of DOM element attribute names to the normalized name. This is
+   * needed to do reverse lookup from normalized name back to actual name.
    */
 
 
   /**
-   * @ngdoc function
-   * @name ng.$compile.directive.Attributes#$set
-   * @methodOf ng.$compile.directive.Attributes
-   * @function
+   * @ngdoc method
+   * @name $compile.directive.Attributes#$set
+   * @kind function
    *
    * @description
    * Set DOM element attribute value.
@@ -6664,7 +10798,7 @@
     /* NodeList */ nodeList,
     /* Element */ rootElement,
     /* function(Function) */ boundTranscludeFn
-      ){}
+  ) {}
 
   function directiveLinkingFn(
     /* nodesetLinkingFn */ nodesetLinkingFn,
@@ -6672,43 +10806,83 @@
     /* Node */ node,
     /* Element */ rootElement,
     /* function(Function) */ boundTranscludeFn
-      ){}
+  ) {}
 
   function tokenDifference(str1, str2) {
     var values = '',
-        tokens1 = str1.split(/\s+/),
-        tokens2 = str2.split(/\s+/);
+      tokens1 = str1.split(/\s+/),
+      tokens2 = str2.split(/\s+/);
 
     outer:
-        for(var i = 0; i < tokens1.length; i++) {
-          var token = tokens1[i];
-          for(var j = 0; j < tokens2.length; j++) {
-            if(token == tokens2[j]) continue outer;
-          }
-          values += (values.length > 0 ? ' ' : '') + token;
+      for (var i = 0; i < tokens1.length; i++) {
+        var token = tokens1[i];
+        for (var j = 0; j < tokens2.length; j++) {
+          if (token === tokens2[j]) continue outer;
         }
+        values += (values.length > 0 ? ' ' : '') + token;
+      }
     return values;
   }
 
+  function removeComments(jqNodes) {
+    jqNodes = jqLite(jqNodes);
+    var i = jqNodes.length;
+
+    if (i <= 1) {
+      return jqNodes;
+    }
+
+    while (i--) {
+      var node = jqNodes[i];
+      if (node.nodeType === NODE_TYPE_COMMENT ||
+        (node.nodeType === NODE_TYPE_TEXT && node.nodeValue.trim() === '')) {
+        splice.call(jqNodes, i, 1);
+      }
+    }
+    return jqNodes;
+  }
+
+  var $controllerMinErr = minErr('$controller');
+
+
+  var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/;
+  function identifierForController(controller, ident) {
+    if (ident && isString(ident)) return ident;
+    if (isString(controller)) {
+      var match = CNTRL_REG.exec(controller);
+      if (match) return match[3];
+    }
+  }
+
+
   /**
-   * @ngdoc object
-   * @name ng.$controllerProvider
+   * @ngdoc provider
+   * @name $controllerProvider
+   * @this
+   *
    * @description
    * The {@link ng.$controller $controller service} is used by Angular to create new
    * controllers.
    *
    * This provider allows controller registration via the
-   * {@link ng.$controllerProvider#methods_register register} method.
+   * {@link ng.$controllerProvider#register register} method.
    */
   function $ControllerProvider() {
     var controllers = {},
-        CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/;
-
+      globals = false;
 
     /**
-     * @ngdoc function
-     * @name ng.$controllerProvider#register
-     * @methodOf ng.$controllerProvider
+     * @ngdoc method
+     * @name $controllerProvider#has
+     * @param {string} name Controller name to check.
+     */
+    this.has = function(name) {
+      return controllers.hasOwnProperty(name);
+    };
+
+    /**
+     * @ngdoc method
+     * @name $controllerProvider#register
      * @param {string|Object} name Controller name, or an object map of controllers where the keys are
      *    the names and the values are the constructors.
      * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI
@@ -6723,12 +10897,26 @@
       }
     };
 
+    /**
+     * @ngdoc method
+     * @name $controllerProvider#allowGlobals
+     * @description If called, allows `$controller` to find controller constructors on `window`
+     *
+     * @deprecated
+     * sinceVersion="v1.3.0"
+     * removeVersion="v1.7.0"
+     * This method of finding controllers has been deprecated.
+     */
+    this.allowGlobals = function() {
+      globals = true;
+    };
+
 
     this.$get = ['$injector', '$window', function($injector, $window) {
 
       /**
-       * @ngdoc function
-       * @name ng.$controller
+       * @ngdoc service
+       * @name $controller
        * @requires $injector
        *
        * @param {Function|string} constructor If called with a function then it's considered to be the
@@ -6737,7 +10925,12 @@
        *
        *    * check if a controller with given name is registered via `$controllerProvider`
        *    * check if evaluating the string on the current scope returns a constructor
-       *    * check `window[constructor]` on the global `window` object
+       *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+       *      `window` object (deprecated, not recommended)
+       *
+       *    The string can use the `controller as property` syntax, where the controller instance is published
+       *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
+       *    to work correctly.
        *
        * @param {Object} locals Injection locals for Controller.
        * @return {Object} Instance of given controller.
@@ -6745,59 +10938,165 @@
        * @description
        * `$controller` service is responsible for instantiating controllers.
        *
-       * It's just a simple call to {@link AUTO.$injector $injector}, but extracted into
-       * a service, so that one can override this service with {@link https://gist.github.com/1649788
-       * BC version}.
+       * It's just a simple call to {@link auto.$injector $injector}, but extracted into
+       * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
        */
-      return function(expression, locals) {
+      return function $controller(expression, locals, later, ident) {
+        // PRIVATE API:
+        //   param `later` --- indicates that the controller's constructor is invoked at a later time.
+        //                     If true, $controller will allocate the object with the correct
+        //                     prototype chain, but will not invoke the controller until a returned
+        //                     callback is invoked.
+        //   param `ident` --- An optional label which overrides the label parsed from the controller
+        //                     expression, if any.
         var instance, match, constructor, identifier;
+        later = later === true;
+        if (ident && isString(ident)) {
+          identifier = ident;
+        }
 
-        if(isString(expression)) {
-          match = expression.match(CNTRL_REG),
-              constructor = match[1],
-              identifier = match[3];
+        if (isString(expression)) {
+          match = expression.match(CNTRL_REG);
+          if (!match) {
+            throw $controllerMinErr('ctrlfmt',
+              'Badly formed controller string \'{0}\'. ' +
+              'Must match `__name__ as __id__` or `__name__`.', expression);
+          }
+          constructor = match[1];
+          identifier = identifier || match[3];
           expression = controllers.hasOwnProperty(constructor)
-              ? controllers[constructor]
-              : getter(locals.$scope, constructor, true) || getter($window, constructor, true);
+            ? controllers[constructor]
+            : getter(locals.$scope, constructor, true) ||
+            (globals ? getter($window, constructor, true) : undefined);
+
+          if (!expression) {
+            throw $controllerMinErr('ctrlreg',
+              'The controller with the name \'{0}\' is not registered.', constructor);
+          }
 
           assertArgFn(expression, constructor, true);
         }
 
-        instance = $injector.instantiate(expression, locals);
+        if (later) {
+          // Instantiate controller later:
+          // This machinery is used to create an instance of the object before calling the
+          // controller's constructor itself.
+          //
+          // This allows properties to be added to the controller before the constructor is
+          // invoked. Primarily, this is used for isolate scope bindings in $compile.
+          //
+          // This feature is not intended for use by applications, and is thus not documented
+          // publicly.
+          // Object creation: http://jsperf.com/create-constructor/2
+          var controllerPrototype = (isArray(expression) ?
+            expression[expression.length - 1] : expression).prototype;
+          instance = Object.create(controllerPrototype || null);
 
-        if (identifier) {
-          if (!(locals && typeof locals.$scope == 'object')) {
-            throw minErr('$controller')('noscp',
-                "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",
-                constructor || expression.name, identifier);
+          if (identifier) {
+            addIdentifier(locals, identifier, instance, constructor || expression.name);
           }
 
-          locals.$scope[identifier] = instance;
+          return extend(function $controllerInit() {
+            var result = $injector.invoke(expression, instance, locals, constructor);
+            if (result !== instance && (isObject(result) || isFunction(result))) {
+              instance = result;
+              if (identifier) {
+                // If result changed, re-assign controllerAs value to scope.
+                addIdentifier(locals, identifier, instance, constructor || expression.name);
+              }
+            }
+            return instance;
+          }, {
+            instance: instance,
+            identifier: identifier
+          });
+        }
+
+        instance = $injector.instantiate(expression, locals, constructor);
+
+        if (identifier) {
+          addIdentifier(locals, identifier, instance, constructor || expression.name);
         }
 
         return instance;
       };
+
+      function addIdentifier(locals, identifier, instance, name) {
+        if (!(locals && isObject(locals.$scope))) {
+          throw minErr('$controller')('noscp',
+            'Cannot export controller \'{0}\' as \'{1}\'! No $scope object provided via `locals`.',
+            name, identifier);
+        }
+
+        locals.$scope[identifier] = instance;
+      }
+    }];
+  }
+
+  /**
+   * @ngdoc service
+   * @name $document
+   * @requires $window
+   * @this
+   *
+   * @description
+   * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
+   *
+   * @example
+   <example module="documentExample" name="document">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <p>$document title: <b ng-bind="title"></b></p>
+   <p>window.document title: <b ng-bind="windowTitle"></b></p>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('documentExample', [])
+   .controller('ExampleController', ['$scope', '$document', function($scope, $document) {
+           $scope.title = $document[0].title;
+           $scope.windowTitle = angular.element(window.document)[0].title;
+         }]);
+   </file>
+   </example>
+   */
+  function $DocumentProvider() {
+    this.$get = ['$window', function(window) {
+      return jqLite(window.document);
+    }];
+  }
+
+
+  /**
+   * @private
+   * @this
+   * Listens for document visibility change and makes the current status accessible.
+   */
+  function $$IsDocumentHiddenProvider() {
+    this.$get = ['$document', '$rootScope', function($document, $rootScope) {
+      var doc = $document[0];
+      var hidden = doc && doc.hidden;
+
+      $document.on('visibilitychange', changeListener);
+
+      $rootScope.$on('$destroy', function() {
+        $document.off('visibilitychange', changeListener);
+      });
+
+      function changeListener() {
+        hidden = doc.hidden;
+      }
+
+      return function() {
+        return hidden;
+      };
     }];
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$document
-   * @requires $window
-   *
-   * @description
-   * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
-   */
-  function $DocumentProvider(){
-    this.$get = ['$window', function(window){
-      return jqLite(window.document);
-    }];
-  }
-
-  /**
-   * @ngdoc function
-   * @name ng.$exceptionHandler
-   * @requires $log
+   * @ngdoc service
+   * @name $exceptionHandler
+   * @requires ng.$log
+   * @this
    *
    * @description
    * Any uncaught exception in angular expressions is delegated to this service.
@@ -6809,20 +11108,31 @@
    *
    * ## Example:
    *
-   * <pre>
-   *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function () {
- *     return function (exception, cause) {
- *       exception.message += ' (caused by "' + cause + '")';
- *       throw exception;
- *     };
- *   });
-   * </pre>
+   * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
+   * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
+   * of `$log.error()`.
    *
-   * This example will override the normal action of `$exceptionHandler`, to make angular
-   * exceptions fail hard when they happen, instead of just logging to the console.
+   * ```js
+   *   angular.
+   *     module('exceptionOverwrite', []).
+   *     factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
+ *       return function myExceptionHandler(exception, cause) {
+ *         logErrorsToBackend(exception, cause);
+ *         $log.warn(exception, cause);
+ *       };
+ *     }]);
+   * ```
+   *
+   * <hr />
+   * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
+   * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
+   * (unless executed during a digest).
+   *
+   * If you wish, you can manually delegate exceptions, e.g.
+   * `try { ... } catch(e) { $exceptionHandler(e); }`
    *
    * @param {Error} exception Exception associated with the error.
-   * @param {string=} cause optional information about the context in which
+   * @param {string=} cause Optional information about the context in which
    *       the error was thrown.
    *
    */
@@ -6834,6 +11144,190 @@
     }];
   }
 
+  var $$ForceReflowProvider = /** @this */ function() {
+    this.$get = ['$document', function($document) {
+      return function(domNode) {
+        //the line below will force the browser to perform a repaint so
+        //that all the animated elements within the animation frame will
+        //be properly updated and drawn on screen. This is required to
+        //ensure that the preparation animation is properly flushed so that
+        //the active state picks up from there. DO NOT REMOVE THIS LINE.
+        //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
+        //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
+        //WILL TAKE YEARS AWAY FROM YOUR LIFE.
+        if (domNode) {
+          if (!domNode.nodeType && domNode instanceof jqLite) {
+            domNode = domNode[0];
+          }
+        } else {
+          domNode = $document[0].body;
+        }
+        return domNode.offsetWidth + 1;
+      };
+    }];
+  };
+
+  var APPLICATION_JSON = 'application/json';
+  var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'};
+  var JSON_START = /^\[|^\{(?!\{)/;
+  var JSON_ENDS = {
+    '[': /]$/,
+    '{': /}$/
+  };
+  var JSON_PROTECTION_PREFIX = /^\)]\}',?\n/;
+  var $httpMinErr = minErr('$http');
+
+  function serializeValue(v) {
+    if (isObject(v)) {
+      return isDate(v) ? v.toISOString() : toJson(v);
+    }
+    return v;
+  }
+
+
+  /** @this */
+  function $HttpParamSerializerProvider() {
+    /**
+     * @ngdoc service
+     * @name $httpParamSerializer
+     * @description
+     *
+     * Default {@link $http `$http`} params serializer that converts objects to strings
+     * according to the following rules:
+     *
+     * * `{'foo': 'bar'}` results in `foo=bar`
+     * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
+     * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
+     * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+     *
+     * Note that serializer will sort the request parameters alphabetically.
+     * */
+
+    this.$get = function() {
+      return function ngParamSerializer(params) {
+        if (!params) return '';
+        var parts = [];
+        forEachSorted(params, function(value, key) {
+          if (value === null || isUndefined(value) || isFunction(value)) return;
+          if (isArray(value)) {
+            forEach(value, function(v) {
+              parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
+            });
+          } else {
+            parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
+          }
+        });
+
+        return parts.join('&');
+      };
+    };
+  }
+
+  /** @this */
+  function $HttpParamSerializerJQLikeProvider() {
+    /**
+     * @ngdoc service
+     * @name $httpParamSerializerJQLike
+     *
+     * @description
+     *
+     * Alternative {@link $http `$http`} params serializer that follows
+     * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
+     * The serializer will also sort the params alphabetically.
+     *
+     * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
+     *
+     * ```js
+     * $http({
+   *   url: myUrl,
+   *   method: 'GET',
+   *   params: myParams,
+   *   paramSerializer: '$httpParamSerializerJQLike'
+   * });
+     * ```
+     *
+     * It is also possible to set it as the default `paramSerializer` in the
+     * {@link $httpProvider#defaults `$httpProvider`}.
+     *
+     * Additionally, you can inject the serializer and use it explicitly, for example to serialize
+     * form data for submission:
+     *
+     * ```js
+     * .controller(function($http, $httpParamSerializerJQLike) {
+   *   //...
+   *
+   *   $http({
+   *     url: myUrl,
+   *     method: 'POST',
+   *     data: $httpParamSerializerJQLike(myData),
+   *     headers: {
+   *       'Content-Type': 'application/x-www-form-urlencoded'
+   *     }
+   *   });
+   *
+   * });
+     * ```
+     *
+     * */
+    this.$get = function() {
+      return function jQueryLikeParamSerializer(params) {
+        if (!params) return '';
+        var parts = [];
+        serialize(params, '', true);
+        return parts.join('&');
+
+        function serialize(toSerialize, prefix, topLevel) {
+          if (toSerialize === null || isUndefined(toSerialize)) return;
+          if (isArray(toSerialize)) {
+            forEach(toSerialize, function(value, index) {
+              serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
+            });
+          } else if (isObject(toSerialize) && !isDate(toSerialize)) {
+            forEachSorted(toSerialize, function(value, key) {
+              serialize(value, prefix +
+                (topLevel ? '' : '[') +
+                key +
+                (topLevel ? '' : ']'));
+            });
+          } else {
+            parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+          }
+        }
+      };
+    };
+  }
+
+  function defaultHttpResponseTransform(data, headers) {
+    if (isString(data)) {
+      // Strip json vulnerability protection prefix and trim whitespace
+      var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
+
+      if (tempData) {
+        var contentType = headers('Content-Type');
+        var hasJsonContentType = contentType && (contentType.indexOf(APPLICATION_JSON) === 0);
+
+        if (hasJsonContentType || isJsonLike(tempData)) {
+          try {
+            data = fromJson(tempData);
+          } catch (e) {
+            if (!hasJsonContentType) {
+              return data;
+            }
+            throw $httpMinErr('baddata', 'Data must be a valid JSON object. Received: "{0}". ' +
+              'Parse error: "{1}"', data, e);
+          }
+        }
+      }
+    }
+
+    return data;
+  }
+
+  function isJsonLike(str) {
+    var jsonStart = str.match(JSON_START);
+    return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
+  }
+
   /**
    * Parse headers into key value object
    *
@@ -6841,23 +11335,24 @@
    * @returns {Object} Parsed headers as key value object
    */
   function parseHeaders(headers) {
-    var parsed = {}, key, val, i;
-
-    if (!headers) return parsed;
-
-    forEach(headers.split('\n'), function(line) {
-      i = line.indexOf(':');
-      key = lowercase(trim(line.substr(0, i)));
-      val = trim(line.substr(i + 1));
+    var parsed = createMap(), i;
 
+    function fillInParsed(key, val) {
       if (key) {
-        if (parsed[key]) {
-          parsed[key] += ', ' + val;
-        } else {
-          parsed[key] = val;
-        }
+        parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
       }
-    });
+    }
+
+    if (isString(headers)) {
+      forEach(headers.split('\n'), function(line) {
+        i = line.indexOf(':');
+        fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
+      });
+    } else if (isObject(headers)) {
+      forEach(headers, function(headerVal, headerKey) {
+        fillInParsed(lowercase(headerKey), trim(headerVal));
+      });
+    }
 
     return parsed;
   }
@@ -6872,17 +11367,21 @@
    * @param {(string|Object)} headers Headers to provide access to.
    * @returns {function(string=)} Returns a getter function which if called with:
    *
-   *   - if called with single an argument returns a single header value or null
+   *   - if called with an argument returns a single header value or null
    *   - if called with no arguments returns an object containing all headers.
    */
   function headersGetter(headers) {
-    var headersObj = isObject(headers) ? headers : undefined;
+    var headersObj;
 
     return function(name) {
       if (!headersObj) headersObj =  parseHeaders(headers);
 
       if (name) {
-        return headersObj[lowercase(name)] || null;
+        var value = headersObj[lowercase(name)];
+        if (value === undefined) {
+          value = null;
+        }
+        return value;
       }
 
       return headersObj;
@@ -6896,16 +11395,18 @@
    * This function is used for both request and response transforming
    *
    * @param {*} data Data to transform.
-   * @param {function(string=)} headers Http headers getter fn.
-   * @param {(function|Array.<function>)} fns Function or an array of functions.
+   * @param {function(string=)} headers HTTP headers getter fn.
+   * @param {number} status HTTP status code of the response.
+   * @param {(Function|Array.<Function>)} fns Function or an array of functions.
    * @returns {*} Transformed data.
    */
-  function transformData(data, headers, fns) {
-    if (isFunction(fns))
-      return fns(data, headers);
+  function transformData(data, headers, status, fns) {
+    if (isFunction(fns)) {
+      return fns(data, headers, status);
+    }
 
     forEach(fns, function(fn) {
-      data = fn(data, headers);
+      data = fn(data, headers, status);
     });
 
     return data;
@@ -6917,27 +11418,75 @@
   }
 
 
+  /**
+   * @ngdoc provider
+   * @name $httpProvider
+   * @this
+   *
+   * @description
+   * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
+   * */
   function $HttpProvider() {
-    var JSON_START = /^\s*(\[|\{[^\{])/,
-        JSON_END = /[\}\]]\s*$/,
-        PROTECTION_PREFIX = /^\)\]\}',?\n/,
-        CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': 'application/json;charset=utf-8'};
-
+    /**
+     * @ngdoc property
+     * @name $httpProvider#defaults
+     * @description
+     *
+     * Object containing default values for all {@link ng.$http $http} requests.
+     *
+     * - **`defaults.cache`** - {boolean|Object} - A boolean value or object created with
+     * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of HTTP responses
+     * by default. See {@link $http#caching $http Caching} for more information.
+     *
+     * - **`defaults.headers`** - {Object} - Default headers for all $http requests.
+     * Refer to {@link ng.$http#setting-http-headers $http} for documentation on
+     * setting default headers.
+     *     - **`defaults.headers.common`**
+     *     - **`defaults.headers.post`**
+     *     - **`defaults.headers.put`**
+     *     - **`defaults.headers.patch`**
+     *
+     * - **`defaults.jsonpCallbackParam`** - `{string}` - the name of the query parameter that passes the name of the
+     * callback in a JSONP request. The value of this parameter will be replaced with the expression generated by the
+     * {@link $jsonpCallbacks} service. Defaults to `'callback'`.
+     *
+     * - **`defaults.paramSerializer`** - `{string|function(Object<string,string>):string}` - A function
+     *  used to the prepare string representation of request parameters (specified as an object).
+     *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
+     *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
+     *
+     * - **`defaults.transformRequest`** -
+     * `{Array<function(data, headersGetter)>|function(data, headersGetter)}` -
+     * An array of functions (or a single function) which are applied to the request data.
+     * By default, this is an array with one request transformation function:
+     *
+     *   - If the `data` property of the request configuration object contains an object, serialize it
+     *     into JSON format.
+     *
+     * - **`defaults.transformResponse`** -
+     * `{Array<function(data, headersGetter, status)>|function(data, headersGetter, status)}` -
+     * An array of functions (or a single function) which are applied to the response data. By default,
+     * this is an array which applies one response transformation function that does two things:
+     *
+     *  - If XSRF prefix is detected, strip it
+     *    (see {@link ng.$http#security-considerations Security Considerations in the $http docs}).
+     *  - If the `Content-Type` is `application/json` or the response looks like JSON,
+     *    deserialize it using a JSON parser.
+     *
+     * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
+     * Defaults value is `'XSRF-TOKEN'`.
+     *
+     * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the
+     * XSRF token. Defaults value is `'X-XSRF-TOKEN'`.
+     *
+     **/
     var defaults = this.defaults = {
       // transform incoming response data
-      transformResponse: [function(data) {
-        if (isString(data)) {
-          // strip json vulnerability protection prefix
-          data = data.replace(PROTECTION_PREFIX, '');
-          if (JSON_START.test(data) && JSON_END.test(data))
-            data = fromJson(data);
-        }
-        return data;
-      }],
+      transformResponse: [defaultHttpResponseTransform],
 
       // transform outgoing request data
       transformRequest: [function(d) {
-        return isObject(d) && !isFile(d) ? toJson(d) : d;
+        return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d;
       }],
 
       // default headers
@@ -6945,32 +11494,73 @@
         common: {
           'Accept': 'application/json, text/plain, */*'
         },
-        post:   CONTENT_TYPE_APPLICATION_JSON,
-        put:    CONTENT_TYPE_APPLICATION_JSON,
-        patch:  CONTENT_TYPE_APPLICATION_JSON
+        post:   shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+        put:    shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+        patch:  shallowCopy(CONTENT_TYPE_APPLICATION_JSON)
       },
 
       xsrfCookieName: 'XSRF-TOKEN',
-      xsrfHeaderName: 'X-XSRF-TOKEN'
+      xsrfHeaderName: 'X-XSRF-TOKEN',
+
+      paramSerializer: '$httpParamSerializer',
+
+      jsonpCallbackParam: 'callback'
+    };
+
+    var useApplyAsync = false;
+    /**
+     * @ngdoc method
+     * @name $httpProvider#useApplyAsync
+     * @description
+     *
+     * Configure $http service to combine processing of multiple http responses received at around
+     * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in
+     * significant performance improvement for bigger applications that make many HTTP requests
+     * concurrently (common during application bootstrap).
+     *
+     * Defaults to false. If no value is specified, returns the current configured value.
+     *
+     * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
+     *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
+     *    to load and share the same digest cycle.
+     *
+     * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+     *    otherwise, returns the current configured value.
+     **/
+    this.useApplyAsync = function(value) {
+      if (isDefined(value)) {
+        useApplyAsync = !!value;
+        return this;
+      }
+      return useApplyAsync;
     };
 
     /**
-     * Are ordered by request, i.e. they are applied in the same order as the
+     * @ngdoc property
+     * @name $httpProvider#interceptors
+     * @description
+     *
+     * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
+     * pre-processing of request or postprocessing of responses.
+     *
+     * These service factories are ordered by request, i.e. they are applied in the same order as the
      * array, on request, but reverse order, on response.
-     */
+     *
+     * {@link ng.$http#interceptors Interceptors detailed info}
+     **/
     var interceptorFactories = this.interceptors = [];
 
-    /**
-     * For historical reasons, response interceptors are ordered by the order in which
-     * they are applied to the response. (This is the opposite of interceptorFactories)
-     */
-    var responseInterceptorFactories = this.responseInterceptors = [];
-
-    this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector',
-      function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) {
+    this.$get = ['$browser', '$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector', '$sce',
+      function($browser, $httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector, $sce) {
 
         var defaultCache = $cacheFactory('$http');
 
+        /**
+         * Make sure that default param serializer is exposed as a function
+         */
+        defaults.paramSerializer = isString(defaults.paramSerializer) ?
+          $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
+
         /**
          * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
          * The reversal is needed so that we can build up the interception chain around the
@@ -6980,35 +11570,14 @@
 
         forEach(interceptorFactories, function(interceptorFactory) {
           reversedInterceptors.unshift(isString(interceptorFactory)
-              ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
+            ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
         });
 
-        forEach(responseInterceptorFactories, function(interceptorFactory, index) {
-          var responseFn = isString(interceptorFactory)
-              ? $injector.get(interceptorFactory)
-              : $injector.invoke(interceptorFactory);
-
-          /**
-           * Response interceptors go before "around" interceptors (no real reason, just
-           * had to pick one.) But they are already reversed, so we can't use unshift, hence
-           * the splice.
-           */
-          reversedInterceptors.splice(index, 0, {
-            response: function(response) {
-              return responseFn($q.when(response));
-            },
-            responseError: function(response) {
-              return responseFn($q.reject(response));
-            }
-          });
-        });
-
-
         /**
-         * @ngdoc function
-         * @name ng.$http
-         * @requires $httpBackend
-         * @requires $browser
+         * @ngdoc service
+         * @kind function
+         * @name $http
+         * @requires ng.$httpBackend
          * @requires $cacheFactory
          * @requires $rootScope
          * @requires $q
@@ -7016,104 +11585,98 @@
          *
          * @description
          * The `$http` service is a core Angular service that facilitates communication with the remote
-         * HTTP servers via the browser's {@link https://developer.mozilla.org/en/xmlhttprequest
-         * XMLHttpRequest} object or via {@link http://en.wikipedia.org/wiki/JSONP JSONP}.
+         * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest)
+         * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP).
          *
          * For unit testing applications that use `$http` service, see
          * {@link ngMock.$httpBackend $httpBackend mock}.
          *
          * For a higher level of abstraction, please check out the {@link ngResource.$resource
-         * $resource} service.
+     * $resource} service.
          *
          * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by
          * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage
          * it is important to familiarize yourself with these APIs and the guarantees they provide.
          *
          *
-         * # General usage
-         * The `$http` service is a function which takes a single argument — a configuration object —
-         * that is used to generate an HTTP request and returns  a {@link ng.$q promise}
-         * with two $http specific methods: `success` and `error`.
+         * ## General usage
+         * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} —
+         * that is used to generate an HTTP request and returns  a {@link ng.$q promise}.
          *
-         * <pre>
-         *   $http({method: 'GET', url: '/someUrl'}).
-         *     success(function(data, status, headers, config) {
+         * ```js
+         *   // Simple GET request example:
+         *   $http({
+     *     method: 'GET',
+     *     url: '/someUrl'
+     *   }).then(function successCallback(response) {
      *       // this callback will be called asynchronously
      *       // when the response is available
-     *     }).
-         *     error(function(data, status, headers, config) {
+     *     }, function errorCallback(response) {
      *       // called asynchronously if an error occurs
      *       // or server returns response with an error status.
      *     });
-         * </pre>
-         *
-         * Since the returned value of calling the $http function is a `promise`, you can also use
-         * the `then` method to register callbacks, and these callbacks will receive a single argument –
-         * an object representing the response. See the API signature and type info below for more
-         * details.
-         *
-         * A response status code between 200 and 299 is considered a success status and
-         * will result in the success callback being called. Note that if the response is a redirect,
-         * XMLHttpRequest will transparently follow it, meaning that the error callback will not be
-         * called for such responses.
-         *
-         * # Calling $http from outside AngularJS
-         * The `$http` service will not actually send the request until the next `$digest()` is
-         * executed. Normally this is not an issue, since almost all the time your call to `$http` will
-         * be from within a `$apply()` block.
-         * If you are calling `$http` from outside Angular, then you should wrap it in a call to
-         * `$apply` to cause a $digest to occur and also to handle errors in the block correctly.
-         *
-         * ```
-         * $scope.$apply(function() {
-     *   $http(...);
-     * });
          * ```
          *
-         * # Writing Unit Tests that use $http
-         * When unit testing you are mostly responsible for scheduling the `$digest` cycle. If you do
-         * not trigger a `$digest` before calling `$httpBackend.flush()` then the request will not have
-         * been made and `$httpBackend.expect(...)` expectations will fail.  The solution is to run the
-         * code that calls the `$http()` method inside a $apply block as explained in the previous
-         * section.
+         * The response object has these properties:
          *
+         *   - **data** – `{string|Object}` – The response body transformed with the transform
+         *     functions.
+         *   - **status** – `{number}` – HTTP status code of the response.
+         *   - **headers** – `{function([headerName])}` – Header getter function.
+         *   - **config** – `{Object}` – The configuration object that was used to generate the request.
+         *   - **statusText** – `{string}` – HTTP status text of the response.
+         *   - **xhrStatus** – `{string}` – Status of the XMLHttpRequest (`complete`, `error`, `timeout` or `abort`).
+         *
+         * A response status code between 200 and 299 is considered a success status and will result in
+         * the success callback being called. Any response status code outside of that range is
+         * considered an error status and will result in the error callback being called.
+         * Also, status codes less than -1 are normalized to zero. -1 usually means the request was
+         * aborted, e.g. using a `config.timeout`.
+         * Note that if the response is a redirect, XMLHttpRequest will transparently follow it, meaning
+         * that the outcome (success or error) will be determined by the final response status code.
+         *
+         *
+         * ## Shortcut methods
+         *
+         * Shortcut methods are also available. All shortcut methods require passing in the URL, and
+         * request data must be passed in for POST/PUT requests. An optional config can be passed as the
+         * last argument.
+         *
+         * ```js
+         *   $http.get('/someUrl', config).then(successCallback, errorCallback);
+         *   $http.post('/someUrl', data, config).then(successCallback, errorCallback);
          * ```
-         * $httpBackend.expectGET(...);
-         * $scope.$apply(function() {
-     *   $http.get(...);
-     * });
-         * $httpBackend.flush();
-         * ```
-         *
-         * # Shortcut methods
-         *
-         * Since all invocations of the $http service require passing in an HTTP method and URL, and
-         * POST/PUT requests require request data to be provided as well, shortcut methods
-         * were created:
-         *
-         * <pre>
-         *   $http.get('/someUrl').success(successCallback);
-         *   $http.post('/someUrl', data).success(successCallback);
-         * </pre>
          *
          * Complete list of shortcut methods:
          *
-         * - {@link ng.$http#methods_get $http.get}
-         * - {@link ng.$http#methods_head $http.head}
-         * - {@link ng.$http#methods_post $http.post}
-         * - {@link ng.$http#methods_put $http.put}
-         * - {@link ng.$http#methods_delete $http.delete}
-         * - {@link ng.$http#methods_jsonp $http.jsonp}
+         * - {@link ng.$http#get $http.get}
+         * - {@link ng.$http#head $http.head}
+         * - {@link ng.$http#post $http.post}
+         * - {@link ng.$http#put $http.put}
+         * - {@link ng.$http#delete $http.delete}
+         * - {@link ng.$http#jsonp $http.jsonp}
+         * - {@link ng.$http#patch $http.patch}
          *
          *
-         * # Setting HTTP Headers
+         * ## Writing Unit Tests that use $http
+         * When unit testing (using {@link ngMock ngMock}), it is necessary to call
+         * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
+         * request using trained responses.
+         *
+         * ```
+         * $httpBackend.expectGET(...);
+         * $http.get(...);
+         * $httpBackend.flush();
+         * ```
+         *
+         * ## Setting HTTP Headers
          *
          * The $http service will automatically add certain HTTP headers to all requests. These defaults
          * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration
          * object, which currently contains this default configuration:
          *
          * - `$httpProvider.defaults.headers.common` (headers that are common for all requests):
-         *   - `Accept: application/json, text/plain, * / *`
+         *   - <code>Accept: application/json, text/plain, \*&#65279;/&#65279;\*</code>
          * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests)
          *   - `Content-Type: application/json`
          * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests)
@@ -7122,74 +11685,143 @@
          * To add or overwrite these defaults, simply add or remove a property from these configuration
          * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object
          * with the lowercased HTTP method name as the key, e.g.
-         * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }.
+         * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`.
          *
          * The defaults can also be set at runtime via the `$http.defaults` object in the same
          * fashion. For example:
          *
          * ```
          * module.run(function($http) {
-     *   $http.defaults.headers.common.Authentication = 'Basic YmVlcDpib29w'
+     *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w';
      * });
          * ```
          *
          * In addition, you can supply a `headers` property in the config object passed when
          * calling `$http(config)`, which overrides the defaults without changing them globally.
          *
+         * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
+         * Use the `headers` property, setting the desired header to `undefined`. For example:
          *
-         * # Transforming Requests and Responses
+         * ```js
+         * var req = {
+     *  method: 'POST',
+     *  url: 'http://example.com',
+     *  headers: {
+     *    'Content-Type': undefined
+     *  },
+     *  data: { test: 'test' }
+     * }
          *
-         * Both requests and responses can be transformed using transform functions. By default, Angular
-         * applies these transformations:
+         * $http(req).then(function(){...}, function(){...});
+         * ```
          *
-         * Request transformations:
+         * ## Transforming Requests and Responses
+         *
+         * Both requests and responses can be transformed using transformation functions: `transformRequest`
+         * and `transformResponse`. These properties can be a single function that returns
+         * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions,
+         * which allows you to `push` or `unshift` a new transformation function into the transformation chain.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** Angular does not make a copy of the `data` parameter before it is passed into the `transformRequest` pipeline.
+         * That means changes to the properties of `data` are not local to the transform function (since Javascript passes objects by reference).
+         * For example, when calling `$http.get(url, $scope.myObject)`, modifications to the object's properties in a transformRequest
+         * function will be reflected on the scope and in any templates where the object is data-bound.
+         * To prevent this, transform functions should have no side-effects.
+         * If you need to modify properties, it is recommended to make a copy of the data, or create new object to return.
+         * </div>
+         *
+         * ### Default Transformations
+         *
+         * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
+         * `defaults.transformResponse` properties. If a request does not provide its own transformations
+         * then these will be applied.
+         *
+         * You can augment or replace the default transformations by modifying these properties by adding to or
+         * replacing the array.
+         *
+         * Angular provides the following default transformations:
+         *
+         * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`) is
+         * an array with one function that does the following:
          *
          * - If the `data` property of the request configuration object contains an object, serialize it
          *   into JSON format.
          *
-         * Response transformations:
+         * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`) is
+         * an array with one function that does the following:
          *
          *  - If XSRF prefix is detected, strip it (see Security Considerations section below).
-         *  - If JSON response is detected, deserialize it using a JSON parser.
+         *  - If the `Content-Type` is `application/json` or the response looks like JSON,
+         *      deserialize it using a JSON parser.
          *
-         * To globally augment or override the default transforms, modify the
-         * `$httpProvider.defaults.transformRequest` and `$httpProvider.defaults.transformResponse`
-         * properties. These properties are by default an array of transform functions, which allows you
-         * to `push` or `unshift` a new transformation function into the transformation chain. You can
-         * also decide to completely override any default transformations by assigning your
-         * transformation functions to these properties directly without the array wrapper.  These defaults
-         * are again available on the $http factory at run-time, which may be useful if you have run-time
-         * services you wish to be involved in your transformations.
          *
-         * Similarly, to locally override the request/response transforms, augment the
-         * `transformRequest` and/or `transformResponse` properties of the configuration object passed
+         * ### Overriding the Default Transformations Per Request
+         *
+         * If you wish to override the request/response transformations only for a single request then provide
+         * `transformRequest` and/or `transformResponse` properties on the configuration object passed
          * into `$http`.
          *
+         * Note that if you provide these properties on the config object the default transformations will be
+         * overwritten. If you wish to augment the default transformations then you must include them in your
+         * local transformation array.
          *
-         * # Caching
+         * The following code demonstrates adding a new response transformation to be run after the default response
+         * transformations have been run.
          *
-         * To enable caching, set the request configuration `cache` property to `true` (to use default
-         * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
-         * When the cache is enabled, `$http` stores the response from the server in the specified
-         * cache. The next time the same request is made, the response is served from the cache without
-         * sending a request to the server.
+         * ```js
+         * function appendTransform(defaults, transform) {
+     *
+     *   // We can't guarantee that the default transformation is an array
+     *   defaults = angular.isArray(defaults) ? defaults : [defaults];
+     *
+     *   // Append the new transformation to the defaults
+     *   return defaults.concat(transform);
+     * }
          *
-         * Note that even if the response is served from cache, delivery of the data is asynchronous in
-         * the same way that real requests are.
+         * $http({
+     *   url: '...',
+     *   method: 'GET',
+     *   transformResponse: appendTransform($http.defaults.transformResponse, function(value) {
+     *     return doTransform(value);
+     *   })
+     * });
+         * ```
          *
-         * If there are multiple GET requests for the same URL that should be cached using the same
-         * cache, but the cache is not populated yet, only one request to the server will be made and
-         * the remaining requests will be fulfilled using the response from the first request.
          *
-         * You can change the default cache to a new object (built with
-         * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
-         * {@link ng.$http#properties_defaults `$http.defaults.cache`} property. All requests who set
-         * their `cache` property to `true` will now use this cache object.
+         * ## Caching
          *
-         * If you set the default cache to `false` then only requests that specify their own custom
-         * cache object will be cached.
+         * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must
+         * set the config.cache value or the default cache value to TRUE or to a cache object (created
+         * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes
+         * precedence over the default cache value.
          *
-         * # Interceptors
+         * In order to:
+         *   * cache all responses - set the default cache value to TRUE or to a cache object
+         *   * cache a specific response - set config.cache value to TRUE or to a cache object
+         *
+         * If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
+         * then the default `$cacheFactory("$http")` object is used.
+         *
+         * The default cache value can be set by updating the
+         * {@link ng.$http#defaults `$http.defaults.cache`} property or the
+         * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property.
+         *
+         * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using
+         * the relevant cache object. The next time the same request is made, the response is returned
+         * from the cache without sending a request to the server.
+         *
+         * Take note that:
+         *
+         *   * Only GET and JSONP requests are cached.
+         *   * The cache key is the request URL including search parameters; headers are not considered.
+         *   * Cached responses are returned asynchronously, in the same way as responses from the server.
+         *   * If multiple identical requests are made using the same cache, which is not yet populated,
+         *     one request will be made to the server and remaining requests will return the same response.
+         *   * A cache-control header on the response does not affect if or how responses are cached.
+         *
+         *
+         * ## Interceptors
          *
          * Before you start creating interceptors, be sure to understand the
          * {@link ng.$q $q and deferred/promise APIs}.
@@ -7199,7 +11831,7 @@
          * able to intercept requests before they are handed to the server and
          * responses before they are handed over to the application code that
          * initiated these requests. The interceptors leverage the {@link ng.$q
-         * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing.
+     * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing.
          *
          * The interceptors are service factories that are registered with the `$httpProvider` by
          * adding them to the `$httpProvider.interceptors` array. The factory is called and
@@ -7207,26 +11839,26 @@
          *
          * There are two kinds of interceptors (and two kinds of rejection interceptors):
          *
-         *   * `request`: interceptors get called with http `config` object. The function is free to
-         *     modify the `config` or create a new one. The function needs to return the `config`
-         *     directly or as a promise.
+         *   * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to
+         *     modify the `config` object or create a new one. The function needs to return the `config`
+         *     object directly, or a promise containing the `config` or a new `config` object.
          *   * `requestError`: interceptor gets called when a previous interceptor threw an error or
          *     resolved with a rejection.
          *   * `response`: interceptors get called with http `response` object. The function is free to
-         *     modify the `response` or create a new one. The function needs to return the `response`
-         *     directly or as a promise.
+         *     modify the `response` object or create a new one. The function needs to return the `response`
+         *     object directly, or as a promise containing the `response` or a new `response` object.
          *   * `responseError`: interceptor gets called when a previous interceptor threw an error or
          *     resolved with a rejection.
          *
          *
-         * <pre>
+         * ```js
          *   // register the interceptor as a service
          *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
      *     return {
      *       // optional method
      *       'request': function(config) {
      *         // do something on success
-     *         return config || $q.when(config);
+     *         return config;
      *       },
      *
      *       // optional method
@@ -7243,7 +11875,7 @@
      *       // optional method
      *       'response': function(response) {
      *         // do something on success
-     *         return response || $q.when(response);
+     *         return response;
      *       },
      *
      *       // optional method
@@ -7272,96 +11904,50 @@
      *       }
      *     };
      *   });
-         * </pre>
+         * ```
          *
-         * # Response interceptors (DEPRECATED)
-         *
-         * Before you start creating interceptors, be sure to understand the
-         * {@link ng.$q $q and deferred/promise APIs}.
-         *
-         * For purposes of global error handling, authentication or any kind of synchronous or
-         * asynchronous preprocessing of received responses, it is desirable to be able to intercept
-         * responses for http requests before they are handed over to the application code that
-         * initiated these requests. The response interceptors leverage the {@link ng.$q
-         * promise apis} to fulfil this need for both synchronous and asynchronous preprocessing.
-         *
-         * The interceptors are service factories that are registered with the $httpProvider by
-         * adding them to the `$httpProvider.responseInterceptors` array. The factory is called and
-         * injected with dependencies (if specified) and returns the interceptor  — a function that
-         * takes a {@link ng.$q promise} and returns the original or a new promise.
-         *
-         * <pre>
-         *   // register the interceptor as a service
-         *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
-     *     return function(promise) {
-     *       return promise.then(function(response) {
-     *         // do something on success
-     *         return response;
-     *       }, function(response) {
-     *         // do something on error
-     *         if (canRecover(response)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(response);
-     *       });
-     *     }
-     *   });
-         *
-         *   $httpProvider.responseInterceptors.push('myHttpInterceptor');
-         *
-         *
-         *   // register the interceptor via an anonymous factory
-         *   $httpProvider.responseInterceptors.push(function($q, dependency1, dependency2) {
-     *     return function(promise) {
-     *       // same as above
-     *     }
-     *   });
-         * </pre>
-         *
-         *
-         * # Security Considerations
+         * ## Security Considerations
          *
          * When designing web applications, consider security threats from:
          *
-         * - {@link http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx
-         *   JSON vulnerability}
-         * - {@link http://en.wikipedia.org/wiki/Cross-site_request_forgery XSRF}
+         * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+         * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
          *
          * Both server and the client must cooperate in order to eliminate these threats. Angular comes
          * pre-configured with strategies that address these issues, but for this to work backend server
          * cooperation is required.
          *
-         * ## JSON Vulnerability Protection
+         * ### JSON Vulnerability Protection
          *
-         * A {@link http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx
-         * JSON vulnerability} allows third party website to turn your JSON resource URL into
-         * {@link http://en.wikipedia.org/wiki/JSONP JSONP} request under some conditions. To
+         * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+         * allows third party website to turn your JSON resource URL into
+         * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To
          * counter this your server can prefix all JSON requests with following string `")]}',\n"`.
          * Angular will automatically strip the prefix before processing it as JSON.
          *
          * For example if your server needs to return:
-         * <pre>
+         * ```js
          * ['one','two']
-         * </pre>
+         * ```
          *
          * which is vulnerable to attack, your server can return:
-         * <pre>
+         * ```js
          * )]}',
          * ['one','two']
-         * </pre>
+         * ```
          *
          * Angular will strip the prefix, before processing the JSON.
          *
          *
-         * ## Cross Site Request Forgery (XSRF) Protection
+         * ### Cross Site Request Forgery (XSRF) Protection
          *
-         * {@link http://en.wikipedia.org/wiki/Cross-site_request_forgery XSRF} is a technique by which
-         * an unauthorized site can gain your user's private data. Angular provides a mechanism
-         * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie
-         * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only
-         * JavaScript that runs on your domain could read the cookie, your server can be assured that
-         * the XHR came from JavaScript running on your domain. The header will not be set for
-         * cross-domain requests.
+         * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is an attack technique by
+         * which the attacker can trick an authenticated user into unknowingly executing actions on your
+         * website. Angular provides a mechanism to counter XSRF. When performing XHR requests, the
+         * $http service reads a token from a cookie (by default, `XSRF-TOKEN`) and sets it as an HTTP
+         * header (`X-XSRF-TOKEN`). Since only JavaScript that runs on your domain could read the
+         * cookie, your server can be assured that the XHR came from JavaScript running on your domain.
+         * The header will not be set for cross-domain requests.
          *
          * To take advantage of this, your server needs to set a token in a JavaScript readable session
          * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the
@@ -7369,84 +11955,92 @@
          * that only JavaScript running on your domain could have sent the request. The token must be
          * unique for each user and must be verifiable by the server (to prevent the JavaScript from
          * making up its own tokens). We recommend that the token is a digest of your site's
-         * authentication cookie with a {@link https://en.wikipedia.org/wiki/Salt_(cryptography) salt}
+         * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography&#41;)
          * for added security.
          *
          * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName
          * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
          * or the per-request config object.
          *
+         * In order to prevent collisions in environments where multiple Angular apps share the
+         * same domain or subdomain, we recommend that each application uses unique cookie name.
          *
          * @param {object} config Object describing the request to be made and how it should be
          *    processed. The object has following properties:
          *
          *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
-         *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
-         *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be turned
-         *      to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be
-         *      JSONified.
+         *    - **url** – `{string|TrustedObject}` – Absolute or relative URL of the resource that is being requested;
+         *      or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+         *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be serialized
+         *      with the `paramSerializer` and appended as GET parameters.
          *    - **data** – `{string|Object}` – Data to be sent as the request message data.
          *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
          *      HTTP headers to send to the server. If the return value of a function is null, the
-         *      header will not be sent.
+         *      header will not be sent. Functions accept a config object as an argument.
+         *    - **eventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest object.
+         *      To bind events to the XMLHttpRequest upload object, use `uploadEventHandlers`.
+         *      The handler will be called in the context of a `$apply` block.
+         *    - **uploadEventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest upload
+         *      object. To bind events to the XMLHttpRequest object, use `eventHandlers`.
+         *      The handler will be called in the context of a `$apply` block.
          *    - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
          *    - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
          *    - **transformRequest** –
          *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
          *      transform function or an array of such functions. The transform function takes the http
          *      request body and headers and returns its transformed (typically serialized) version.
+         *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
          *    - **transformResponse** –
-         *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+         *      `{function(data, headersGetter, status)|Array.<function(data, headersGetter, status)>}` –
          *      transform function or an array of such functions. The transform function takes the http
-         *      response body and headers and returns its transformed (typically deserialized) version.
-         *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
-         *      GET request, otherwise if a cache instance built with
-         *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
-         *      caching.
+         *      response body, headers and status and returns its transformed (typically deserialized) version.
+         *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
+         *    - **paramSerializer** - `{string|function(Object<string,string>):string}` - A function used to
+         *      prepare the string representation of request parameters (specified as an object).
+         *      If specified as string, it is interpreted as function registered with the
+         *      {@link $injector $injector}, which means you can create your own serializer
+         *      by registering it as a {@link auto.$provide#service service}.
+         *      The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
+         *      alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
+         *    - **cache** – `{boolean|Object}` – A boolean value or object created with
+         *      {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response.
+         *      See {@link $http#caching $http Caching} for more information.
          *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
          *      that should abort the request when resolved.
-         *    - **withCredentials** - `{boolean}` - whether to to set the `withCredentials` flag on the
-         *      XHR object. See {@link https://developer.mozilla.org/en/http_access_control#section_5
-         *      requests with credentials} for more information.
-         *    - **responseType** - `{string}` - see {@link
-         *      https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType requestType}.
+         *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
+         *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
+         *      for more information.
+         *    - **responseType** - `{string}` - see
+         *      [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype).
          *
-         * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the
-         *   standard `then` method and two http specific methods: `success` and `error`. The `then`
-         *   method takes two arguments a success and an error callback which will be called with a
-         *   response object. The `success` and `error` methods take a single argument - a function that
-         *   will be called when the request succeeds or fails respectively. The arguments passed into
-         *   these functions are destructured representation of the response object passed into the
-         *   `then` method. The response object has these properties:
+         * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object
+         *                        when the request succeeds or fails.
          *
-         *   - **data** – `{string|Object}` – The response body transformed with the transform
-         *     functions.
-         *   - **status** – `{number}` – HTTP status code of the response.
-         *   - **headers** – `{function([headerName])}` – Header getter function.
-         *   - **config** – `{Object}` – The configuration object that was used to generate the request.
          *
          * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
          *   requests. This is primarily meant to be used for debugging purposes.
          *
          *
          * @example
-         <example>
+         <example module="httpExample" name="http-service">
          <file name="index.html">
-         <div ng-controller="FetchCtrl">
-         <select ng-model="method">
+         <div ng-controller="FetchController">
+         <select ng-model="method" aria-label="Request method">
          <option>GET</option>
          <option>JSONP</option>
          </select>
-         <input type="text" ng-model="url" size="80"/>
-         <button ng-click="fetch()">fetch</button><br>
-         <button ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
-         <button
+         <input type="text" ng-model="url" size="80" aria-label="URL" />
+         <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
+         <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
+         <button id="samplejsonpbtn"
          ng-click="updateModel('JSONP',
-         'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">
+         'https://angularjs.org/greet.php?name=Super%20Hero')">
          Sample JSONP
          </button>
-         <button
-         ng-click="updateModel('JSONP', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">
+         <button id="invalidjsonpbtn"
+         ng-click="updateModel('JSONP', 'https://angularjs.org/doesntexist')">
          Invalid JSONP
          </button>
          <pre>http status code: {{status}}</pre>
@@ -7454,84 +12048,187 @@
          </div>
          </file>
          <file name="script.js">
-         function FetchCtrl($scope, $http, $templateCache) {
-    $scope.method = 'GET';
-    $scope.url = 'http-hello.html';
+         angular.module('httpExample', [])
+         .config(['$sceDelegateProvider', function($sceDelegateProvider) {
+      // We must whitelist the JSONP endpoint that we are using to show that we trust it
+      $sceDelegateProvider.resourceUrlWhitelist([
+        'self',
+        'https://angularjs.org/**'
+      ]);
+    }])
+         .controller('FetchController', ['$scope', '$http', '$templateCache',
+         function($scope, $http, $templateCache) {
+        $scope.method = 'GET';
+        $scope.url = 'http-hello.html';
 
-    $scope.fetch = function() {
-      $scope.code = null;
-      $scope.response = null;
+        $scope.fetch = function() {
+          $scope.code = null;
+          $scope.response = null;
 
-      $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
-        success(function(data, status) {
-          $scope.status = status;
-          $scope.data = data;
-        }).
-        error(function(data, status) {
-          $scope.data = data || "Request failed";
-          $scope.status = status;
-      });
-    };
+          $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
+            then(function(response) {
+              $scope.status = response.status;
+              $scope.data = response.data;
+            }, function(response) {
+              $scope.data = response.data || 'Request failed';
+              $scope.status = response.status;
+          });
+        };
 
-    $scope.updateModel = function(method, url) {
-      $scope.method = method;
-      $scope.url = url;
-    };
-  }
+        $scope.updateModel = function(method, url) {
+          $scope.method = method;
+          $scope.url = url;
+        };
+      }]);
          </file>
          <file name="http-hello.html">
          Hello, $http!
          </file>
-         <file name="scenario.js">
+         <file name="protractor.js" type="protractor">
+         var status = element(by.binding('status'));
+         var data = element(by.binding('data'));
+         var fetchBtn = element(by.id('fetchbtn'));
+         var sampleGetBtn = element(by.id('samplegetbtn'));
+         var invalidJsonpBtn = element(by.id('invalidjsonpbtn'));
+
          it('should make an xhr GET request', function() {
-    element(':button:contains("Sample GET")').click();
-    element(':button:contains("fetch")').click();
-    expect(binding('status')).toBe('200');
-    expect(binding('data')).toMatch(/Hello, \$http!/);
+    sampleGetBtn.click();
+    fetchBtn.click();
+    expect(status.getText()).toMatch('200');
+    expect(data.getText()).toMatch(/Hello, \$http!/);
   });
 
-         it('should make a JSONP request to angularjs.org', function() {
-    element(':button:contains("Sample JSONP")').click();
-    element(':button:contains("fetch")').click();
-    expect(binding('status')).toBe('200');
-    expect(binding('data')).toMatch(/Super Hero!/);
-  });
+         // Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185
+         // it('should make a JSONP request to angularjs.org', function() {
+//   var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
+//   sampleJsonpBtn.click();
+//   fetchBtn.click();
+//   expect(status.getText()).toMatch('200');
+//   expect(data.getText()).toMatch(/Super Hero!/);
+// });
 
          it('should make JSONP request to invalid URL and invoke the error handler',
          function() {
-    element(':button:contains("Invalid JSONP")').click();
-    element(':button:contains("fetch")').click();
-    expect(binding('status')).toBe('0');
-    expect(binding('data')).toBe('Request failed');
+    invalidJsonpBtn.click();
+    fetchBtn.click();
+    expect(status.getText()).toMatch('0');
+    expect(data.getText()).toMatch('Request failed');
   });
          </file>
          </example>
          */
         function $http(requestConfig) {
-          var config = {
-            transformRequest: defaults.transformRequest,
-            transformResponse: defaults.transformResponse
-          };
-          var headers = mergeHeaders(requestConfig);
 
-          extend(config, requestConfig);
-          config.headers = headers;
-          config.method = uppercase(config.method);
-
-          var xsrfValue = urlIsSameOrigin(config.url)
-              ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName]
-              : undefined;
-          if (xsrfValue) {
-            headers[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+          if (!isObject(requestConfig)) {
+            throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
           }
 
+          if (!isString($sce.valueOf(requestConfig.url))) {
+            throw minErr('$http')('badreq', 'Http request configuration url must be a string or a $sce trusted object.  Received: {0}', requestConfig.url);
+          }
 
-          var serverRequest = function(config) {
-            headers = config.headers;
-            var reqData = transformData(config.data, headersGetter(headers), config.transformRequest);
+          var config = extend({
+            method: 'get',
+            transformRequest: defaults.transformRequest,
+            transformResponse: defaults.transformResponse,
+            paramSerializer: defaults.paramSerializer,
+            jsonpCallbackParam: defaults.jsonpCallbackParam
+          }, requestConfig);
+
+          config.headers = mergeHeaders(requestConfig);
+          config.method = uppercase(config.method);
+          config.paramSerializer = isString(config.paramSerializer) ?
+            $injector.get(config.paramSerializer) : config.paramSerializer;
+
+          $browser.$$incOutstandingRequestCount();
+
+          var requestInterceptors = [];
+          var responseInterceptors = [];
+          var promise = $q.resolve(config);
+
+          // apply interceptors
+          forEach(reversedInterceptors, function(interceptor) {
+            if (interceptor.request || interceptor.requestError) {
+              requestInterceptors.unshift(interceptor.request, interceptor.requestError);
+            }
+            if (interceptor.response || interceptor.responseError) {
+              responseInterceptors.push(interceptor.response, interceptor.responseError);
+            }
+          });
+
+          promise = chainInterceptors(promise, requestInterceptors);
+          promise = promise.then(serverRequest);
+          promise = chainInterceptors(promise, responseInterceptors);
+          promise = promise.finally(completeOutstandingRequest);
+
+          return promise;
+
+
+          function chainInterceptors(promise, interceptors) {
+            for (var i = 0, ii = interceptors.length; i < ii;) {
+              var thenFn = interceptors[i++];
+              var rejectFn = interceptors[i++];
+
+              promise = promise.then(thenFn, rejectFn);
+            }
+
+            interceptors.length = 0;
+
+            return promise;
+          }
+
+          function completeOutstandingRequest() {
+            $browser.$$completeOutstandingRequest(noop);
+          }
+
+          function executeHeaderFns(headers, config) {
+            var headerContent, processedHeaders = {};
+
+            forEach(headers, function(headerFn, header) {
+              if (isFunction(headerFn)) {
+                headerContent = headerFn(config);
+                if (headerContent != null) {
+                  processedHeaders[header] = headerContent;
+                }
+              } else {
+                processedHeaders[header] = headerFn;
+              }
+            });
+
+            return processedHeaders;
+          }
+
+          function mergeHeaders(config) {
+            var defHeaders = defaults.headers,
+              reqHeaders = extend({}, config.headers),
+              defHeaderName, lowercaseDefHeaderName, reqHeaderName;
+
+            defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
+
+            // using for-in instead of forEach to avoid unnecessary iteration after header has been found
+            defaultHeadersIteration:
+              for (defHeaderName in defHeaders) {
+                lowercaseDefHeaderName = lowercase(defHeaderName);
+
+                for (reqHeaderName in reqHeaders) {
+                  if (lowercase(reqHeaderName) === lowercaseDefHeaderName) {
+                    continue defaultHeadersIteration;
+                  }
+                }
+
+                reqHeaders[defHeaderName] = defHeaders[defHeaderName];
+              }
+
+            // execute if header value is a function for merged headers
+            return executeHeaderFns(reqHeaders, shallowCopy(config));
+          }
+
+          function serverRequest(config) {
+            var headers = config.headers;
+            var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
 
             // strip content-type if data is undefined
-            if (isUndefined(config.data)) {
+            if (isUndefined(reqData)) {
               forEach(headers, function(value, header) {
                 if (lowercase(header) === 'content-type') {
                   delete headers[header];
@@ -7544,96 +12241,17 @@
             }
 
             // send request
-            return sendReq(config, reqData, headers).then(transformResponse, transformResponse);
-          };
-
-          var chain = [serverRequest, undefined];
-          var promise = $q.when(config);
-
-          // apply interceptors
-          forEach(reversedInterceptors, function(interceptor) {
-            if (interceptor.request || interceptor.requestError) {
-              chain.unshift(interceptor.request, interceptor.requestError);
-            }
-            if (interceptor.response || interceptor.responseError) {
-              chain.push(interceptor.response, interceptor.responseError);
-            }
-          });
-
-          while(chain.length) {
-            var thenFn = chain.shift();
-            var rejectFn = chain.shift();
-
-            promise = promise.then(thenFn, rejectFn);
+            return sendReq(config, reqData).then(transformResponse, transformResponse);
           }
 
-          promise.success = function(fn) {
-            promise.then(function(response) {
-              fn(response.data, response.status, response.headers, config);
-            });
-            return promise;
-          };
-
-          promise.error = function(fn) {
-            promise.then(null, function(response) {
-              fn(response.data, response.status, response.headers, config);
-            });
-            return promise;
-          };
-
-          return promise;
-
           function transformResponse(response) {
             // make a copy since the response must be cacheable
-            var resp = extend({}, response, {
-              data: transformData(response.data, response.headers, config.transformResponse)
-            });
+            var resp = extend({}, response);
+            resp.data = transformData(response.data, response.headers, response.status,
+              config.transformResponse);
             return (isSuccess(response.status))
-                ? resp
-                : $q.reject(resp);
-          }
-
-          function mergeHeaders(config) {
-            var defHeaders = defaults.headers,
-                reqHeaders = extend({}, config.headers),
-                defHeaderName, lowercaseDefHeaderName, reqHeaderName;
-
-            defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
-
-            // execute if header value is function
-            execHeaders(defHeaders);
-            execHeaders(reqHeaders);
-
-            // using for-in instead of forEach to avoid unecessary iteration after header has been found
-            defaultHeadersIteration:
-                for (defHeaderName in defHeaders) {
-                  lowercaseDefHeaderName = lowercase(defHeaderName);
-
-                  for (reqHeaderName in reqHeaders) {
-                    if (lowercase(reqHeaderName) === lowercaseDefHeaderName) {
-                      continue defaultHeadersIteration;
-                    }
-                  }
-
-                  reqHeaders[defHeaderName] = defHeaders[defHeaderName];
-                }
-
-            return reqHeaders;
-
-            function execHeaders(headers) {
-              var headerContent;
-
-              forEach(headers, function(headerFn, header) {
-                if (isFunction(headerFn)) {
-                  headerContent = headerFn();
-                  if (headerContent != null) {
-                    headers[header] = headerContent;
-                  } else {
-                    delete headers[header];
-                  }
-                }
-              });
-            }
+              ? resp
+              : $q.reject(resp);
           }
         }
 
@@ -7641,53 +12259,77 @@
 
         /**
          * @ngdoc method
-         * @name ng.$http#get
-         * @methodOf ng.$http
+         * @name $http#get
          *
          * @description
          * Shortcut method to perform `GET` request.
          *
-         * @param {string} url Relative or absolute URL specifying the destination of the request
+         * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+         *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
          * @param {Object=} config Optional configuration object
          * @returns {HttpPromise} Future object
          */
 
         /**
          * @ngdoc method
-         * @name ng.$http#delete
-         * @methodOf ng.$http
+         * @name $http#delete
          *
          * @description
          * Shortcut method to perform `DELETE` request.
          *
-         * @param {string} url Relative or absolute URL specifying the destination of the request
+         * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+         *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
          * @param {Object=} config Optional configuration object
          * @returns {HttpPromise} Future object
          */
 
         /**
          * @ngdoc method
-         * @name ng.$http#head
-         * @methodOf ng.$http
+         * @name $http#head
          *
          * @description
          * Shortcut method to perform `HEAD` request.
          *
-         * @param {string} url Relative or absolute URL specifying the destination of the request
+         * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+         *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
          * @param {Object=} config Optional configuration object
          * @returns {HttpPromise} Future object
          */
 
         /**
          * @ngdoc method
-         * @name ng.$http#jsonp
-         * @methodOf ng.$http
+         * @name $http#jsonp
          *
          * @description
          * Shortcut method to perform `JSONP` request.
          *
-         * @param {string} url Relative or absolute URL specifying the destination of the request.
-         *                     Should contain `JSON_CALLBACK` string.
+         * Note that, since JSONP requests are sensitive because the response is given full access to the browser,
+         * the url must be declared, via {@link $sce} as a trusted resource URL.
+         * You can trust a URL by adding it to the whitelist via
+         * {@link $sceDelegateProvider#resourceUrlWhitelist  `$sceDelegateProvider.resourceUrlWhitelist`} or
+         * by explicitly trusting the URL via {@link $sce#trustAsResourceUrl `$sce.trustAsResourceUrl(url)`}.
+         *
+         * JSONP requests must specify a callback to be used in the response from the server. This callback
+         * is passed as a query parameter in the request. You must specify the name of this parameter by
+         * setting the `jsonpCallbackParam` property on the request config object.
+         *
+         * ```
+         * $http.jsonp('some/trusted/url', {jsonpCallbackParam: 'callback'})
+         * ```
+         *
+         * You can also specify a default callback parameter name in `$http.defaults.jsonpCallbackParam`.
+         * Initially this is set to `'callback'`.
+         *
+         * <div class="alert alert-danger">
+         * You can no longer use the `JSON_CALLBACK` string as a placeholder for specifying where the callback
+         * parameter value should go.
+         * </div>
+         *
+         * If you would like to customise where and how the callbacks are stored then try overriding
+         * or decorating the {@link $jsonpCallbacks} service.
+         *
+         * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+         *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
          * @param {Object=} config Optional configuration object
          * @returns {HttpPromise} Future object
          */
@@ -7695,8 +12337,7 @@
 
         /**
          * @ngdoc method
-         * @name ng.$http#post
-         * @methodOf ng.$http
+         * @name $http#post
          *
          * @description
          * Shortcut method to perform `POST` request.
@@ -7709,8 +12350,7 @@
 
         /**
          * @ngdoc method
-         * @name ng.$http#put
-         * @methodOf ng.$http
+         * @name $http#put
          *
          * @description
          * Shortcut method to perform `PUT` request.
@@ -7720,12 +12360,24 @@
          * @param {Object=} config Optional configuration object
          * @returns {HttpPromise} Future object
          */
-        createShortMethodsWithData('post', 'put');
+
+        /**
+         * @ngdoc method
+         * @name $http#patch
+         *
+         * @description
+         * Shortcut method to perform `PATCH` request.
+         *
+         * @param {string} url Relative or absolute URL specifying the destination of the request
+         * @param {*} data Request content
+         * @param {Object=} config Optional configuration object
+         * @returns {HttpPromise} Future object
+         */
+        createShortMethodsWithData('post', 'put', 'patch');
 
         /**
          * @ngdoc property
-         * @name ng.$http#defaults
-         * @propertyOf ng.$http
+         * @name $http#defaults
          *
          * @description
          * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of
@@ -7742,7 +12394,7 @@
         function createShortMethods(names) {
           forEach(arguments, function(name) {
             $http[name] = function(url, config) {
-              return $http(extend(config || {}, {
+              return $http(extend({}, config || {}, {
                 method: name,
                 url: url
               }));
@@ -7754,7 +12406,7 @@
         function createShortMethodsWithData(name) {
           forEach(arguments, function(name) {
             $http[name] = function(url, data, config) {
-              return $http(extend(config || {}, {
+              return $http(extend({}, config || {}, {
                 method: name,
                 url: url,
                 data: data
@@ -7770,36 +12422,54 @@
          * !!! ACCESSES CLOSURE VARS:
          * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
          */
-        function sendReq(config, reqData, reqHeaders) {
+        function sendReq(config, reqData) {
           var deferred = $q.defer(),
-              promise = deferred.promise,
-              cache,
-              cachedResp,
-              url = buildUrl(config.url, config.params);
+            promise = deferred.promise,
+            cache,
+            cachedResp,
+            reqHeaders = config.headers,
+            isJsonp = lowercase(config.method) === 'jsonp',
+            url = config.url;
+
+          if (isJsonp) {
+            // JSONP is a pretty sensitive operation where we're allowing a script to have full access to
+            // our DOM and JS space.  So we require that the URL satisfies SCE.RESOURCE_URL.
+            url = $sce.getTrustedResourceUrl(url);
+          } else if (!isString(url)) {
+            // If it is not a string then the URL must be a $sce trusted object
+            url = $sce.valueOf(url);
+          }
+
+          url = buildUrl(url, config.paramSerializer(config.params));
+
+          if (isJsonp) {
+            // Check the url and add the JSONP callback placeholder
+            url = sanitizeJsonpCallbackParam(url, config.jsonpCallbackParam);
+          }
 
           $http.pendingRequests.push(config);
           promise.then(removePendingReq, removePendingReq);
 
-
-          if ((config.cache || defaults.cache) && config.cache !== false && config.method == 'GET') {
+          if ((config.cache || defaults.cache) && config.cache !== false &&
+            (config.method === 'GET' || config.method === 'JSONP')) {
             cache = isObject(config.cache) ? config.cache
-                : isObject(defaults.cache) ? defaults.cache
+              : isObject(/** @type {?} */ (defaults).cache)
+                ? /** @type {?} */ (defaults).cache
                 : defaultCache;
           }
 
           if (cache) {
             cachedResp = cache.get(url);
             if (isDefined(cachedResp)) {
-              if (cachedResp.then) {
+              if (isPromiseLike(cachedResp)) {
                 // cached request has already been sent, but there is no response yet
-                cachedResp.then(removePendingReq, removePendingReq);
-                return cachedResp;
+                cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult);
               } else {
                 // serving from cache
                 if (isArray(cachedResp)) {
-                  resolvePromise(cachedResp[1], cachedResp[0], copy(cachedResp[2]));
+                  resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3], cachedResp[4]);
                 } else {
-                  resolvePromise(cachedResp, 200, {});
+                  resolvePromise(cachedResp, 200, {}, 'OK', 'complete');
                 }
               }
             } else {
@@ -7808,14 +12478,47 @@
             }
           }
 
-          // if we won't have the response in cache, send the request to the backend
+
+          // if we won't have the response in cache, set the xsrf headers and
+          // send the request to the backend
           if (isUndefined(cachedResp)) {
+            var xsrfValue = urlIsSameOrigin(config.url)
+              ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
+              : undefined;
+            if (xsrfValue) {
+              reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+            }
+
             $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
-                config.withCredentials, config.responseType);
+              config.withCredentials, config.responseType,
+              createApplyHandlers(config.eventHandlers),
+              createApplyHandlers(config.uploadEventHandlers));
           }
 
           return promise;
 
+          function createApplyHandlers(eventHandlers) {
+            if (eventHandlers) {
+              var applyHandlers = {};
+              forEach(eventHandlers, function(eventHandler, key) {
+                applyHandlers[key] = function(event) {
+                  if (useApplyAsync) {
+                    $rootScope.$applyAsync(callEventHandler);
+                  } else if ($rootScope.$$phase) {
+                    callEventHandler();
+                  } else {
+                    $rootScope.$apply(callEventHandler);
+                  }
+
+                  function callEventHandler() {
+                    eventHandler(event);
+                  }
+                };
+              });
+              return applyHandlers;
+            }
+          }
+
 
           /**
            * Callback registered to $httpBackend():
@@ -7823,81 +12526,121 @@
            *  - resolves the raw $http promise
            *  - calls $apply
            */
-          function done(status, response, headersString) {
+          function done(status, response, headersString, statusText, xhrStatus) {
             if (cache) {
               if (isSuccess(status)) {
-                cache.put(url, [status, response, parseHeaders(headersString)]);
+                cache.put(url, [status, response, parseHeaders(headersString), statusText, xhrStatus]);
               } else {
                 // remove promise from the cache
                 cache.remove(url);
               }
             }
 
-            resolvePromise(response, status, headersString);
-            if (!$rootScope.$$phase) $rootScope.$apply();
+            function resolveHttpPromise() {
+              resolvePromise(response, status, headersString, statusText, xhrStatus);
+            }
+
+            if (useApplyAsync) {
+              $rootScope.$applyAsync(resolveHttpPromise);
+            } else {
+              resolveHttpPromise();
+              if (!$rootScope.$$phase) $rootScope.$apply();
+            }
           }
 
 
           /**
            * Resolves the raw $http promise.
            */
-          function resolvePromise(response, status, headers) {
-            // normalize internal statuses to 0
-            status = Math.max(status, 0);
+          function resolvePromise(response, status, headers, statusText, xhrStatus) {
+            //status: HTTP response status code, 0, -1 (aborted by timeout / promise)
+            status = status >= -1 ? status : 0;
 
             (isSuccess(status) ? deferred.resolve : deferred.reject)({
               data: response,
               status: status,
               headers: headersGetter(headers),
-              config: config
+              config: config,
+              statusText: statusText,
+              xhrStatus: xhrStatus
             });
           }
 
+          function resolvePromiseWithResult(result) {
+            resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText, result.xhrStatus);
+          }
 
           function removePendingReq() {
-            var idx = indexOf($http.pendingRequests, config);
+            var idx = $http.pendingRequests.indexOf(config);
             if (idx !== -1) $http.pendingRequests.splice(idx, 1);
           }
         }
 
 
-        function buildUrl(url, params) {
-          if (!params) return url;
-          var parts = [];
-          forEachSorted(params, function(value, key) {
-            if (value === null || isUndefined(value)) return;
-            if (!isArray(value)) value = [value];
-
-            forEach(value, function(v) {
-              if (isObject(v)) {
-                v = toJson(v);
-              }
-              parts.push(encodeUriQuery(key) + '=' +
-                  encodeUriQuery(v));
-            });
-          });
-          return url + ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&');
+        function buildUrl(url, serializedParams) {
+          if (serializedParams.length > 0) {
+            url += ((url.indexOf('?') === -1) ? '?' : '&') + serializedParams;
+          }
+          return url;
         }
 
+        function sanitizeJsonpCallbackParam(url, key) {
+          if (/[&?][^=]+=JSON_CALLBACK/.test(url)) {
+            // Throw if the url already contains a reference to JSON_CALLBACK
+            throw $httpMinErr('badjsonp', 'Illegal use of JSON_CALLBACK in url, "{0}"', url);
+          }
 
+          var callbackParamRegex = new RegExp('[&?]' + key + '=');
+          if (callbackParamRegex.test(url)) {
+            // Throw if the callback param was already provided
+            throw $httpMinErr('badjsonp', 'Illegal use of callback param, "{0}", in url, "{1}"', key, url);
+          }
+
+          // Add in the JSON_CALLBACK callback param value
+          url += ((url.indexOf('?') === -1) ? '?' : '&') + key + '=JSON_CALLBACK';
+
+          return url;
+        }
       }];
   }
 
-  function createXhr(method) {
-    // IE8 doesn't support PATCH method, but the ActiveX object does
-    /* global ActiveXObject */
-    return (msie <= 8 && lowercase(method) === 'patch')
-        ? new ActiveXObject('Microsoft.XMLHTTP')
-        : new window.XMLHttpRequest();
+  /**
+   * @ngdoc service
+   * @name $xhrFactory
+   * @this
+   *
+   * @description
+   * Factory function used to create XMLHttpRequest objects.
+   *
+   * Replace or decorate this service to create your own custom XMLHttpRequest objects.
+   *
+   * ```
+   * angular.module('myApp', [])
+   * .factory('$xhrFactory', function() {
+ *   return function createXhr(method, url) {
+ *     return new window.XMLHttpRequest({mozSystem: true});
+ *   };
+ * });
+   * ```
+   *
+   * @param {string} method HTTP method of the request (GET, POST, PUT, ..)
+   * @param {string} url URL of the request.
+   */
+  function $xhrFactoryProvider() {
+    this.$get = function() {
+      return function createXhr() {
+        return new window.XMLHttpRequest();
+      };
+    };
   }
 
-
   /**
-   * @ngdoc object
-   * @name ng.$httpBackend
-   * @requires $browser
-   * @requires $window
+   * @ngdoc service
+   * @name $httpBackend
+   * @requires $jsonpCallbacks
    * @requires $document
+   * @requires $xhrFactory
+   * @this
    *
    * @description
    * HTTP backend used by the {@link ng.$http service} that delegates to
@@ -7907,41 +12650,30 @@
    * {@link ng.$http $http} or {@link ngResource.$resource $resource}.
    *
    * During testing this implementation is swapped with {@link ngMock.$httpBackend mock
-   * $httpBackend} which can be trained with responses.
+ * $httpBackend} which can be trained with responses.
    */
   function $HttpBackendProvider() {
-    this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) {
-      return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]);
+    this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
+      return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
     }];
   }
 
   function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) {
-    var ABORTED = -1;
-
     // TODO(vojta): fix the signature
-    return function(method, url, post, callback, headers, timeout, withCredentials, responseType) {
-      var status;
-      $browser.$$incOutstandingRequestCount();
+    return function(method, url, post, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) {
       url = url || $browser.url();
 
-      if (lowercase(method) == 'jsonp') {
-        var callbackId = '_' + (callbacks.counter++).toString(36);
-        callbacks[callbackId] = function(data) {
-          callbacks[callbackId].data = data;
-        };
-
-        var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
-            function() {
-              if (callbacks[callbackId].data) {
-                completeRequest(callback, 200, callbacks[callbackId].data);
-              } else {
-                completeRequest(callback, status || -2);
-              }
-              callbacks[callbackId] = angular.noop;
-            });
+      if (lowercase(method) === 'jsonp') {
+        var callbackPath = callbacks.createCallback(url);
+        var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
+          // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
+          var response = (status === 200) && callbacks.getResponse(callbackPath);
+          completeRequest(callback, status, response, '', text, 'complete');
+          callbacks.removeCallback(callbackPath);
+        });
       } else {
 
-        var xhr = createXhr(method);
+        var xhr = createXhr(method, url);
 
         xhr.open(method, url, true);
         forEach(headers, function(value, key) {
@@ -7950,123 +12682,180 @@
           }
         });
 
-        // In IE6 and 7, this might be called synchronously when xhr.send below is called and the
-        // response is in the cache. the promise api will ensure that to the app code the api is
-        // always async
-        xhr.onreadystatechange = function() {
-          // onreadystatechange might get called multiple times with readyState === 4 on mobile webkit caused by
-          // xhrs that are resolved while the app is in the background (see #5426).
-          // since calling completeRequest sets the `xhr` variable to null, we just check if it's not null before
-          // continuing
-          //
-          // we can't set xhr.onreadystatechange to undefined or delete it because that breaks IE8 (method=PATCH) and
-          // Safari respectively.
-          if (xhr && xhr.readyState == 4) {
-            var responseHeaders = null,
-                response = null;
+        xhr.onload = function requestLoaded() {
+          var statusText = xhr.statusText || '';
 
-            if(status !== ABORTED) {
-              responseHeaders = xhr.getAllResponseHeaders();
+          // responseText is the old-school way of retrieving response (supported by IE9)
+          // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
+          var response = ('response' in xhr) ? xhr.response : xhr.responseText;
 
-              // responseText is the old-school way of retrieving response (supported by IE8 & 9)
-              // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
-              response = ('response' in xhr) ? xhr.response : xhr.responseText;
-            }
+          // normalize IE9 bug (http://bugs.jquery.com/ticket/1450)
+          var status = xhr.status === 1223 ? 204 : xhr.status;
 
-            completeRequest(callback,
-                status || xhr.status,
-                response,
-                responseHeaders);
+          // fix status code when it is 0 (0 status is undocumented).
+          // Occurs when accessing file resources or on Android 4.1 stock browser
+          // while retrieving files from application cache.
+          if (status === 0) {
+            status = response ? 200 : urlResolve(url).protocol === 'file' ? 404 : 0;
           }
+
+          completeRequest(callback,
+            status,
+            response,
+            xhr.getAllResponseHeaders(),
+            statusText,
+            'complete');
         };
 
+        var requestError = function() {
+          // The response is always empty
+          // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+          completeRequest(callback, -1, null, null, '', 'error');
+        };
+
+        var requestAborted = function() {
+          completeRequest(callback, -1, null, null, '', 'abort');
+        };
+
+        var requestTimeout = function() {
+          // The response is always empty
+          // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+          completeRequest(callback, -1, null, null, '', 'timeout');
+        };
+
+        xhr.onerror = requestError;
+        xhr.onabort = requestAborted;
+        xhr.ontimeout = requestTimeout;
+
+        forEach(eventHandlers, function(value, key) {
+          xhr.addEventListener(key, value);
+        });
+
+        forEach(uploadEventHandlers, function(value, key) {
+          xhr.upload.addEventListener(key, value);
+        });
+
         if (withCredentials) {
           xhr.withCredentials = true;
         }
 
         if (responseType) {
-          xhr.responseType = responseType;
+          try {
+            xhr.responseType = responseType;
+          } catch (e) {
+            // WebKit added support for the json responseType value on 09/03/2013
+            // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are
+            // known to throw when setting the value "json" as the response type. Other older
+            // browsers implementing the responseType
+            //
+            // The json response type can be ignored if not supported, because JSON payloads are
+            // parsed on the client-side regardless.
+            if (responseType !== 'json') {
+              throw e;
+            }
+          }
         }
 
-        xhr.send(post || null);
+        xhr.send(isUndefined(post) ? null : post);
       }
 
       if (timeout > 0) {
         var timeoutId = $browserDefer(timeoutRequest, timeout);
-      } else if (timeout && timeout.then) {
+      } else if (isPromiseLike(timeout)) {
         timeout.then(timeoutRequest);
       }
 
 
       function timeoutRequest() {
-        status = ABORTED;
-        jsonpDone && jsonpDone();
-        xhr && xhr.abort();
+        if (jsonpDone) {
+          jsonpDone();
+        }
+        if (xhr) {
+          xhr.abort();
+        }
       }
 
-      function completeRequest(callback, status, response, headersString) {
+      function completeRequest(callback, status, response, headersString, statusText, xhrStatus) {
         // cancel timeout and subsequent timeout promise resolution
-        timeoutId && $browserDefer.cancel(timeoutId);
+        if (isDefined(timeoutId)) {
+          $browserDefer.cancel(timeoutId);
+        }
         jsonpDone = xhr = null;
 
-        // fix status code when it is 0 (0 status is undocumented).
-        // Occurs when accessing file resources.
-        // On Android 4.1 stock browser it occurs while retrieving files from application cache.
-        status = (status === 0) ? (response ? 200 : 404) : status;
-
-        // normalize IE bug (http://bugs.jquery.com/ticket/1450)
-        status = status == 1223 ? 204 : status;
-
-        callback(status, response, headersString);
-        $browser.$$completeOutstandingRequest(noop);
+        callback(status, response, headersString, statusText, xhrStatus);
       }
     };
 
-    function jsonpReq(url, done) {
-      // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.:
+    function jsonpReq(url, callbackPath, done) {
+      url = url.replace('JSON_CALLBACK', callbackPath);
+      // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
       // - fetches local scripts via XHR and evals them
       // - adds and immediately removes script elements from the document
-      var script = rawDocument.createElement('script'),
-          doneWrapper = function() {
-            script.onreadystatechange = script.onload = script.onerror = null;
-            rawDocument.body.removeChild(script);
-            if (done) done();
-          };
-
+      var script = rawDocument.createElement('script'), callback = null;
       script.type = 'text/javascript';
       script.src = url;
+      script.async = true;
 
-      if (msie && msie <= 8) {
-        script.onreadystatechange = function() {
-          if (/loaded|complete/.test(script.readyState)) {
-            doneWrapper();
+      callback = function(event) {
+        script.removeEventListener('load', callback);
+        script.removeEventListener('error', callback);
+        rawDocument.body.removeChild(script);
+        script = null;
+        var status = -1;
+        var text = 'unknown';
+
+        if (event) {
+          if (event.type === 'load' && !callbacks.wasCalled(callbackPath)) {
+            event = { type: 'error' };
           }
-        };
-      } else {
-        script.onload = script.onerror = function() {
-          doneWrapper();
-        };
-      }
+          text = event.type;
+          status = event.type === 'error' ? 404 : 200;
+        }
 
+        if (done) {
+          done(status, text);
+        }
+      };
+
+      script.addEventListener('load', callback);
+      script.addEventListener('error', callback);
       rawDocument.body.appendChild(script);
-      return doneWrapper;
+      return callback;
     }
   }
 
-  var $interpolateMinErr = minErr('$interpolate');
+  var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
+  $interpolateMinErr.throwNoconcat = function(text) {
+    throw $interpolateMinErr('noconcat',
+      'Error while interpolating: {0}\nStrict Contextual Escaping disallows ' +
+      'interpolations that concatenate multiple expressions when a trusted value is ' +
+      'required.  See http://docs.angularjs.org/api/ng.$sce', text);
+  };
+
+  $interpolateMinErr.interr = function(text, err) {
+    return $interpolateMinErr('interr', 'Can\'t interpolate: {0}\n{1}', text, err.toString());
+  };
 
   /**
-   * @ngdoc object
-   * @name ng.$interpolateProvider
-   * @function
+   * @ngdoc provider
+   * @name $interpolateProvider
+   * @this
    *
    * @description
    *
    * Used for configuring the interpolation markup. Defaults to `{{` and `}}`.
    *
+   * <div class="alert alert-danger">
+   * This feature is sometimes used to mix different markup languages, e.g. to wrap an Angular
+   * template within a Python Jinja template (or any other template language). Mixing templating
+   * languages is **very dangerous**. The embedding template language will not safely escape Angular
+   * expressions, so any user-controlled values in the template will cause Cross Site Scripting (XSS)
+   * security bugs!
+   * </div>
+   *
    * @example
-   <doc:example module="customInterpolationApp">
-   <doc:source>
+   <example name="custom-interpolation-markup" module="customInterpolationApp">
+   <file name="index.html">
    <script>
    var customInterpolationApp = angular.module('customInterpolationApp', []);
 
@@ -8076,20 +12865,20 @@
   });
 
 
-   customInterpolationApp.controller('DemoController', function DemoController() {
+   customInterpolationApp.controller('DemoController', function() {
       this.label = "This binding is brought you by // interpolation symbols.";
   });
    </script>
-   <div ng-app="App" ng-controller="DemoController as demo">
+   <div ng-controller="DemoController as demo">
    //demo.label//
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should interpolate binding with custom symbols', function() {
-  expect(binding('demo.label')).toBe('This binding is brought you by // interpolation symbols.');
- });
-   </doc:scenario>
-   </doc:example>
+    expect(element(by.binding('demo.label')).getText()).toBe('This binding is brought you by // interpolation symbols.');
+  });
+   </file>
+   </example>
    */
   function $InterpolateProvider() {
     var startSymbol = '{{';
@@ -8097,15 +12886,14 @@
 
     /**
      * @ngdoc method
-     * @name ng.$interpolateProvider#startSymbol
-     * @methodOf ng.$interpolateProvider
+     * @name $interpolateProvider#startSymbol
      * @description
      * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
    *
-   * @param {string=} value new value to set the starting symbol to.
+     * @param {string=} value new value to set the starting symbol to.
      * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
      */
-    this.startSymbol = function(value){
+    this.startSymbol = function(value) {
       if (value) {
         startSymbol = value;
         return this;
@@ -8116,15 +12904,14 @@
 
     /**
      * @ngdoc method
-     * @name ng.$interpolateProvider#endSymbol
-     * @methodOf ng.$interpolateProvider
+     * @name $interpolateProvider#endSymbol
      * @description
      * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
      *
      * @param {string=} value new value to set the ending symbol to.
      * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
      */
-    this.endSymbol = function(value){
+    this.endSymbol = function(value) {
       if (value) {
         endSymbol = value;
         return this;
@@ -8136,12 +12923,32 @@
 
     this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
       var startSymbolLength = startSymbol.length,
-          endSymbolLength = endSymbol.length;
+        endSymbolLength = endSymbol.length,
+        escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
+        escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g');
+
+      function escape(ch) {
+        return '\\\\\\' + ch;
+      }
+
+      function unescapeText(text) {
+        return text.replace(escapedStartRegexp, startSymbol).
+        replace(escapedEndRegexp, endSymbol);
+      }
+
+      // TODO: this is the same as the constantWatchDelegate in parse.js
+      function constantWatchDelegate(scope, listener, objectEquality, constantInterp) {
+        var unwatch = scope.$watch(function constantInterpolateWatch(scope) {
+          unwatch();
+          return constantInterp(scope);
+        }, listener, objectEquality);
+        return unwatch;
+      }
 
       /**
-       * @ngdoc function
-       * @name ng.$interpolate
-       * @function
+       * @ngdoc service
+       * @name $interpolate
+       * @kind function
        *
        * @requires $parse
        * @requires $sce
@@ -8154,58 +12961,152 @@
        * interpolation markup.
        *
        *
-       <pre>
-       var $interpolate = ...; // injected
-       var exp = $interpolate('Hello {{name | uppercase}}!');
-       expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!');
-       </pre>
+       * ```js
+       *   var $interpolate = ...; // injected
+       *   var exp = $interpolate('Hello {{name | uppercase}}!');
+       *   expect(exp({name:'Angular'})).toEqual('Hello ANGULAR!');
+       * ```
        *
+       * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is
+       * `true`, the interpolation function will return `undefined` unless all embedded expressions
+       * evaluate to a value other than `undefined`.
+       *
+       * ```js
+       *   var $interpolate = ...; // injected
+       *   var context = {greeting: 'Hello', name: undefined };
+       *
+       *   // default "forgiving" mode
+       *   var exp = $interpolate('{{greeting}} {{name}}!');
+       *   expect(exp(context)).toEqual('Hello !');
+       *
+       *   // "allOrNothing" mode
+       *   exp = $interpolate('{{greeting}} {{name}}!', false, null, true);
+       *   expect(exp(context)).toBeUndefined();
+       *   context.name = 'Angular';
+       *   expect(exp(context)).toEqual('Hello Angular!');
+       * ```
+       *
+       * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
+       *
+       * #### Escaped Interpolation
+       * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
+       * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
+       * It will be rendered as a regular start/end marker, and will not be interpreted as an expression
+       * or binding.
+       *
+       * This enables web-servers to prevent script injection attacks and defacing attacks, to some
+       * degree, while also enabling code examples to work without relying on the
+       * {@link ng.directive:ngNonBindable ngNonBindable} directive.
+       *
+       * **For security purposes, it is strongly encouraged that web servers escape user-supplied data,
+       * replacing angle brackets (&lt;, &gt;) with &amp;lt; and &amp;gt; respectively, and replacing all
+       * interpolation start/end markers with their escaped counterparts.**
+       *
+       * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered
+       * output when the $interpolate service processes the text. So, for HTML elements interpolated
+       * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter
+       * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such,
+       * this is typically useful only when user-data is used in rendering a template from the server, or
+       * when otherwise untrusted data is used by a directive.
+       *
+       * <example name="interpolation">
+       *  <file name="index.html">
+       *    <div ng-init="username='A user'">
+       *      <p ng-init="apptitle='Escaping demo'">{{apptitle}}: \{\{ username = "defaced value"; \}\}
+       *        </p>
+       *      <p><strong>{{username}}</strong> attempts to inject code which will deface the
+       *        application, but fails to accomplish their task, because the server has correctly
+       *        escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash)
+       *        characters.</p>
+       *      <p>Instead, the result of the attempted script injection is visible, and can be removed
+       *        from the database by an administrator.</p>
+       *    </div>
+       *  </file>
+       * </example>
+       *
+       * @knownIssue
+       * It is currently not possible for an interpolated expression to contain the interpolation end
+       * symbol. For example, `{{ '}}' }}` will be incorrectly interpreted as `{{ ' }}` + `' }}`, i.e.
+       * an interpolated expression consisting of a single-quote (`'`) and the `' }}` string.
+       *
+       * @knownIssue
+       * All directives and components must use the standard `{{` `}}` interpolation symbols
+       * in their templates. If you change the application interpolation symbols the {@link $compile}
+       * service will attempt to denormalize the standard symbols to the custom symbols.
+       * The denormalization process is not clever enough to know not to replace instances of the standard
+       * symbols where they would not normally be treated as interpolation symbols. For example in the following
+       * code snippet the closing braces of the literal object will get incorrectly denormalized:
+       *
+       * ```
+       * <div data-context='{"context":{"id":3,"type":"page"}}">
+       * ```
+       *
+       * The workaround is to ensure that such instances are separated by whitespace:
+       * ```
+       * <div data-context='{"context":{"id":3,"type":"page"} }">
+       * ```
+       *
+       * See https://github.com/angular/angular.js/pull/14610#issuecomment-219401099 for more information.
        *
        * @param {string} text The text with markup to interpolate.
        * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have
        *    embedded expression in order to return an interpolation function. Strings with no
        *    embedded expression will return null for the interpolation function.
        * @param {string=} trustedContext when provided, the returned function passes the interpolated
-       *    result through {@link ng.$sce#methods_getTrusted $sce.getTrusted(interpolatedResult,
-       *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
+       *    result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult,
+     *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
        *    provides Strict Contextual Escaping for details.
+       * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined
+       *    unless all embedded expressions evaluate to a value other than `undefined`.
        * @returns {function(context)} an interpolation function which is used to compute the
        *    interpolated string. The function has these parameters:
        *
-       *    * `context`: an object against which any expressions embedded in the strings are evaluated
-       *      against.
-       *
+       * - `context`: evaluation context for all expressions embedded in the interpolated text
        */
-      function $interpolate(text, mustHaveExpression, trustedContext) {
-        var startIndex,
-            endIndex,
-            index = 0,
-            parts = [],
-            length = text.length,
-            hasInterpolation = false,
-            fn,
-            exp,
-            concat = [];
-
-        while(index < length) {
-          if ( ((startIndex = text.indexOf(startSymbol, index)) != -1) &&
-              ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1) ) {
-            (index != startIndex) && parts.push(text.substring(index, startIndex));
-            parts.push(fn = $parse(exp = text.substring(startIndex + startSymbolLength, endIndex)));
-            fn.exp = exp;
-            index = endIndex + endSymbolLength;
-            hasInterpolation = true;
-          } else {
-            // we did not find anything, so we have to add the remainder to the parts array
-            (index != length) && parts.push(text.substring(index));
-            index = length;
+      function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
+        // Provide a quick exit and simplified result function for text with no interpolation
+        if (!text.length || text.indexOf(startSymbol) === -1) {
+          var constantInterp;
+          if (!mustHaveExpression) {
+            var unescapedText = unescapeText(text);
+            constantInterp = valueFn(unescapedText);
+            constantInterp.exp = text;
+            constantInterp.expressions = [];
+            constantInterp.$$watchDelegate = constantWatchDelegate;
           }
+          return constantInterp;
         }
 
-        if (!(length = parts.length)) {
-          // we added, nothing, must have been an empty string.
-          parts.push('');
-          length = 1;
+        allOrNothing = !!allOrNothing;
+        var startIndex,
+          endIndex,
+          index = 0,
+          expressions = [],
+          parseFns = [],
+          textLength = text.length,
+          exp,
+          concat = [],
+          expressionPositions = [];
+
+        while (index < textLength) {
+          if (((startIndex = text.indexOf(startSymbol, index)) !== -1) &&
+            ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) !== -1)) {
+            if (index !== startIndex) {
+              concat.push(unescapeText(text.substring(index, startIndex)));
+            }
+            exp = text.substring(startIndex + startSymbolLength, endIndex);
+            expressions.push(exp);
+            parseFns.push($parse(exp, parseStringifyInterceptor));
+            index = endIndex + endSymbolLength;
+            expressionPositions.push(concat.length);
+            concat.push('');
+          } else {
+            // we did not find an interpolation, so we have to add the remainder to the separators array
+            if (index !== textLength) {
+              concat.push(unescapeText(text.substring(index)));
+            }
+            break;
+          }
         }
 
         // Concatenating expressions makes it hard to reason about whether some combination of
@@ -8214,58 +13115,77 @@
         // that's used is assigned or constructed by some JS code somewhere that is more testable or
         // make it obvious that you bound the value to some user controlled value.  This helps reduce
         // the load when auditing for XSS issues.
-        if (trustedContext && parts.length > 1) {
-          throw $interpolateMinErr('noconcat',
-              "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
-                  "interpolations that concatenate multiple expressions when a trusted value is " +
-                  "required.  See http://docs.angularjs.org/../api/ng.$sce", text);
+        if (trustedContext && concat.length > 1) {
+          $interpolateMinErr.throwNoconcat(text);
         }
 
-        if (!mustHaveExpression  || hasInterpolation) {
-          concat.length = length;
-          fn = function(context) {
-            try {
-              for(var i = 0, ii = length, part; i<ii; i++) {
-                if (typeof (part = parts[i]) == 'function') {
-                  part = part(context);
-                  if (trustedContext) {
-                    part = $sce.getTrusted(trustedContext, part);
-                  } else {
-                    part = $sce.valueOf(part);
-                  }
-                  if (part === null || isUndefined(part)) {
-                    part = '';
-                  } else if (typeof part != 'string') {
-                    part = toJson(part);
-                  }
-                }
-                concat[i] = part;
-              }
-              return concat.join('');
-            }
-            catch(err) {
-              var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text,
-                  err.toString());
-              $exceptionHandler(newErr);
+        if (!mustHaveExpression || expressions.length) {
+          var compute = function(values) {
+            for (var i = 0, ii = expressions.length; i < ii; i++) {
+              if (allOrNothing && isUndefined(values[i])) return;
+              concat[expressionPositions[i]] = values[i];
             }
+            return concat.join('');
           };
-          fn.exp = text;
-          fn.parts = parts;
-          return fn;
+
+          var getValue = function(value) {
+            return trustedContext ?
+              $sce.getTrusted(trustedContext, value) :
+              $sce.valueOf(value);
+          };
+
+          return extend(function interpolationFn(context) {
+            var i = 0;
+            var ii = expressions.length;
+            var values = new Array(ii);
+
+            try {
+              for (; i < ii; i++) {
+                values[i] = parseFns[i](context);
+              }
+
+              return compute(values);
+            } catch (err) {
+              $exceptionHandler($interpolateMinErr.interr(text, err));
+            }
+
+          }, {
+            // all of these properties are undocumented for now
+            exp: text, //just for compatibility with regular watchers created via $watch
+            expressions: expressions,
+            $$watchDelegate: function(scope, listener) {
+              var lastValue;
+              return scope.$watchGroup(parseFns, /** @this */ function interpolateFnWatcher(values, oldValues) {
+                var currValue = compute(values);
+                if (isFunction(listener)) {
+                  listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
+                }
+                lastValue = currValue;
+              });
+            }
+          });
+        }
+
+        function parseStringifyInterceptor(value) {
+          try {
+            value = getValue(value);
+            return allOrNothing && !isDefined(value) ? value : stringify(value);
+          } catch (err) {
+            $exceptionHandler($interpolateMinErr.interr(text, err));
+          }
         }
       }
 
 
       /**
        * @ngdoc method
-       * @name ng.$interpolate#startSymbol
-       * @methodOf ng.$interpolate
+       * @name $interpolate#startSymbol
        * @description
        * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
      *
-     * Use {@link ng.$interpolateProvider#startSymbol $interpolateProvider#startSymbol} to change
-       * the symbol.
-       *
+     * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
+     * the symbol.
+     *
        * @returns {string} start symbol.
        */
       $interpolate.startSymbol = function() {
@@ -8275,15 +13195,14 @@
 
       /**
        * @ngdoc method
-       * @name ng.$interpolate#endSymbol
-       * @methodOf ng.$interpolate
+       * @name $interpolate#endSymbol
        * @description
        * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
        *
-       * Use {@link ng.$interpolateProvider#endSymbol $interpolateProvider#endSymbol} to change
+       * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
        * the symbol.
        *
-       * @returns {string} start symbol.
+       * @returns {string} end symbol.
        */
       $interpolate.endSymbol = function() {
         return endSymbol;
@@ -8293,15 +13212,16 @@
     }];
   }
 
+  /** @this */
   function $IntervalProvider() {
-    this.$get = ['$rootScope', '$window', '$q',
-      function($rootScope,   $window,   $q) {
+    this.$get = ['$rootScope', '$window', '$q', '$$q', '$browser',
+      function($rootScope,   $window,   $q,   $$q,   $browser) {
         var intervals = {};
 
 
         /**
-         * @ngdoc function
-         * @name ng.$interval
+         * @ngdoc service
+         * @name $interval
          *
          * @description
          * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
@@ -8313,7 +13233,7 @@
          * number of iterations that have run.
          * To cancel an interval, call `$interval.cancel(promise)`.
          *
-         * In tests you can use {@link ngMock.$interval#methods_flush `$interval.flush(millis)`} to
+         * In tests you can use {@link ngMock.$interval#flush `$interval.flush(millis)`} to
          * move forward by `millis` milliseconds and trigger any functions scheduled to run in that
          * time.
          *
@@ -8325,116 +13245,124 @@
          * appropriate moment.  See the example below for more details on how and when to do this.
          * </div>
          *
-         * @param {function()} fn A function that should be called repeatedly.
+         * @param {function()} fn A function that should be called repeatedly. If no additional arguments
+         *   are passed (see below), the function is called with the current iteration count.
          * @param {number} delay Number of milliseconds between each function call.
          * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
          *   indefinitely.
          * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
-         *   will invoke `fn` within the {@link ng.$rootScope.Scope#methods_$apply $apply} block.
-         * @returns {promise} A promise which will be notified on each iteration.
+         *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+         * @param {...*=} Pass additional parameters to the executed function.
+         * @returns {promise} A promise which will be notified on each iteration. It will resolve once all iterations of the interval complete.
          *
          * @example
-         <doc:example module="time">
-         <doc:source>
-         <script>
-         function Ctrl2($scope,$interval) {
-              $scope.format = 'M/d/yy h:mm:ss a';
-              $scope.blood_1 = 100;
-              $scope.blood_2 = 120;
-
-              var stop;
-              $scope.fight = function() {
-                // Don't start a new fight if we are already fighting
-                if ( angular.isDefined(stop) ) return;
-
-                stop = $interval(function() {
-                  if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
-                      $scope.blood_1 = $scope.blood_1 - 3;
-                      $scope.blood_2 = $scope.blood_2 - 4;
-                  } else {
-                      $scope.stopFight();
-                  }
-                }, 100);
-              };
-
-              $scope.stopFight = function() {
-                if (angular.isDefined(stop)) {
-                  $interval.cancel(stop);
-                  stop = undefined;
-                }
-              };
-
-              $scope.resetFight = function() {
-                $scope.blood_1 = 100;
-                $scope.blood_2 = 120;
-              }
-
-              $scope.$on('$destroy', function() {
-                // Make sure that the interval is destroyed too
-                $scope.stopFight();
-              });
-            }
-
-         angular.module('time', [])
-         // Register the 'myCurrentTime' directive factory method.
-         // We inject $interval and dateFilter service since the factory method is DI.
-         .directive('myCurrentTime', function($interval, dateFilter) {
-                // return the directive link function. (compile function not needed)
-                return function(scope, element, attrs) {
-                  var format,  // date format
-                  stopTime; // so that we can cancel the time updates
-
-                  // used to update the UI
-                  function updateTime() {
-                    element.text(dateFilter(new Date(), format));
-                  }
-
-                  // watch the expression, and update the UI on change.
-                  scope.$watch(attrs.myCurrentTime, function(value) {
-                    format = value;
-                    updateTime();
-                  });
-
-                  stopTime = $interval(updateTime, 1000);
-
-                  // listen on DOM destroy (removal) event, and cancel the next UI update
-                  // to prevent updating time ofter the DOM element was removed.
-                  element.bind('$destroy', function() {
-                    $interval.cancel(stopTime);
-                  });
-                }
-              });
-         </script>
-
-         <div>
-         <div ng-controller="Ctrl2">
-         Date format: <input ng-model="format"> <hr/>
-         Current time is: <span my-current-time="format"></span>
-         <hr/>
-         Blood 1 : <font color='red'>{{blood_1}}</font>
-         Blood 2 : <font color='red'>{{blood_2}}</font>
-         <button type="button" data-ng-click="fight()">Fight</button>
-         <button type="button" data-ng-click="stopFight()">StopFight</button>
-         <button type="button" data-ng-click="resetFight()">resetFight</button>
-         </div>
-         </div>
-
-         </doc:source>
-         </doc:example>
+         * <example module="intervalExample" name="interval-service">
+         * <file name="index.html">
+         *   <script>
+         *     angular.module('intervalExample', [])
+         *       .controller('ExampleController', ['$scope', '$interval',
+         *         function($scope, $interval) {
+      *           $scope.format = 'M/d/yy h:mm:ss a';
+      *           $scope.blood_1 = 100;
+      *           $scope.blood_2 = 120;
+      *
+      *           var stop;
+      *           $scope.fight = function() {
+      *             // Don't start a new fight if we are already fighting
+      *             if ( angular.isDefined(stop) ) return;
+      *
+      *             stop = $interval(function() {
+      *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
+      *                 $scope.blood_1 = $scope.blood_1 - 3;
+      *                 $scope.blood_2 = $scope.blood_2 - 4;
+      *               } else {
+      *                 $scope.stopFight();
+      *               }
+      *             }, 100);
+      *           };
+      *
+      *           $scope.stopFight = function() {
+      *             if (angular.isDefined(stop)) {
+      *               $interval.cancel(stop);
+      *               stop = undefined;
+      *             }
+      *           };
+      *
+      *           $scope.resetFight = function() {
+      *             $scope.blood_1 = 100;
+      *             $scope.blood_2 = 120;
+      *           };
+      *
+      *           $scope.$on('$destroy', function() {
+      *             // Make sure that the interval is destroyed too
+      *             $scope.stopFight();
+      *           });
+      *         }])
+         *       // Register the 'myCurrentTime' directive factory method.
+         *       // We inject $interval and dateFilter service since the factory method is DI.
+         *       .directive('myCurrentTime', ['$interval', 'dateFilter',
+         *         function($interval, dateFilter) {
+      *           // return the directive link function. (compile function not needed)
+      *           return function(scope, element, attrs) {
+      *             var format,  // date format
+      *                 stopTime; // so that we can cancel the time updates
+      *
+      *             // used to update the UI
+      *             function updateTime() {
+      *               element.text(dateFilter(new Date(), format));
+      *             }
+      *
+      *             // watch the expression, and update the UI on change.
+      *             scope.$watch(attrs.myCurrentTime, function(value) {
+      *               format = value;
+      *               updateTime();
+      *             });
+      *
+      *             stopTime = $interval(updateTime, 1000);
+      *
+      *             // listen on DOM destroy (removal) event, and cancel the next UI update
+      *             // to prevent updating time after the DOM element was removed.
+      *             element.on('$destroy', function() {
+      *               $interval.cancel(stopTime);
+      *             });
+      *           }
+      *         }]);
+         *   </script>
+         *
+         *   <div>
+         *     <div ng-controller="ExampleController">
+         *       <label>Date format: <input ng-model="format"></label> <hr/>
+         *       Current time is: <span my-current-time="format"></span>
+         *       <hr/>
+         *       Blood 1 : <font color='red'>{{blood_1}}</font>
+         *       Blood 2 : <font color='red'>{{blood_2}}</font>
+         *       <button type="button" data-ng-click="fight()">Fight</button>
+         *       <button type="button" data-ng-click="stopFight()">StopFight</button>
+         *       <button type="button" data-ng-click="resetFight()">resetFight</button>
+         *     </div>
+         *   </div>
+         *
+         * </file>
+         * </example>
          */
         function interval(fn, delay, count, invokeApply) {
-          var setInterval = $window.setInterval,
-              clearInterval = $window.clearInterval,
-              deferred = $q.defer(),
-              promise = deferred.promise,
-              iteration = 0,
-              skipApply = (isDefined(invokeApply) && !invokeApply);
+          var hasParams = arguments.length > 4,
+            args = hasParams ? sliceArgs(arguments, 4) : [],
+            setInterval = $window.setInterval,
+            clearInterval = $window.clearInterval,
+            iteration = 0,
+            skipApply = (isDefined(invokeApply) && !invokeApply),
+            deferred = (skipApply ? $$q : $q).defer(),
+            promise = deferred.promise;
 
-          count = isDefined(count) ? count : 0,
-
-              promise.then(null, null, fn);
+          count = isDefined(count) ? count : 0;
 
           promise.$$intervalId = setInterval(function tick() {
+            if (skipApply) {
+              $browser.defer(callback);
+            } else {
+              $rootScope.$evalAsync(callback);
+            }
             deferred.notify(iteration++);
 
             if (count > 0 && iteration >= count) {
@@ -8450,24 +13378,33 @@
           intervals[promise.$$intervalId] = deferred;
 
           return promise;
+
+          function callback() {
+            if (!hasParams) {
+              fn(iteration);
+            } else {
+              fn.apply(null, args);
+            }
+          }
         }
 
 
         /**
-         * @ngdoc function
-         * @name ng.$interval#cancel
-         * @methodOf ng.$interval
+         * @ngdoc method
+         * @name $interval#cancel
          *
          * @description
          * Cancels a task associated with the `promise`.
          *
-         * @param {number} promise Promise returned by the `$interval` function.
+         * @param {Promise=} promise returned by the `$interval` function.
          * @returns {boolean} Returns `true` if the task was successfully canceled.
          */
         interval.cancel = function(promise) {
           if (promise && promise.$$intervalId in intervals) {
+            // Interval cancels should not report as unhandled promise.
+            markQExceptionHandled(intervals[promise.$$intervalId].promise);
             intervals[promise.$$intervalId].reject('canceled');
-            clearInterval(promise.$$intervalId);
+            $window.clearInterval(promise.$$intervalId);
             delete intervals[promise.$$intervalId];
             return true;
           }
@@ -8479,8 +13416,89 @@
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$locale
+   * @ngdoc service
+   * @name $jsonpCallbacks
+   * @requires $window
+   * @description
+   * This service handles the lifecycle of callbacks to handle JSONP requests.
+   * Override this service if you wish to customise where the callbacks are stored and
+   * how they vary compared to the requested url.
+   */
+  var $jsonpCallbacksProvider = /** @this */ function() {
+    this.$get = function() {
+      var callbacks = angular.callbacks;
+      var callbackMap = {};
+
+      function createCallback(callbackId) {
+        var callback = function(data) {
+          callback.data = data;
+          callback.called = true;
+        };
+        callback.id = callbackId;
+        return callback;
+      }
+
+      return {
+        /**
+         * @ngdoc method
+         * @name $jsonpCallbacks#createCallback
+         * @param {string} url the url of the JSONP request
+         * @returns {string} the callback path to send to the server as part of the JSONP request
+         * @description
+         * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
+         * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
+         */
+        createCallback: function(url) {
+          var callbackId = '_' + (callbacks.$$counter++).toString(36);
+          var callbackPath = 'angular.callbacks.' + callbackId;
+          var callback = createCallback(callbackId);
+          callbackMap[callbackPath] = callbacks[callbackId] = callback;
+          return callbackPath;
+        },
+        /**
+         * @ngdoc method
+         * @name $jsonpCallbacks#wasCalled
+         * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+         * @returns {boolean} whether the callback has been called, as a result of the JSONP response
+         * @description
+         * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
+         * callback that was passed in the request.
+         */
+        wasCalled: function(callbackPath) {
+          return callbackMap[callbackPath].called;
+        },
+        /**
+         * @ngdoc method
+         * @name $jsonpCallbacks#getResponse
+         * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+         * @returns {*} the data received from the response via the registered callback
+         * @description
+         * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
+         * in the JSONP response.
+         */
+        getResponse: function(callbackPath) {
+          return callbackMap[callbackPath].data;
+        },
+        /**
+         * @ngdoc method
+         * @name $jsonpCallbacks#removeCallback
+         * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+         * @description
+         * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
+         * completed or timed-out.
+         */
+        removeCallback: function(callbackPath) {
+          var callback = callbackMap[callbackPath];
+          delete callbacks[callback.id];
+          delete callbackMap[callbackPath];
+        }
+      };
+    };
+  };
+
+  /**
+   * @ngdoc service
+   * @name $locale
    *
    * @description
    * $locale service provides localization rules for various Angular components. As of right now the
@@ -8488,70 +13506,9 @@
    *
    * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
    */
-  function $LocaleProvider(){
-    this.$get = function() {
-      return {
-        id: 'en-us',
 
-        NUMBER_FORMATS: {
-          DECIMAL_SEP: '.',
-          GROUP_SEP: ',',
-          PATTERNS: [
-            { // Decimal Pattern
-              minInt: 1,
-              minFrac: 0,
-              maxFrac: 3,
-              posPre: '',
-              posSuf: '',
-              negPre: '-',
-              negSuf: '',
-              gSize: 3,
-              lgSize: 3
-            },{ //Currency Pattern
-              minInt: 1,
-              minFrac: 2,
-              maxFrac: 2,
-              posPre: '\u00A4',
-              posSuf: '',
-              negPre: '(\u00A4',
-              negSuf: ')',
-              gSize: 3,
-              lgSize: 3
-            }
-          ],
-          CURRENCY_SYM: '$'
-        },
-
-        DATETIME_FORMATS: {
-          MONTH:
-              'January,February,March,April,May,June,July,August,September,October,November,December'
-                  .split(','),
-          SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
-          DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
-          SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
-          AMPMS: ['AM','PM'],
-          medium: 'MMM d, y h:mm:ss a',
-          short: 'M/d/yy h:mm a',
-          fullDate: 'EEEE, MMMM d, y',
-          longDate: 'MMMM d, y',
-          mediumDate: 'MMM d, y',
-          shortDate: 'M/d/yy',
-          mediumTime: 'h:mm:ss a',
-          shortTime: 'h:mm a'
-        },
-
-        pluralCat: function(num) {
-          if (num === 1) {
-            return 'one';
-          }
-          return 'other';
-        }
-      };
-    };
-  }
-
-  var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
-      DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
+  var PATH_MATCH = /^([^?#]*)(\?([^#]*))?(#(.*))?$/,
+    DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
   var $locationMinErr = minErr('$location');
 
 
@@ -8563,7 +13520,7 @@
    */
   function encodePath(path) {
     var segments = path.split('/'),
-        i = segments.length;
+      i = segments.length;
 
     while (i--) {
       segments[i] = encodeUriSegment(segments[i]);
@@ -8572,50 +13529,62 @@
     return segments.join('/');
   }
 
-  function parseAbsoluteUrl(absoluteUrl, locationObj, appBase) {
-    var parsedUrl = urlResolve(absoluteUrl, appBase);
+  function parseAbsoluteUrl(absoluteUrl, locationObj) {
+    var parsedUrl = urlResolve(absoluteUrl);
 
     locationObj.$$protocol = parsedUrl.protocol;
     locationObj.$$host = parsedUrl.hostname;
-    locationObj.$$port = int(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
+    locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
   }
 
+  var DOUBLE_SLASH_REGEX = /^\s*[\\/]{2,}/;
+  function parseAppUrl(url, locationObj) {
 
-  function parseAppUrl(relativeUrl, locationObj, appBase) {
-    var prefixed = (relativeUrl.charAt(0) !== '/');
-    if (prefixed) {
-      relativeUrl = '/' + relativeUrl;
+    if (DOUBLE_SLASH_REGEX.test(url)) {
+      throw $locationMinErr('badpath', 'Invalid url "{0}".', url);
     }
-    var match = urlResolve(relativeUrl, appBase);
+
+    var prefixed = (url.charAt(0) !== '/');
+    if (prefixed) {
+      url = '/' + url;
+    }
+    var match = urlResolve(url);
     locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
-        match.pathname.substring(1) : match.pathname);
+      match.pathname.substring(1) : match.pathname);
     locationObj.$$search = parseKeyValue(match.search);
     locationObj.$$hash = decodeURIComponent(match.hash);
 
     // make sure path starts with '/';
-    if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
+    if (locationObj.$$path && locationObj.$$path.charAt(0) !== '/') {
       locationObj.$$path = '/' + locationObj.$$path;
     }
   }
 
+  function startsWith(str, search) {
+    return str.slice(0, search.length) === search;
+  }
 
   /**
    *
-   * @param {string} begin
-   * @param {string} whole
-   * @returns {string} returns text from whole after begin or undefined if it does not begin with
-   *                   expected string.
+   * @param {string} base
+   * @param {string} url
+   * @returns {string} returns text from `url` after `base` or `undefined` if it does not begin with
+   *                   the expected string.
    */
-  function beginsWith(begin, whole) {
-    if (whole.indexOf(begin) === 0) {
-      return whole.substr(begin.length);
+  function stripBaseUrl(base, url) {
+    if (startsWith(url, base)) {
+      return url.substr(base.length);
     }
   }
 
 
   function stripHash(url) {
     var index = url.indexOf('#');
-    return index == -1 ? url : url.substr(0, index);
+    return index === -1 ? url : url.substr(0, index);
+  }
+
+  function trimEmptyHash(url) {
+    return url.replace(/(#.+)|#$/, '$1');
   }
 
 
@@ -8630,33 +13599,33 @@
 
 
   /**
-   * LocationHtml5Url represents an url
+   * LocationHtml5Url represents a URL
    * This object is exposed as $location service when HTML5 mode is enabled and supported
    *
    * @constructor
    * @param {string} appBase application base URL
-   * @param {string} basePrefix url path prefix
+   * @param {string} appBaseNoFile application base URL stripped of any filename
+   * @param {string} basePrefix URL path prefix
    */
-  function LocationHtml5Url(appBase, basePrefix) {
+  function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) {
     this.$$html5 = true;
     basePrefix = basePrefix || '';
-    var appBaseNoFile = stripFile(appBase);
-    parseAbsoluteUrl(appBase, this, appBase);
+    parseAbsoluteUrl(appBase, this);
 
 
     /**
-     * Parse given html5 (regular) url string into properties
-     * @param {string} newAbsoluteUrl HTML5 url
+     * Parse given HTML5 (regular) URL string into properties
+     * @param {string} url HTML5 URL
      * @private
      */
     this.$$parse = function(url) {
-      var pathUrl = beginsWith(appBaseNoFile, url);
+      var pathUrl = stripBaseUrl(appBaseNoFile, url);
       if (!isString(pathUrl)) {
         throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url,
-            appBaseNoFile);
+          appBaseNoFile);
       }
 
-      parseAppUrl(pathUrl, this, appBase);
+      parseAppUrl(pathUrl, this);
 
       if (!this.$$path) {
         this.$$path = '/';
@@ -8671,98 +13640,126 @@
      */
     this.$$compose = function() {
       var search = toKeyValue(this.$$search),
-          hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
       this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
       this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
+
+      this.$$urlUpdatedByLocation = true;
     };
 
-    this.$$rewrite = function(url) {
-      var appUrl, prevAppUrl;
-
-      if ( (appUrl = beginsWith(appBase, url)) !== undefined ) {
-        prevAppUrl = appUrl;
-        if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) {
-          return appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
-        } else {
-          return appBase + prevAppUrl;
-        }
-      } else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) {
-        return appBaseNoFile + appUrl;
-      } else if (appBaseNoFile == url + '/') {
-        return appBaseNoFile;
+    this.$$parseLinkUrl = function(url, relHref) {
+      if (relHref && relHref[0] === '#') {
+        // special case for links to hash fragments:
+        // keep the old url and only replace the hash fragment
+        this.hash(relHref.slice(1));
+        return true;
       }
+      var appUrl, prevAppUrl;
+      var rewrittenUrl;
+
+
+      if (isDefined(appUrl = stripBaseUrl(appBase, url))) {
+        prevAppUrl = appUrl;
+        if (basePrefix && isDefined(appUrl = stripBaseUrl(basePrefix, appUrl))) {
+          rewrittenUrl = appBaseNoFile + (stripBaseUrl('/', appUrl) || appUrl);
+        } else {
+          rewrittenUrl = appBase + prevAppUrl;
+        }
+      } else if (isDefined(appUrl = stripBaseUrl(appBaseNoFile, url))) {
+        rewrittenUrl = appBaseNoFile + appUrl;
+      } else if (appBaseNoFile === url + '/') {
+        rewrittenUrl = appBaseNoFile;
+      }
+      if (rewrittenUrl) {
+        this.$$parse(rewrittenUrl);
+      }
+      return !!rewrittenUrl;
     };
   }
 
 
   /**
-   * LocationHashbangUrl represents url
+   * LocationHashbangUrl represents URL
    * This object is exposed as $location service when developer doesn't opt into html5 mode.
    * It also serves as the base class for html5 mode fallback on legacy browsers.
    *
    * @constructor
    * @param {string} appBase application base URL
+   * @param {string} appBaseNoFile application base URL stripped of any filename
    * @param {string} hashPrefix hashbang prefix
    */
-  function LocationHashbangUrl(appBase, hashPrefix) {
-    var appBaseNoFile = stripFile(appBase);
+  function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) {
 
-    parseAbsoluteUrl(appBase, this, appBase);
+    parseAbsoluteUrl(appBase, this);
 
 
     /**
-     * Parse given hashbang url into properties
-     * @param {string} url Hashbang url
+     * Parse given hashbang URL into properties
+     * @param {string} url Hashbang URL
      * @private
      */
     this.$$parse = function(url) {
-      var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
-      var withoutHashUrl = withoutBaseUrl.charAt(0) == '#'
-          ? beginsWith(hashPrefix, withoutBaseUrl)
-          : (this.$$html5)
-          ? withoutBaseUrl
-          : '';
+      var withoutBaseUrl = stripBaseUrl(appBase, url) || stripBaseUrl(appBaseNoFile, url);
+      var withoutHashUrl;
 
-      if (!isString(withoutHashUrl)) {
-        throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url,
-            hashPrefix);
+      if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') {
+
+        // The rest of the URL starts with a hash so we have
+        // got either a hashbang path or a plain hash fragment
+        withoutHashUrl = stripBaseUrl(hashPrefix, withoutBaseUrl);
+        if (isUndefined(withoutHashUrl)) {
+          // There was no hashbang prefix so we just have a hash fragment
+          withoutHashUrl = withoutBaseUrl;
+        }
+
+      } else {
+        // There was no hashbang path nor hash fragment:
+        // If we are in HTML5 mode we use what is left as the path;
+        // Otherwise we ignore what is left
+        if (this.$$html5) {
+          withoutHashUrl = withoutBaseUrl;
+        } else {
+          withoutHashUrl = '';
+          if (isUndefined(withoutBaseUrl)) {
+            appBase = url;
+            /** @type {?} */ (this).replace();
+          }
+        }
       }
-      parseAppUrl(withoutHashUrl, this, appBase);
+
+      parseAppUrl(withoutHashUrl, this);
 
       this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase);
 
       this.$$compose();
 
       /*
-       * In Windows, on an anchor node on documents loaded from
-       * the filesystem, the browser will return a pathname
-       * prefixed with the drive name ('/C:/path') when a
-       * pathname without a drive is set:
-       *  * a.setAttribute('href', '/foo')
-       *   * a.pathname === '/C:/foo' //true
-       *
-       * Inside of Angular, we're always using pathnames that
-       * do not include drive names for routing.
-       */
-      function removeWindowsDriveName (path, url, base) {
+     * In Windows, on an anchor node on documents loaded from
+     * the filesystem, the browser will return a pathname
+     * prefixed with the drive name ('/C:/path') when a
+     * pathname without a drive is set:
+     *  * a.setAttribute('href', '/foo')
+     *   * a.pathname === '/C:/foo' //true
+     *
+     * Inside of Angular, we're always using pathnames that
+     * do not include drive names for routing.
+     */
+      function removeWindowsDriveName(path, url, base) {
         /*
-         Matches paths for file protocol on windows,
-         such as /C:/foo/bar, and captures only /foo/bar.
-         */
-        var windowsFilePathExp = /^\/?.*?:(\/.*)/;
+      Matches paths for file protocol on windows,
+      such as /C:/foo/bar, and captures only /foo/bar.
+      */
+        var windowsFilePathExp = /^\/[A-Z]:(\/.*)/;
 
         var firstPathSegmentMatch;
 
         //Get the relative path from the input URL.
-        if (url.indexOf(base) === 0) {
+        if (startsWith(url, base)) {
           url = url.replace(base, '');
         }
 
-        /*
-         * The input URL intentionally contains a
-         * first path segment that ends with a colon.
-         */
+        // The input URL intentionally contains a first path segment that ends with a colon.
         if (windowsFilePathExp.exec(url)) {
           return path;
         }
@@ -8773,268 +13770,424 @@
     };
 
     /**
-     * Compose hashbang url and update `absUrl` property
+     * Compose hashbang URL and update `absUrl` property
      * @private
      */
     this.$$compose = function() {
       var search = toKeyValue(this.$$search),
-          hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
       this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
       this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
+
+      this.$$urlUpdatedByLocation = true;
     };
 
-    this.$$rewrite = function(url) {
-      if(stripHash(appBase) == stripHash(url)) {
-        return url;
+    this.$$parseLinkUrl = function(url, relHref) {
+      if (stripHash(appBase) === stripHash(url)) {
+        this.$$parse(url);
+        return true;
       }
+      return false;
     };
   }
 
 
   /**
-   * LocationHashbangUrl represents url
+   * LocationHashbangUrl represents URL
    * This object is exposed as $location service when html5 history api is enabled but the browser
    * does not support it.
    *
    * @constructor
    * @param {string} appBase application base URL
+   * @param {string} appBaseNoFile application base URL stripped of any filename
    * @param {string} hashPrefix hashbang prefix
    */
-  function LocationHashbangInHtml5Url(appBase, hashPrefix) {
+  function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
     this.$$html5 = true;
     LocationHashbangUrl.apply(this, arguments);
 
-    var appBaseNoFile = stripFile(appBase);
+    this.$$parseLinkUrl = function(url, relHref) {
+      if (relHref && relHref[0] === '#') {
+        // special case for links to hash fragments:
+        // keep the old url and only replace the hash fragment
+        this.hash(relHref.slice(1));
+        return true;
+      }
 
-    this.$$rewrite = function(url) {
+      var rewrittenUrl;
       var appUrl;
 
-      if ( appBase == stripHash(url) ) {
-        return url;
-      } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
-        return appBase + hashPrefix + appUrl;
-      } else if ( appBaseNoFile === url + '/') {
-        return appBaseNoFile;
+      if (appBase === stripHash(url)) {
+        rewrittenUrl = url;
+      } else if ((appUrl = stripBaseUrl(appBaseNoFile, url))) {
+        rewrittenUrl = appBase + hashPrefix + appUrl;
+      } else if (appBaseNoFile === url + '/') {
+        rewrittenUrl = appBaseNoFile;
       }
+      if (rewrittenUrl) {
+        this.$$parse(rewrittenUrl);
+      }
+      return !!rewrittenUrl;
     };
+
+    this.$$compose = function() {
+      var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+      this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+      // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#'
+      this.$$absUrl = appBase + hashPrefix + this.$$url;
+
+      this.$$urlUpdatedByLocation = true;
+    };
+
   }
 
 
-  LocationHashbangInHtml5Url.prototype =
-      LocationHashbangUrl.prototype =
-          LocationHtml5Url.prototype = {
+  var locationPrototype = {
 
-            /**
-             * Are we in html5 mode?
-             * @private
-             */
-            $$html5: false,
+    /**
+     * Ensure absolute URL is initialized.
+     * @private
+     */
+    $$absUrl:'',
 
-            /**
-             * Has any change been replacing ?
-             * @private
-             */
-            $$replace: false,
+    /**
+     * Are we in html5 mode?
+     * @private
+     */
+    $$html5: false,
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#absUrl
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter only.
-             *
-             * Return full url representation with all segments encoded according to rules specified in
-             * {@link http://www.ietf.org/rfc/rfc3986.txt RFC 3986}.
-             *
-             * @return {string} full url
-             */
-            absUrl: locationGetter('$$absUrl'),
+    /**
+     * Has any change been replacing?
+     * @private
+     */
+    $$replace: false,
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#url
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter / setter.
-             *
-             * Return url (e.g. `/path?a=b#hash`) when called without any parameter.
-             *
-             * Change path, search and hash, when called with parameter and return `$location`.
-             *
-             * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
-             * @param {string=} replace The path that will be changed
-             * @return {string} url
-             */
-            url: function(url, replace) {
-              if (isUndefined(url))
-                return this.$$url;
+    /**
+     * @ngdoc method
+     * @name $location#absUrl
+     *
+     * @description
+     * This method is getter only.
+     *
+     * Return full URL representation with all segments encoded according to rules specified in
+     * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var absUrl = $location.absUrl();
+     * // => "http://example.com/#/some/path?foo=bar&baz=xoxo"
+     * ```
+     *
+     * @return {string} full URL
+     */
+    absUrl: locationGetter('$$absUrl'),
 
-              var match = PATH_MATCH.exec(url);
-              if (match[1]) this.path(decodeURIComponent(match[1]));
-              if (match[2] || match[1]) this.search(match[3] || '');
-              this.hash(match[5] || '', replace);
+    /**
+     * @ngdoc method
+     * @name $location#url
+     *
+     * @description
+     * This method is getter / setter.
+     *
+     * Return URL (e.g. `/path?a=b#hash`) when called without any parameter.
+     *
+     * Change path, search and hash, when called with parameter and return `$location`.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var url = $location.url();
+     * // => "/some/path?foo=bar&baz=xoxo"
+     * ```
+     *
+     * @param {string=} url New URL without base prefix (e.g. `/path?a=b#hash`)
+     * @return {string} url
+     */
+    url: function(url) {
+      if (isUndefined(url)) {
+        return this.$$url;
+      }
 
-              return this;
-            },
+      var match = PATH_MATCH.exec(url);
+      if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
+      if (match[2] || match[1] || url === '') this.search(match[3] || '');
+      this.hash(match[5] || '');
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#protocol
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter only.
-             *
-             * Return protocol of current url.
-             *
-             * @return {string} protocol of current url
-             */
-            protocol: locationGetter('$$protocol'),
+      return this;
+    },
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#host
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter only.
-             *
-             * Return host of current url.
-             *
-             * @return {string} host of current url.
-             */
-            host: locationGetter('$$host'),
+    /**
+     * @ngdoc method
+     * @name $location#protocol
+     *
+     * @description
+     * This method is getter only.
+     *
+     * Return protocol of current URL.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var protocol = $location.protocol();
+     * // => "http"
+     * ```
+     *
+     * @return {string} protocol of current URL
+     */
+    protocol: locationGetter('$$protocol'),
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#port
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter only.
-             *
-             * Return port of current url.
-             *
-             * @return {Number} port
-             */
-            port: locationGetter('$$port'),
+    /**
+     * @ngdoc method
+     * @name $location#host
+     *
+     * @description
+     * This method is getter only.
+     *
+     * Return host of current URL.
+     *
+     * Note: compared to the non-angular version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var host = $location.host();
+     * // => "example.com"
+     *
+     * // given URL http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
+     * host = $location.host();
+     * // => "example.com"
+     * host = location.host;
+     * // => "example.com:8080"
+     * ```
+     *
+     * @return {string} host of current URL.
+     */
+    host: locationGetter('$$host'),
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#path
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter / setter.
-             *
-             * Return path of current url when called without any parameter.
-             *
-             * Change path when called with parameter and return `$location`.
-             *
-             * Note: Path should always begin with forward slash (/), this method will add the forward slash
-             * if it is missing.
-             *
-             * @param {string=} path New path
-             * @return {string} path
-             */
-            path: locationGetterSetter('$$path', function(path) {
-              return path.charAt(0) == '/' ? path : '/' + path;
-            }),
+    /**
+     * @ngdoc method
+     * @name $location#port
+     *
+     * @description
+     * This method is getter only.
+     *
+     * Return port of current URL.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var port = $location.port();
+     * // => 80
+     * ```
+     *
+     * @return {Number} port
+     */
+    port: locationGetter('$$port'),
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#search
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter / setter.
-             *
-             * Return search part (as object) of current url when called without any parameter.
-             *
-             * Change search part when called with parameter and return `$location`.
-             *
-             * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
-             * hash object. Hash object may contain an array of values, which will be decoded as duplicates in
-             * the url.
-             *
-             * @param {(string|Array<string>)=} paramValue If `search` is a string, then `paramValue` will override only a
-             * single search parameter. If `paramValue` is an array, it will set the parameter as a
-             * comma-separated value. If `paramValue` is `null`, the parameter will be deleted.
-             *
-             * @return {string} search
-             */
-            search: function(search, paramValue) {
-              switch (arguments.length) {
-                case 0:
-                  return this.$$search;
-                case 1:
-                  if (isString(search)) {
-                    this.$$search = parseKeyValue(search);
-                  } else if (isObject(search)) {
-                    this.$$search = search;
-                  } else {
-                    throw $locationMinErr('isrcharg',
-                        'The first argument of the `$location#search()` call must be a string or an object.');
-                  }
-                  break;
-                default:
-                  if (isUndefined(paramValue) || paramValue === null) {
-                    delete this.$$search[search];
-                  } else {
-                    this.$$search[search] = paramValue;
-                  }
-              }
+    /**
+     * @ngdoc method
+     * @name $location#path
+     *
+     * @description
+     * This method is getter / setter.
+     *
+     * Return path of current URL when called without any parameter.
+     *
+     * Change path when called with parameter and return `$location`.
+     *
+     * Note: Path should always begin with forward slash (/), this method will add the forward slash
+     * if it is missing.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var path = $location.path();
+     * // => "/some/path"
+     * ```
+     *
+     * @param {(string|number)=} path New path
+     * @return {(string|object)} path if called with no parameters, or `$location` if called with a parameter
+     */
+    path: locationGetterSetter('$$path', function(path) {
+      path = path !== null ? path.toString() : '';
+      return path.charAt(0) === '/' ? path : '/' + path;
+    }),
 
-              this.$$compose();
-              return this;
-            },
+    /**
+     * @ngdoc method
+     * @name $location#search
+     *
+     * @description
+     * This method is getter / setter.
+     *
+     * Return search part (as object) of current URL when called without any parameter.
+     *
+     * Change search part when called with parameter and return `$location`.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+     * var searchObject = $location.search();
+     * // => {foo: 'bar', baz: 'xoxo'}
+     *
+     * // set foo to 'yipee'
+     * $location.search('foo', 'yipee');
+     * // $location.search() => {foo: 'yipee', baz: 'xoxo'}
+     * ```
+     *
+     * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
+     * hash object.
+     *
+     * When called with a single argument the method acts as a setter, setting the `search` component
+     * of `$location` to the specified value.
+     *
+     * If the argument is a hash object containing an array of values, these values will be encoded
+     * as duplicate search parameters in the URL.
+     *
+     * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
+     * will override only a single search property.
+     *
+     * If `paramValue` is an array, it will override the property of the `search` component of
+     * `$location` specified via the first argument.
+     *
+     * If `paramValue` is `null`, the property specified via the first argument will be deleted.
+     *
+     * If `paramValue` is `true`, the property specified via the first argument will be added with no
+     * value nor trailing equal sign.
+     *
+     * @return {Object} If called with no arguments returns the parsed `search` object. If called with
+     * one or more arguments returns `$location` object itself.
+     */
+    search: function(search, paramValue) {
+      switch (arguments.length) {
+        case 0:
+          return this.$$search;
+        case 1:
+          if (isString(search) || isNumber(search)) {
+            search = search.toString();
+            this.$$search = parseKeyValue(search);
+          } else if (isObject(search)) {
+            search = copy(search, {});
+            // remove object undefined or null properties
+            forEach(search, function(value, key) {
+              if (value == null) delete search[key];
+            });
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#hash
-             * @methodOf ng.$location
-             *
-             * @description
-             * This method is getter / setter.
-             *
-             * Return hash fragment when called without any parameter.
-             *
-             * Change hash fragment when called with parameter and return `$location`.
-             *
-             * @param {string=} hash New hash fragment
-             * @return {string} hash
-             */
-            hash: locationGetterSetter('$$hash', identity),
+            this.$$search = search;
+          } else {
+            throw $locationMinErr('isrcharg',
+              'The first argument of the `$location#search()` call must be a string or an object.');
+          }
+          break;
+        default:
+          if (isUndefined(paramValue) || paramValue === null) {
+            delete this.$$search[search];
+          } else {
+            this.$$search[search] = paramValue;
+          }
+      }
+
+      this.$$compose();
+      return this;
+    },
+
+    /**
+     * @ngdoc method
+     * @name $location#hash
+     *
+     * @description
+     * This method is getter / setter.
+     *
+     * Returns the hash fragment when called without any parameters.
+     *
+     * Changes the hash fragment when called with a parameter and returns `$location`.
+     *
+     *
+     * ```js
+     * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
+     * var hash = $location.hash();
+     * // => "hashValue"
+     * ```
+     *
+     * @param {(string|number)=} hash New hash fragment
+     * @return {string} hash
+     */
+    hash: locationGetterSetter('$$hash', function(hash) {
+      return hash !== null ? hash.toString() : '';
+    }),
+
+    /**
+     * @ngdoc method
+     * @name $location#replace
+     *
+     * @description
+     * If called, all changes to $location during the current `$digest` will replace the current history
+     * record, instead of adding a new one.
+     */
+    replace: function() {
+      this.$$replace = true;
+      return this;
+    }
+  };
+
+  forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) {
+    Location.prototype = Object.create(locationPrototype);
+
+    /**
+     * @ngdoc method
+     * @name $location#state
+     *
+     * @description
+     * This method is getter / setter.
+     *
+     * Return the history state object when called without any parameter.
+     *
+     * Change the history state object when called with one parameter and return `$location`.
+     * The state object is later passed to `pushState` or `replaceState`.
+     *
+     * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
+     * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
+     * older browsers (like IE9 or Android < 4.0), don't use this method.
+     *
+     * @param {object=} state State object for pushState or replaceState
+     * @return {object} state
+     */
+    Location.prototype.state = function(state) {
+      if (!arguments.length) {
+        return this.$$state;
+      }
+
+      if (Location !== LocationHtml5Url || !this.$$html5) {
+        throw $locationMinErr('nostate', 'History API state support is available only ' +
+          'in HTML5 mode and only in browsers supporting HTML5 History API');
+      }
+      // The user might modify `stateObject` after invoking `$location.state(stateObject)`
+      // but we're changing the $$state reference to $browser.state() during the $digest
+      // so the modification window is narrow.
+      this.$$state = isUndefined(state) ? null : state;
+      this.$$urlUpdatedByLocation = true;
+
+      return this;
+    };
+  });
 
-            /**
-             * @ngdoc method
-             * @name ng.$location#replace
-             * @methodOf ng.$location
-             *
-             * @description
-             * If called, all changes to $location during current `$digest` will be replacing current history
-             * record, instead of adding new one.
-             */
-            replace: function() {
-              this.$$replace = true;
-              return this;
-            }
-          };
 
   function locationGetter(property) {
-    return function() {
+    return /** @this */ function() {
       return this[property];
     };
   }
 
 
   function locationGetterSetter(property, preprocess) {
-    return function(value) {
-      if (isUndefined(value))
+    return /** @this */ function(value) {
+      if (isUndefined(value)) {
         return this[property];
+      }
 
       this[property] = preprocess(value);
       this.$$compose();
@@ -9045,16 +14198,14 @@
 
 
   /**
-   * @ngdoc object
-   * @name ng.$location
+   * @ngdoc service
+   * @name $location
    *
-   * @requires $browser
-   * @requires $sniffer
    * @requires $rootElement
    *
    * @description
    * The $location service parses the URL in the browser address bar (based on the
-   * {@link https://developer.mozilla.org/en/window.location window.location}) and makes the URL
+   * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL
    * available to your application. Changes to the URL in the address bar are reflected into
    * $location service and changes to $location are reflected into the browser address bar.
    *
@@ -9069,25 +14220,30 @@
    *   - Clicks on a link.
    * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash).
    *
-   * For more information see {@link guide/dev_guide.services.$location Developer Guide: Angular
-   * Services: Using $location}
+   * For more information see {@link guide/$location Developer Guide: Using $location}
    */
 
   /**
-   * @ngdoc object
-   * @name ng.$locationProvider
+   * @ngdoc provider
+   * @name $locationProvider
+   * @this
+   *
    * @description
    * Use the `$locationProvider` to configure how the application deep linking paths are stored.
    */
-  function $LocationProvider(){
-    var hashPrefix = '',
-        html5Mode = false;
+  function $LocationProvider() {
+    var hashPrefix = '!',
+      html5Mode = {
+        enabled: false,
+        requireBase: true,
+        rewriteLinks: true
+      };
 
     /**
-     * @ngdoc property
-     * @name ng.$locationProvider#hashPrefix
-     * @methodOf ng.$locationProvider
+     * @ngdoc method
+     * @name $locationProvider#hashPrefix
      * @description
+     * The default value for the prefix is `'!'`.
      * @param {string=} prefix Prefix for hash part (containing path and search)
      * @returns {*} current value if used as getter or itself (chaining) if used as setter
      */
@@ -9101,16 +14257,46 @@
     };
 
     /**
-     * @ngdoc property
-     * @name ng.$locationProvider#html5Mode
-     * @methodOf ng.$locationProvider
+     * @ngdoc method
+     * @name $locationProvider#html5Mode
      * @description
-     * @param {boolean=} mode Use HTML5 strategy if available.
-     * @returns {*} current value if used as getter or itself (chaining) if used as setter
+     * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
+     *   If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported
+     *   properties:
+     *   - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to
+     *     change urls where supported. Will fall back to hash-prefixed paths in browsers that do not
+     *     support `pushState`.
+     *   - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies
+     *     whether or not a <base> tag is required to be present. If `enabled` and `requireBase` are
+     *     true, and a base tag is not present, an error will be thrown when `$location` is injected.
+     *     See the {@link guide/$location $location guide for more information}
+     *   - **rewriteLinks** - `{boolean|string}` - (default: `true`) When html5Mode is enabled,
+     *     enables/disables URL rewriting for relative links. If set to a string, URL rewriting will
+     *     only happen on links with an attribute that matches the given string. For example, if set
+     *     to `'internal-link'`, then the URL will only be rewritten for `<a internal-link>` links.
+     *     Note that [attribute name normalization](guide/directive#normalization) does not apply
+     *     here, so `'internalLink'` will **not** match `'internal-link'`.
+     *
+     * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
      */
     this.html5Mode = function(mode) {
-      if (isDefined(mode)) {
-        html5Mode = mode;
+      if (isBoolean(mode)) {
+        html5Mode.enabled = mode;
+        return this;
+      } else if (isObject(mode)) {
+
+        if (isBoolean(mode.enabled)) {
+          html5Mode.enabled = mode.enabled;
+        }
+
+        if (isBoolean(mode.requireBase)) {
+          html5Mode.requireBase = mode.requireBase;
+        }
+
+        if (isBoolean(mode.rewriteLinks) || isString(mode.rewriteLinks)) {
+          html5Mode.rewriteLinks = mode.rewriteLinks;
+        }
+
         return this;
       } else {
         return html5Mode;
@@ -9119,66 +14305,111 @@
 
     /**
      * @ngdoc event
-     * @name ng.$location#$locationChangeStart
-     * @eventOf ng.$location
+     * @name $location#$locationChangeStart
      * @eventType broadcast on root scope
      * @description
-     * Broadcasted before a URL will change. This change can be prevented by calling
+     * Broadcasted before a URL will change.
+     *
+     * This change can be prevented by calling
      * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more
      * details about event object. Upon successful change
-     * {@link ng.$location#events_$locationChangeSuccess $locationChangeSuccess} is fired.
+     * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired.
+     *
+     * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+     * the browser supports the HTML5 History API.
      *
      * @param {Object} angularEvent Synthetic event object.
      * @param {string} newUrl New URL
      * @param {string=} oldUrl URL that was before it was changed.
+     * @param {string=} newState New history state object
+     * @param {string=} oldState History state object that was before it was changed.
      */
 
     /**
      * @ngdoc event
-     * @name ng.$location#$locationChangeSuccess
-     * @eventOf ng.$location
+     * @name $location#$locationChangeSuccess
      * @eventType broadcast on root scope
      * @description
      * Broadcasted after a URL was changed.
      *
+     * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+     * the browser supports the HTML5 History API.
+     *
      * @param {Object} angularEvent Synthetic event object.
      * @param {string} newUrl New URL
      * @param {string=} oldUrl URL that was before it was changed.
+     * @param {string=} newState New history state object
+     * @param {string=} oldState History state object that was before it was changed.
      */
 
-    this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement',
-      function( $rootScope,   $browser,   $sniffer,   $rootElement) {
+    this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window',
+      function($rootScope, $browser, $sniffer, $rootElement, $window) {
         var $location,
-            LocationMode,
-            baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
-            initialUrl = $browser.url(),
-            appBase;
+          LocationMode,
+          baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
+          initialUrl = $browser.url(),
+          appBase;
 
-        if (html5Mode) {
+        if (html5Mode.enabled) {
+          if (!baseHref && html5Mode.requireBase) {
+            throw $locationMinErr('nobase',
+              '$location in HTML5 mode requires a <base> tag to be present!');
+          }
           appBase = serverBase(initialUrl) + (baseHref || '/');
           LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url;
         } else {
           appBase = stripHash(initialUrl);
           LocationMode = LocationHashbangUrl;
         }
-        $location = new LocationMode(appBase, '#' + hashPrefix);
-        $location.$$parse($location.$$rewrite(initialUrl));
+        var appBaseNoFile = stripFile(appBase);
+
+        $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix);
+        $location.$$parseLinkUrl(initialUrl, initialUrl);
+
+        $location.$$state = $browser.state();
+
+        var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
+
+        function setBrowserUrlWithFallback(url, replace, state) {
+          var oldUrl = $location.url();
+          var oldState = $location.$$state;
+          try {
+            $browser.url(url, replace, state);
+
+            // Make sure $location.state() returns referentially identical (not just deeply equal)
+            // state object; this makes possible quick checking if the state changed in the digest
+            // loop. Checking deep equality would be too expensive.
+            $location.$$state = $browser.state();
+          } catch (e) {
+            // Restore old values if pushState fails
+            $location.url(oldUrl);
+            $location.$$state = oldState;
+
+            throw e;
+          }
+        }
 
         $rootElement.on('click', function(event) {
+          var rewriteLinks = html5Mode.rewriteLinks;
           // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
           // currently we open nice url link and redirect then
 
-          if (event.ctrlKey || event.metaKey || event.which == 2) return;
+          if (!rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which === 2 || event.button === 2) return;
 
           var elm = jqLite(event.target);
 
           // traverse the DOM up to find first A tag
-          while (lowercase(elm[0].nodeName) !== 'a') {
+          while (nodeName_(elm[0]) !== 'a') {
             // ignore rewriting if no A tag (reached root element, or no parent - removed from document)
             if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return;
           }
 
+          if (isString(rewriteLinks) && isUndefined(elm.attr(rewriteLinks))) return;
+
           var absHref = elm.prop('href');
+          // get the actual href attribute - see
+          // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
+          var relHref = elm.attr('href') || elm.attr('xlink:href');
 
           if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
             // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
@@ -9186,79 +14417,125 @@
             absHref = urlResolve(absHref.animVal).href;
           }
 
-          var rewrittenUrl = $location.$$rewrite(absHref);
+          // Ignore when url is started with javascript: or mailto:
+          if (IGNORE_URI_REGEXP.test(absHref)) return;
 
-          if (absHref && !elm.attr('target') && rewrittenUrl && !event.isDefaultPrevented()) {
-            event.preventDefault();
-            if (rewrittenUrl != $browser.url()) {
+          if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
+            if ($location.$$parseLinkUrl(absHref, relHref)) {
+              // We do a preventDefault for all urls that are part of the angular application,
+              // in html5mode and also without, so that we are able to abort navigation without
+              // getting double entries in the location history.
+              event.preventDefault();
               // update location manually
-              $location.$$parse(rewrittenUrl);
-              $rootScope.$apply();
-              // hack to work around FF6 bug 684208 when scenario runner clicks on links
-              window.angular['ff-684208-preventDefault'] = true;
+              if ($location.absUrl() !== $browser.url()) {
+                $rootScope.$apply();
+                // hack to work around FF6 bug 684208 when scenario runner clicks on links
+                $window.angular['ff-684208-preventDefault'] = true;
+              }
             }
           }
         });
 
 
         // rewrite hashbang url <> html5 url
-        if ($location.absUrl() != initialUrl) {
+        if (trimEmptyHash($location.absUrl()) !== trimEmptyHash(initialUrl)) {
           $browser.url($location.absUrl(), true);
         }
 
-        // update $location when $browser url changes
-        $browser.onUrlChange(function(newUrl) {
-          if ($location.absUrl() != newUrl) {
-            $rootScope.$evalAsync(function() {
-              var oldUrl = $location.absUrl();
+        var initializing = true;
 
-              $location.$$parse(newUrl);
-              if ($rootScope.$broadcast('$locationChangeStart', newUrl,
-                  oldUrl).defaultPrevented) {
-                $location.$$parse(oldUrl);
-                $browser.url(oldUrl);
-              } else {
-                afterLocationChange(oldUrl);
-              }
-            });
-            if (!$rootScope.$$phase) $rootScope.$digest();
+        // update $location when $browser url changes
+        $browser.onUrlChange(function(newUrl, newState) {
+
+          if (!startsWith(newUrl, appBaseNoFile)) {
+            // If we are navigating outside of the app then force a reload
+            $window.location.href = newUrl;
+            return;
           }
+
+          $rootScope.$evalAsync(function() {
+            var oldUrl = $location.absUrl();
+            var oldState = $location.$$state;
+            var defaultPrevented;
+            newUrl = trimEmptyHash(newUrl);
+            $location.$$parse(newUrl);
+            $location.$$state = newState;
+
+            defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+              newState, oldState).defaultPrevented;
+
+            // if the location was changed by a `$locationChangeStart` handler then stop
+            // processing this location change
+            if ($location.absUrl() !== newUrl) return;
+
+            if (defaultPrevented) {
+              $location.$$parse(oldUrl);
+              $location.$$state = oldState;
+              setBrowserUrlWithFallback(oldUrl, false, oldState);
+            } else {
+              initializing = false;
+              afterLocationChange(oldUrl, oldState);
+            }
+          });
+          if (!$rootScope.$$phase) $rootScope.$digest();
         });
 
         // update browser
-        var changeCounter = 0;
         $rootScope.$watch(function $locationWatch() {
-          var oldUrl = $browser.url();
-          var currentReplace = $location.$$replace;
+          if (initializing || $location.$$urlUpdatedByLocation) {
+            $location.$$urlUpdatedByLocation = false;
 
-          if (!changeCounter || oldUrl != $location.absUrl()) {
-            changeCounter++;
-            $rootScope.$evalAsync(function() {
-              if ($rootScope.$broadcast('$locationChangeStart', $location.absUrl(), oldUrl).
-                  defaultPrevented) {
-                $location.$$parse(oldUrl);
-              } else {
-                $browser.url($location.absUrl(), currentReplace);
-                afterLocationChange(oldUrl);
-              }
-            });
+            var oldUrl = trimEmptyHash($browser.url());
+            var newUrl = trimEmptyHash($location.absUrl());
+            var oldState = $browser.state();
+            var currentReplace = $location.$$replace;
+            var urlOrStateChanged = oldUrl !== newUrl ||
+              ($location.$$html5 && $sniffer.history && oldState !== $location.$$state);
+
+            if (initializing || urlOrStateChanged) {
+              initializing = false;
+
+              $rootScope.$evalAsync(function() {
+                var newUrl = $location.absUrl();
+                var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+                  $location.$$state, oldState).defaultPrevented;
+
+                // if the location was changed by a `$locationChangeStart` handler then stop
+                // processing this location change
+                if ($location.absUrl() !== newUrl) return;
+
+                if (defaultPrevented) {
+                  $location.$$parse(oldUrl);
+                  $location.$$state = oldState;
+                } else {
+                  if (urlOrStateChanged) {
+                    setBrowserUrlWithFallback(newUrl, currentReplace,
+                      oldState === $location.$$state ? null : $location.$$state);
+                  }
+                  afterLocationChange(oldUrl, oldState);
+                }
+              });
+            }
           }
+
           $location.$$replace = false;
 
-          return changeCounter;
+          // we don't need to return anything because $evalAsync will make the digest loop dirty when
+          // there is a change
         });
 
         return $location;
 
-        function afterLocationChange(oldUrl) {
-          $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl);
+        function afterLocationChange(oldUrl, oldState) {
+          $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl,
+            $location.$$state, oldState);
         }
       }];
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$log
+   * @ngdoc service
+   * @name $log
    * @requires $window
    *
    * @description
@@ -9267,47 +14544,58 @@
    *
    * The main purpose of this service is to simplify debugging and troubleshooting.
    *
+   * To reveal the location of the calls to `$log` in the JavaScript console,
+   * you can "blackbox" the AngularJS source in your browser:
+   *
+   * [Mozilla description of blackboxing](https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Black_box_a_source).
+   * [Chrome description of blackboxing](https://developer.chrome.com/devtools/docs/blackboxing).
+   *
+   * Note: Not all browsers support blackboxing.
+   *
    * The default is to log `debug` messages. You can use
    * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this.
    *
    * @example
-   <example>
+   <example module="logExample" name="log-service">
    <file name="script.js">
-   function LogCtrl($scope, $log) {
-         $scope.$log = $log;
-         $scope.message = 'Hello World!';
-       }
+   angular.module('logExample', [])
+   .controller('LogController', ['$scope', '$log', function($scope, $log) {
+           $scope.$log = $log;
+           $scope.message = 'Hello World!';
+         }]);
    </file>
    <file name="index.html">
-   <div ng-controller="LogCtrl">
+   <div ng-controller="LogController">
    <p>Reload this page with open console, enter text and hit the log button...</p>
-   Message:
-   <input type="text" ng-model="message"/>
+   <label>Message:
+   <input type="text" ng-model="message" /></label>
    <button ng-click="$log.log(message)">log</button>
    <button ng-click="$log.warn(message)">warn</button>
    <button ng-click="$log.info(message)">info</button>
    <button ng-click="$log.error(message)">error</button>
+   <button ng-click="$log.debug(message)">debug</button>
    </div>
    </file>
    </example>
    */
 
   /**
-   * @ngdoc object
-   * @name ng.$logProvider
+   * @ngdoc provider
+   * @name $logProvider
+   * @this
+   *
    * @description
    * Use the `$logProvider` to configure how the application logs messages
    */
-  function $LogProvider(){
+  function $LogProvider() {
     var debug = true,
-        self = this;
+      self = this;
 
     /**
-     * @ngdoc property
-     * @name ng.$logProvider#debugEnabled
-     * @methodOf ng.$logProvider
+     * @ngdoc method
+     * @name $logProvider#debugEnabled
      * @description
-     * @param {string=} flag enable or disable debug level messages
+     * @param {boolean=} flag enable or disable debug level messages
      * @returns {*} current value if used as getter or itself (chaining) if used as setter
      */
     this.debugEnabled = function(flag) {
@@ -9319,12 +14607,20 @@
       }
     };
 
-    this.$get = ['$window', function($window){
+    this.$get = ['$window', function($window) {
+      // Support: IE 9-11, Edge 12-14+
+      // IE/Edge display errors in such a way that it requires the user to click in 4 places
+      // to see the stack trace. There is no way to feature-detect it so there's a chance
+      // of the user agent sniffing to go wrong but since it's only about logging, this shouldn't
+      // break apps. Other browsers display errors in a sensible way and some of them map stack
+      // traces along source maps if available so it makes sense to let browsers display it
+      // as they want.
+      var formatStackTrace = msie || /\bEdge\//.test($window.navigator && $window.navigator.userAgent);
+
       return {
         /**
          * @ngdoc method
-         * @name ng.$log#log
-         * @methodOf ng.$log
+         * @name $log#log
          *
          * @description
          * Write a log message
@@ -9333,8 +14629,7 @@
 
         /**
          * @ngdoc method
-         * @name ng.$log#info
-         * @methodOf ng.$log
+         * @name $log#info
          *
          * @description
          * Write an information message
@@ -9343,8 +14638,7 @@
 
         /**
          * @ngdoc method
-         * @name ng.$log#warn
-         * @methodOf ng.$log
+         * @name $log#warn
          *
          * @description
          * Write a warning message
@@ -9353,8 +14647,7 @@
 
         /**
          * @ngdoc method
-         * @name ng.$log#error
-         * @methodOf ng.$log
+         * @name $log#error
          *
          * @description
          * Write an error message
@@ -9363,13 +14656,12 @@
 
         /**
          * @ngdoc method
-         * @name ng.$log#debug
-         * @methodOf ng.$log
+         * @name $log#debug
          *
          * @description
          * Write a debug message
          */
-        debug: (function () {
+        debug: (function() {
           var fn = consoleLog('debug');
 
           return function() {
@@ -9377,15 +14669,15 @@
               fn.apply(self, arguments);
             }
           };
-        }())
+        })()
       };
 
       function formatError(arg) {
-        if (arg instanceof Error) {
-          if (arg.stack) {
+        if (isError(arg)) {
+          if (arg.stack && formatStackTrace) {
             arg = (arg.message && arg.stack.indexOf(arg.message) === -1)
-                ? 'Error: ' + arg.message + '\n' + arg.stack
-                : arg.stack;
+              ? 'Error: ' + arg.message + '\n' + arg.stack
+              : arg.stack;
           } else if (arg.sourceURL) {
             arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line;
           }
@@ -9395,139 +14687,74 @@
 
       function consoleLog(type) {
         var console = $window.console || {},
-            logFn = console[type] || console.log || noop,
-            hasApply = false;
+          logFn = console[type] || console.log || noop;
 
-        // Note: reading logFn.apply throws an error in IE11 in IE8 document mode.
-        // The reason behind this is that console.log has type "object" in IE8...
-        try {
-          hasApply = !! logFn.apply;
-        } catch (e) {}
-
-        if (hasApply) {
-          return function() {
-            var args = [];
-            forEach(arguments, function(arg) {
-              args.push(formatError(arg));
-            });
-            return logFn.apply(console, args);
-          };
-        }
-
-        // we are IE which either doesn't have window.console => this is noop and we do nothing,
-        // or we are IE where console.log doesn't have apply so we log at least first 2 args
-        return function(arg1, arg2) {
-          logFn(arg1, arg2 == null ? '' : arg2);
+        return function() {
+          var args = [];
+          forEach(arguments, function(arg) {
+            args.push(formatError(arg));
+          });
+          // Support: IE 9 only
+          // console methods don't inherit from Function.prototype in IE 9 so we can't
+          // call `logFn.apply(console, args)` directly.
+          return Function.prototype.apply.call(logFn, console, args);
         };
       }
     }];
   }
 
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
   var $parseMinErr = minErr('$parse');
-  var promiseWarningCache = {};
-  var promiseWarning;
+
+  var objectValueOf = {}.constructor.prototype.valueOf;
 
 // Sandboxing Angular Expressions
 // ------------------------------
-// Angular expressions are generally considered safe because these expressions only have direct
-// access to $scope and locals. However, one can obtain the ability to execute arbitrary JS code by
-// obtaining a reference to native JS functions such as the Function constructor.
+// Angular expressions are no longer sandboxed. So it is now even easier to access arbitrary JS code by
+// various means such as obtaining a reference to native JS functions like the Function constructor.
 //
 // As an example, consider the following Angular expression:
 //
-//   {}.toString.constructor(alert("evil JS code"))
+//   {}.toString.constructor('alert("evil JS code")')
 //
-// We want to prevent this type of access. For the sake of performance, during the lexing phase we
-// disallow any "dotted" access to any member named "constructor".
+// It is important to realize that if you create an expression from a string that contains user provided
+// content then it is possible that your application contains a security vulnerability to an XSS style attack.
 //
-// For reflective calls (a[b]) we check that the value of the lookup is not the Function constructor
-// while evaluating the expression, which is a stronger but more expensive test. Since reflective
-// calls are expensive anyway, this is not such a big deal compared to static dereferencing.
-//
-// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
-// against the expression language, but not to prevent exploits that were enabled by exposing
-// sensitive JavaScript or browser apis on Scope. Exposing such objects on a Scope is never a good
-// practice and therefore we are not even trying to protect against interaction with an object
-// explicitly exposed in this way.
-//
-// A developer could foil the name check by aliasing the Function constructor under a different
-// name on the scope.
-//
-// In general, it is not possible to access a Window object from an angular expression unless a
-// window or some DOM object that has a reference to window is published onto a Scope.
+// See https://docs.angularjs.org/guide/security
 
-  function ensureSafeMemberName(name, fullExpression) {
-    if (name === "constructor") {
-      throw $parseMinErr('isecfld',
-          'Referencing "constructor" field in Angular expressions is disallowed! Expression: {0}',
-          fullExpression);
-    }
-    return name;
+
+  function getStringValue(name) {
+    // Property names must be strings. This means that non-string objects cannot be used
+    // as keys in an object. Any non-string object, including a number, is typecasted
+    // into a string via the toString method.
+    // -- MDN, https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Property_accessors#Property_names
+    //
+    // So, to ensure that we are checking the same `name` that JavaScript would use, we cast it
+    // to a string. It's not always possible. If `name` is an object and its `toString` method is
+    // 'broken' (doesn't return a string, isn't a function, etc.), an error will be thrown:
+    //
+    // TypeError: Cannot convert object to primitive value
+    //
+    // For performance reasons, we don't catch this error here and allow it to propagate up the call
+    // stack. Note that you'll get the same error in JavaScript if you try to access a property using
+    // such a 'broken' object as a key.
+    return name + '';
   }
 
-  function ensureSafeObject(obj, fullExpression) {
-    // nifty check if obj is Function that is fast and works across iframes and other contexts
-    if (obj) {
-      if (obj.constructor === obj) {
-        throw $parseMinErr('isecfn',
-            'Referencing Function in Angular expressions is disallowed! Expression: {0}',
-            fullExpression);
-      } else if (// isWindow(obj)
-          obj.document && obj.location && obj.alert && obj.setInterval) {
-        throw $parseMinErr('isecwindow',
-            'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
-            fullExpression);
-      } else if (// isElement(obj)
-          obj.children && (obj.nodeName || (obj.on && obj.find))) {
-        throw $parseMinErr('isecdom',
-            'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
-            fullExpression);
-      }
-    }
-    return obj;
-  }
 
-  var OPERATORS = {
-    /* jshint bitwise : false */
-    'null':function(){return null;},
-    'true':function(){return true;},
-    'false':function(){return false;},
-    undefined:noop,
-    '+':function(self, locals, a,b){
-      a=a(self, locals); b=b(self, locals);
-      if (isDefined(a)) {
-        if (isDefined(b)) {
-          return a + b;
-        }
-        return a;
-      }
-      return isDefined(b)?b:undefined;},
-    '-':function(self, locals, a,b){
-      a=a(self, locals); b=b(self, locals);
-      return (isDefined(a)?a:0)-(isDefined(b)?b:0);
-    },
-    '*':function(self, locals, a,b){return a(self, locals)*b(self, locals);},
-    '/':function(self, locals, a,b){return a(self, locals)/b(self, locals);},
-    '%':function(self, locals, a,b){return a(self, locals)%b(self, locals);},
-    '^':function(self, locals, a,b){return a(self, locals)^b(self, locals);},
-    '=':noop,
-    '===':function(self, locals, a, b){return a(self, locals)===b(self, locals);},
-    '!==':function(self, locals, a, b){return a(self, locals)!==b(self, locals);},
-    '==':function(self, locals, a,b){return a(self, locals)==b(self, locals);},
-    '!=':function(self, locals, a,b){return a(self, locals)!=b(self, locals);},
-    '<':function(self, locals, a,b){return a(self, locals)<b(self, locals);},
-    '>':function(self, locals, a,b){return a(self, locals)>b(self, locals);},
-    '<=':function(self, locals, a,b){return a(self, locals)<=b(self, locals);},
-    '>=':function(self, locals, a,b){return a(self, locals)>=b(self, locals);},
-    '&&':function(self, locals, a,b){return a(self, locals)&&b(self, locals);},
-    '||':function(self, locals, a,b){return a(self, locals)||b(self, locals);},
-    '&':function(self, locals, a,b){return a(self, locals)&b(self, locals);},
-//    '|':function(self, locals, a,b){return a|b;},
-    '|':function(self, locals, a,b){return b(self, locals)(self, locals, a(self, locals));},
-    '!':function(self, locals, a){return !a(self, locals);}
-  };
-  /* jshint bitwise: true */
-  var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
+  var OPERATORS = createMap();
+  forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
+  var ESCAPE = {'n':'\n', 'f':'\f', 'r':'\r', 't':'\t', 'v':'\v', '\'':'\'', '"':'"'};
 
 
 /////////////////////////////////////////
@@ -9536,85 +14763,51 @@
   /**
    * @constructor
    */
-  var Lexer = function (options) {
+  var Lexer = function Lexer(options) {
     this.options = options;
   };
 
   Lexer.prototype = {
     constructor: Lexer,
 
-    lex: function (text) {
+    lex: function(text) {
       this.text = text;
-
       this.index = 0;
-      this.ch = undefined;
-      this.lastCh = ':'; // can start regexp
-
       this.tokens = [];
 
-      var token;
-      var json = [];
-
       while (this.index < this.text.length) {
-        this.ch = this.text.charAt(this.index);
-        if (this.is('"\'')) {
-          this.readString(this.ch);
-        } else if (this.isNumber(this.ch) || this.is('.') && this.isNumber(this.peek())) {
+        var ch = this.text.charAt(this.index);
+        if (ch === '"' || ch === '\'') {
+          this.readString(ch);
+        } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) {
           this.readNumber();
-        } else if (this.isIdent(this.ch)) {
+        } else if (this.isIdentifierStart(this.peekMultichar())) {
           this.readIdent();
-          // identifiers can only be if the preceding char was a { or ,
-          if (this.was('{,') && json[0] === '{' &&
-              (token = this.tokens[this.tokens.length - 1])) {
-            token.json = token.text.indexOf('.') === -1;
-          }
-        } else if (this.is('(){}[].,;:?')) {
-          this.tokens.push({
-            index: this.index,
-            text: this.ch,
-            json: (this.was(':[,') && this.is('{[')) || this.is('}]:,')
-          });
-          if (this.is('{[')) json.unshift(this.ch);
-          if (this.is('}]')) json.shift();
+        } else if (this.is(ch, '(){}[].,;:?')) {
+          this.tokens.push({index: this.index, text: ch});
           this.index++;
-        } else if (this.isWhitespace(this.ch)) {
+        } else if (this.isWhitespace(ch)) {
           this.index++;
-          continue;
         } else {
-          var ch2 = this.ch + this.peek();
+          var ch2 = ch + this.peek();
           var ch3 = ch2 + this.peek(2);
-          var fn = OPERATORS[this.ch];
-          var fn2 = OPERATORS[ch2];
-          var fn3 = OPERATORS[ch3];
-          if (fn3) {
-            this.tokens.push({index: this.index, text: ch3, fn: fn3});
-            this.index += 3;
-          } else if (fn2) {
-            this.tokens.push({index: this.index, text: ch2, fn: fn2});
-            this.index += 2;
-          } else if (fn) {
-            this.tokens.push({
-              index: this.index,
-              text: this.ch,
-              fn: fn,
-              json: (this.was('[,:') && this.is('+-'))
-            });
-            this.index += 1;
+          var op1 = OPERATORS[ch];
+          var op2 = OPERATORS[ch2];
+          var op3 = OPERATORS[ch3];
+          if (op1 || op2 || op3) {
+            var token = op3 ? ch3 : (op2 ? ch2 : ch);
+            this.tokens.push({index: this.index, text: token, operator: true});
+            this.index += token.length;
           } else {
             this.throwError('Unexpected next character ', this.index, this.index + 1);
           }
         }
-        this.lastCh = this.ch;
       }
       return this.tokens;
     },
 
-    is: function(chars) {
-      return chars.indexOf(this.ch) !== -1;
-    },
-
-    was: function(chars) {
-      return chars.indexOf(this.lastCh) !== -1;
+    is: function(ch, chars) {
+      return chars.indexOf(ch) !== -1;
     },
 
     peek: function(i) {
@@ -9623,19 +14816,55 @@
     },
 
     isNumber: function(ch) {
-      return ('0' <= ch && ch <= '9');
+      return ('0' <= ch && ch <= '9') && typeof ch === 'string';
     },
 
     isWhitespace: function(ch) {
       // IE treats non-breaking space as \u00A0
       return (ch === ' ' || ch === '\r' || ch === '\t' ||
-          ch === '\n' || ch === '\v' || ch === '\u00A0');
+        ch === '\n' || ch === '\v' || ch === '\u00A0');
     },
 
-    isIdent: function(ch) {
+    isIdentifierStart: function(ch) {
+      return this.options.isIdentifierStart ?
+        this.options.isIdentifierStart(ch, this.codePointAt(ch)) :
+        this.isValidIdentifierStart(ch);
+    },
+
+    isValidIdentifierStart: function(ch) {
       return ('a' <= ch && ch <= 'z' ||
-          'A' <= ch && ch <= 'Z' ||
-          '_' === ch || ch === '$');
+        'A' <= ch && ch <= 'Z' ||
+        '_' === ch || ch === '$');
+    },
+
+    isIdentifierContinue: function(ch) {
+      return this.options.isIdentifierContinue ?
+        this.options.isIdentifierContinue(ch, this.codePointAt(ch)) :
+        this.isValidIdentifierContinue(ch);
+    },
+
+    isValidIdentifierContinue: function(ch, cp) {
+      return this.isValidIdentifierStart(ch, cp) || this.isNumber(ch);
+    },
+
+    codePointAt: function(ch) {
+      if (ch.length === 1) return ch.charCodeAt(0);
+      // eslint-disable-next-line no-bitwise
+      return (ch.charCodeAt(0) << 10) + ch.charCodeAt(1) - 0x35FDC00;
+    },
+
+    peekMultichar: function() {
+      var ch = this.text.charAt(this.index);
+      var peek = this.peek();
+      if (!peek) {
+        return ch;
+      }
+      var cp1 = ch.charCodeAt(0);
+      var cp2 = peek.charCodeAt(0);
+      if (cp1 >= 0xD800 && cp1 <= 0xDBFF && cp2 >= 0xDC00 && cp2 <= 0xDFFF) {
+        return ch + peek;
+      }
+      return ch;
     },
 
     isExpOperator: function(ch) {
@@ -9645,10 +14874,10 @@
     throwError: function(error, start, end) {
       end = end || this.index;
       var colStr = (isDefined(start)
-          ? 's ' + start +  '-' + this.index + ' [' + this.text.substring(start, end) + ']'
-          : ' ' + end);
+        ? 's ' + start +  '-' + this.index + ' [' + this.text.substring(start, end) + ']'
+        : ' ' + end);
       throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].',
-          error, colStr, this.text);
+        error, colStr, this.text);
     },
 
     readNumber: function() {
@@ -9656,19 +14885,19 @@
       var start = this.index;
       while (this.index < this.text.length) {
         var ch = lowercase(this.text.charAt(this.index));
-        if (ch == '.' || this.isNumber(ch)) {
+        if (ch === '.' || this.isNumber(ch)) {
           number += ch;
         } else {
           var peekCh = this.peek();
-          if (ch == 'e' && this.isExpOperator(peekCh)) {
+          if (ch === 'e' && this.isExpOperator(peekCh)) {
             number += ch;
           } else if (this.isExpOperator(ch) &&
-              peekCh && this.isNumber(peekCh) &&
-              number.charAt(number.length - 1) == 'e') {
+            peekCh && this.isNumber(peekCh) &&
+            number.charAt(number.length - 1) === 'e') {
             number += ch;
           } else if (this.isExpOperator(ch) &&
-              (!peekCh || !this.isNumber(peekCh)) &&
-              number.charAt(number.length - 1) == 'e') {
+            (!peekCh || !this.isNumber(peekCh)) &&
+            number.charAt(number.length - 1) === 'e') {
             this.throwError('Invalid exponent');
           } else {
             break;
@@ -9676,88 +14905,29 @@
         }
         this.index++;
       }
-      number = 1 * number;
       this.tokens.push({
         index: start,
         text: number,
-        json: true,
-        fn: function() { return number; }
+        constant: true,
+        value: Number(number)
       });
     },
 
     readIdent: function() {
-      var parser = this;
-
-      var ident = '';
       var start = this.index;
-
-      var lastDot, peekIndex, methodName, ch;
-
+      this.index += this.peekMultichar().length;
       while (this.index < this.text.length) {
-        ch = this.text.charAt(this.index);
-        if (ch === '.' || this.isIdent(ch) || this.isNumber(ch)) {
-          if (ch === '.') lastDot = this.index;
-          ident += ch;
-        } else {
+        var ch = this.peekMultichar();
+        if (!this.isIdentifierContinue(ch)) {
           break;
         }
-        this.index++;
+        this.index += ch.length;
       }
-
-      //check if this is not a method invocation and if it is back out to last dot
-      if (lastDot) {
-        peekIndex = this.index;
-        while (peekIndex < this.text.length) {
-          ch = this.text.charAt(peekIndex);
-          if (ch === '(') {
-            methodName = ident.substr(lastDot - start + 1);
-            ident = ident.substr(0, lastDot - start);
-            this.index = peekIndex;
-            break;
-          }
-          if (this.isWhitespace(ch)) {
-            peekIndex++;
-          } else {
-            break;
-          }
-        }
-      }
-
-
-      var token = {
+      this.tokens.push({
         index: start,
-        text: ident
-      };
-
-      // OPERATORS is our own object so we don't need to use special hasOwnPropertyFn
-      if (OPERATORS.hasOwnProperty(ident)) {
-        token.fn = OPERATORS[ident];
-        token.json = OPERATORS[ident];
-      } else {
-        var getter = getterFn(ident, this.options, this.text);
-        token.fn = extend(function(self, locals) {
-          return (getter(self, locals));
-        }, {
-          assign: function(self, value) {
-            return setter(self, ident, value, parser.text, parser.options);
-          }
-        });
-      }
-
-      this.tokens.push(token);
-
-      if (methodName) {
-        this.tokens.push({
-          index:lastDot,
-          text: '.',
-          json: false
-        });
-        this.tokens.push({
-          index: lastDot + 1,
-          text: methodName,
-          json: false
-        });
-      }
+        text: this.text.slice(start, this.index),
+        identifier: true
+      });
     },
 
     readString: function(quote) {
@@ -9772,17 +14942,14 @@
         if (escape) {
           if (ch === 'u') {
             var hex = this.text.substring(this.index + 1, this.index + 5);
-            if (!hex.match(/[\da-f]{4}/i))
+            if (!hex.match(/[\da-f]{4}/i)) {
               this.throwError('Invalid unicode escape [\\u' + hex + ']');
+            }
             this.index += 4;
             string += String.fromCharCode(parseInt(hex, 16));
           } else {
             var rep = ESCAPE[ch];
-            if (rep) {
-              string += rep;
-            } else {
-              string += ch;
-            }
+            string = string + (rep || ch);
           }
           escape = false;
         } else if (ch === '\\') {
@@ -9792,9 +14959,8 @@
           this.tokens.push({
             index: start,
             text: rawString,
-            string: string,
-            json: true,
-            fn: function() { return string; }
+            constant: true,
+            value: string
           });
           return;
         } else {
@@ -9806,215 +14972,66 @@
     }
   };
 
-
-  /**
-   * @constructor
-   */
-  var Parser = function (lexer, $filter, options) {
+  var AST = function AST(lexer, options) {
     this.lexer = lexer;
-    this.$filter = $filter;
     this.options = options;
   };
 
-  Parser.ZERO = function () { return 0; };
+  AST.Program = 'Program';
+  AST.ExpressionStatement = 'ExpressionStatement';
+  AST.AssignmentExpression = 'AssignmentExpression';
+  AST.ConditionalExpression = 'ConditionalExpression';
+  AST.LogicalExpression = 'LogicalExpression';
+  AST.BinaryExpression = 'BinaryExpression';
+  AST.UnaryExpression = 'UnaryExpression';
+  AST.CallExpression = 'CallExpression';
+  AST.MemberExpression = 'MemberExpression';
+  AST.Identifier = 'Identifier';
+  AST.Literal = 'Literal';
+  AST.ArrayExpression = 'ArrayExpression';
+  AST.Property = 'Property';
+  AST.ObjectExpression = 'ObjectExpression';
+  AST.ThisExpression = 'ThisExpression';
+  AST.LocalsExpression = 'LocalsExpression';
 
-  Parser.prototype = {
-    constructor: Parser,
+// Internal use only
+  AST.NGValueParameter = 'NGValueParameter';
 
-    parse: function (text, json) {
+  AST.prototype = {
+    ast: function(text) {
       this.text = text;
-
-      //TODO(i): strip all the obsolte json stuff from this file
-      this.json = json;
-
       this.tokens = this.lexer.lex(text);
 
-      if (json) {
-        // The extra level of aliasing is here, just in case the lexer misses something, so that
-        // we prevent any accidental execution in JSON.
-        this.assignment = this.logicalOR;
-
-        this.functionCall =
-            this.fieldAccess =
-                this.objectIndex =
-                    this.filterChain = function() {
-                      this.throwError('is not valid json', {text: text, index: 0});
-                    };
-      }
-
-      var value = json ? this.primary() : this.statements();
+      var value = this.program();
 
       if (this.tokens.length !== 0) {
         this.throwError('is an unexpected token', this.tokens[0]);
       }
 
-      value.literal = !!value.literal;
-      value.constant = !!value.constant;
-
       return value;
     },
 
-    primary: function () {
-      var primary;
-      if (this.expect('(')) {
-        primary = this.filterChain();
-        this.consume(')');
-      } else if (this.expect('[')) {
-        primary = this.arrayDeclaration();
-      } else if (this.expect('{')) {
-        primary = this.object();
-      } else {
-        var token = this.expect();
-        primary = token.fn;
-        if (!primary) {
-          this.throwError('not a primary expression', token);
-        }
-        if (token.json) {
-          primary.constant = true;
-          primary.literal = true;
-        }
-      }
-
-      var next, context;
-      while ((next = this.expect('(', '[', '.'))) {
-        if (next.text === '(') {
-          primary = this.functionCall(primary, context);
-          context = null;
-        } else if (next.text === '[') {
-          context = primary;
-          primary = this.objectIndex(primary);
-        } else if (next.text === '.') {
-          context = primary;
-          primary = this.fieldAccess(primary);
-        } else {
-          this.throwError('IMPOSSIBLE');
-        }
-      }
-      return primary;
-    },
-
-    throwError: function(msg, token) {
-      throw $parseMinErr('syntax',
-          'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
-          token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
-    },
-
-    peekToken: function() {
-      if (this.tokens.length === 0)
-        throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
-      return this.tokens[0];
-    },
-
-    peek: function(e1, e2, e3, e4) {
-      if (this.tokens.length > 0) {
-        var token = this.tokens[0];
-        var t = token.text;
-        if (t === e1 || t === e2 || t === e3 || t === e4 ||
-            (!e1 && !e2 && !e3 && !e4)) {
-          return token;
-        }
-      }
-      return false;
-    },
-
-    expect: function(e1, e2, e3, e4){
-      var token = this.peek(e1, e2, e3, e4);
-      if (token) {
-        if (this.json && !token.json) {
-          this.throwError('is not valid json', token);
-        }
-        this.tokens.shift();
-        return token;
-      }
-      return false;
-    },
-
-    consume: function(e1){
-      if (!this.expect(e1)) {
-        this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
-      }
-    },
-
-    unaryFn: function(fn, right) {
-      return extend(function(self, locals) {
-        return fn(self, locals, right);
-      }, {
-        constant:right.constant
-      });
-    },
-
-    ternaryFn: function(left, middle, right){
-      return extend(function(self, locals){
-        return left(self, locals) ? middle(self, locals) : right(self, locals);
-      }, {
-        constant: left.constant && middle.constant && right.constant
-      });
-    },
-
-    binaryFn: function(left, fn, right) {
-      return extend(function(self, locals) {
-        return fn(self, locals, left, right);
-      }, {
-        constant:left.constant && right.constant
-      });
-    },
-
-    statements: function() {
-      var statements = [];
+    program: function() {
+      var body = [];
       while (true) {
         if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
-          statements.push(this.filterChain());
+          body.push(this.expressionStatement());
         if (!this.expect(';')) {
-          // optimize for the common case where there is only one statement.
-          // TODO(size): maybe we should not support multiple statements?
-          return (statements.length === 1)
-              ? statements[0]
-              : function(self, locals) {
-            var value;
-            for (var i = 0; i < statements.length; i++) {
-              var statement = statements[i];
-              if (statement) {
-                value = statement(self, locals);
-              }
-            }
-            return value;
-          };
+          return { type: AST.Program, body: body};
         }
       }
     },
 
+    expressionStatement: function() {
+      return { type: AST.ExpressionStatement, expression: this.filterChain() };
+    },
+
     filterChain: function() {
       var left = this.expression();
-      var token;
-      while (true) {
-        if ((token = this.expect('|'))) {
-          left = this.binaryFn(left, token.fn, this.filter());
-        } else {
-          return left;
-        }
-      }
-    },
-
-    filter: function() {
-      var token = this.expect();
-      var fn = this.$filter(token.text);
-      var argsFn = [];
-      while (true) {
-        if ((token = this.expect(':'))) {
-          argsFn.push(this.expression());
-        } else {
-          var fnInvoke = function(self, locals, input) {
-            var args = [input];
-            for (var i = 0; i < argsFn.length; i++) {
-              args.push(argsFn[i](self, locals));
-            }
-            return fn.apply(self, args);
-          };
-          return function() {
-            return fnInvoke;
-          };
-        }
+      while (this.expect('|')) {
+        left = this.filter(left);
       }
+      return left;
     },
 
     expression: function() {
@@ -10022,55 +15039,43 @@
     },
 
     assignment: function() {
-      var left = this.ternary();
-      var right;
-      var token;
-      if ((token = this.expect('='))) {
-        if (!left.assign) {
-          this.throwError('implies assignment but [' +
-              this.text.substring(0, token.index) + '] can not be assigned to', token);
+      var result = this.ternary();
+      if (this.expect('=')) {
+        if (!isAssignable(result)) {
+          throw $parseMinErr('lval', 'Trying to assign a value to a non l-value');
         }
-        right = this.ternary();
-        return function(scope, locals) {
-          return left.assign(scope, right(scope, locals), locals);
-        };
+
+        result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='};
       }
-      return left;
+      return result;
     },
 
     ternary: function() {
-      var left = this.logicalOR();
-      var middle;
-      var token;
-      if ((token = this.expect('?'))) {
-        middle = this.ternary();
-        if ((token = this.expect(':'))) {
-          return this.ternaryFn(left, middle, this.ternary());
-        } else {
-          this.throwError('expected :', token);
+      var test = this.logicalOR();
+      var alternate;
+      var consequent;
+      if (this.expect('?')) {
+        alternate = this.expression();
+        if (this.consume(':')) {
+          consequent = this.expression();
+          return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent};
         }
-      } else {
-        return left;
       }
+      return test;
     },
 
     logicalOR: function() {
       var left = this.logicalAND();
-      var token;
-      while (true) {
-        if ((token = this.expect('||'))) {
-          left = this.binaryFn(left, token.fn, this.logicalAND());
-        } else {
-          return left;
-        }
+      while (this.expect('||')) {
+        left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() };
       }
+      return left;
     },
 
     logicalAND: function() {
       var left = this.equality();
-      var token;
-      if ((token = this.expect('&&'))) {
-        left = this.binaryFn(left, token.fn, this.logicalAND());
+      while (this.expect('&&')) {
+        left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()};
       }
       return left;
     },
@@ -10078,8 +15083,8 @@
     equality: function() {
       var left = this.relational();
       var token;
-      if ((token = this.expect('==','!=','===','!=='))) {
-        left = this.binaryFn(left, token.fn, this.equality());
+      while ((token = this.expect('==','!=','===','!=='))) {
+        left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() };
       }
       return left;
     },
@@ -10087,8 +15092,8 @@
     relational: function() {
       var left = this.additive();
       var token;
-      if ((token = this.expect('<', '>', '<=', '>='))) {
-        left = this.binaryFn(left, token.fn, this.relational());
+      while ((token = this.expect('<', '>', '<=', '>='))) {
+        left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() };
       }
       return left;
     },
@@ -10097,7 +15102,7 @@
       var left = this.multiplicative();
       var token;
       while ((token = this.expect('+','-'))) {
-        left = this.binaryFn(left, token.fn, this.multiplicative());
+        left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() };
       }
       return left;
     },
@@ -10106,415 +15111,1266 @@
       var left = this.unary();
       var token;
       while ((token = this.expect('*','/','%'))) {
-        left = this.binaryFn(left, token.fn, this.unary());
+        left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() };
       }
       return left;
     },
 
     unary: function() {
       var token;
-      if (this.expect('+')) {
-        return this.primary();
-      } else if ((token = this.expect('-'))) {
-        return this.binaryFn(Parser.ZERO, token.fn, this.unary());
-      } else if ((token = this.expect('!'))) {
-        return this.unaryFn(token.fn, this.unary());
+      if ((token = this.expect('+', '-', '!'))) {
+        return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() };
       } else {
         return this.primary();
       }
     },
 
-    fieldAccess: function(object) {
-      var parser = this;
-      var field = this.expect().text;
-      var getter = getterFn(field, this.options, this.text);
+    primary: function() {
+      var primary;
+      if (this.expect('(')) {
+        primary = this.filterChain();
+        this.consume(')');
+      } else if (this.expect('[')) {
+        primary = this.arrayDeclaration();
+      } else if (this.expect('{')) {
+        primary = this.object();
+      } else if (this.selfReferential.hasOwnProperty(this.peek().text)) {
+        primary = copy(this.selfReferential[this.consume().text]);
+      } else if (this.options.literals.hasOwnProperty(this.peek().text)) {
+        primary = { type: AST.Literal, value: this.options.literals[this.consume().text]};
+      } else if (this.peek().identifier) {
+        primary = this.identifier();
+      } else if (this.peek().constant) {
+        primary = this.constant();
+      } else {
+        this.throwError('not a primary expression', this.peek());
+      }
 
-      return extend(function(scope, locals, self) {
-        return getter(self || object(scope, locals), locals);
-      }, {
-        assign: function(scope, value, locals) {
-          return setter(object(scope, locals), field, value, parser.text, parser.options);
+      var next;
+      while ((next = this.expect('(', '[', '.'))) {
+        if (next.text === '(') {
+          primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() };
+          this.consume(')');
+        } else if (next.text === '[') {
+          primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true };
+          this.consume(']');
+        } else if (next.text === '.') {
+          primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false };
+        } else {
+          this.throwError('IMPOSSIBLE');
         }
-      });
+      }
+      return primary;
     },
 
-    objectIndex: function(obj) {
-      var parser = this;
+    filter: function(baseExpression) {
+      var args = [baseExpression];
+      var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true};
 
-      var indexFn = this.expression();
-      this.consume(']');
+      while (this.expect(':')) {
+        args.push(this.expression());
+      }
 
-      return extend(function(self, locals) {
-        var o = obj(self, locals),
-            i = indexFn(self, locals),
-            v, p;
-
-        if (!o) return undefined;
-        v = ensureSafeObject(o[i], parser.text);
-        if (v && v.then && parser.options.unwrapPromises) {
-          p = v;
-          if (!('$$v' in v)) {
-            p.$$v = undefined;
-            p.then(function(val) { p.$$v = val; });
-          }
-          v = v.$$v;
-        }
-        return v;
-      }, {
-        assign: function(self, value, locals) {
-          var key = indexFn(self, locals);
-          // prevent overwriting of Function.constructor which would break ensureSafeObject check
-          var safe = ensureSafeObject(obj(self, locals), parser.text);
-          return safe[key] = value;
-        }
-      });
+      return result;
     },
 
-    functionCall: function(fn, contextGetter) {
-      var argsFn = [];
+    parseArguments: function() {
+      var args = [];
       if (this.peekToken().text !== ')') {
         do {
-          argsFn.push(this.expression());
+          args.push(this.filterChain());
         } while (this.expect(','));
       }
-      this.consume(')');
-
-      var parser = this;
-
-      return function(scope, locals) {
-        var args = [];
-        var context = contextGetter ? contextGetter(scope, locals) : scope;
-
-        for (var i = 0; i < argsFn.length; i++) {
-          args.push(argsFn[i](scope, locals));
-        }
-        var fnPtr = fn(scope, locals, context) || noop;
-
-        ensureSafeObject(context, parser.text);
-        ensureSafeObject(fnPtr, parser.text);
-
-        // IE stupidity! (IE doesn't have apply for some native functions)
-        var v = fnPtr.apply
-            ? fnPtr.apply(context, args)
-            : fnPtr(args[0], args[1], args[2], args[3], args[4]);
-
-        return ensureSafeObject(v, parser.text);
-      };
+      return args;
     },
 
-    // This is used with json array declaration
-    arrayDeclaration: function () {
-      var elementFns = [];
-      var allConstant = true;
+    identifier: function() {
+      var token = this.consume();
+      if (!token.identifier) {
+        this.throwError('is not a valid identifier', token);
+      }
+      return { type: AST.Identifier, name: token.text };
+    },
+
+    constant: function() {
+      // TODO check that it is a constant
+      return { type: AST.Literal, value: this.consume().value };
+    },
+
+    arrayDeclaration: function() {
+      var elements = [];
       if (this.peekToken().text !== ']') {
         do {
-          var elementFn = this.expression();
-          elementFns.push(elementFn);
-          if (!elementFn.constant) {
-            allConstant = false;
+          if (this.peek(']')) {
+            // Support trailing commas per ES5.1.
+            break;
           }
+          elements.push(this.expression());
         } while (this.expect(','));
       }
       this.consume(']');
 
-      return extend(function(self, locals) {
-        var array = [];
-        for (var i = 0; i < elementFns.length; i++) {
-          array.push(elementFns[i](self, locals));
-        }
-        return array;
-      }, {
-        literal: true,
-        constant: allConstant
-      });
+      return { type: AST.ArrayExpression, elements: elements };
     },
 
-    object: function () {
-      var keyValues = [];
-      var allConstant = true;
+    object: function() {
+      var properties = [], property;
       if (this.peekToken().text !== '}') {
         do {
-          var token = this.expect(),
-              key = token.string || token.text;
-          this.consume(':');
-          var value = this.expression();
-          keyValues.push({key: key, value: value});
-          if (!value.constant) {
-            allConstant = false;
+          if (this.peek('}')) {
+            // Support trailing commas per ES5.1.
+            break;
           }
+          property = {type: AST.Property, kind: 'init'};
+          if (this.peek().constant) {
+            property.key = this.constant();
+            property.computed = false;
+            this.consume(':');
+            property.value = this.expression();
+          } else if (this.peek().identifier) {
+            property.key = this.identifier();
+            property.computed = false;
+            if (this.peek(':')) {
+              this.consume(':');
+              property.value = this.expression();
+            } else {
+              property.value = property.key;
+            }
+          } else if (this.peek('[')) {
+            this.consume('[');
+            property.key = this.expression();
+            this.consume(']');
+            property.computed = true;
+            this.consume(':');
+            property.value = this.expression();
+          } else {
+            this.throwError('invalid key', this.peek());
+          }
+          properties.push(property);
         } while (this.expect(','));
       }
       this.consume('}');
 
-      return extend(function(self, locals) {
-        var object = {};
-        for (var i = 0; i < keyValues.length; i++) {
-          var keyValue = keyValues[i];
-          object[keyValue.key] = keyValue.value(self, locals);
+      return {type: AST.ObjectExpression, properties: properties };
+    },
+
+    throwError: function(msg, token) {
+      throw $parseMinErr('syntax',
+        'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
+        token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
+    },
+
+    consume: function(e1) {
+      if (this.tokens.length === 0) {
+        throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+      }
+
+      var token = this.expect(e1);
+      if (!token) {
+        this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
+      }
+      return token;
+    },
+
+    peekToken: function() {
+      if (this.tokens.length === 0) {
+        throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+      }
+      return this.tokens[0];
+    },
+
+    peek: function(e1, e2, e3, e4) {
+      return this.peekAhead(0, e1, e2, e3, e4);
+    },
+
+    peekAhead: function(i, e1, e2, e3, e4) {
+      if (this.tokens.length > i) {
+        var token = this.tokens[i];
+        var t = token.text;
+        if (t === e1 || t === e2 || t === e3 || t === e4 ||
+          (!e1 && !e2 && !e3 && !e4)) {
+          return token;
         }
-        return object;
-      }, {
-        literal: true,
-        constant: allConstant
+      }
+      return false;
+    },
+
+    expect: function(e1, e2, e3, e4) {
+      var token = this.peek(e1, e2, e3, e4);
+      if (token) {
+        this.tokens.shift();
+        return token;
+      }
+      return false;
+    },
+
+    selfReferential: {
+      'this': {type: AST.ThisExpression },
+      '$locals': {type: AST.LocalsExpression }
+    }
+  };
+
+  function ifDefined(v, d) {
+    return typeof v !== 'undefined' ? v : d;
+  }
+
+  function plusFn(l, r) {
+    if (typeof l === 'undefined') return r;
+    if (typeof r === 'undefined') return l;
+    return l + r;
+  }
+
+  function isStateless($filter, filterName) {
+    var fn = $filter(filterName);
+    return !fn.$stateful;
+  }
+
+  var PURITY_ABSOLUTE = 1;
+  var PURITY_RELATIVE = 2;
+
+// Detect nodes which could depend on non-shallow state of objects
+  function isPure(node, parentIsPure) {
+    switch (node.type) {
+      // Computed members might invoke a stateful toString()
+      case AST.MemberExpression:
+        if (node.computed) {
+          return false;
+        }
+        break;
+
+      // Unary always convert to primative
+      case AST.UnaryExpression:
+        return PURITY_ABSOLUTE;
+
+      // The binary + operator can invoke a stateful toString().
+      case AST.BinaryExpression:
+        return node.operator !== '+' ? PURITY_ABSOLUTE : false;
+
+      // Functions / filters probably read state from within objects
+      case AST.CallExpression:
+        return false;
+    }
+
+    return (undefined === parentIsPure) ? PURITY_RELATIVE : parentIsPure;
+  }
+
+  function findConstantAndWatchExpressions(ast, $filter, parentIsPure) {
+    var allConstants;
+    var argsToWatch;
+    var isStatelessFilter;
+
+    var astIsPure = ast.isPure = isPure(ast, parentIsPure);
+
+    switch (ast.type) {
+      case AST.Program:
+        allConstants = true;
+        forEach(ast.body, function(expr) {
+          findConstantAndWatchExpressions(expr.expression, $filter, astIsPure);
+          allConstants = allConstants && expr.expression.constant;
+        });
+        ast.constant = allConstants;
+        break;
+      case AST.Literal:
+        ast.constant = true;
+        ast.toWatch = [];
+        break;
+      case AST.UnaryExpression:
+        findConstantAndWatchExpressions(ast.argument, $filter, astIsPure);
+        ast.constant = ast.argument.constant;
+        ast.toWatch = ast.argument.toWatch;
+        break;
+      case AST.BinaryExpression:
+        findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+        findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+        ast.constant = ast.left.constant && ast.right.constant;
+        ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch);
+        break;
+      case AST.LogicalExpression:
+        findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+        findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+        ast.constant = ast.left.constant && ast.right.constant;
+        ast.toWatch = ast.constant ? [] : [ast];
+        break;
+      case AST.ConditionalExpression:
+        findConstantAndWatchExpressions(ast.test, $filter, astIsPure);
+        findConstantAndWatchExpressions(ast.alternate, $filter, astIsPure);
+        findConstantAndWatchExpressions(ast.consequent, $filter, astIsPure);
+        ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant;
+        ast.toWatch = ast.constant ? [] : [ast];
+        break;
+      case AST.Identifier:
+        ast.constant = false;
+        ast.toWatch = [ast];
+        break;
+      case AST.MemberExpression:
+        findConstantAndWatchExpressions(ast.object, $filter, astIsPure);
+        if (ast.computed) {
+          findConstantAndWatchExpressions(ast.property, $filter, astIsPure);
+        }
+        ast.constant = ast.object.constant && (!ast.computed || ast.property.constant);
+        ast.toWatch = ast.constant ? [] : [ast];
+        break;
+      case AST.CallExpression:
+        isStatelessFilter = ast.filter ? isStateless($filter, ast.callee.name) : false;
+        allConstants = isStatelessFilter;
+        argsToWatch = [];
+        forEach(ast.arguments, function(expr) {
+          findConstantAndWatchExpressions(expr, $filter, astIsPure);
+          allConstants = allConstants && expr.constant;
+          argsToWatch.push.apply(argsToWatch, expr.toWatch);
+        });
+        ast.constant = allConstants;
+        ast.toWatch = isStatelessFilter ? argsToWatch : [ast];
+        break;
+      case AST.AssignmentExpression:
+        findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+        findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+        ast.constant = ast.left.constant && ast.right.constant;
+        ast.toWatch = [ast];
+        break;
+      case AST.ArrayExpression:
+        allConstants = true;
+        argsToWatch = [];
+        forEach(ast.elements, function(expr) {
+          findConstantAndWatchExpressions(expr, $filter, astIsPure);
+          allConstants = allConstants && expr.constant;
+          argsToWatch.push.apply(argsToWatch, expr.toWatch);
+        });
+        ast.constant = allConstants;
+        ast.toWatch = argsToWatch;
+        break;
+      case AST.ObjectExpression:
+        allConstants = true;
+        argsToWatch = [];
+        forEach(ast.properties, function(property) {
+          findConstantAndWatchExpressions(property.value, $filter, astIsPure);
+          allConstants = allConstants && property.value.constant;
+          argsToWatch.push.apply(argsToWatch, property.value.toWatch);
+          if (property.computed) {
+            //`{[key]: value}` implicitly does `key.toString()` which may be non-pure
+            findConstantAndWatchExpressions(property.key, $filter, /*parentIsPure=*/false);
+            allConstants = allConstants && property.key.constant;
+            argsToWatch.push.apply(argsToWatch, property.key.toWatch);
+          }
+        });
+        ast.constant = allConstants;
+        ast.toWatch = argsToWatch;
+        break;
+      case AST.ThisExpression:
+        ast.constant = false;
+        ast.toWatch = [];
+        break;
+      case AST.LocalsExpression:
+        ast.constant = false;
+        ast.toWatch = [];
+        break;
+    }
+  }
+
+  function getInputs(body) {
+    if (body.length !== 1) return;
+    var lastExpression = body[0].expression;
+    var candidate = lastExpression.toWatch;
+    if (candidate.length !== 1) return candidate;
+    return candidate[0] !== lastExpression ? candidate : undefined;
+  }
+
+  function isAssignable(ast) {
+    return ast.type === AST.Identifier || ast.type === AST.MemberExpression;
+  }
+
+  function assignableAST(ast) {
+    if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) {
+      return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='};
+    }
+  }
+
+  function isLiteral(ast) {
+    return ast.body.length === 0 ||
+      ast.body.length === 1 && (
+        ast.body[0].expression.type === AST.Literal ||
+        ast.body[0].expression.type === AST.ArrayExpression ||
+        ast.body[0].expression.type === AST.ObjectExpression);
+  }
+
+  function isConstant(ast) {
+    return ast.constant;
+  }
+
+  function ASTCompiler($filter) {
+    this.$filter = $filter;
+  }
+
+  ASTCompiler.prototype = {
+    compile: function(ast) {
+      var self = this;
+      this.state = {
+        nextId: 0,
+        filters: {},
+        fn: {vars: [], body: [], own: {}},
+        assign: {vars: [], body: [], own: {}},
+        inputs: []
+      };
+      findConstantAndWatchExpressions(ast, self.$filter);
+      var extra = '';
+      var assignable;
+      this.stage = 'assign';
+      if ((assignable = assignableAST(ast))) {
+        this.state.computing = 'assign';
+        var result = this.nextId();
+        this.recurse(assignable, result);
+        this.return_(result);
+        extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l');
+      }
+      var toWatch = getInputs(ast.body);
+      self.stage = 'inputs';
+      forEach(toWatch, function(watch, key) {
+        var fnKey = 'fn' + key;
+        self.state[fnKey] = {vars: [], body: [], own: {}};
+        self.state.computing = fnKey;
+        var intoId = self.nextId();
+        self.recurse(watch, intoId);
+        self.return_(intoId);
+        self.state.inputs.push({name: fnKey, isPure: watch.isPure});
+        watch.watchId = key;
       });
+      this.state.computing = 'fn';
+      this.stage = 'main';
+      this.recurse(ast);
+      var fnString =
+        // The build and minification steps remove the string "use strict" from the code, but this is done using a regex.
+        // This is a workaround for this until we do a better job at only removing the prefix only when we should.
+        '"' + this.USE + ' ' + this.STRICT + '";\n' +
+        this.filterPrefix() +
+        'var fn=' + this.generateFunction('fn', 's,l,a,i') +
+        extra +
+        this.watchFns() +
+        'return fn;';
+
+      // eslint-disable-next-line no-new-func
+      var fn = (new Function('$filter',
+        'getStringValue',
+        'ifDefined',
+        'plus',
+        fnString))(
+        this.$filter,
+        getStringValue,
+        ifDefined,
+        plusFn);
+      this.state = this.stage = undefined;
+      return fn;
+    },
+
+    USE: 'use',
+
+    STRICT: 'strict',
+
+    watchFns: function() {
+      var result = [];
+      var inputs = this.state.inputs;
+      var self = this;
+      forEach(inputs, function(input) {
+        result.push('var ' + input.name + '=' + self.generateFunction(input.name, 's'));
+        if (input.isPure) {
+          result.push(input.name, '.isPure=' + JSON.stringify(input.isPure) + ';');
+        }
+      });
+      if (inputs.length) {
+        result.push('fn.inputs=[' + inputs.map(function(i) { return i.name; }).join(',') + '];');
+      }
+      return result.join('');
+    },
+
+    generateFunction: function(name, params) {
+      return 'function(' + params + '){' +
+        this.varsPrefix(name) +
+        this.body(name) +
+        '};';
+    },
+
+    filterPrefix: function() {
+      var parts = [];
+      var self = this;
+      forEach(this.state.filters, function(id, filter) {
+        parts.push(id + '=$filter(' + self.escape(filter) + ')');
+      });
+      if (parts.length) return 'var ' + parts.join(',') + ';';
+      return '';
+    },
+
+    varsPrefix: function(section) {
+      return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : '';
+    },
+
+    body: function(section) {
+      return this.state[section].body.join('');
+    },
+
+    recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+      var left, right, self = this, args, expression, computed;
+      recursionFn = recursionFn || noop;
+      if (!skipWatchIdCheck && isDefined(ast.watchId)) {
+        intoId = intoId || this.nextId();
+        this.if_('i',
+          this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
+          this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
+        );
+        return;
+      }
+      switch (ast.type) {
+        case AST.Program:
+          forEach(ast.body, function(expression, pos) {
+            self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; });
+            if (pos !== ast.body.length - 1) {
+              self.current().body.push(right, ';');
+            } else {
+              self.return_(right);
+            }
+          });
+          break;
+        case AST.Literal:
+          expression = this.escape(ast.value);
+          this.assign(intoId, expression);
+          recursionFn(intoId || expression);
+          break;
+        case AST.UnaryExpression:
+          this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; });
+          expression = ast.operator + '(' + this.ifDefined(right, 0) + ')';
+          this.assign(intoId, expression);
+          recursionFn(expression);
+          break;
+        case AST.BinaryExpression:
+          this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; });
+          this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; });
+          if (ast.operator === '+') {
+            expression = this.plus(left, right);
+          } else if (ast.operator === '-') {
+            expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0);
+          } else {
+            expression = '(' + left + ')' + ast.operator + '(' + right + ')';
+          }
+          this.assign(intoId, expression);
+          recursionFn(expression);
+          break;
+        case AST.LogicalExpression:
+          intoId = intoId || this.nextId();
+          self.recurse(ast.left, intoId);
+          self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
+          recursionFn(intoId);
+          break;
+        case AST.ConditionalExpression:
+          intoId = intoId || this.nextId();
+          self.recurse(ast.test, intoId);
+          self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
+          recursionFn(intoId);
+          break;
+        case AST.Identifier:
+          intoId = intoId || this.nextId();
+          if (nameId) {
+            nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s');
+            nameId.computed = false;
+            nameId.name = ast.name;
+          }
+          self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
+            function() {
+              self.if_(self.stage === 'inputs' || 's', function() {
+                if (create && create !== 1) {
+                  self.if_(
+                    self.isNull(self.nonComputedMember('s', ast.name)),
+                    self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
+                }
+                self.assign(intoId, self.nonComputedMember('s', ast.name));
+              });
+            }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name))
+          );
+          recursionFn(intoId);
+          break;
+        case AST.MemberExpression:
+          left = nameId && (nameId.context = this.nextId()) || this.nextId();
+          intoId = intoId || this.nextId();
+          self.recurse(ast.object, left, undefined, function() {
+            self.if_(self.notNull(left), function() {
+              if (ast.computed) {
+                right = self.nextId();
+                self.recurse(ast.property, right);
+                self.getStringValue(right);
+                if (create && create !== 1) {
+                  self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
+                }
+                expression = self.computedMember(left, right);
+                self.assign(intoId, expression);
+                if (nameId) {
+                  nameId.computed = true;
+                  nameId.name = right;
+                }
+              } else {
+                if (create && create !== 1) {
+                  self.if_(self.isNull(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+                }
+                expression = self.nonComputedMember(left, ast.property.name);
+                self.assign(intoId, expression);
+                if (nameId) {
+                  nameId.computed = false;
+                  nameId.name = ast.property.name;
+                }
+              }
+            }, function() {
+              self.assign(intoId, 'undefined');
+            });
+            recursionFn(intoId);
+          }, !!create);
+          break;
+        case AST.CallExpression:
+          intoId = intoId || this.nextId();
+          if (ast.filter) {
+            right = self.filter(ast.callee.name);
+            args = [];
+            forEach(ast.arguments, function(expr) {
+              var argument = self.nextId();
+              self.recurse(expr, argument);
+              args.push(argument);
+            });
+            expression = right + '(' + args.join(',') + ')';
+            self.assign(intoId, expression);
+            recursionFn(intoId);
+          } else {
+            right = self.nextId();
+            left = {};
+            args = [];
+            self.recurse(ast.callee, right, left, function() {
+              self.if_(self.notNull(right), function() {
+                forEach(ast.arguments, function(expr) {
+                  self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
+                    args.push(argument);
+                  });
+                });
+                if (left.name) {
+                  expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')';
+                } else {
+                  expression = right + '(' + args.join(',') + ')';
+                }
+                self.assign(intoId, expression);
+              }, function() {
+                self.assign(intoId, 'undefined');
+              });
+              recursionFn(intoId);
+            });
+          }
+          break;
+        case AST.AssignmentExpression:
+          right = this.nextId();
+          left = {};
+          this.recurse(ast.left, undefined, left, function() {
+            self.if_(self.notNull(left.context), function() {
+              self.recurse(ast.right, right);
+              expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
+              self.assign(intoId, expression);
+              recursionFn(intoId || expression);
+            });
+          }, 1);
+          break;
+        case AST.ArrayExpression:
+          args = [];
+          forEach(ast.elements, function(expr) {
+            self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
+              args.push(argument);
+            });
+          });
+          expression = '[' + args.join(',') + ']';
+          this.assign(intoId, expression);
+          recursionFn(intoId || expression);
+          break;
+        case AST.ObjectExpression:
+          args = [];
+          computed = false;
+          forEach(ast.properties, function(property) {
+            if (property.computed) {
+              computed = true;
+            }
+          });
+          if (computed) {
+            intoId = intoId || this.nextId();
+            this.assign(intoId, '{}');
+            forEach(ast.properties, function(property) {
+              if (property.computed) {
+                left = self.nextId();
+                self.recurse(property.key, left);
+              } else {
+                left = property.key.type === AST.Identifier ?
+                  property.key.name :
+                  ('' + property.key.value);
+              }
+              right = self.nextId();
+              self.recurse(property.value, right);
+              self.assign(self.member(intoId, left, property.computed), right);
+            });
+          } else {
+            forEach(ast.properties, function(property) {
+              self.recurse(property.value, ast.constant ? undefined : self.nextId(), undefined, function(expr) {
+                args.push(self.escape(
+                  property.key.type === AST.Identifier ? property.key.name :
+                    ('' + property.key.value)) +
+                  ':' + expr);
+              });
+            });
+            expression = '{' + args.join(',') + '}';
+            this.assign(intoId, expression);
+          }
+          recursionFn(intoId || expression);
+          break;
+        case AST.ThisExpression:
+          this.assign(intoId, 's');
+          recursionFn(intoId || 's');
+          break;
+        case AST.LocalsExpression:
+          this.assign(intoId, 'l');
+          recursionFn(intoId || 'l');
+          break;
+        case AST.NGValueParameter:
+          this.assign(intoId, 'v');
+          recursionFn(intoId || 'v');
+          break;
+      }
+    },
+
+    getHasOwnProperty: function(element, property) {
+      var key = element + '.' + property;
+      var own = this.current().own;
+      if (!own.hasOwnProperty(key)) {
+        own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')');
+      }
+      return own[key];
+    },
+
+    assign: function(id, value) {
+      if (!id) return;
+      this.current().body.push(id, '=', value, ';');
+      return id;
+    },
+
+    filter: function(filterName) {
+      if (!this.state.filters.hasOwnProperty(filterName)) {
+        this.state.filters[filterName] = this.nextId(true);
+      }
+      return this.state.filters[filterName];
+    },
+
+    ifDefined: function(id, defaultValue) {
+      return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')';
+    },
+
+    plus: function(left, right) {
+      return 'plus(' + left + ',' + right + ')';
+    },
+
+    return_: function(id) {
+      this.current().body.push('return ', id, ';');
+    },
+
+    if_: function(test, alternate, consequent) {
+      if (test === true) {
+        alternate();
+      } else {
+        var body = this.current().body;
+        body.push('if(', test, '){');
+        alternate();
+        body.push('}');
+        if (consequent) {
+          body.push('else{');
+          consequent();
+          body.push('}');
+        }
+      }
+    },
+
+    not: function(expression) {
+      return '!(' + expression + ')';
+    },
+
+    isNull: function(expression) {
+      return expression + '==null';
+    },
+
+    notNull: function(expression) {
+      return expression + '!=null';
+    },
+
+    nonComputedMember: function(left, right) {
+      var SAFE_IDENTIFIER = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/;
+      var UNSAFE_CHARACTERS = /[^$_a-zA-Z0-9]/g;
+      if (SAFE_IDENTIFIER.test(right)) {
+        return left + '.' + right;
+      } else {
+        return left  + '["' + right.replace(UNSAFE_CHARACTERS, this.stringEscapeFn) + '"]';
+      }
+    },
+
+    computedMember: function(left, right) {
+      return left + '[' + right + ']';
+    },
+
+    member: function(left, right, computed) {
+      if (computed) return this.computedMember(left, right);
+      return this.nonComputedMember(left, right);
+    },
+
+    getStringValue: function(item) {
+      this.assign(item, 'getStringValue(' + item + ')');
+    },
+
+    lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+      var self = this;
+      return function() {
+        self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck);
+      };
+    },
+
+    lazyAssign: function(id, value) {
+      var self = this;
+      return function() {
+        self.assign(id, value);
+      };
+    },
+
+    stringEscapeRegex: /[^ a-zA-Z0-9]/g,
+
+    stringEscapeFn: function(c) {
+      return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
+    },
+
+    escape: function(value) {
+      if (isString(value)) return '\'' + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + '\'';
+      if (isNumber(value)) return value.toString();
+      if (value === true) return 'true';
+      if (value === false) return 'false';
+      if (value === null) return 'null';
+      if (typeof value === 'undefined') return 'undefined';
+
+      throw $parseMinErr('esc', 'IMPOSSIBLE');
+    },
+
+    nextId: function(skip, init) {
+      var id = 'v' + (this.state.nextId++);
+      if (!skip) {
+        this.current().vars.push(id + (init ? '=' + init : ''));
+      }
+      return id;
+    },
+
+    current: function() {
+      return this.state[this.state.computing];
     }
   };
 
 
-//////////////////////////////////////////////////
-// Parser helper functions
-//////////////////////////////////////////////////
-
-  function setter(obj, path, setValue, fullExp, options) {
-    //needed?
-    options = options || {};
-
-    var element = path.split('.'), key;
-    for (var i = 0; element.length > 1; i++) {
-      key = ensureSafeMemberName(element.shift(), fullExp);
-      var propertyObj = obj[key];
-      if (!propertyObj) {
-        propertyObj = {};
-        obj[key] = propertyObj;
-      }
-      obj = propertyObj;
-      if (obj.then && options.unwrapPromises) {
-        promiseWarning(fullExp);
-        if (!("$$v" in obj)) {
-          (function(promise) {
-            promise.then(function(val) { promise.$$v = val; }); }
-              )(obj);
-        }
-        if (obj.$$v === undefined) {
-          obj.$$v = {};
-        }
-        obj = obj.$$v;
-      }
-    }
-    key = ensureSafeMemberName(element.shift(), fullExp);
-    obj[key] = setValue;
-    return setValue;
+  function ASTInterpreter($filter) {
+    this.$filter = $filter;
   }
 
-  var getterFnCache = {};
-
-  /**
-   * Implementation of the "Black Hole" variant from:
-   * - http://jsperf.com/angularjs-parse-getter/4
-   * - http://jsperf.com/path-evaluation-simplified/7
-   */
-  function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) {
-    ensureSafeMemberName(key0, fullExp);
-    ensureSafeMemberName(key1, fullExp);
-    ensureSafeMemberName(key2, fullExp);
-    ensureSafeMemberName(key3, fullExp);
-    ensureSafeMemberName(key4, fullExp);
-
-    return !options.unwrapPromises
-        ? function cspSafeGetter(scope, locals) {
-      var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope;
-
-      if (pathVal == null) return pathVal;
-      pathVal = pathVal[key0];
-
-      if (!key1) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key1];
-
-      if (!key2) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key2];
-
-      if (!key3) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key3];
-
-      if (!key4) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key4];
-
-      return pathVal;
-    }
-        : function cspSafePromiseEnabledGetter(scope, locals) {
-      var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope,
-          promise;
-
-      if (pathVal == null) return pathVal;
-
-      pathVal = pathVal[key0];
-      if (pathVal && pathVal.then) {
-        promiseWarning(fullExp);
-        if (!("$$v" in pathVal)) {
-          promise = pathVal;
-          promise.$$v = undefined;
-          promise.then(function(val) { promise.$$v = val; });
-        }
-        pathVal = pathVal.$$v;
+  ASTInterpreter.prototype = {
+    compile: function(ast) {
+      var self = this;
+      findConstantAndWatchExpressions(ast, self.$filter);
+      var assignable;
+      var assign;
+      if ((assignable = assignableAST(ast))) {
+        assign = this.recurse(assignable);
       }
-
-      if (!key1) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key1];
-      if (pathVal && pathVal.then) {
-        promiseWarning(fullExp);
-        if (!("$$v" in pathVal)) {
-          promise = pathVal;
-          promise.$$v = undefined;
-          promise.then(function(val) { promise.$$v = val; });
-        }
-        pathVal = pathVal.$$v;
+      var toWatch = getInputs(ast.body);
+      var inputs;
+      if (toWatch) {
+        inputs = [];
+        forEach(toWatch, function(watch, key) {
+          var input = self.recurse(watch);
+          input.isPure = watch.isPure;
+          watch.input = input;
+          inputs.push(input);
+          watch.watchId = key;
+        });
       }
-
-      if (!key2) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key2];
-      if (pathVal && pathVal.then) {
-        promiseWarning(fullExp);
-        if (!("$$v" in pathVal)) {
-          promise = pathVal;
-          promise.$$v = undefined;
-          promise.then(function(val) { promise.$$v = val; });
-        }
-        pathVal = pathVal.$$v;
-      }
-
-      if (!key3) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key3];
-      if (pathVal && pathVal.then) {
-        promiseWarning(fullExp);
-        if (!("$$v" in pathVal)) {
-          promise = pathVal;
-          promise.$$v = undefined;
-          promise.then(function(val) { promise.$$v = val; });
-        }
-        pathVal = pathVal.$$v;
-      }
-
-      if (!key4) return pathVal;
-      if (pathVal == null) return undefined;
-      pathVal = pathVal[key4];
-      if (pathVal && pathVal.then) {
-        promiseWarning(fullExp);
-        if (!("$$v" in pathVal)) {
-          promise = pathVal;
-          promise.$$v = undefined;
-          promise.then(function(val) { promise.$$v = val; });
-        }
-        pathVal = pathVal.$$v;
-      }
-      return pathVal;
-    };
-  }
-
-  function simpleGetterFn1(key0, fullExp) {
-    ensureSafeMemberName(key0, fullExp);
-
-    return function simpleGetterFn1(scope, locals) {
-      if (scope == null) return undefined;
-      return ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
-    };
-  }
-
-  function simpleGetterFn2(key0, key1, fullExp) {
-    ensureSafeMemberName(key0, fullExp);
-    ensureSafeMemberName(key1, fullExp);
-
-    return function simpleGetterFn2(scope, locals) {
-      if (scope == null) return undefined;
-      scope = ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
-      return scope == null ? undefined : scope[key1];
-    };
-  }
-
-  function getterFn(path, options, fullExp) {
-    // Check whether the cache has this getter already.
-    // We can use hasOwnProperty directly on the cache because we ensure,
-    // see below, that the cache never stores a path called 'hasOwnProperty'
-    if (getterFnCache.hasOwnProperty(path)) {
-      return getterFnCache[path];
-    }
-
-    var pathKeys = path.split('.'),
-        pathKeysLength = pathKeys.length,
-        fn;
-
-    // When we have only 1 or 2 tokens, use optimized special case closures.
-    // http://jsperf.com/angularjs-parse-getter/6
-    if (!options.unwrapPromises && pathKeysLength === 1) {
-      fn = simpleGetterFn1(pathKeys[0], fullExp);
-    } else if (!options.unwrapPromises && pathKeysLength === 2) {
-      fn = simpleGetterFn2(pathKeys[0], pathKeys[1], fullExp);
-    } else if (options.csp) {
-      if (pathKeysLength < 6) {
-        fn = cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4], fullExp,
-            options);
-      } else {
-        fn = function(scope, locals) {
-          var i = 0, val;
-          do {
-            val = cspSafeGetterFn(pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++],
-                pathKeys[i++], fullExp, options)(scope, locals);
-
-            locals = undefined; // clear after first iteration
-            scope = val;
-          } while (i < pathKeysLength);
-          return val;
+      var expressions = [];
+      forEach(ast.body, function(expression) {
+        expressions.push(self.recurse(expression.expression));
+      });
+      var fn = ast.body.length === 0 ? noop :
+        ast.body.length === 1 ? expressions[0] :
+          function(scope, locals) {
+            var lastValue;
+            forEach(expressions, function(exp) {
+              lastValue = exp(scope, locals);
+            });
+            return lastValue;
+          };
+      if (assign) {
+        fn.assign = function(scope, value, locals) {
+          return assign(scope, locals, value);
         };
       }
-    } else {
-      var code = 'var p;\n';
-      forEach(pathKeys, function(key, index) {
-        ensureSafeMemberName(key, fullExp);
-        code += 'if(s == null) return undefined;\n' +
-            's='+ (index
-          // we simply dereference 's' on any .dot notation
-            ? 's'
-          // but if we are first then we check locals first, and if so read it first
-            : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
-            (options.unwrapPromises
-                ? 'if (s && s.then) {\n' +
-                ' pw("' + fullExp.replace(/(["\r\n])/g, '\\$1') + '");\n' +
-                ' if (!("$$v" in s)) {\n' +
-                ' p=s;\n' +
-                ' p.$$v = undefined;\n' +
-                ' p.then(function(v) {p.$$v=v;});\n' +
-                '}\n' +
-                ' s=s.$$v\n' +
-                '}\n'
-                : '');
-      });
-      code += 'return s;';
+      if (inputs) {
+        fn.inputs = inputs;
+      }
+      return fn;
+    },
 
-      /* jshint -W054 */
-      var evaledFnGetter = new Function('s', 'k', 'pw', code); // s=scope, k=locals, pw=promiseWarning
-      /* jshint +W054 */
-      evaledFnGetter.toString = valueFn(code);
-      fn = options.unwrapPromises ? function(scope, locals) {
-        return evaledFnGetter(scope, locals, promiseWarning);
-      } : evaledFnGetter;
-    }
+    recurse: function(ast, context, create) {
+      var left, right, self = this, args;
+      if (ast.input) {
+        return this.inputs(ast.input, ast.watchId);
+      }
+      switch (ast.type) {
+        case AST.Literal:
+          return this.value(ast.value, context);
+        case AST.UnaryExpression:
+          right = this.recurse(ast.argument);
+          return this['unary' + ast.operator](right, context);
+        case AST.BinaryExpression:
+          left = this.recurse(ast.left);
+          right = this.recurse(ast.right);
+          return this['binary' + ast.operator](left, right, context);
+        case AST.LogicalExpression:
+          left = this.recurse(ast.left);
+          right = this.recurse(ast.right);
+          return this['binary' + ast.operator](left, right, context);
+        case AST.ConditionalExpression:
+          return this['ternary?:'](
+            this.recurse(ast.test),
+            this.recurse(ast.alternate),
+            this.recurse(ast.consequent),
+            context
+          );
+        case AST.Identifier:
+          return self.identifier(ast.name, context, create);
+        case AST.MemberExpression:
+          left = this.recurse(ast.object, false, !!create);
+          if (!ast.computed) {
+            right = ast.property.name;
+          }
+          if (ast.computed) right = this.recurse(ast.property);
+          return ast.computed ?
+            this.computedMember(left, right, context, create) :
+            this.nonComputedMember(left, right, context, create);
+        case AST.CallExpression:
+          args = [];
+          forEach(ast.arguments, function(expr) {
+            args.push(self.recurse(expr));
+          });
+          if (ast.filter) right = this.$filter(ast.callee.name);
+          if (!ast.filter) right = this.recurse(ast.callee, true);
+          return ast.filter ?
+            function(scope, locals, assign, inputs) {
+              var values = [];
+              for (var i = 0; i < args.length; ++i) {
+                values.push(args[i](scope, locals, assign, inputs));
+              }
+              var value = right.apply(undefined, values, inputs);
+              return context ? {context: undefined, name: undefined, value: value} : value;
+            } :
+            function(scope, locals, assign, inputs) {
+              var rhs = right(scope, locals, assign, inputs);
+              var value;
+              if (rhs.value != null) {
+                var values = [];
+                for (var i = 0; i < args.length; ++i) {
+                  values.push(args[i](scope, locals, assign, inputs));
+                }
+                value = rhs.value.apply(rhs.context, values);
+              }
+              return context ? {value: value} : value;
+            };
+        case AST.AssignmentExpression:
+          left = this.recurse(ast.left, true, 1);
+          right = this.recurse(ast.right);
+          return function(scope, locals, assign, inputs) {
+            var lhs = left(scope, locals, assign, inputs);
+            var rhs = right(scope, locals, assign, inputs);
+            lhs.context[lhs.name] = rhs;
+            return context ? {value: rhs} : rhs;
+          };
+        case AST.ArrayExpression:
+          args = [];
+          forEach(ast.elements, function(expr) {
+            args.push(self.recurse(expr));
+          });
+          return function(scope, locals, assign, inputs) {
+            var value = [];
+            for (var i = 0; i < args.length; ++i) {
+              value.push(args[i](scope, locals, assign, inputs));
+            }
+            return context ? {value: value} : value;
+          };
+        case AST.ObjectExpression:
+          args = [];
+          forEach(ast.properties, function(property) {
+            if (property.computed) {
+              args.push({key: self.recurse(property.key),
+                computed: true,
+                value: self.recurse(property.value)
+              });
+            } else {
+              args.push({key: property.key.type === AST.Identifier ?
+                property.key.name :
+                ('' + property.key.value),
+                computed: false,
+                value: self.recurse(property.value)
+              });
+            }
+          });
+          return function(scope, locals, assign, inputs) {
+            var value = {};
+            for (var i = 0; i < args.length; ++i) {
+              if (args[i].computed) {
+                value[args[i].key(scope, locals, assign, inputs)] = args[i].value(scope, locals, assign, inputs);
+              } else {
+                value[args[i].key] = args[i].value(scope, locals, assign, inputs);
+              }
+            }
+            return context ? {value: value} : value;
+          };
+        case AST.ThisExpression:
+          return function(scope) {
+            return context ? {value: scope} : scope;
+          };
+        case AST.LocalsExpression:
+          return function(scope, locals) {
+            return context ? {value: locals} : locals;
+          };
+        case AST.NGValueParameter:
+          return function(scope, locals, assign) {
+            return context ? {value: assign} : assign;
+          };
+      }
+    },
 
-    // Only cache the value if it's not going to mess up the cache object
-    // This is more performant that using Object.prototype.hasOwnProperty.call
-    if (path !== 'hasOwnProperty') {
-      getterFnCache[path] = fn;
+    'unary+': function(argument, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = argument(scope, locals, assign, inputs);
+        if (isDefined(arg)) {
+          arg = +arg;
+        } else {
+          arg = 0;
+        }
+        return context ? {value: arg} : arg;
+      };
+    },
+    'unary-': function(argument, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = argument(scope, locals, assign, inputs);
+        if (isDefined(arg)) {
+          arg = -arg;
+        } else {
+          arg = -0;
+        }
+        return context ? {value: arg} : arg;
+      };
+    },
+    'unary!': function(argument, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = !argument(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary+': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var lhs = left(scope, locals, assign, inputs);
+        var rhs = right(scope, locals, assign, inputs);
+        var arg = plusFn(lhs, rhs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary-': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var lhs = left(scope, locals, assign, inputs);
+        var rhs = right(scope, locals, assign, inputs);
+        var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary*': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary/': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary%': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary===': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary!==': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary==': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        // eslint-disable-next-line eqeqeq
+        var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary!=': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        // eslint-disable-next-line eqeqeq
+        var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary<': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary>': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary<=': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary>=': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary&&': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'binary||': function(left, right, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    'ternary?:': function(test, alternate, consequent, context) {
+      return function(scope, locals, assign, inputs) {
+        var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs);
+        return context ? {value: arg} : arg;
+      };
+    },
+    value: function(value, context) {
+      return function() { return context ? {context: undefined, name: undefined, value: value} : value; };
+    },
+    identifier: function(name, context, create) {
+      return function(scope, locals, assign, inputs) {
+        var base = locals && (name in locals) ? locals : scope;
+        if (create && create !== 1 && base && base[name] == null) {
+          base[name] = {};
+        }
+        var value = base ? base[name] : undefined;
+        if (context) {
+          return {context: base, name: name, value: value};
+        } else {
+          return value;
+        }
+      };
+    },
+    computedMember: function(left, right, context, create) {
+      return function(scope, locals, assign, inputs) {
+        var lhs = left(scope, locals, assign, inputs);
+        var rhs;
+        var value;
+        if (lhs != null) {
+          rhs = right(scope, locals, assign, inputs);
+          rhs = getStringValue(rhs);
+          if (create && create !== 1) {
+            if (lhs && !(lhs[rhs])) {
+              lhs[rhs] = {};
+            }
+          }
+          value = lhs[rhs];
+        }
+        if (context) {
+          return {context: lhs, name: rhs, value: value};
+        } else {
+          return value;
+        }
+      };
+    },
+    nonComputedMember: function(left, right, context, create) {
+      return function(scope, locals, assign, inputs) {
+        var lhs = left(scope, locals, assign, inputs);
+        if (create && create !== 1) {
+          if (lhs && lhs[right] == null) {
+            lhs[right] = {};
+          }
+        }
+        var value = lhs != null ? lhs[right] : undefined;
+        if (context) {
+          return {context: lhs, name: right, value: value};
+        } else {
+          return value;
+        }
+      };
+    },
+    inputs: function(input, watchId) {
+      return function(scope, value, locals, inputs) {
+        if (inputs) return inputs[watchId];
+        return input(scope, value, locals);
+      };
     }
-    return fn;
+  };
+
+  /**
+   * @constructor
+   */
+  function Parser(lexer, $filter, options) {
+    this.ast = new AST(lexer, options);
+    this.astCompiler = options.csp ? new ASTInterpreter($filter) :
+      new ASTCompiler($filter);
+  }
+
+  Parser.prototype = {
+    constructor: Parser,
+
+    parse: function(text) {
+      var ast = this.ast.ast(text);
+      var fn = this.astCompiler.compile(ast);
+      fn.literal = isLiteral(ast);
+      fn.constant = isConstant(ast);
+      return fn;
+    }
+  };
+
+  function getValueOf(value) {
+    return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value);
   }
 
 ///////////////////////////////////
 
   /**
-   * @ngdoc function
-   * @name ng.$parse
-   * @function
+   * @ngdoc service
+   * @name $parse
+   * @kind function
    *
    * @description
    *
    * Converts Angular {@link guide/expression expression} into a function.
    *
-   * <pre>
+   * ```js
    *   var getter = $parse('user.name');
    *   var setter = getter.assign;
    *   var context = {user:{name:'angular'}};
@@ -10524,7 +16380,7 @@
    *   setter(context, 'newValue');
    *   expect(context.user.name).toEqual('newValue');
    *   expect(getter(context, locals)).toEqual('local');
-   * </pre>
+   * ```
    *
    *
    * @param {string} expression String expression to compile.
@@ -10547,156 +16403,351 @@
 
 
   /**
-   * @ngdoc object
-   * @name ng.$parseProvider
-   * @function
+   * @ngdoc provider
+   * @name $parseProvider
+   * @this
    *
    * @description
    * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
    *  service.
    */
   function $ParseProvider() {
-    var cache = {};
-
-    var $parseOptions = {
-      csp: false,
-      unwrapPromises: false,
-      logPromiseWarnings: true
+    var cache = createMap();
+    var literals = {
+      'true': true,
+      'false': false,
+      'null': null,
+      'undefined': undefined
     };
-
+    var identStart, identContinue;
 
     /**
-     * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
-     *
      * @ngdoc method
-     * @name ng.$parseProvider#unwrapPromises
-     * @methodOf ng.$parseProvider
+     * @name $parseProvider#addLiteral
      * @description
      *
-     * **This feature is deprecated, see deprecation notes below for more info**
+     * Configure $parse service to add literal values that will be present as literal at expressions.
      *
-     * If set to true (default is false), $parse will unwrap promises automatically when a promise is
-     * found at any part of the expression. In other words, if set to true, the expression will always
-     * result in a non-promise value.
+     * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name.
+     * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`.
      *
-     * While the promise is unresolved, it's treated as undefined, but once resolved and fulfilled,
-     * the fulfillment value is used in place of the promise while evaluating the expression.
-     *
-     * **Deprecation notice**
-     *
-     * This is a feature that didn't prove to be wildly useful or popular, primarily because of the
-     * dichotomy between data access in templates (accessed as raw values) and controller code
-     * (accessed as promises).
-     *
-     * In most code we ended up resolving promises manually in controllers anyway and thus unifying
-     * the model access there.
-     *
-     * Other downsides of automatic promise unwrapping:
-     *
-     * - when building components it's often desirable to receive the raw promises
-     * - adds complexity and slows down expression evaluation
-     * - makes expression code pre-generation unattractive due to the amount of code that needs to be
-     *   generated
-     * - makes IDE auto-completion and tool support hard
-     *
-     * **Warning Logs**
-     *
-     * If the unwrapping is enabled, Angular will log a warning about each expression that unwraps a
-     * promise (to reduce the noise, each expression is logged only once). To disable this logging use
-     * `$parseProvider.logPromiseWarnings(false)` api.
-     *
-     *
-     * @param {boolean=} value New value.
-     * @returns {boolean|self} Returns the current setting when used as getter and self if used as
-     *                         setter.
-     */
-    this.unwrapPromises = function(value) {
-      if (isDefined(value)) {
-        $parseOptions.unwrapPromises = !!value;
-        return this;
-      } else {
-        return $parseOptions.unwrapPromises;
-      }
+     **/
+    this.addLiteral = function(literalName, literalValue) {
+      literals[literalName] = literalValue;
     };
 
-
     /**
-     * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
-     *
      * @ngdoc method
-     * @name ng.$parseProvider#logPromiseWarnings
-     * @methodOf ng.$parseProvider
+     * @name $parseProvider#setIdentifierFns
+     *
      * @description
      *
-     * Controls whether Angular should log a warning on any encounter of a promise in an expression.
+     * Allows defining the set of characters that are allowed in Angular expressions. The function
+     * `identifierStart` will get called to know if a given character is a valid character to be the
+     * first character for an identifier. The function `identifierContinue` will get called to know if
+     * a given character is a valid character to be a follow-up identifier character. The functions
+     * `identifierStart` and `identifierContinue` will receive as arguments the single character to be
+     * identifier and the character code point. These arguments will be `string` and `numeric`. Keep in
+     * mind that the `string` parameter can be two characters long depending on the character
+     * representation. It is expected for the function to return `true` or `false`, whether that
+     * character is allowed or not.
      *
-     * The default is set to `true`.
+     * Since this function will be called extensively, keep the implementation of these functions fast,
+     * as the performance of these functions have a direct impact on the expressions parsing speed.
      *
-     * This setting applies only if `$parseProvider.unwrapPromises` setting is set to true as well.
-     *
-     * @param {boolean=} value New value.
-     * @returns {boolean|self} Returns the current setting when used as getter and self if used as
-     *                         setter.
+     * @param {function=} identifierStart The function that will decide whether the given character is
+     *   a valid identifier start character.
+     * @param {function=} identifierContinue The function that will decide whether the given character is
+     *   a valid identifier continue character.
      */
-    this.logPromiseWarnings = function(value) {
-      if (isDefined(value)) {
-        $parseOptions.logPromiseWarnings = value;
-        return this;
-      } else {
-        return $parseOptions.logPromiseWarnings;
-      }
+    this.setIdentifierFns = function(identifierStart, identifierContinue) {
+      identStart = identifierStart;
+      identContinue = identifierContinue;
+      return this;
     };
 
-
-    this.$get = ['$filter', '$sniffer', '$log', function($filter, $sniffer, $log) {
-      $parseOptions.csp = $sniffer.csp;
-
-      promiseWarning = function promiseWarningFn(fullExp) {
-        if (!$parseOptions.logPromiseWarnings || promiseWarningCache.hasOwnProperty(fullExp)) return;
-        promiseWarningCache[fullExp] = true;
-        $log.warn('[$parse] Promise found in the expression `' + fullExp + '`. ' +
-            'Automatic unwrapping of promises in Angular expressions is deprecated.');
+    this.$get = ['$filter', function($filter) {
+      var noUnsafeEval = csp().noUnsafeEval;
+      var $parseOptions = {
+        csp: noUnsafeEval,
+        literals: copy(literals),
+        isIdentifierStart: isFunction(identStart) && identStart,
+        isIdentifierContinue: isFunction(identContinue) && identContinue
       };
+      return $parse;
 
-      return function(exp) {
-        var parsedExpression;
+      function $parse(exp, interceptorFn) {
+        var parsedExpression, oneTime, cacheKey;
 
         switch (typeof exp) {
           case 'string':
+            exp = exp.trim();
+            cacheKey = exp;
 
-            if (cache.hasOwnProperty(exp)) {
-              return cache[exp];
+            parsedExpression = cache[cacheKey];
+
+            if (!parsedExpression) {
+              if (exp.charAt(0) === ':' && exp.charAt(1) === ':') {
+                oneTime = true;
+                exp = exp.substring(2);
+              }
+              var lexer = new Lexer($parseOptions);
+              var parser = new Parser(lexer, $filter, $parseOptions);
+              parsedExpression = parser.parse(exp);
+              if (parsedExpression.constant) {
+                parsedExpression.$$watchDelegate = constantWatchDelegate;
+              } else if (oneTime) {
+                parsedExpression.$$watchDelegate = parsedExpression.literal ?
+                  oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
+              } else if (parsedExpression.inputs) {
+                parsedExpression.$$watchDelegate = inputsWatchDelegate;
+              }
+              cache[cacheKey] = parsedExpression;
             }
-
-            var lexer = new Lexer($parseOptions);
-            var parser = new Parser(lexer, $filter, $parseOptions);
-            parsedExpression = parser.parse(exp, false);
-
-            if (exp !== 'hasOwnProperty') {
-              // Only cache the value if it's not going to mess up the cache object
-              // This is more performant that using Object.prototype.hasOwnProperty.call
-              cache[exp] = parsedExpression;
-            }
-
-            return parsedExpression;
+            return addInterceptor(parsedExpression, interceptorFn);
 
           case 'function':
-            return exp;
+            return addInterceptor(exp, interceptorFn);
 
           default:
-            return noop;
+            return addInterceptor(noop, interceptorFn);
         }
-      };
+      }
+
+      function expressionInputDirtyCheck(newValue, oldValueOfValue, compareObjectIdentity) {
+
+        if (newValue == null || oldValueOfValue == null) { // null/undefined
+          return newValue === oldValueOfValue;
+        }
+
+        if (typeof newValue === 'object') {
+
+          // attempt to convert the value to a primitive type
+          // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
+          //             be cheaply dirty-checked
+          newValue = getValueOf(newValue);
+
+          if (typeof newValue === 'object' && !compareObjectIdentity) {
+            // objects/arrays are not supported - deep-watching them would be too expensive
+            return false;
+          }
+
+          // fall-through to the primitive equality check
+        }
+
+        //Primitive or NaN
+        // eslint-disable-next-line no-self-compare
+        return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
+      }
+
+      function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+        var inputExpressions = parsedExpression.inputs;
+        var lastResult;
+
+        if (inputExpressions.length === 1) {
+          var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails
+          inputExpressions = inputExpressions[0];
+          return scope.$watch(function expressionInputWatch(scope) {
+            var newInputValue = inputExpressions(scope);
+            if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf, inputExpressions.isPure)) {
+              lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]);
+              oldInputValueOf = newInputValue && getValueOf(newInputValue);
+            }
+            return lastResult;
+          }, listener, objectEquality, prettyPrintExpression);
+        }
+
+        var oldInputValueOfValues = [];
+        var oldInputValues = [];
+        for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+          oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
+          oldInputValues[i] = null;
+        }
+
+        return scope.$watch(function expressionInputsWatch(scope) {
+          var changed = false;
+
+          for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+            var newInputValue = inputExpressions[i](scope);
+            if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i], inputExpressions[i].isPure))) {
+              oldInputValues[i] = newInputValue;
+              oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue);
+            }
+          }
+
+          if (changed) {
+            lastResult = parsedExpression(scope, undefined, undefined, oldInputValues);
+          }
+
+          return lastResult;
+        }, listener, objectEquality, prettyPrintExpression);
+      }
+
+      function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+        var unwatch, lastValue;
+        if (parsedExpression.inputs) {
+          unwatch = inputsWatchDelegate(scope, oneTimeListener, objectEquality, parsedExpression, prettyPrintExpression);
+        } else {
+          unwatch = scope.$watch(oneTimeWatch, oneTimeListener, objectEquality);
+        }
+        return unwatch;
+
+        function oneTimeWatch(scope) {
+          return parsedExpression(scope);
+        }
+        function oneTimeListener(value, old, scope) {
+          lastValue = value;
+          if (isFunction(listener)) {
+            listener(value, old, scope);
+          }
+          if (isDefined(value)) {
+            scope.$$postDigest(function() {
+              if (isDefined(lastValue)) {
+                unwatch();
+              }
+            });
+          }
+        }
+      }
+
+      function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+        var unwatch, lastValue;
+        unwatch = scope.$watch(function oneTimeWatch(scope) {
+          return parsedExpression(scope);
+        }, function oneTimeListener(value, old, scope) {
+          lastValue = value;
+          if (isFunction(listener)) {
+            listener(value, old, scope);
+          }
+          if (isAllDefined(value)) {
+            scope.$$postDigest(function() {
+              if (isAllDefined(lastValue)) unwatch();
+            });
+          }
+        }, objectEquality);
+
+        return unwatch;
+
+        function isAllDefined(value) {
+          var allDefined = true;
+          forEach(value, function(val) {
+            if (!isDefined(val)) allDefined = false;
+          });
+          return allDefined;
+        }
+      }
+
+      function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+        var unwatch = scope.$watch(function constantWatch(scope) {
+          unwatch();
+          return parsedExpression(scope);
+        }, listener, objectEquality);
+        return unwatch;
+      }
+
+      function addInterceptor(parsedExpression, interceptorFn) {
+        if (!interceptorFn) return parsedExpression;
+        var watchDelegate = parsedExpression.$$watchDelegate;
+        var useInputs = false;
+
+        var regularWatch =
+          watchDelegate !== oneTimeLiteralWatchDelegate &&
+          watchDelegate !== oneTimeWatchDelegate;
+
+        var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) {
+          var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs);
+          return interceptorFn(value, scope, locals);
+        } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) {
+          var value = parsedExpression(scope, locals, assign, inputs);
+          var result = interceptorFn(value, scope, locals);
+          // we only return the interceptor's result if the
+          // initial value is defined (for bind-once)
+          return isDefined(value) ? result : value;
+        };
+
+        // Propagate $$watchDelegates other then inputsWatchDelegate
+        useInputs = !parsedExpression.inputs;
+        if (watchDelegate && watchDelegate !== inputsWatchDelegate) {
+          fn.$$watchDelegate = watchDelegate;
+          fn.inputs = parsedExpression.inputs;
+        } else if (!interceptorFn.$stateful) {
+          // Treat interceptor like filters - assume non-stateful by default and use the inputsWatchDelegate
+          fn.$$watchDelegate = inputsWatchDelegate;
+          fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression];
+        }
+
+        if (fn.inputs) {
+          fn.inputs = fn.inputs.map(function(e) {
+            // Remove the isPure flag of inputs when it is not absolute because they are now wrapped in a
+            // potentially non-pure interceptor function.
+            if (e.isPure === PURITY_RELATIVE) {
+              return function depurifier(s) { return e(s); };
+            }
+            return e;
+          });
+        }
+
+        return fn;
+      }
     }];
   }
 
   /**
    * @ngdoc service
-   * @name ng.$q
+   * @name $q
    * @requires $rootScope
    *
    * @description
-   * A promise/deferred implementation inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
+   * A service that helps you run functions asynchronously, and use their return values (or exceptions)
+   * when they are done processing.
+   *
+   * This is a [Promises/A+](https://promisesaplus.com/)-compliant implementation of promises/deferred
+   * objects inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
+   *
+   * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
+   * implementations, and the other which resembles ES6 (ES2015) promises to some degree.
+   *
+   * # $q constructor
+   *
+   * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
+   * function as the first argument. This is similar to the native Promise implementation from ES6,
+   * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
+   *
+   * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are
+   * available yet.
+   *
+   * It can be used like so:
+   *
+   * ```js
+   *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+   *   // are available in the current lexical scope (they could have been injected or passed in).
+   *
+   *   function asyncGreet(name) {
+ *     // perform some asynchronous operation, resolve or reject the promise when appropriate.
+ *     return $q(function(resolve, reject) {
+ *       setTimeout(function() {
+ *         if (okToGreet(name)) {
+ *           resolve('Hello, ' + name + '!');
+ *         } else {
+ *           reject('Greeting ' + name + ' is not allowed.');
+ *         }
+ *       }, 1000);
+ *     });
+ *   }
+   *
+   *   var promise = asyncGreet('Robin Hood');
+   *   promise.then(function(greeting) {
+ *     alert('Success: ' + greeting);
+ *   }, function(reason) {
+ *     alert('Failed: ' + reason);
+ *   });
+   * ```
+   *
+   * Note: progress/notify callbacks are not currently supported via the ES6-style interface.
+   *
+   * Note: unlike ES6 behavior, an exception thrown in the constructor function will NOT implicitly reject the promise.
+   *
+   * However, the more traditional CommonJS-style usage is still available, and documented below.
    *
    * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
    * interface for interacting with an object that represents the result of an action that is
@@ -10705,25 +16756,21 @@
    * From the perspective of dealing with error handling, deferred and promise APIs are to
    * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
    *
-   * <pre>
-   *   // for the purpose of this example let's assume that variables `$q` and `scope` are
-   *   // available in the current lexical scope (they could have been injected or passed in).
+   * ```js
+   *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+   *   // are available in the current lexical scope (they could have been injected or passed in).
    *
    *   function asyncGreet(name) {
  *     var deferred = $q.defer();
  *
  *     setTimeout(function() {
- *       // since this fn executes async in a future turn of the event loop, we need to wrap
- *       // our code into an $apply call so that the model changes are properly observed.
- *       scope.$apply(function() {
- *         deferred.notify('About to greet ' + name + '.');
+ *       deferred.notify('About to greet ' + name + '.');
  *
- *         if (okToGreet(name)) {
- *           deferred.resolve('Hello, ' + name + '!');
- *         } else {
- *           deferred.reject('Greeting ' + name + ' is not allowed.');
- *         }
- *       });
+ *       if (okToGreet(name)) {
+ *         deferred.resolve('Hello, ' + name + '!');
+ *       } else {
+ *         deferred.reject('Greeting ' + name + ' is not allowed.');
+ *       }
  *     }, 1000);
  *
  *     return deferred.promise;
@@ -10737,7 +16784,7 @@
  *   }, function(update) {
  *     alert('Got notification: ' + update);
  *   });
-   * </pre>
+   * ```
    *
    * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
    * comes in the way of guarantees that promise and deferred APIs make, see
@@ -10748,7 +16795,6 @@
    * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
    * section on serial or parallel joining of promises.
    *
-   *
    * # The Deferred API
    *
    * A new instance of deferred is constructed by calling `$q.defer()`.
@@ -10763,7 +16809,7 @@
    *   constructed via `$q.reject`, the promise will be rejected instead.
    * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
    *   resolving it with a rejection constructed via `$q.reject`.
-   * - `notify(value)` - provides updates on the status of the promises execution. This may be called
+   * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
    *   multiple times before the promise is either resolved or rejected.
    *
    * **Properties**
@@ -10781,42 +16827,41 @@
    *
    * **Methods**
    *
-   * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
+   * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
    *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
    *   as soon as the result is available. The callbacks are called with a single argument: the result
    *   or rejection reason. Additionally, the notify callback may be called zero or more times to
    *   provide a progress indication, before the promise is resolved or rejected.
    *
    *   This method *returns a new promise* which is resolved or rejected via the return value of the
-   *   `successCallback`, `errorCallback`. It also notifies via the return value of the
-   *   `notifyCallback` method. The promise can not be resolved or rejected from the notifyCallback
-   *   method.
+   *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
+   *   with the value which is resolved in that promise using
+   *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
+   *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
+   *   resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
+   *   arguments are optional.
    *
    * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
    *
-   * - `finally(callback)` – allows you to observe either the fulfillment or rejection of a promise,
+   * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise,
    *   but to do so without modifying the final value. This is useful to release resources or do some
    *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
    *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
    *   more information.
    *
-   *   Because `finally` is a reserved word in JavaScript and reserved keywords are not supported as
-   *   property names by ES3, you'll need to invoke the method like `promise['finally'](callback)` to
-   *   make your code IE8 compatible.
-   *
    * # Chaining promises
    *
    * Because calling the `then` method of a promise returns a new derived promise, it is easily
    * possible to create a chain of promises:
    *
-   * <pre>
+   * ```js
    *   promiseB = promiseA.then(function(result) {
  *     return result + 1;
  *   });
    *
    *   // promiseB will be resolved immediately after promiseA is resolved and its value
    *   // will be the result of promiseA incremented by 1
-   * </pre>
+   * ```
    *
    * It is possible to create chains of any length and since a promise can be resolved with another
    * promise (which will defer its resolution further), it is possible to pause/defer resolution of
@@ -10834,9 +16879,9 @@
    * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
    *   all the important functionality needed for common async tasks.
    *
-   *  # Testing
+   * # Testing
    *
-   *  <pre>
+   *  ```js
    *    it('should simulate promise', inject(function($q, $rootScope) {
  *      var deferred = $q.defer();
  *      var promise = deferred.promise;
@@ -10856,17 +16901,70 @@
  *      $rootScope.$apply();
  *      expect(resolvedValue).toEqual(123);
  *    }));
-   *  </pre>
+   *  ```
+   *
+   * @param {function(function, function)} resolver Function which is responsible for resolving or
+   *   rejecting the newly created promise. The first parameter is a function which resolves the
+   *   promise, the second parameter is a function which rejects the promise.
+   *
+   * @returns {Promise} The newly created promise.
+   */
+  /**
+   * @ngdoc provider
+   * @name $qProvider
+   * @this
+   *
+   * @description
    */
   function $QProvider() {
-
+    var errorOnUnhandledRejections = true;
     this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
       return qFactory(function(callback) {
         $rootScope.$evalAsync(callback);
-      }, $exceptionHandler);
+      }, $exceptionHandler, errorOnUnhandledRejections);
     }];
+
+    /**
+     * @ngdoc method
+     * @name $qProvider#errorOnUnhandledRejections
+     * @kind function
+     *
+     * @description
+     * Retrieves or overrides whether to generate an error when a rejected promise is not handled.
+     * This feature is enabled by default.
+     *
+     * @param {boolean=} value Whether to generate an error when a rejected promise is not handled.
+     * @returns {boolean|ng.$qProvider} Current value when called without a new value or self for
+     *    chaining otherwise.
+     */
+    this.errorOnUnhandledRejections = function(value) {
+      if (isDefined(value)) {
+        errorOnUnhandledRejections = value;
+        return this;
+      } else {
+        return errorOnUnhandledRejections;
+      }
+    };
   }
 
+  /** @this */
+  function $$QProvider() {
+    var errorOnUnhandledRejections = true;
+    this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
+      return qFactory(function(callback) {
+        $browser.defer(callback);
+      }, $exceptionHandler, errorOnUnhandledRejections);
+    }];
+
+    this.errorOnUnhandledRejections = function(value) {
+      if (isDefined(value)) {
+        errorOnUnhandledRejections = value;
+        return this;
+      } else {
+        return errorOnUnhandledRejections;
+      }
+    };
+  }
 
   /**
    * Constructs a promise manager.
@@ -10874,170 +16972,209 @@
    * @param {function(function)} nextTick Function for executing functions in the next turn.
    * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
    *     debugging purposes.
+   * @param {boolean=} errorOnUnhandledRejections Whether an error should be generated on unhandled
+   *     promises rejections.
    * @returns {object} Promise manager.
    */
-  function qFactory(nextTick, exceptionHandler) {
+  function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
+    var $qMinErr = minErr('$q', TypeError);
+    var queueSize = 0;
+    var checkQueue = [];
 
     /**
-     * @ngdoc
+     * @ngdoc method
      * @name ng.$q#defer
-     * @methodOf ng.$q
+     * @kind function
+     *
      * @description
      * Creates a `Deferred` object which represents a task which will finish in the future.
      *
      * @returns {Deferred} Returns a new instance of deferred.
      */
-    var defer = function() {
-      var pending = [],
-          value, deferred;
+    function defer() {
+      return new Deferred();
+    }
 
-      deferred = {
-
-        resolve: function(val) {
-          if (pending) {
-            var callbacks = pending;
-            pending = undefined;
-            value = ref(val);
-
-            if (callbacks.length) {
-              nextTick(function() {
-                var callback;
-                for (var i = 0, ii = callbacks.length; i < ii; i++) {
-                  callback = callbacks[i];
-                  value.then(callback[0], callback[1], callback[2]);
-                }
-              });
-            }
-          }
-        },
+    function Deferred() {
+      var promise = this.promise = new Promise();
+      //Non prototype methods necessary to support unbound execution :/
+      this.resolve = function(val) { resolvePromise(promise, val); };
+      this.reject = function(reason) { rejectPromise(promise, reason); };
+      this.notify = function(progress) { notifyPromise(promise, progress); };
+    }
 
 
-        reject: function(reason) {
-          deferred.resolve(reject(reason));
-        },
+    function Promise() {
+      this.$$state = { status: 0 };
+    }
 
+    extend(Promise.prototype, {
+      then: function(onFulfilled, onRejected, progressBack) {
+        if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) {
+          return this;
+        }
+        var result = new Promise();
 
-        notify: function(progress) {
-          if (pending) {
-            var callbacks = pending;
+        this.$$state.pending = this.$$state.pending || [];
+        this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]);
+        if (this.$$state.status > 0) scheduleProcessQueue(this.$$state);
 
-            if (pending.length) {
-              nextTick(function() {
-                var callback;
-                for (var i = 0, ii = callbacks.length; i < ii; i++) {
-                  callback = callbacks[i];
-                  callback[2](progress);
-                }
-              });
-            }
-          }
-        },
+        return result;
+      },
 
+      'catch': function(callback) {
+        return this.then(null, callback);
+      },
 
-        promise: {
-          then: function(callback, errback, progressback) {
-            var result = defer();
+      'finally': function(callback, progressBack) {
+        return this.then(function(value) {
+          return handleCallback(value, resolve, callback);
+        }, function(error) {
+          return handleCallback(error, reject, callback);
+        }, progressBack);
+      }
+    });
 
-            var wrappedCallback = function(value) {
-              try {
-                result.resolve((isFunction(callback) ? callback : defaultCallback)(value));
-              } catch(e) {
-                result.reject(e);
-                exceptionHandler(e);
-              }
-            };
+    function processQueue(state) {
+      var fn, promise, pending;
 
-            var wrappedErrback = function(reason) {
-              try {
-                result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
-              } catch(e) {
-                result.reject(e);
-                exceptionHandler(e);
-              }
-            };
-
-            var wrappedProgressback = function(progress) {
-              try {
-                result.notify((isFunction(progressback) ? progressback : defaultCallback)(progress));
-              } catch(e) {
-                exceptionHandler(e);
-              }
-            };
-
-            if (pending) {
-              pending.push([wrappedCallback, wrappedErrback, wrappedProgressback]);
+      pending = state.pending;
+      state.processScheduled = false;
+      state.pending = undefined;
+      try {
+        for (var i = 0, ii = pending.length; i < ii; ++i) {
+          markQStateExceptionHandled(state);
+          promise = pending[i][0];
+          fn = pending[i][state.status];
+          try {
+            if (isFunction(fn)) {
+              resolvePromise(promise, fn(state.value));
+            } else if (state.status === 1) {
+              resolvePromise(promise, state.value);
             } else {
-              value.then(wrappedCallback, wrappedErrback, wrappedProgressback);
+              rejectPromise(promise, state.value);
             }
-
-            return result.promise;
-          },
-
-          "catch": function(callback) {
-            return this.then(null, callback);
-          },
-
-          "finally": function(callback) {
-
-            function makePromise(value, resolved) {
-              var result = defer();
-              if (resolved) {
-                result.resolve(value);
-              } else {
-                result.reject(value);
-              }
-              return result.promise;
-            }
-
-            function handleCallback(value, isResolved) {
-              var callbackOutput = null;
-              try {
-                callbackOutput = (callback ||defaultCallback)();
-              } catch(e) {
-                return makePromise(e, false);
-              }
-              if (callbackOutput && isFunction(callbackOutput.then)) {
-                return callbackOutput.then(function() {
-                  return makePromise(value, isResolved);
-                }, function(error) {
-                  return makePromise(error, false);
-                });
-              } else {
-                return makePromise(value, isResolved);
-              }
-            }
-
-            return this.then(function(value) {
-              return handleCallback(value, true);
-            }, function(error) {
-              return handleCallback(error, false);
-            });
+          } catch (e) {
+            rejectPromise(promise, e);
           }
         }
-      };
-
-      return deferred;
-    };
-
-
-    var ref = function(value) {
-      if (value && isFunction(value.then)) return value;
-      return {
-        then: function(callback) {
-          var result = defer();
-          nextTick(function() {
-            result.resolve(callback(value));
-          });
-          return result.promise;
+      } finally {
+        --queueSize;
+        if (errorOnUnhandledRejections && queueSize === 0) {
+          nextTick(processChecks);
         }
-      };
-    };
+      }
+    }
 
+    function processChecks() {
+      // eslint-disable-next-line no-unmodified-loop-condition
+      while (!queueSize && checkQueue.length) {
+        var toCheck = checkQueue.shift();
+        if (!isStateExceptionHandled(toCheck)) {
+          markQStateExceptionHandled(toCheck);
+          var errorMessage = 'Possibly unhandled rejection: ' + toDebugString(toCheck.value);
+          if (isError(toCheck.value)) {
+            exceptionHandler(toCheck.value, errorMessage);
+          } else {
+            exceptionHandler(errorMessage);
+          }
+        }
+      }
+    }
+
+    function scheduleProcessQueue(state) {
+      if (errorOnUnhandledRejections && !state.pending && state.status === 2 && !isStateExceptionHandled(state)) {
+        if (queueSize === 0 && checkQueue.length === 0) {
+          nextTick(processChecks);
+        }
+        checkQueue.push(state);
+      }
+      if (state.processScheduled || !state.pending) return;
+      state.processScheduled = true;
+      ++queueSize;
+      nextTick(function() { processQueue(state); });
+    }
+
+    function resolvePromise(promise, val) {
+      if (promise.$$state.status) return;
+      if (val === promise) {
+        $$reject(promise, $qMinErr(
+          'qcycle',
+          'Expected promise to be resolved with value other than itself \'{0}\'',
+          val));
+      } else {
+        $$resolve(promise, val);
+      }
+
+    }
+
+    function $$resolve(promise, val) {
+      var then;
+      var done = false;
+      try {
+        if (isObject(val) || isFunction(val)) then = val.then;
+        if (isFunction(then)) {
+          promise.$$state.status = -1;
+          then.call(val, doResolve, doReject, doNotify);
+        } else {
+          promise.$$state.value = val;
+          promise.$$state.status = 1;
+          scheduleProcessQueue(promise.$$state);
+        }
+      } catch (e) {
+        doReject(e);
+      }
+
+      function doResolve(val) {
+        if (done) return;
+        done = true;
+        $$resolve(promise, val);
+      }
+      function doReject(val) {
+        if (done) return;
+        done = true;
+        $$reject(promise, val);
+      }
+      function doNotify(progress) {
+        notifyPromise(promise, progress);
+      }
+    }
+
+    function rejectPromise(promise, reason) {
+      if (promise.$$state.status) return;
+      $$reject(promise, reason);
+    }
+
+    function $$reject(promise, reason) {
+      promise.$$state.value = reason;
+      promise.$$state.status = 2;
+      scheduleProcessQueue(promise.$$state);
+    }
+
+    function notifyPromise(promise, progress) {
+      var callbacks = promise.$$state.pending;
+
+      if ((promise.$$state.status <= 0) && callbacks && callbacks.length) {
+        nextTick(function() {
+          var callback, result;
+          for (var i = 0, ii = callbacks.length; i < ii; i++) {
+            result = callbacks[i][0];
+            callback = callbacks[i][3];
+            try {
+              notifyPromise(result, isFunction(callback) ? callback(progress) : progress);
+            } catch (e) {
+              exceptionHandler(e);
+            }
+          }
+        });
+      }
+    }
 
     /**
-     * @ngdoc
-     * @name ng.$q#reject
-     * @methodOf ng.$q
+     * @ngdoc method
+     * @name $q#reject
+     * @kind function
+     *
      * @description
      * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
      * used to forward rejection in a chain of promises. If you are dealing with the last promise in
@@ -11049,7 +17186,7 @@
      * current promise, you have to "rethrow" the error by returning a rejection constructed via
      * `reject`.
      *
-     * <pre>
+     * ```js
      *   promiseB = promiseA.then(function(result) {
    *     // success: do something and resolve promiseB
    *     //          with the old or a new result
@@ -11064,104 +17201,78 @@
    *     }
    *     return $q.reject(reason);
    *   });
-     * </pre>
+     * ```
      *
      * @param {*} reason Constant, message, exception or an object representing the rejection reason.
      * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
      */
-    var reject = function(reason) {
-      return {
-        then: function(callback, errback) {
-          var result = defer();
-          nextTick(function() {
-            try {
-              result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
-            } catch(e) {
-              result.reject(e);
-              exceptionHandler(e);
-            }
-          });
-          return result.promise;
-        }
-      };
-    };
+    function reject(reason) {
+      var result = new Promise();
+      rejectPromise(result, reason);
+      return result;
+    }
 
+    function handleCallback(value, resolver, callback) {
+      var callbackOutput = null;
+      try {
+        if (isFunction(callback)) callbackOutput = callback();
+      } catch (e) {
+        return reject(e);
+      }
+      if (isPromiseLike(callbackOutput)) {
+        return callbackOutput.then(function() {
+          return resolver(value);
+        }, reject);
+      } else {
+        return resolver(value);
+      }
+    }
 
     /**
-     * @ngdoc
-     * @name ng.$q#when
-     * @methodOf ng.$q
+     * @ngdoc method
+     * @name $q#when
+     * @kind function
+     *
      * @description
      * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
      * This is useful when you are dealing with an object that might or might not be a promise, or if
      * the promise comes from a source that can't be trusted.
      *
      * @param {*} value Value or a promise
+     * @param {Function=} successCallback
+     * @param {Function=} errorCallback
+     * @param {Function=} progressCallback
      * @returns {Promise} Returns a promise of the passed value or promise
      */
-    var when = function(value, callback, errback, progressback) {
-      var result = defer(),
-          done;
-
-      var wrappedCallback = function(value) {
-        try {
-          return (isFunction(callback) ? callback : defaultCallback)(value);
-        } catch (e) {
-          exceptionHandler(e);
-          return reject(e);
-        }
-      };
-
-      var wrappedErrback = function(reason) {
-        try {
-          return (isFunction(errback) ? errback : defaultErrback)(reason);
-        } catch (e) {
-          exceptionHandler(e);
-          return reject(e);
-        }
-      };
-
-      var wrappedProgressback = function(progress) {
-        try {
-          return (isFunction(progressback) ? progressback : defaultCallback)(progress);
-        } catch (e) {
-          exceptionHandler(e);
-        }
-      };
-
-      nextTick(function() {
-        ref(value).then(function(value) {
-          if (done) return;
-          done = true;
-          result.resolve(ref(value).then(wrappedCallback, wrappedErrback, wrappedProgressback));
-        }, function(reason) {
-          if (done) return;
-          done = true;
-          result.resolve(wrappedErrback(reason));
-        }, function(progress) {
-          if (done) return;
-          result.notify(wrappedProgressback(progress));
-        });
-      });
-
-      return result.promise;
-    };
 
 
-    function defaultCallback(value) {
-      return value;
+    function when(value, callback, errback, progressBack) {
+      var result = new Promise();
+      resolvePromise(result, value);
+      return result.then(callback, errback, progressBack);
     }
 
-
-    function defaultErrback(reason) {
-      return reject(reason);
-    }
-
-
     /**
-     * @ngdoc
-     * @name ng.$q#all
-     * @methodOf ng.$q
+     * @ngdoc method
+     * @name $q#resolve
+     * @kind function
+     *
+     * @description
+     * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
+     *
+     * @param {*} value Value or a promise
+     * @param {Function=} successCallback
+     * @param {Function=} errorCallback
+     * @param {Function=} progressCallback
+     * @returns {Promise} Returns a promise of the passed value or promise
+     */
+    var resolve = when;
+
+    /**
+     * @ngdoc method
+     * @name $q#all
+     * @kind function
+     *
      * @description
      * Combines multiple promises into a single promise that is resolved when all of the input
      * promises are resolved.
@@ -11172,36 +17283,126 @@
      *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
      *   with the same rejection value.
      */
+
     function all(promises) {
-      var deferred = defer(),
-          counter = 0,
-          results = isArray(promises) ? [] : {};
+      var result = new Promise(),
+        counter = 0,
+        results = isArray(promises) ? [] : {};
 
       forEach(promises, function(promise, key) {
         counter++;
-        ref(promise).then(function(value) {
-          if (results.hasOwnProperty(key)) return;
+        when(promise).then(function(value) {
           results[key] = value;
-          if (!(--counter)) deferred.resolve(results);
+          if (!(--counter)) resolvePromise(result, results);
         }, function(reason) {
-          if (results.hasOwnProperty(key)) return;
-          deferred.reject(reason);
+          rejectPromise(result, reason);
         });
       });
 
       if (counter === 0) {
-        deferred.resolve(results);
+        resolvePromise(result, results);
       }
 
+      return result;
+    }
+
+    /**
+     * @ngdoc method
+     * @name $q#race
+     * @kind function
+     *
+     * @description
+     * Returns a promise that resolves or rejects as soon as one of those promises
+     * resolves or rejects, with the value or reason from that promise.
+     *
+     * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+     * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
+     * resolves or rejects, with the value or reason from that promise.
+     */
+
+    function race(promises) {
+      var deferred = defer();
+
+      forEach(promises, function(promise) {
+        when(promise).then(deferred.resolve, deferred.reject);
+      });
+
       return deferred.promise;
     }
 
-    return {
-      defer: defer,
-      reject: reject,
-      when: when,
-      all: all
-    };
+    function $Q(resolver) {
+      if (!isFunction(resolver)) {
+        throw $qMinErr('norslvr', 'Expected resolverFn, got \'{0}\'', resolver);
+      }
+
+      var promise = new Promise();
+
+      function resolveFn(value) {
+        resolvePromise(promise, value);
+      }
+
+      function rejectFn(reason) {
+        rejectPromise(promise, reason);
+      }
+
+      resolver(resolveFn, rejectFn);
+
+      return promise;
+    }
+
+    // Let's make the instanceof operator work for promises, so that
+    // `new $q(fn) instanceof $q` would evaluate to true.
+    $Q.prototype = Promise.prototype;
+
+    $Q.defer = defer;
+    $Q.reject = reject;
+    $Q.when = when;
+    $Q.resolve = resolve;
+    $Q.all = all;
+    $Q.race = race;
+
+    return $Q;
+  }
+
+  function isStateExceptionHandled(state) {
+    return !!state.pur;
+  }
+  function markQStateExceptionHandled(state) {
+    state.pur = true;
+  }
+  function markQExceptionHandled(q) {
+    markQStateExceptionHandled(q.$$state);
+  }
+
+  /** @this */
+  function $$RAFProvider() { //rAF
+    this.$get = ['$window', '$timeout', function($window, $timeout) {
+      var requestAnimationFrame = $window.requestAnimationFrame ||
+        $window.webkitRequestAnimationFrame;
+
+      var cancelAnimationFrame = $window.cancelAnimationFrame ||
+        $window.webkitCancelAnimationFrame ||
+        $window.webkitCancelRequestAnimationFrame;
+
+      var rafSupported = !!requestAnimationFrame;
+      var raf = rafSupported
+        ? function(fn) {
+          var id = requestAnimationFrame(fn);
+          return function() {
+            cancelAnimationFrame(id);
+          };
+        }
+        : function(fn) {
+          var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
+          return function() {
+            $timeout.cancel(timer);
+          };
+        };
+
+      raf.supported = rafSupported;
+
+      return raf;
+    }];
   }
 
   /**
@@ -11218,30 +17419,29 @@
    *     exposed as $$____ properties
    *
    * Loop operations are optimized by using while(count--) { ... }
-   *   - this means that in order to keep the same order of execution as addition we have to add
-   *     items to the array at the beginning (shift) instead of at the end (push)
+   *   - This means that in order to keep the same order of execution as addition we have to add
+   *     items to the array at the beginning (unshift) instead of at the end (push)
    *
    * Child scopes are created and removed often
-   *   - Using an array would be slow since inserts in middle are expensive so we use linked list
+   *   - Using an array would be slow since inserts in the middle are expensive; so we use linked lists
    *
-   * There are few watches then a lot of observers. This is why you don't want the observer to be
-   * implemented in the same way as watch. Watch requires return of initialization function which
-   * are expensive to construct.
+   * There are fewer watches than observers. This is why you don't want the observer to be implemented
+   * in the same way as watch. Watch requires return of the initialization function which is expensive
+   * to construct.
    */
 
 
   /**
-   * @ngdoc object
-   * @name ng.$rootScopeProvider
+   * @ngdoc provider
+   * @name $rootScopeProvider
    * @description
    *
    * Provider for the $rootScope service.
    */
 
   /**
-   * @ngdoc function
-   * @name ng.$rootScopeProvider#digestTtl
-   * @methodOf ng.$rootScopeProvider
+   * @ngdoc method
+   * @name $rootScopeProvider#digestTtl
    * @description
    *
    * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
@@ -11262,20 +17462,23 @@
 
 
   /**
-   * @ngdoc object
-   * @name ng.$rootScope
+   * @ngdoc service
+   * @name $rootScope
+   * @this
+   *
    * @description
    *
    * Every application has a single root {@link ng.$rootScope.Scope scope}.
    * All other scopes are descendant scopes of the root scope. Scopes provide separation
    * between the model and the view, via a mechanism for watching the model for changes.
-   * They also provide an event emission/broadcast and subscription facility. See the
+   * They also provide event emission/broadcast and subscription facility. See the
    * {@link guide/scope developer guide on scopes}.
    */
-  function $RootScopeProvider(){
+  function $RootScopeProvider() {
     var TTL = 10;
     var $rootScopeMinErr = minErr('$rootScope');
     var lastDirtyWatch = null;
+    var applyAsyncId = null;
 
     this.digestTtl = function(value) {
       if (arguments.length) {
@@ -11284,38 +17487,84 @@
       return TTL;
     };
 
-    this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
-      function( $injector,   $exceptionHandler,   $parse,   $browser) {
+    function createChildScopeClass(parent) {
+      function ChildScope() {
+        this.$$watchers = this.$$nextSibling =
+          this.$$childHead = this.$$childTail = null;
+        this.$$listeners = {};
+        this.$$listenerCount = {};
+        this.$$watchersCount = 0;
+        this.$id = nextUid();
+        this.$$ChildScope = null;
+      }
+      ChildScope.prototype = parent;
+      return ChildScope;
+    }
+
+    this.$get = ['$exceptionHandler', '$parse', '$browser',
+      function($exceptionHandler, $parse, $browser) {
+
+        function destroyChildScope($event) {
+          $event.currentScope.$$destroyed = true;
+        }
+
+        function cleanUpScope($scope) {
+
+          // Support: IE 9 only
+          if (msie === 9) {
+            // There is a memory leak in IE9 if all child scopes are not disconnected
+            // completely when a scope is destroyed. So this code will recurse up through
+            // all this scopes children
+            //
+            // See issue https://github.com/angular/angular.js/issues/10706
+            if ($scope.$$childHead) {
+              cleanUpScope($scope.$$childHead);
+            }
+            if ($scope.$$nextSibling) {
+              cleanUpScope($scope.$$nextSibling);
+            }
+          }
+
+          // The code below works around IE9 and V8's memory leaks
+          //
+          // See:
+          // - https://code.google.com/p/v8/issues/detail?id=2073#c26
+          // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
+          // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+
+          $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead =
+            $scope.$$childTail = $scope.$root = $scope.$$watchers = null;
+        }
 
         /**
-         * @ngdoc function
-         * @name ng.$rootScope.Scope
+         * @ngdoc type
+         * @name $rootScope.Scope
          *
          * @description
          * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
-         * {@link AUTO.$injector $injector}. Child scopes are created using the
-         * {@link ng.$rootScope.Scope#methods_$new $new()} method. (Most scopes are created automatically when
-         * compiled HTML template is executed.)
+         * {@link auto.$injector $injector}. Child scopes are created using the
+         * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
+         * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
+         * an in-depth introduction and usage examples.
          *
-         * Here is a simple scope snippet to show how you can interact with the scope.
-         * <pre>
-         * <file src="./test/ng/rootScopeSpec.js" tag="docs1" />
-         * </pre>
          *
          * # Inheritance
          * A scope can inherit from a parent scope, as in this example:
-         * <pre>
+         * ```js
          var parent = $rootScope;
          var child = parent.$new();
 
          parent.salutation = "Hello";
-         child.name = "World";
          expect(child.salutation).toEqual('Hello');
 
          child.salutation = "Welcome";
          expect(child.salutation).toEqual('Welcome');
          expect(parent.salutation).toEqual('Hello');
-         * </pre>
+         * ```
+         *
+         * When interacting with `Scope` in tests, additional helper methods are available on the
+         * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional
+         * details.
          *
          *
          * @param {Object.<string, function()>=} providers Map of service factory which need to be
@@ -11330,42 +17579,54 @@
         function Scope() {
           this.$id = nextUid();
           this.$$phase = this.$parent = this.$$watchers =
-              this.$$nextSibling = this.$$prevSibling =
-                  this.$$childHead = this.$$childTail = null;
-          this['this'] = this.$root =  this;
+            this.$$nextSibling = this.$$prevSibling =
+              this.$$childHead = this.$$childTail = null;
+          this.$root = this;
           this.$$destroyed = false;
-          this.$$asyncQueue = [];
-          this.$$postDigestQueue = [];
           this.$$listeners = {};
           this.$$listenerCount = {};
-          this.$$isolateBindings = {};
+          this.$$watchersCount = 0;
+          this.$$isolateBindings = null;
         }
 
         /**
          * @ngdoc property
-         * @name ng.$rootScope.Scope#$id
-         * @propertyOf ng.$rootScope.Scope
-         * @returns {number} Unique scope ID (monotonically increasing alphanumeric sequence) useful for
-         *   debugging.
+         * @name $rootScope.Scope#$id
+         *
+         * @description
+         * Unique scope ID (monotonically increasing) useful for debugging.
          */
 
+        /**
+         * @ngdoc property
+         * @name $rootScope.Scope#$parent
+         *
+         * @description
+         * Reference to the parent scope.
+         */
+
+        /**
+         * @ngdoc property
+         * @name $rootScope.Scope#$root
+         *
+         * @description
+         * Reference to the root scope.
+         */
 
         Scope.prototype = {
           constructor: Scope,
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$new
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$new
+           * @kind function
            *
            * @description
            * Creates a new child {@link ng.$rootScope.Scope scope}.
            *
-           * The parent scope will propagate the {@link ng.$rootScope.Scope#methods_$digest $digest()} and
-           * {@link ng.$rootScope.Scope#methods_$digest $digest()} events. The scope can be removed from the
-           * scope hierarchy using {@link ng.$rootScope.Scope#methods_$destroy $destroy()}.
+           * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
+           * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
            *
-           * {@link ng.$rootScope.Scope#methods_$destroy $destroy()} must be called on a scope when it is
+           * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
            * desired for the scope and its child scopes to be permanently detached from the parent and
            * thus stop participating in model change detection and listener notification by invoking.
            *
@@ -11374,84 +17635,96 @@
            *         When creating widgets, it is useful for the widget to not accidentally read parent
            *         state.
            *
+           * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent`
+           *                              of the newly created scope. Defaults to `this` scope if not provided.
+           *                              This is used when creating a transclude scope to correctly place it
+           *                              in the scope hierarchy while maintaining the correct prototypical
+           *                              inheritance.
+           *
            * @returns {Object} The newly created child scope.
            *
            */
-          $new: function(isolate) {
-            var ChildScope,
-                child;
+          $new: function(isolate, parent) {
+            var child;
+
+            parent = parent || this;
 
             if (isolate) {
               child = new Scope();
               child.$root = this.$root;
-              // ensure that there is just one async queue per $rootScope and its children
-              child.$$asyncQueue = this.$$asyncQueue;
-              child.$$postDigestQueue = this.$$postDigestQueue;
             } else {
-              ChildScope = function() {}; // should be anonymous; This is so that when the minifier munges
-              // the name it does not become random set of chars. This will then show up as class
-              // name in the web inspector.
-              ChildScope.prototype = this;
-              child = new ChildScope();
-              child.$id = nextUid();
+              // Only create a child scope class if somebody asks for one,
+              // but cache it to allow the VM to optimize lookups.
+              if (!this.$$ChildScope) {
+                this.$$ChildScope = createChildScopeClass(this);
+              }
+              child = new this.$$ChildScope();
             }
-            child['this'] = child;
-            child.$$listeners = {};
-            child.$$listenerCount = {};
-            child.$parent = this;
-            child.$$watchers = child.$$nextSibling = child.$$childHead = child.$$childTail = null;
-            child.$$prevSibling = this.$$childTail;
-            if (this.$$childHead) {
-              this.$$childTail.$$nextSibling = child;
-              this.$$childTail = child;
+            child.$parent = parent;
+            child.$$prevSibling = parent.$$childTail;
+            if (parent.$$childHead) {
+              parent.$$childTail.$$nextSibling = child;
+              parent.$$childTail = child;
             } else {
-              this.$$childHead = this.$$childTail = child;
+              parent.$$childHead = parent.$$childTail = child;
             }
+
+            // When the new scope is not isolated or we inherit from `this`, and
+            // the parent scope is destroyed, the property `$$destroyed` is inherited
+            // prototypically. In all other cases, this property needs to be set
+            // when the parent scope is destroyed.
+            // The listener needs to be added after the parent is set
+            if (isolate || parent !== this) child.$on('$destroy', destroyChildScope);
+
             return child;
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$watch
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$watch
+           * @kind function
            *
            * @description
            * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
            *
-           * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#methods_$digest
-           *   $digest()} and should return the value that will be watched. (Since
-           *   {@link ng.$rootScope.Scope#methods_$digest $digest()} reruns when it detects changes the
-           *   `watchExpression` can execute multiple times per
-           *   {@link ng.$rootScope.Scope#methods_$digest $digest()} and should be idempotent.)
+           * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
+       *   $digest()} and should return the value that will be watched. (`watchExpression` should not change
+           *   its value when executed multiple times with the same input because it may be executed multiple
+           *   times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be
+           *   [idempotent](http://en.wikipedia.org/wiki/Idempotence).)
            * - The `listener` is called only when the value from the current `watchExpression` and the
            *   previous call to `watchExpression` are not equal (with the exception of the initial run,
-           *   see below). The inequality is determined according to
-           *   {@link angular.equals} function. To save the value of the object for later comparison,
-           *   the {@link angular.copy} function is used. It also means that watching complex options
-           *   will have adverse memory and performance implications.
+           *   see below). Inequality is determined according to reference inequality,
+           *   [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators)
+           *    via the `!==` Javascript operator, unless `objectEquality == true`
+           *   (see next point)
+           * - When `objectEquality == true`, inequality of the `watchExpression` is determined
+           *   according to the {@link angular.equals} function. To save the value of the object for
+           *   later comparison, the {@link angular.copy} function is used. This therefore means that
+           *   watching complex objects will have adverse memory and performance implications.
+           * - This should not be used to watch for changes in objects that are
+           *   or contain [File](https://developer.mozilla.org/docs/Web/API/File) objects due to limitations with {@link angular.copy `angular.copy`}.
            * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
            *   This is achieved by rerunning the watchers until no changes are detected. The rerun
            *   iteration limit is 10 to prevent an infinite loop deadlock.
            *
            *
-           * If you want to be notified whenever {@link ng.$rootScope.Scope#methods_$digest $digest} is called,
-           * you can register a `watchExpression` function with no `listener`. (Since `watchExpression`
-           * can execute multiple times per {@link ng.$rootScope.Scope#methods_$digest $digest} cycle when a
-           * change is detected, be prepared for multiple calls to your listener.)
+           * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
+           * you can register a `watchExpression` function with no `listener`. (Be prepared for
+           * multiple calls to your `watchExpression` because it will execute multiple times in a
+           * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.)
            *
            * After a watcher is registered with the scope, the `listener` fn is called asynchronously
-           * (via {@link ng.$rootScope.Scope#methods_$evalAsync $evalAsync}) to initialize the
+           * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
            * watcher. In rare cases, this is undesirable because the listener is called when the result
            * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
            * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
            * listener was called due to initialization.
            *
-           * The example below contains an illustration of using a function as your $watch listener
            *
            *
            * # Example
-           * <pre>
+           * ```js
            // let's assume that scope was dependency injected as the $rootScope
            var scope = $rootScope;
            scope.name = 'misko';
@@ -11464,23 +17737,27 @@
            expect(scope.counter).toEqual(0);
 
            scope.$digest();
-           // no variable change
-           expect(scope.counter).toEqual(0);
+           // the listener is always called during the first $digest loop after it was registered
+           expect(scope.counter).toEqual(1);
+
+           scope.$digest();
+           // but now it will not be called unless the value changes
+           expect(scope.counter).toEqual(1);
 
            scope.name = 'adam';
            scope.$digest();
-           expect(scope.counter).toEqual(1);
+           expect(scope.counter).toEqual(2);
 
 
 
-           // Using a listener function
+           // Using a function as a watchExpression
            var food;
            scope.foodCounter = 0;
            expect(scope.foodCounter).toEqual(0);
            scope.$watch(
-           // This is the listener function
+           // This function returns the value being watched. It is called for each turn of the $digest loop
            function() { return food; },
-           // This is the change handler
+           // This is the change listener, called when the value returned from the above function changes
            function(newValue, oldValue) {
                if ( newValue !== oldValue ) {
                  // Only increment the counter if the value changed
@@ -11500,73 +17777,191 @@
            scope.$digest();
            expect(scope.foodCounter).toEqual(1);
 
-           * </pre>
+           * ```
            *
            *
            *
            * @param {(function()|string)} watchExpression Expression that is evaluated on each
-           *    {@link ng.$rootScope.Scope#methods_$digest $digest} cycle. A change in the return value triggers
+           *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
            *    a call to the `listener`.
            *
            *    - `string`: Evaluated as {@link guide/expression expression}
            *    - `function(scope)`: called with current `scope` as a parameter.
-           * @param {(function()|string)=} listener Callback called whenever the return value of
-           *   the `watchExpression` changes.
+           * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value
+           *    of `watchExpression` changes.
            *
-           *    - `string`: Evaluated as {@link guide/expression expression}
-           *    - `function(newValue, oldValue, scope)`: called with current and previous values as
-           *      parameters.
-           *
-           * @param {boolean=} objectEquality Compare object for equality rather than for reference.
+           *    - `newVal` contains the current value of the `watchExpression`
+           *    - `oldVal` contains the previous value of the `watchExpression`
+           *    - `scope` refers to the current scope
+           * @param {boolean=} [objectEquality=false] Compare for object equality using {@link angular.equals} instead of
+           *     comparing for reference equality.
            * @returns {function()} Returns a deregistration function for this listener.
            */
-          $watch: function(watchExp, listener, objectEquality) {
+          $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) {
+            var get = $parse(watchExp);
+
+            if (get.$$watchDelegate) {
+              return get.$$watchDelegate(this, listener, objectEquality, get, watchExp);
+            }
             var scope = this,
-                get = compileToFn(watchExp, 'watch'),
-                array = scope.$$watchers,
-                watcher = {
-                  fn: listener,
-                  last: initWatchVal,
-                  get: get,
-                  exp: watchExp,
-                  eq: !!objectEquality
-                };
+              array = scope.$$watchers,
+              watcher = {
+                fn: listener,
+                last: initWatchVal,
+                get: get,
+                exp: prettyPrintExpression || watchExp,
+                eq: !!objectEquality
+              };
 
             lastDirtyWatch = null;
 
-            // in the case user pass string, we need to compile it, do we really need this ?
             if (!isFunction(listener)) {
-              var listenFn = compileToFn(listener || noop, 'listener');
-              watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);};
-            }
-
-            if (typeof watchExp == 'string' && get.constant) {
-              var originalFn = watcher.fn;
-              watcher.fn = function(newVal, oldVal, scope) {
-                originalFn.call(this, newVal, oldVal, scope);
-                arrayRemove(array, watcher);
-              };
+              watcher.fn = noop;
             }
 
             if (!array) {
               array = scope.$$watchers = [];
+              array.$$digestWatchIndex = -1;
             }
             // we use unshift since we use a while loop in $digest for speed.
             // the while loop reads in reverse order.
             array.unshift(watcher);
+            array.$$digestWatchIndex++;
+            incrementWatchersCount(this, 1);
 
-            return function() {
-              arrayRemove(array, watcher);
+            return function deregisterWatch() {
+              var index = arrayRemove(array, watcher);
+              if (index >= 0) {
+                incrementWatchersCount(scope, -1);
+                if (index < array.$$digestWatchIndex) {
+                  array.$$digestWatchIndex--;
+                }
+              }
               lastDirtyWatch = null;
             };
           },
 
+          /**
+           * @ngdoc method
+           * @name $rootScope.Scope#$watchGroup
+           * @kind function
+           *
+           * @description
+           * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`.
+           * If any one expression in the collection changes the `listener` is executed.
+           *
+           * - The items in the `watchExpressions` array are observed via the standard `$watch` operation. Their return
+           *   values are examined for changes on every call to `$digest`.
+           * - The `listener` is called whenever any expression in the `watchExpressions` array changes.
+           *
+           * `$watchGroup` is more performant than watching each expression individually, and should be
+           * used when the listener does not need to know which expression has changed.
+           * If the listener needs to know which expression has changed,
+           * {@link ng.$rootScope.Scope#$watch $watch()} or
+           * {@link ng.$rootScope.Scope#$watchCollection $watchCollection()} should be used.
+           *
+           * @param {Array.<string|Function(scope)>} watchExpressions Array of expressions that will be individually
+           * watched using {@link ng.$rootScope.Scope#$watch $watch()}
+           *
+           * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any
+           *    expression in `watchExpressions` changes
+           *    The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching
+           *    those of `watchExpression`
+           *    and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching
+           *    those of `watchExpression`.
+           *
+           *    Note that `newValues` and `oldValues` reflect the differences in each **individual**
+           *    expression, and not the difference of the values between each call of the listener.
+           *    That means the difference between `newValues` and `oldValues` cannot be used to determine
+           *    which expression has changed / remained stable:
+           *
+           *    ```js
+           *
+           *    $scope.$watchGroup(['v1', 'v2'], function(newValues, oldValues) {
+       *      console.log(newValues, oldValues);
+       *    });
+           *
+           *    // newValues, oldValues initially
+           *    // [undefined, undefined], [undefined, undefined]
+           *
+           *    $scope.v1 = 'a';
+           *    $scope.v2 = 'a';
+           *
+           *    // ['a', 'a'], [undefined, undefined]
+           *
+           *    $scope.v2 = 'b'
+           *
+           *    // v1 hasn't changed since it became `'a'`, therefore its oldValue is still `undefined`
+           *    // ['a', 'b'], [undefined, 'a']
+           *
+           *    ```
+           *
+           *    The `scope` refers to the current scope.
+           * @returns {function()} Returns a de-registration function for all listeners.
+           */
+          $watchGroup: function(watchExpressions, listener) {
+            var oldValues = new Array(watchExpressions.length);
+            var newValues = new Array(watchExpressions.length);
+            var deregisterFns = [];
+            var self = this;
+            var changeReactionScheduled = false;
+            var firstRun = true;
+
+            if (!watchExpressions.length) {
+              // No expressions means we call the listener ASAP
+              var shouldCall = true;
+              self.$evalAsync(function() {
+                if (shouldCall) listener(newValues, newValues, self);
+              });
+              return function deregisterWatchGroup() {
+                shouldCall = false;
+              };
+            }
+
+            if (watchExpressions.length === 1) {
+              // Special case size of one
+              return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) {
+                newValues[0] = value;
+                oldValues[0] = oldValue;
+                listener(newValues, (value === oldValue) ? newValues : oldValues, scope);
+              });
+            }
+
+            forEach(watchExpressions, function(expr, i) {
+              var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) {
+                newValues[i] = value;
+                oldValues[i] = oldValue;
+                if (!changeReactionScheduled) {
+                  changeReactionScheduled = true;
+                  self.$evalAsync(watchGroupAction);
+                }
+              });
+              deregisterFns.push(unwatchFn);
+            });
+
+            function watchGroupAction() {
+              changeReactionScheduled = false;
+
+              if (firstRun) {
+                firstRun = false;
+                listener(newValues, newValues, self);
+              } else {
+                listener(newValues, oldValues, self);
+              }
+            }
+
+            return function deregisterWatchGroup() {
+              while (deregisterFns.length) {
+                deregisterFns.shift()();
+              }
+            };
+          },
+
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$watchCollection
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$watchCollection
+           * @kind function
            *
            * @description
            * Shallow watches the properties of an object and fires whenever any of the properties change
@@ -11580,7 +17975,7 @@
            *
            *
            * # Example
-           * <pre>
+           * ```js
            $scope.names = ['igor', 'matias', 'misko', 'james'];
            $scope.dataCount = 4;
 
@@ -11599,38 +17994,53 @@
 
            //now there's been a change
            expect($scope.dataCount).toEqual(3);
-           * </pre>
+           * ```
            *
            *
-           * @param {string|Function(scope)} obj Evaluated as {@link guide/expression expression}. The
+           * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
            *    expression value should evaluate to an object or an array which is observed on each
-           *    {@link ng.$rootScope.Scope#methods_$digest $digest} cycle. Any shallow change within the
+           *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
            *    collection will trigger a call to the `listener`.
            *
-           * @param {function(newCollection, oldCollection, scope)} listener a callback function that is
-           *    fired with both the `newCollection` and `oldCollection` as parameters.
-           *    The `newCollection` object is the newly modified data obtained from the `obj` expression
-           *    and the `oldCollection` object is a copy of the former collection data.
-           *    The `scope` refers to the current scope.
+           * @param {function(newCollection, oldCollection, scope)} listener a callback function called
+           *    when a change is detected.
+           *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
+           *    - The `oldCollection` object is a copy of the former collection data.
+           *      Due to performance considerations, the`oldCollection` value is computed only if the
+           *      `listener` function declares two or more arguments.
+           *    - The `scope` argument refers to the current scope.
            *
            * @returns {function()} Returns a de-registration function for this listener. When the
            *    de-registration function is executed, the internal watch operation is terminated.
            */
           $watchCollection: function(obj, listener) {
+            $watchCollectionInterceptor.$stateful = true;
+
             var self = this;
-            var oldValue;
+            // the current value, updated on each dirty-check run
             var newValue;
+            // a shallow copy of the newValue from the last dirty-check run,
+            // updated to match newValue during dirty-check run
+            var oldValue;
+            // a shallow copy of the newValue from when the last change happened
+            var veryOldValue;
+            // only track veryOldValue if the listener is asking for it
+            var trackVeryOldValue = (listener.length > 1);
             var changeDetected = 0;
-            var objGetter = $parse(obj);
+            var changeDetector = $parse(obj, $watchCollectionInterceptor);
             var internalArray = [];
             var internalObject = {};
+            var initRun = true;
             var oldLength = 0;
 
-            function $watchCollectionWatch() {
-              newValue = objGetter(self);
-              var newLength, key;
+            function $watchCollectionInterceptor(_value) {
+              newValue = _value;
+              var newLength, key, bothNaN, newItem, oldItem;
 
-              if (!isObject(newValue)) {
+              // If the new value is undefined, then return undefined as the watch may be a one-time watch
+              if (isUndefined(newValue)) return;
+
+              if (!isObject(newValue)) { // if primitive
                 if (oldValue !== newValue) {
                   oldValue = newValue;
                   changeDetected++;
@@ -11652,9 +18062,14 @@
                 }
                 // copy the items to oldValue and look for changes.
                 for (var i = 0; i < newLength; i++) {
-                  if (oldValue[i] !== newValue[i]) {
+                  oldItem = oldValue[i];
+                  newItem = newValue[i];
+
+                  // eslint-disable-next-line no-self-compare
+                  bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                  if (!bothNaN && (oldItem !== newItem)) {
                     changeDetected++;
-                    oldValue[i] = newValue[i];
+                    oldValue[i] = newItem;
                   }
                 }
               } else {
@@ -11667,16 +18082,21 @@
                 // copy the items to oldValue and look for changes.
                 newLength = 0;
                 for (key in newValue) {
-                  if (newValue.hasOwnProperty(key)) {
+                  if (hasOwnProperty.call(newValue, key)) {
                     newLength++;
-                    if (oldValue.hasOwnProperty(key)) {
-                      if (oldValue[key] !== newValue[key]) {
+                    newItem = newValue[key];
+                    oldItem = oldValue[key];
+
+                    if (key in oldValue) {
+                      // eslint-disable-next-line no-self-compare
+                      bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                      if (!bothNaN && (oldItem !== newItem)) {
                         changeDetected++;
-                        oldValue[key] = newValue[key];
+                        oldValue[key] = newItem;
                       }
                     } else {
                       oldLength++;
-                      oldValue[key] = newValue[key];
+                      oldValue[key] = newItem;
                       changeDetected++;
                     }
                   }
@@ -11684,8 +18104,8 @@
                 if (oldLength > newLength) {
                   // we used to have more keys, need to find them and destroy them.
                   changeDetected++;
-                  for(key in oldValue) {
-                    if (oldValue.hasOwnProperty(key) && !newValue.hasOwnProperty(key)) {
+                  for (key in oldValue) {
+                    if (!hasOwnProperty.call(newValue, key)) {
                       oldLength--;
                       delete oldValue[key];
                     }
@@ -11696,40 +18116,64 @@
             }
 
             function $watchCollectionAction() {
-              listener(newValue, oldValue, self);
+              if (initRun) {
+                initRun = false;
+                listener(newValue, newValue, self);
+              } else {
+                listener(newValue, veryOldValue, self);
+              }
+
+              // make a copy for the next time a collection is changed
+              if (trackVeryOldValue) {
+                if (!isObject(newValue)) {
+                  //primitive
+                  veryOldValue = newValue;
+                } else if (isArrayLike(newValue)) {
+                  veryOldValue = new Array(newValue.length);
+                  for (var i = 0; i < newValue.length; i++) {
+                    veryOldValue[i] = newValue[i];
+                  }
+                } else { // if object
+                  veryOldValue = {};
+                  for (var key in newValue) {
+                    if (hasOwnProperty.call(newValue, key)) {
+                      veryOldValue[key] = newValue[key];
+                    }
+                  }
+                }
+              }
             }
 
-            return this.$watch($watchCollectionWatch, $watchCollectionAction);
+            return this.$watch(changeDetector, $watchCollectionAction);
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$digest
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$digest
+           * @kind function
            *
            * @description
-           * Processes all of the {@link ng.$rootScope.Scope#methods_$watch watchers} of the current scope and
-           * its children. Because a {@link ng.$rootScope.Scope#methods_$watch watcher}'s listener can change
-           * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#methods_$watch watchers}
+           * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
+           * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
+           * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
            * until no more listeners are firing. This means that it is possible to get into an infinite
            * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
            * iterations exceeds 10.
            *
            * Usually, you don't call `$digest()` directly in
            * {@link ng.directive:ngController controllers} or in
-           * {@link ng.$compileProvider#methods_directive directives}.
-           * Instead, you should call {@link ng.$rootScope.Scope#methods_$apply $apply()} (typically from within
-           * a {@link ng.$compileProvider#methods_directive directives}), which will force a `$digest()`.
+           * {@link ng.$compileProvider#directive directives}.
+           * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
+           * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`.
            *
            * If you want to be notified whenever `$digest()` is called,
            * you can register a `watchExpression` function with
-           * {@link ng.$rootScope.Scope#methods_$watch $watch()} with no `listener`.
+           * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
            *
            * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
            *
            * # Example
-           * <pre>
+           * ```js
            var scope = ...;
            scope.name = 'misko';
            scope.counter = 0;
@@ -11741,27 +18185,37 @@
            expect(scope.counter).toEqual(0);
 
            scope.$digest();
-           // no variable change
-           expect(scope.counter).toEqual(0);
+           // the listener is always called during the first $digest loop after it was registered
+           expect(scope.counter).toEqual(1);
+
+           scope.$digest();
+           // but now it will not be called unless the value changes
+           expect(scope.counter).toEqual(1);
 
            scope.name = 'adam';
            scope.$digest();
-           expect(scope.counter).toEqual(1);
-           * </pre>
+           expect(scope.counter).toEqual(2);
+           * ```
            *
            */
           $digest: function() {
-            var watch, value, last,
-                watchers,
-                asyncQueue = this.$$asyncQueue,
-                postDigestQueue = this.$$postDigestQueue,
-                length,
-                dirty, ttl = TTL,
-                next, current, target = this,
-                watchLog = [],
-                logIdx, logMsg, asyncTask;
+            var watch, value, last, fn, get,
+              watchers,
+              dirty, ttl = TTL,
+              next, current, target = this,
+              watchLog = [],
+              logIdx, asyncTask;
 
             beginPhase('$digest');
+            // Check for changes to browser url that happened in sync before the call to $digest
+            $browser.$$checkUrlChange();
+
+            if (this === $rootScope && applyAsyncId !== null) {
+              // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then
+              // cancel the scheduled $apply and flush the queue of expressions to be evaluated.
+              $browser.defer.cancel(applyAsyncId);
+              flushApplyAsync();
+            }
 
             lastDirtyWatch = null;
 
@@ -11769,99 +18223,108 @@
               dirty = false;
               current = target;
 
-              while(asyncQueue.length) {
+              // It's safe for asyncQueuePosition to be a local variable here because this loop can't
+              // be reentered recursively. Calling $digest from a function passed to $evalAsync would
+              // lead to a '$digest already in progress' error.
+              for (var asyncQueuePosition = 0; asyncQueuePosition < asyncQueue.length; asyncQueuePosition++) {
                 try {
-                  asyncTask = asyncQueue.shift();
-                  asyncTask.scope.$eval(asyncTask.expression);
+                  asyncTask = asyncQueue[asyncQueuePosition];
+                  fn = asyncTask.fn;
+                  fn(asyncTask.scope, asyncTask.locals);
                 } catch (e) {
-                  clearPhase();
                   $exceptionHandler(e);
                 }
                 lastDirtyWatch = null;
               }
+              asyncQueue.length = 0;
 
               traverseScopesLoop:
-                  do { // "traverse the scopes" loop
-                    if ((watchers = current.$$watchers)) {
-                      // process our watches
-                      length = watchers.length;
-                      while (length--) {
-                        try {
-                          watch = watchers[length];
-                          // Most common watches are on primitives, in which case we can short
-                          // circuit it with === operator, only when === fails do we use .equals
-                          if (watch) {
-                            if ((value = watch.get(current)) !== (last = watch.last) &&
-                                !(watch.eq
-                                    ? equals(value, last)
-                                    : (typeof value == 'number' && typeof last == 'number'
-                                    && isNaN(value) && isNaN(last)))) {
-                              dirty = true;
-                              lastDirtyWatch = watch;
-                              watch.last = watch.eq ? copy(value) : value;
-                              watch.fn(value, ((last === initWatchVal) ? value : last), current);
-                              if (ttl < 5) {
-                                logIdx = 4 - ttl;
-                                if (!watchLog[logIdx]) watchLog[logIdx] = [];
-                                logMsg = (isFunction(watch.exp))
-                                    ? 'fn: ' + (watch.exp.name || watch.exp.toString())
-                                    : watch.exp;
-                                logMsg += '; newVal: ' + toJson(value) + '; oldVal: ' + toJson(last);
-                                watchLog[logIdx].push(logMsg);
-                              }
-                            } else if (watch === lastDirtyWatch) {
-                              // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
-                              // have already been tested.
-                              dirty = false;
-                              break traverseScopesLoop;
+                do { // "traverse the scopes" loop
+                  if ((watchers = current.$$watchers)) {
+                    // process our watches
+                    watchers.$$digestWatchIndex = watchers.length;
+                    while (watchers.$$digestWatchIndex--) {
+                      try {
+                        watch = watchers[watchers.$$digestWatchIndex];
+                        // Most common watches are on primitives, in which case we can short
+                        // circuit it with === operator, only when === fails do we use .equals
+                        if (watch) {
+                          get = watch.get;
+                          if ((value = get(current)) !== (last = watch.last) &&
+                            !(watch.eq
+                              ? equals(value, last)
+                              : (isNumberNaN(value) && isNumberNaN(last)))) {
+                            dirty = true;
+                            lastDirtyWatch = watch;
+                            watch.last = watch.eq ? copy(value, null) : value;
+                            fn = watch.fn;
+                            fn(value, ((last === initWatchVal) ? value : last), current);
+                            if (ttl < 5) {
+                              logIdx = 4 - ttl;
+                              if (!watchLog[logIdx]) watchLog[logIdx] = [];
+                              watchLog[logIdx].push({
+                                msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp,
+                                newVal: value,
+                                oldVal: last
+                              });
                             }
+                          } else if (watch === lastDirtyWatch) {
+                            // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
+                            // have already been tested.
+                            dirty = false;
+                            break traverseScopesLoop;
                           }
-                        } catch (e) {
-                          clearPhase();
-                          $exceptionHandler(e);
                         }
+                      } catch (e) {
+                        $exceptionHandler(e);
                       }
                     }
+                  }
 
-                    // Insanity Warning: scope depth-first traversal
-                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
-                    // this piece should be kept in sync with the traversal in $broadcast
-                    if (!(next = (current.$$childHead ||
-                        (current !== target && current.$$nextSibling)))) {
-                      while(current !== target && !(next = current.$$nextSibling)) {
-                        current = current.$parent;
-                      }
+                  // Insanity Warning: scope depth-first traversal
+                  // yes, this code is a bit crazy, but it works and we have tests to prove it!
+                  // this piece should be kept in sync with the traversal in $broadcast
+                  if (!(next = ((current.$$watchersCount && current.$$childHead) ||
+                      (current !== target && current.$$nextSibling)))) {
+                    while (current !== target && !(next = current.$$nextSibling)) {
+                      current = current.$parent;
                     }
-                  } while ((current = next));
+                  }
+                } while ((current = next));
 
               // `break traverseScopesLoop;` takes us to here
 
-              if(dirty && !(ttl--)) {
+              if ((dirty || asyncQueue.length) && !(ttl--)) {
                 clearPhase();
                 throw $rootScopeMinErr('infdig',
-                    '{0} $digest() iterations reached. Aborting!\n' +
-                        'Watchers fired in the last 5 iterations: {1}',
-                    TTL, toJson(watchLog));
+                  '{0} $digest() iterations reached. Aborting!\n' +
+                  'Watchers fired in the last 5 iterations: {1}',
+                  TTL, watchLog);
               }
 
             } while (dirty || asyncQueue.length);
 
             clearPhase();
 
-            while(postDigestQueue.length) {
+            // postDigestQueuePosition isn't local here because this loop can be reentered recursively.
+            while (postDigestQueuePosition < postDigestQueue.length) {
               try {
-                postDigestQueue.shift()();
+                postDigestQueue[postDigestQueuePosition++]();
               } catch (e) {
                 $exceptionHandler(e);
               }
             }
+            postDigestQueue.length = postDigestQueuePosition = 0;
+
+            // Check for changes to browser url that happened during the $digest
+            // (for which no event is fired; e.g. via `history.pushState()`)
+            $browser.$$checkUrlChange();
           },
 
 
           /**
            * @ngdoc event
-           * @name ng.$rootScope.Scope#$destroy
-           * @eventOf ng.$rootScope.Scope
+           * @name $rootScope.Scope#$destroy
            * @eventType broadcast on scope being destroyed
            *
            * @description
@@ -11872,14 +18335,13 @@
            */
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$destroy
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$destroy
+           * @kind function
            *
            * @description
            * Removes the current scope (and all of its children) from the parent scope. Removal implies
-           * that calls to {@link ng.$rootScope.Scope#methods_$digest $digest()} will no longer
+           * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
            * propagate to the current scope and its children. Removal also implies that the current
            * scope is eligible for garbage collection.
            *
@@ -11895,32 +18357,44 @@
            * clean up DOM bindings before an element is removed from the DOM.
            */
           $destroy: function() {
-            // we can't destroy the root scope or a scope that has been already destroyed
+            // We can't destroy a scope that has been already destroyed.
             if (this.$$destroyed) return;
             var parent = this.$parent;
 
             this.$broadcast('$destroy');
             this.$$destroyed = true;
-            if (this === $rootScope) return;
 
-            forEach(this.$$listenerCount, bind(null, decrementListenerCount, this));
+            if (this === $rootScope) {
+              //Remove handlers attached to window when $rootScope is removed
+              $browser.$$applicationDestroyed();
+            }
 
-            if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
-            if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
+            incrementWatchersCount(this, -this.$$watchersCount);
+            for (var eventName in this.$$listenerCount) {
+              decrementListenerCount(this, this.$$listenerCount[eventName], eventName);
+            }
+
+            // sever all the references to parent scopes (after this cleanup, the current scope should
+            // not be retained by any of our references and should be eligible for garbage collection)
+            if (parent && parent.$$childHead === this) parent.$$childHead = this.$$nextSibling;
+            if (parent && parent.$$childTail === this) parent.$$childTail = this.$$prevSibling;
             if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
             if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
 
-            // This is bogus code that works around Chrome's GC leak
-            // see: https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
-            this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead =
-                this.$$childTail = null;
+            // Disable listeners, watchers and apply/digest methods
+            this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop;
+            this.$on = this.$watch = this.$watchGroup = function() { return noop; };
+            this.$$listeners = {};
+
+            // Disconnect the next sibling to prevent `cleanUpScope` destroying those too
+            this.$$nextSibling = null;
+            cleanUpScope(this);
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$eval
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$eval
+           * @kind function
            *
            * @description
            * Executes the `expression` on the current scope and returns the result. Any exceptions in
@@ -11928,14 +18402,14 @@
            * expressions.
            *
            * # Example
-           * <pre>
+           * ```js
            var scope = ng.$rootScope.Scope();
            scope.a = 1;
            scope.b = 2;
 
            expect(scope.$eval('a+b')).toEqual(3);
            expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
-           * </pre>
+           * ```
            *
            * @param {(string|function())=} expression An angular expression to be executed.
            *
@@ -11950,10 +18424,9 @@
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$evalAsync
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$evalAsync
+           * @kind function
            *
            * @description
            * Executes the expression on the current scope at a later point in time.
@@ -11963,7 +18436,7 @@
            *
            *   - it will execute after the function that scheduled the evaluation (preferably before DOM
            *     rendering).
-           *   - at least one {@link ng.$rootScope.Scope#methods_$digest $digest cycle} will be performed after
+           *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
            *     `expression` execution.
            *
            * Any exceptions from the execution of the expression are forwarded to the
@@ -11978,42 +18451,42 @@
            *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
            *    - `function(scope)`: execute the function with the current `scope` parameter.
            *
+           * @param {(object)=} locals Local variables object, useful for overriding values in scope.
            */
-          $evalAsync: function(expr) {
+          $evalAsync: function(expr, locals) {
             // if we are outside of an $digest loop and this is the first time we are scheduling async
             // task also schedule async auto-flush
-            if (!$rootScope.$$phase && !$rootScope.$$asyncQueue.length) {
+            if (!$rootScope.$$phase && !asyncQueue.length) {
               $browser.defer(function() {
-                if ($rootScope.$$asyncQueue.length) {
+                if (asyncQueue.length) {
                   $rootScope.$digest();
                 }
               });
             }
 
-            this.$$asyncQueue.push({scope: this, expression: expr});
+            asyncQueue.push({scope: this, fn: $parse(expr), locals: locals});
           },
 
-          $$postDigest : function(fn) {
-            this.$$postDigestQueue.push(fn);
+          $$postDigest: function(fn) {
+            postDigestQueue.push(fn);
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$apply
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$apply
+           * @kind function
            *
            * @description
            * `$apply()` is used to execute an expression in angular from outside of the angular
            * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
            * Because we are calling into the angular framework we need to perform proper scope life
            * cycle of {@link ng.$exceptionHandler exception handling},
-           * {@link ng.$rootScope.Scope#methods_$digest executing watches}.
+           * {@link ng.$rootScope.Scope#$digest executing watches}.
            *
            * ## Life cycle
            *
            * # Pseudo-Code of `$apply()`
-           * <pre>
+           * ```js
            function $apply(expr) {
              try {
                return $eval(expr);
@@ -12023,17 +18496,17 @@
                $root.$digest();
              }
            }
-           * </pre>
+           * ```
            *
            *
            * Scope's `$apply()` method transitions through the following stages:
            *
            * 1. The {@link guide/expression expression} is executed using the
-           *    {@link ng.$rootScope.Scope#methods_$eval $eval()} method.
+           *    {@link ng.$rootScope.Scope#$eval $eval()} method.
            * 2. Any exceptions from the execution of the expression are forwarded to the
            *    {@link ng.$exceptionHandler $exceptionHandler} service.
-           * 3. The {@link ng.$rootScope.Scope#methods_$watch watch} listeners are fired immediately after the
-           *    expression was executed using the {@link ng.$rootScope.Scope#methods_$digest $digest()} method.
+           * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
+           *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
            *
            *
            * @param {(string|function())=} exp An angular expression to be executed.
@@ -12046,28 +18519,61 @@
           $apply: function(expr) {
             try {
               beginPhase('$apply');
-              return this.$eval(expr);
+              try {
+                return this.$eval(expr);
+              } finally {
+                clearPhase();
+              }
             } catch (e) {
               $exceptionHandler(e);
             } finally {
-              clearPhase();
               try {
                 $rootScope.$digest();
               } catch (e) {
                 $exceptionHandler(e);
+                // eslint-disable-next-line no-unsafe-finally
                 throw e;
               }
             }
           },
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$on
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$applyAsync
+           * @kind function
            *
            * @description
-           * Listens on events of a given type. See {@link ng.$rootScope.Scope#methods_$emit $emit} for
+           * Schedule the invocation of $apply to occur at a later time. The actual time difference
+           * varies across browsers, but is typically around ~10 milliseconds.
+           *
+           * This can be used to queue up multiple expressions which need to be evaluated in the same
+           * digest.
+           *
+           * @param {(string|function())=} exp An angular expression to be executed.
+           *
+           *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+           *    - `function(scope)`: execute the function with current `scope` parameter.
+           */
+          $applyAsync: function(expr) {
+            var scope = this;
+            if (expr) {
+              applyAsyncQueue.push($applyAsyncExpression);
+            }
+            expr = $parse(expr);
+            scheduleApplyAsync();
+
+            function $applyAsyncExpression() {
+              scope.$eval(expr);
+            }
+          },
+
+          /**
+           * @ngdoc method
+           * @name $rootScope.Scope#$on
+           * @kind function
+           *
+           * @description
+           * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
            * discussion of event life cycle.
            *
            * The event listener function format is: `function(event, args...)`. The `event` object
@@ -12075,7 +18581,8 @@
            *
            *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
            *     `$broadcast`-ed.
-           *   - `currentScope` - `{Scope}`: the current scope which is handling the event.
+           *   - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the
+           *     event propagates through the scope hierarchy, this property is set to null.
            *   - `name` - `{string}`: name of the event.
            *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
            *     further event propagation (available only for events that were `$emit`-ed).
@@ -12084,7 +18591,7 @@
            *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
            *
            * @param {string} name Event name to listen on.
-           * @param {function(event, args...)} listener Function to call when the event is emitted.
+           * @param {function(event, ...args)} listener Function to call when the event is emitted.
            * @returns {function()} Returns a deregistration function for this listener.
            */
           $on: function(name, listener) {
@@ -12104,56 +18611,58 @@
 
             var self = this;
             return function() {
-              namedListeners[indexOf(namedListeners, listener)] = null;
-              decrementListenerCount(self, 1, name);
+              var indexOfListener = namedListeners.indexOf(listener);
+              if (indexOfListener !== -1) {
+                namedListeners[indexOfListener] = null;
+                decrementListenerCount(self, 1, name);
+              }
             };
           },
 
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$emit
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$emit
+           * @kind function
            *
            * @description
            * Dispatches an event `name` upwards through the scope hierarchy notifying the
-           * registered {@link ng.$rootScope.Scope#methods_$on} listeners.
+           * registered {@link ng.$rootScope.Scope#$on} listeners.
            *
            * The event life cycle starts at the scope on which `$emit` was called. All
-           * {@link ng.$rootScope.Scope#methods_$on listeners} listening for `name` event on this scope get
+           * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
            * notified. Afterwards, the event traverses upwards toward the root scope and calls all
            * registered listeners along the way. The event will stop propagating if one of the listeners
            * cancels it.
            *
-           * Any exception emitted from the {@link ng.$rootScope.Scope#methods_$on listeners} will be passed
+           * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
            * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
            *
            * @param {string} name Event name to emit.
-           * @param {...*} args Optional set of arguments which will be passed onto the event listeners.
-           * @return {Object} Event object (see {@link ng.$rootScope.Scope#methods_$on}).
+           * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+           * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
            */
           $emit: function(name, args) {
             var empty = [],
-                namedListeners,
-                scope = this,
-                stopPropagation = false,
-                event = {
-                  name: name,
-                  targetScope: scope,
-                  stopPropagation: function() {stopPropagation = true;},
-                  preventDefault: function() {
-                    event.defaultPrevented = true;
-                  },
-                  defaultPrevented: false
+              namedListeners,
+              scope = this,
+              stopPropagation = false,
+              event = {
+                name: name,
+                targetScope: scope,
+                stopPropagation: function() {stopPropagation = true;},
+                preventDefault: function() {
+                  event.defaultPrevented = true;
                 },
-                listenerArgs = concat([event], arguments, 1),
-                i, length;
+                defaultPrevented: false
+              },
+              listenerArgs = concat([event], arguments, 1),
+              i, length;
 
             do {
               namedListeners = scope.$$listeners[name] || empty;
               event.currentScope = scope;
-              for (i=0, length=namedListeners.length; i<length; i++) {
+              for (i = 0, length = namedListeners.length; i < length; i++) {
 
                 // if listeners were deregistered, defragment the array
                 if (!namedListeners[i]) {
@@ -12170,57 +18679,64 @@
                 }
               }
               //if any listener on the current scope stops propagation, prevent bubbling
-              if (stopPropagation) return event;
+              if (stopPropagation) {
+                event.currentScope = null;
+                return event;
+              }
               //traverse upwards
               scope = scope.$parent;
             } while (scope);
 
+            event.currentScope = null;
+
             return event;
           },
 
 
           /**
-           * @ngdoc function
-           * @name ng.$rootScope.Scope#$broadcast
-           * @methodOf ng.$rootScope.Scope
-           * @function
+           * @ngdoc method
+           * @name $rootScope.Scope#$broadcast
+           * @kind function
            *
            * @description
            * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
-           * registered {@link ng.$rootScope.Scope#methods_$on} listeners.
+           * registered {@link ng.$rootScope.Scope#$on} listeners.
            *
            * The event life cycle starts at the scope on which `$broadcast` was called. All
-           * {@link ng.$rootScope.Scope#methods_$on listeners} listening for `name` event on this scope get
+           * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
            * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
            * scope and calls all registered listeners along the way. The event cannot be canceled.
            *
-           * Any exception emitted from the {@link ng.$rootScope.Scope#methods_$on listeners} will be passed
+           * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
            * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
            *
            * @param {string} name Event name to broadcast.
-           * @param {...*} args Optional set of arguments which will be passed onto the event listeners.
-           * @return {Object} Event object, see {@link ng.$rootScope.Scope#methods_$on}
+           * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+           * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
            */
           $broadcast: function(name, args) {
             var target = this,
-                current = target,
-                next = target,
-                event = {
-                  name: name,
-                  targetScope: target,
-                  preventDefault: function() {
-                    event.defaultPrevented = true;
-                  },
-                  defaultPrevented: false
+              current = target,
+              next = target,
+              event = {
+                name: name,
+                targetScope: target,
+                preventDefault: function() {
+                  event.defaultPrevented = true;
                 },
-                listenerArgs = concat([event], arguments, 1),
-                listeners, i, length;
+                defaultPrevented: false
+              };
+
+            if (!target.$$listenerCount[name]) return event;
+
+            var listenerArgs = concat([event], arguments, 1),
+              listeners, i, length;
 
             //down while you can, then up and next sibling or up and next sibling until back at root
             while ((current = next)) {
               event.currentScope = current;
               listeners = current.$$listeners[name] || [];
-              for (i=0, length = listeners.length; i<length; i++) {
+              for (i = 0, length = listeners.length; i < length; i++) {
                 // if listeners were deregistered, defragment the array
                 if (!listeners[i]) {
                   listeners.splice(i, 1);
@@ -12231,7 +18747,7 @@
 
                 try {
                   listeners[i].apply(null, listenerArgs);
-                } catch(e) {
+                } catch (e) {
                   $exceptionHandler(e);
                 }
               }
@@ -12242,18 +18758,26 @@
               // (though it differs due to having the extra check for $$listenerCount)
               if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
                   (current !== target && current.$$nextSibling)))) {
-                while(current !== target && !(next = current.$$nextSibling)) {
+                while (current !== target && !(next = current.$$nextSibling)) {
                   current = current.$parent;
                 }
               }
             }
 
+            event.currentScope = null;
             return event;
           }
         };
 
         var $rootScope = new Scope();
 
+        //The internal queues. Expose them on the $rootScope for debugging/testing purposes.
+        var asyncQueue = $rootScope.$$asyncQueue = [];
+        var postDigestQueue = $rootScope.$$postDigestQueue = [];
+        var applyAsyncQueue = $rootScope.$$applyAsyncQueue = [];
+
+        var postDigestQueuePosition = 0;
+
         return $rootScope;
 
 
@@ -12269,10 +18793,10 @@
           $rootScope.$$phase = null;
         }
 
-        function compileToFn(exp, name) {
-          var fn = $parse(exp);
-          assertArgFn(fn, name);
-          return fn;
+        function incrementWatchersCount(current, count) {
+          do {
+            current.$$watchersCount += count;
+          } while ((current = current.$parent));
         }
 
         function decrementListenerCount(current, count, name) {
@@ -12290,16 +18814,51 @@
          * because it's unique we can easily tell it apart from other values
          */
         function initWatchVal() {}
+
+        function flushApplyAsync() {
+          while (applyAsyncQueue.length) {
+            try {
+              applyAsyncQueue.shift()();
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+          }
+          applyAsyncId = null;
+        }
+
+        function scheduleApplyAsync() {
+          if (applyAsyncId === null) {
+            applyAsyncId = $browser.defer(function() {
+              $rootScope.$apply(flushApplyAsync);
+            });
+          }
+        }
       }];
   }
 
   /**
+   * @ngdoc service
+   * @name $rootElement
+   *
+   * @description
+   * The root element of Angular application. This is either the element where {@link
+    * ng.directive:ngApp ngApp} was declared or the element passed into
+   * {@link angular.bootstrap}. The element represents the root element of application. It is also the
+   * location where the application's {@link auto.$injector $injector} service gets
+   * published, and can be retrieved using `$rootElement.injector()`.
+   */
+
+
+// the implementation is in angular.bootstrap
+
+  /**
+   * @this
    * @description
    * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
    */
   function $$SanitizeUriProvider() {
     var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/,
-        imgSrcSanitizationWhitelist = /^\s*(https?|ftp|file):|data:image\//;
+      imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/;
 
     /**
      * @description
@@ -12354,40 +18913,57 @@
       return function sanitizeUri(uri, isImage) {
         var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
         var normalizedVal;
-        // NOTE: urlResolve() doesn't support IE < 8 so we don't sanitize for that case.
-        if (!msie || msie >= 8 ) {
-          normalizedVal = urlResolve(uri).href;
-          if (normalizedVal !== '' && !normalizedVal.match(regex)) {
-            return 'unsafe:'+normalizedVal;
-          }
+        normalizedVal = urlResolve(uri).href;
+        if (normalizedVal !== '' && !normalizedVal.match(regex)) {
+          return 'unsafe:' + normalizedVal;
         }
         return uri;
       };
     };
   }
 
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+  /* exported $SceProvider, $SceDelegateProvider */
+
   var $sceMinErr = minErr('$sce');
 
   var SCE_CONTEXTS = {
+    // HTML is used when there's HTML rendered (e.g. ng-bind-html, iframe srcdoc binding).
     HTML: 'html',
+
+    // Style statements or stylesheets. Currently unused in AngularJS.
     CSS: 'css',
+
+    // An URL used in a context where it does not refer to a resource that loads code. Currently
+    // unused in AngularJS.
     URL: 'url',
-    // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a
-    // url.  (e.g. ng-include, script src, templateUrl)
+
+    // RESOURCE_URL is a subtype of URL used where the referred-to resource could be interpreted as
+    // code. (e.g. ng-include, script src binding, templateUrl)
     RESOURCE_URL: 'resourceUrl',
+
+    // Script. Currently unused in AngularJS.
     JS: 'js'
   };
 
 // Helper functions follow.
 
-// Copied from:
-// http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962
-// Prereq: s is a string.
-  function escapeForRegexp(s) {
-    return s.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g, '\\$1').
-        replace(/\x08/g, '\\x08');
-  }
+  var UNDERSCORE_LOWERCASE_REGEXP = /_([a-z])/g;
 
+  function snakeToCamel(name) {
+    return name
+      .replace(UNDERSCORE_LOWERCASE_REGEXP, fnCamelCaseReplace);
+  }
 
   function adjustMatcher(matcher) {
     if (matcher === 'self') {
@@ -12399,11 +18975,11 @@
       // More than 2 *'s raises an error as it's ill defined.
       if (matcher.indexOf('***') > -1) {
         throw $sceMinErr('iwcard',
-            'Illegal sequence *** in string matcher.  String: {0}', matcher);
+          'Illegal sequence *** in string matcher.  String: {0}', matcher);
       }
       matcher = escapeForRegexp(matcher).
-          replace('\\*\\*', '.*').
-          replace('\\*', '[^:/.?&;]*');
+      replace(/\\\*\\\*/g, '.*').
+      replace(/\\\*/g, '[^:/.?&;]*');
       return new RegExp('^' + matcher + '$');
     } else if (isRegExp(matcher)) {
       // The only other type of matcher allowed is a Regexp.
@@ -12412,7 +18988,7 @@
       return new RegExp('^' + matcher.source + '$');
     } else {
       throw $sceMinErr('imatcher',
-          'Matchers may only be "self", string patterns or RegExp objects');
+        'Matchers may only be "self", string patterns or RegExp objects');
     }
   }
 
@@ -12430,13 +19006,23 @@
 
   /**
    * @ngdoc service
-   * @name ng.$sceDelegate
-   * @function
+   * @name $sceDelegate
+   * @kind function
    *
    * @description
    *
    * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
-   * Contextual Escaping (SCE)} services to AngularJS.
+ * Contextual Escaping (SCE)} services to AngularJS.
+   *
+   * For an overview of this service and the functionnality it provides in AngularJS, see the main
+   * page for {@link ng.$sce SCE}. The current page is targeted for developers who need to alter how
+   * SCE works in their application, which shouldn't be needed in most cases.
+   *
+   * <div class="alert alert-danger">
+   * AngularJS strongly relies on contextual escaping for the security of bindings: disabling or
+   * modifying this might cause cross site scripting (XSS) vulnerabilities. For libraries owners,
+   * changes to this service will also influence users, so be extra careful and document your changes.
+   * </div>
    *
    * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
    * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
@@ -12450,47 +19036,62 @@
    * can override it completely to change the behavior of `$sce`, the common case would
    * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
    * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
-   * templates.  Refer {@link ng.$sceDelegateProvider#methods_resourceUrlWhitelist
-   * $sceDelegateProvider.resourceUrlWhitelist} and {@link
-   * ng.$sceDelegateProvider#methods_resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+   * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
+ * $sceDelegateProvider.resourceUrlWhitelist} and {@link
+    * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
    */
 
   /**
-   * @ngdoc object
-   * @name ng.$sceDelegateProvider
+   * @ngdoc provider
+   * @name $sceDelegateProvider
+   * @this
+   *
    * @description
    *
    * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
-   * $sceDelegate} service.  This allows one to get/set the whitelists and blacklists used to ensure
-   * that the URLs used for sourcing Angular templates are safe.  Refer {@link
-   * ng.$sceDelegateProvider#methods_resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and
-   * {@link ng.$sceDelegateProvider#methods_resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+ * $sceDelegate service}, used as a delegate for {@link ng.$sce Strict Contextual Escaping (SCE)}.
+   *
+   * The `$sceDelegateProvider` allows one to get/set the whitelists and blacklists used to ensure
+   * that the URLs used for sourcing AngularJS templates and other script-running URLs are safe (all
+   * places that use the `$sce.RESOURCE_URL` context). See
+   * {@link ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist}
+   * and
+   * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist},
    *
    * For the general details about this service in Angular, read the main page for {@link ng.$sce
-   * Strict Contextual Escaping (SCE)}.
+ * Strict Contextual Escaping (SCE)}.
    *
    * **Example**:  Consider the following case. <a name="example"></a>
    *
    * - your app is hosted at url `http://myapp.example.com/`
    * - but some of your templates are hosted on other domains you control such as
-   *   `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc.
+   *   `http://srv01.assets.example.com/`, `http://srv02.assets.example.com/`, etc.
    * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
    *
    * Here is what a secure configuration for this scenario might look like:
    *
-   * <pre class="prettyprint">
-   *    angular.module('myApp', []).config(function($sceDelegateProvider) {
- *      $sceDelegateProvider.resourceUrlWhitelist([
- *        // Allow same origin resource loads.
- *        'self',
- *        // Allow loading from our assets domain.  Notice the difference between * and **.
- *        'http://srv*.assets.example.com/**']);
+   * ```
+   *  angular.module('myApp', []).config(function($sceDelegateProvider) {
+ *    $sceDelegateProvider.resourceUrlWhitelist([
+ *      // Allow same origin resource loads.
+ *      'self',
+ *      // Allow loading from our assets domain.  Notice the difference between * and **.
+ *      'http://srv*.assets.example.com/**'
+ *    ]);
  *
- *      // The blacklist overrides the whitelist so the open redirect here is blocked.
- *      $sceDelegateProvider.resourceUrlBlacklist([
- *        'http://myapp.example.com/clickThru**']);
- *      });
-   * </pre>
+ *    // The blacklist overrides the whitelist so the open redirect here is blocked.
+ *    $sceDelegateProvider.resourceUrlBlacklist([
+ *      'http://myapp.example.com/clickThru**'
+ *    ]);
+ *  });
+   * ```
+   * Note that an empty whitelist will block every resource URL from being loaded, and will require
+   * you to manually mark each one as trusted with `$sce.trustAsResourceUrl`. However, templates
+   * requested by {@link ng.$templateRequest $templateRequest} that are present in
+   * {@link ng.$templateCache $templateCache} will not go through this check. If you have a mechanism
+   * to populate your templates in that cache at config time, then it is a good idea to remove 'self'
+   * from that whitelist. This helps to mitigate the security impact of certain types of issues, like
+   * for instance attacker-controlled `ng-includes`.
    */
 
   function $SceDelegateProvider() {
@@ -12498,32 +19099,33 @@
 
     // Resource URLs can also be trusted by policy.
     var resourceUrlWhitelist = ['self'],
-        resourceUrlBlacklist = [];
+      resourceUrlBlacklist = [];
 
     /**
-     * @ngdoc function
-     * @name ng.sceDelegateProvider#resourceUrlWhitelist
-     * @methodOf ng.$sceDelegateProvider
-     * @function
+     * @ngdoc method
+     * @name $sceDelegateProvider#resourceUrlWhitelist
+     * @kind function
      *
      * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
      *     provided.  This must be an array or null.  A snapshot of this array is used so further
      *     changes to the array are ignored.
-     *
      *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
      *     allowed in this array.
      *
-     *     Note: **an empty whitelist array will block all URLs**!
+     * @return {Array} The currently set whitelist array.
      *
-     * @return {Array} the currently set whitelist array.
+     * @description
+     * Sets/Gets the whitelist of trusted resource URLs.
      *
      * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
      * same origin resource requests.
      *
-     * @description
-     * Sets/Gets the whitelist of trusted resource URLs.
+     * <div class="alert alert-warning">
+     * **Note:** the default whitelist of 'self' is not recommended if your app shares its origin
+     * with other apps! It is a good idea to limit it to only your application's directory.
+     * </div>
      */
-    this.resourceUrlWhitelist = function (value) {
+    this.resourceUrlWhitelist = function(value) {
       if (arguments.length) {
         resourceUrlWhitelist = adjustMatchers(value);
       }
@@ -12531,34 +19133,31 @@
     };
 
     /**
-     * @ngdoc function
-     * @name ng.sceDelegateProvider#resourceUrlBlacklist
-     * @methodOf ng.$sceDelegateProvider
-     * @function
+     * @ngdoc method
+     * @name $sceDelegateProvider#resourceUrlBlacklist
+     * @kind function
      *
      * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
      *     provided.  This must be an array or null.  A snapshot of this array is used so further
-     *     changes to the array are ignored.
-     *
+     *     changes to the array are ignored.</p><p>
      *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-     *     allowed in this array.
-     *
+     *     allowed in this array.</p><p>
      *     The typical usage for the blacklist is to **block
      *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
      *     these would otherwise be trusted but actually return content from the redirected domain.
-     *
+     *     </p><p>
      *     Finally, **the blacklist overrides the whitelist** and has the final say.
      *
-     * @return {Array} the currently set blacklist array.
-     *
-     * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
-     * is no blacklist.)
+     * @return {Array} The currently set blacklist array.
      *
      * @description
      * Sets/Gets the blacklist of trusted resource URLs.
+     *
+     * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
+     * is no blacklist.)
      */
 
-    this.resourceUrlBlacklist = function (value) {
+    this.resourceUrlBlacklist = function(value) {
       if (arguments.length) {
         resourceUrlBlacklist = adjustMatchers(value);
       }
@@ -12626,7 +19225,7 @@
       }
 
       var trustedValueHolderBase = generateHolderType(),
-          byType = {};
+        byType = {};
 
       byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
       byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
@@ -12636,59 +19235,64 @@
 
       /**
        * @ngdoc method
-       * @name ng.$sceDelegate#trustAs
-       * @methodOf ng.$sceDelegate
+       * @name $sceDelegate#trustAs
        *
        * @description
-       * Returns an object that is trusted by angular for use in specified strict
-       * contextual escaping contexts (such as ng-html-bind-unsafe, ng-include, any src
-       * attribute interpolation, any dom event binding attribute interpolation
-       * such as for onclick,  etc.) that uses the provided value.
-       * See {@link ng.$sce $sce} for enabling strict contextual escaping.
+       * Returns a trusted representation of the parameter for the specified context. This trusted
+       * object will later on be used as-is, without any security check, by bindings or directives
+       * that require this security context.
+       * For instance, marking a string as trusted for the `$sce.HTML` context will entirely bypass
+       * the potential `$sanitize` call in corresponding `$sce.HTML` bindings or directives, such as
+       * `ng-bind-html`. Note that in most cases you won't need to call this function: if you have the
+       * sanitizer loaded, passing the value itself will render all the HTML that does not pose a
+       * security risk.
        *
-       * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-       *   resourceUrl, html, js and css.
-       * @param {*} value The value that that should be considered trusted/safe.
-       * @returns {*} A value that can be used to stand in for the provided `value` in places
-       * where Angular expects a $sce.trustAs() return value.
+       * See {@link ng.$sceDelegate#getTrusted getTrusted} for the function that will consume those
+       * trusted values, and {@link ng.$sce $sce} for general documentation about strict contextual
+       * escaping.
+       *
+       * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
+       *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
+       *
+       * @param {*} value The value that should be considered trusted.
+       * @return {*} A trusted representation of value, that can be used in the given context.
        */
       function trustAs(type, trustedValue) {
         var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
         if (!Constructor) {
           throw $sceMinErr('icontext',
-              'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
-              type, trustedValue);
+            'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
+            type, trustedValue);
         }
-        if (trustedValue === null || trustedValue === undefined || trustedValue === '') {
+        if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') {
           return trustedValue;
         }
         // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
         // mutable objects, we ensure here that the value passed in is actually a string.
         if (typeof trustedValue !== 'string') {
           throw $sceMinErr('itype',
-              'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
-              type);
+            'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
+            type);
         }
         return new Constructor(trustedValue);
       }
 
       /**
        * @ngdoc method
-       * @name ng.$sceDelegate#valueOf
-       * @methodOf ng.$sceDelegate
+       * @name $sceDelegate#valueOf
        *
        * @description
-       * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#methods_trustAs
-       * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
-       * ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`}.
+       * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
+     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
+        * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
        *
        * If the passed parameter is not a value that had been returned by {@link
-       * ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`}, returns it as-is.
+        * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, it must be returned as-is.
        *
-       * @param {*} value The result of a prior {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`}
-       *      call or anything else.
-       * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#methods_trustAs
-       *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
+       * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
+       *     call or anything else.
+       * @return {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
        *     `value` unchanged.
        */
       function valueOf(maybeTrusted) {
@@ -12701,42 +19305,53 @@
 
       /**
        * @ngdoc method
-       * @name ng.$sceDelegate#getTrusted
-       * @methodOf ng.$sceDelegate
+       * @name $sceDelegate#getTrusted
        *
        * @description
-       * Takes the result of a {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`} call and
-       * returns the originally supplied value if the queried context type is a supertype of the
-       * created type.  If this condition isn't satisfied, throws an exception.
+       * Takes any input, and either returns a value that's safe to use in the specified context, or
+       * throws an exception.
        *
-       * @param {string} type The kind of context in which this value is to be used.
-       * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#methods_trustAs
-       *     `$sceDelegate.trustAs`} call.
-       * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#methods_trustAs
-       *     `$sceDelegate.trustAs`} if valid in this context.  Otherwise, throws an exception.
+       * In practice, there are several cases. When given a string, this function runs checks
+       * and sanitization to make it safe without prior assumptions. When given the result of a {@link
+        * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call, it returns the originally supplied
+       * value if that value's context is valid for this call's context. Finally, this function can
+       * also throw when there is no way to turn `maybeTrusted` in a safe value (e.g., no sanitization
+       * is available or possible.)
+       *
+       * @param {string} type The context in which this value is to be used (such as `$sce.HTML`).
+       * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} call, or anything else (which will not be considered trusted.)
+       * @return {*} A version of the value that's safe to use in the given context, or throws an
+       *     exception if this is impossible.
        */
       function getTrusted(type, maybeTrusted) {
-        if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') {
+        if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') {
           return maybeTrusted;
         }
         var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+        // If maybeTrusted is a trusted class instance or subclass instance, then unwrap and return
+        // as-is.
         if (constructor && maybeTrusted instanceof constructor) {
           return maybeTrusted.$$unwrapTrustedValue();
         }
-        // If we get here, then we may only take one of two actions.
-        // 1. sanitize the value for the requested type, or
-        // 2. throw an exception.
+        // Otherwise, if we get here, then we may either make it safe, or throw an exception. This
+        // depends on the context: some are sanitizatible (HTML), some use whitelists (RESOURCE_URL),
+        // some are impossible to do (JS). This step isn't implemented for CSS and URL, as AngularJS
+        // has no corresponding sinks.
         if (type === SCE_CONTEXTS.RESOURCE_URL) {
+          // RESOURCE_URL uses a whitelist.
           if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
             return maybeTrusted;
           } else {
             throw $sceMinErr('insecurl',
-                'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
-                maybeTrusted.toString());
+              'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
+              maybeTrusted.toString());
           }
         } else if (type === SCE_CONTEXTS.HTML) {
+          // htmlSanitizer throws its own error when no sanitizer is available.
           return htmlSanitizer(maybeTrusted);
         }
+        // Default error when the $sce service has no way to make the input safe.
         throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
       }
 
@@ -12748,8 +19363,10 @@
 
 
   /**
-   * @ngdoc object
-   * @name ng.$sceProvider
+   * @ngdoc provider
+   * @name $sceProvider
+   * @this
+   *
    * @description
    *
    * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
@@ -12759,12 +19376,10 @@
    * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
    */
 
-  /* jshint maxlen: false*/
-
   /**
    * @ngdoc service
-   * @name ng.$sce
-   * @function
+   * @name $sce
+   * @kind function
    *
    * @description
    *
@@ -12772,34 +19387,40 @@
    *
    * # Strict Contextual Escaping
    *
-   * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain
-   * contexts to result in a value that is marked as safe to use for that context.  One example of
-   * such a context is binding arbitrary html controlled by the user via `ng-bind-html`.  We refer
-   * to these contexts as privileged or SCE contexts.
+   * Strict Contextual Escaping (SCE) is a mode in which AngularJS constrains bindings to only render
+   * trusted values. Its goal is to assist in writing code in a way that (a) is secure by default, and
+   * (b) makes auditing for security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
    *
-   * As of version 1.2, Angular ships with SCE enabled by default.
+   * ## Overview
    *
-   * Note:  When enabled (the default), IE8 in quirks mode is not supported.  In this mode, IE8 allows
-   * one to execute arbitrary javascript by the use of the expression() syntax.  Refer
-   * <http://blogs.msdn.com/b/ie/archive/2008/10/16/ending-expressions.aspx> to learn more about them.
-   * You can ensure your document is in standards mode and not quirks mode by adding `<!doctype html>`
-   * to the top of your HTML document.
+   * To systematically block XSS security bugs, AngularJS treats all values as untrusted by default in
+   * HTML or sensitive URL bindings. When binding untrusted values, AngularJS will automatically
+   * run security checks on them (sanitizations, whitelists, depending on context), or throw when it
+   * cannot guarantee the security of the result. That behavior depends strongly on contexts: HTML
+   * can be sanitized, but template URLs cannot, for instance.
    *
-   * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for
-   * security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
+   * To illustrate this, consider the `ng-bind-html` directive. It renders its value directly as HTML:
+   * we call that the *context*. When given an untrusted input, AngularJS will attempt to sanitize it
+   * before rendering if a sanitizer is available, and throw otherwise. To bypass sanitization and
+   * render the input as-is, you will need to mark it as trusted for that context before attempting
+   * to bind it.
+   *
+   * As of version 1.2, AngularJS ships with SCE enabled by default.
+   *
+   * ## In practice
    *
    * Here's an example of a binding in a privileged context:
    *
-   * <pre class="prettyprint">
-   *     <input ng-model="userHtml">
-   *     <div ng-bind-html="userHtml">
-   * </pre>
+   * ```
+   * <input ng-model="userHtml" aria-label="User input">
+   * <div ng-bind-html="userHtml"></div>
+   * ```
    *
    * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
-   * disabled, this application allows the user to render arbitrary HTML into the DIV.
-   * In a more realistic example, one may be rendering user comments, blog articles, etc. via
-   * bindings.  (HTML is just one example of a context where rendering user controlled input creates
-   * security vulnerabilities.)
+   * disabled, this application allows the user to render arbitrary HTML into the DIV, which would
+   * be an XSS security bug. In a more realistic example, one may be rendering user comments, blog
+   * articles, etc. via bindings. (HTML is just one example of a context where rendering user
+   * controlled input creates security vulnerabilities.)
    *
    * For the case of HTML, you might use a library, either on the client side, or on the server side,
    * to sanitize unsafe HTML before binding to the value and rendering it in the document.
@@ -12809,39 +19430,43 @@
    * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
    * properties/fields and forgot to update the binding to the sanitized value?
    *
-   * To be secure by default, you want to ensure that any such bindings are disallowed unless you can
-   * determine that something explicitly says it's safe to use a value for binding in that
-   * context.  You can then audit your code (a simple grep would do) to ensure that this is only done
-   * for those values that you can easily tell are safe - because they were received from your server,
-   * sanitized by your library, etc.  You can organize your codebase to help with this - perhaps
-   * allowing only the files in a specific directory to do this.  Ensuring that the internal API
-   * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task.
-   *
-   * In the case of AngularJS' SCE service, one uses {@link ng.$sce#methods_trustAs $sce.trustAs}
-   * (and shorthand methods such as {@link ng.$sce#methods_trustAsHtml $sce.trustAsHtml}, etc.) to
-   * obtain values that will be accepted by SCE / privileged contexts.
+   * To be secure by default, AngularJS makes sure bindings go through that sanitization, or
+   * any similar validation process, unless there's a good reason to trust the given value in this
+   * context.  That trust is formalized with a function call. This means that as a developer, you
+   * can assume all untrusted bindings are safe. Then, to audit your code for binding security issues,
+   * you just need to ensure the values you mark as trusted indeed are safe - because they were
+   * received from your server, sanitized by your library, etc. You can organize your codebase to
+   * help with this - perhaps allowing only the files in a specific directory to do this.
+   * Ensuring that the internal API exposed by that code doesn't markup arbitrary values as safe then
+   * becomes a more manageable task.
    *
+   * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
+   * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
+   * build the trusted versions of your values.
    *
    * ## How does it work?
    *
-   * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#methods_getTrusted
-   * $sce.getTrusted(context, value)} rather than to the value directly.  Directives use {@link
-   * ng.$sce#methods_parse $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the
-   * {@link ng.$sce#methods_getTrusted $sce.getTrusted} behind the scenes on non-constant literals.
+   * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
+ * $sce.getTrusted(context, value)} rather than to the value directly.  Think of this function as
+   * a way to enforce the required security context in your data sink. Directives use {@link
+    * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs
+   * the {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. Also,
+   * when binding without directives, AngularJS will understand the context of your bindings
+   * automatically.
    *
    * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
-   * ng.$sce#methods_parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
+    * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
    * simplified):
    *
-   * <pre class="prettyprint">
-   *   var ngBindHtmlDirective = ['$sce', function($sce) {
- *     return function(scope, element, attr) {
- *       scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
- *         element.html(value || '');
- *       });
- *     };
- *   }];
-   * </pre>
+   * ```
+   * var ngBindHtmlDirective = ['$sce', function($sce) {
+ *   return function(scope, element, attr) {
+ *     scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
+ *       element.html(value || '');
+ *     });
+ *   };
+ * }];
+   * ```
    *
    * ## Impact on loading templates
    *
@@ -12849,37 +19474,38 @@
    * `templateUrl`'s specified by {@link guide/directive directives}.
    *
    * By default, Angular only loads templates from the same domain and protocol as the application
-   * document.  This is done by calling {@link ng.$sce#methods_getTrustedResourceUrl
-   * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
-   * protocols, you may either either {@link ng.$sceDelegateProvider#methods_resourceUrlWhitelist whitelist
-   * them} or {@link ng.$sce#methods_trustAsResourceUrl wrap it} into a trusted value.
+   * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
+   * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
+ * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
    *
    * *Please note*:
    * The browser's
-   * {@link https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest
-   * Same Origin Policy} and {@link http://www.w3.org/TR/cors/ Cross-Origin Resource Sharing (CORS)}
+   * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+   * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
    * policy apply in addition to this and may further restrict whether the template is successfully
    * loaded.  This means that without the right CORS policy, loading templates from a different domain
    * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
    * browsers.
    *
-   * ## This feels like too much overhead for the developer?
+   * ## This feels like too much overhead
    *
    * It's important to remember that SCE only applies to interpolation expressions.
    *
    * If your expressions are constant literals, they're automatically trusted and you don't need to
-   * call `$sce.trustAs` on them.  (e.g.
-   * `<div ng-html-bind-unsafe="'<b>implicitly trusted</b>'"></div>`) just works.
-   *
-   * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
-   * through {@link ng.$sce#methods_getTrusted $sce.getTrusted}.  SCE doesn't play a role here.
+   * call `$sce.trustAs` on them (e.g.
+   * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works. The `$sceDelegate` will
+   * also use the `$sanitize` service if it is available when binding untrusted values to
+   * `$sce.HTML` context. AngularJS provides an implementation in `angular-sanitize.js`, and if you
+   * wish to use it, you will also need to depend on the {@link ngSanitize `ngSanitize`} module in
+   * your application.
    *
    * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
    * templates in `ng-include` from your application's domain without having to even know about SCE.
    * It blocks loading templates from other domains or loading templates over http from an https
    * served document.  You can change these by setting your own custom {@link
-   * ng.$sceDelegateProvider#methods_resourceUrlWhitelist whitelists} and {@link
-   * ng.$sceDelegateProvider#methods_resourceUrlBlacklist blacklists} for matching such URLs.
+    * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
+    * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
    *
    * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
    * application that's secure and can be audited to verify that with much more ease than bolting
@@ -12890,13 +19516,19 @@
    *
    * | Context             | Notes          |
    * |---------------------|----------------|
-   * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. |
-   * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently unused.  Feel free to use it in your own directives. |
-   * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=` and `<img src=` sanitize their urls and don't consititute an SCE context. |
-   * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contens are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
-   * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently unused.  Feel free to use it in your own directives. |
+   * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered, and the {@link ngSanitize.$sanitize $sanitize} service is available (implemented by the {@link ngSanitize ngSanitize} module) this will sanitize the value instead of throwing an error. |
+   * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently, no bindings require this context. Feel free to use it in your own directives. |
+   * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=`, `<img src=`, and some others sanitize their urls and don't constitute an SCE context.) |
+   * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG`, `VIDEO`, `AUDIO`, `SOURCE`, and `TRACK` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does (it's not just the URL that matters, but also what is at the end of it), and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
+   * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently, no bindings require this context.  Feel free to use it in your own directives. |
    *
-   * ## Format of items in {@link ng.$sceDelegateProvider#methods_resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#methods_resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+   *
+   * Be aware that `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
+   * through {@link ng.$sce#getTrusted $sce.getTrusted}. There's no CSS-, URL-, or JS-context bindings
+   * in AngularJS currently, so their corresponding `$sce.trustAs` functions aren't useful yet. This
+   * might evolve.
+   *
+   * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
    *
    *  Each element in these arrays must be one of the following:
    *
@@ -12908,33 +19540,33 @@
    *      being tested (substring matches are not good enough.)
    *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
    *      match themselves.
-   *    - `*`: matches zero or more occurances of any character other than one of the following 6
-   *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'.  It's a useful wildcard for use
+   *    - `*`: matches zero or more occurrences of any character other than one of the following 6
+   *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'.  It's a useful wildcard for use
    *      in a whitelist.
-   *    - `**`: matches zero or more occurances of *any* character.  As such, it's not
-   *      not appropriate to use in for a scheme, domain, etc. as it would match too much.  (e.g.
+   *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
+   *      appropriate for use in a scheme, domain, etc. as it would match too much.  (e.g.
    *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
-   *      not have been the intention.)  It's usage at the very end of the path is ok.  (e.g.
+   *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
    *      http://foo.example.com/templates/**).
    *  - **RegExp** (*see caveat below*)
    *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
    *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
    *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
-   *      have good test coverage.).  For instance, the use of `.` in the regex is correct only in a
+   *      have good test coverage).  For instance, the use of `.` in the regex is correct only in a
    *      small number of cases.  A `.` character in the regex used when matching the scheme or a
    *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
    *      is highly recommended to use the string patterns and only fall back to regular expressions
-   *      if they as a last resort.
+   *      as a last resort.
    *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
    *      matched against the **entire** *normalized / absolute URL* of the resource being tested
    *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
    *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
-   *    - If you are generating your Javascript from some other templating engine (not
+   *    - If you are generating your JavaScript from some other templating engine (not
    *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
    *      remember to escape your regular expression (and be aware that you might need more than
    *      one level of escaping depending on your templating engine and the way you interpolated
    *      the value.)  Do make use of your platform's escaping mechanism as it might be good
-   *      enough before coding your own.  e.g. Ruby has
+   *      enough before coding your own.  E.g. Ruby has
    *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
    *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
    *      Javascript lacks a similar built in function for escaping.  Take a look at Google
@@ -12945,64 +19577,65 @@
    *
    * ## Show me an example using SCE.
    *
-   * @example
-   <example module="mySceApp">
-   <file name="index.html">
-   <div ng-controller="myAppController as myCtrl">
-   <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
-   <b>User comments</b><br>
-   By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
-   $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
-   exploit.
-   <div class="well">
-   <div ng-repeat="userComment in myCtrl.userComments">
-   <b>{{userComment.name}}</b>:
-   <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
-   <br>
-   </div>
-   </div>
-   </div>
-   </file>
-
-   <file name="script.js">
-   var mySceApp = angular.module('mySceApp', ['ngSanitize']);
-
-   mySceApp.controller("myAppController", function myAppController($http, $templateCache, $sce) {
-    var self = this;
-    $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) {
-      self.userComments = userComments;
-    });
-    self.explicitlyTrustedHtml = $sce.trustAsHtml(
-        '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-        'sanitization.&quot;">Hover over this text.</span>');
-  });
-   </file>
-
-   <file name="test_data.json">
-   [
-   { "name": "Alice",
-    "htmlComment":
-        "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
-  },
-   { "name": "Bob",
-    "htmlComment": "<i>Yes!</i>  Am I the only other one?"
-  }
-   ]
-   </file>
-
-   <file name="scenario.js">
-   describe('SCE doc demo', function() {
-    it('should sanitize untrusted values', function() {
-      expect(element('.htmlComment').html()).toBe('<span>Is <i>anyone</i> reading this?</span>');
-    });
-    it('should NOT sanitize explicitly trusted values', function() {
-      expect(element('#explicitlyTrustedHtml').html()).toBe(
-          '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-          'sanitization.&quot;">Hover over this text.</span>');
-    });
-  });
-   </file>
-   </example>
+   * <example module="mySceApp" deps="angular-sanitize.js" name="sce-service">
+   * <file name="index.html">
+   *   <div ng-controller="AppController as myCtrl">
+   *     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
+   *     <b>User comments</b><br>
+   *     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
+   *     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
+   *     exploit.
+   *     <div class="well">
+   *       <div ng-repeat="userComment in myCtrl.userComments">
+   *         <b>{{userComment.name}}</b>:
+   *         <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
+   *         <br>
+   *       </div>
+   *     </div>
+   *   </div>
+   * </file>
+   *
+   * <file name="script.js">
+   *   angular.module('mySceApp', ['ngSanitize'])
+   *     .controller('AppController', ['$http', '$templateCache', '$sce',
+   *       function AppController($http, $templateCache, $sce) {
+ *         var self = this;
+ *         $http.get('test_data.json', {cache: $templateCache}).then(function(response) {
+ *           self.userComments = response.data;
+ *         });
+ *         self.explicitlyTrustedHtml = $sce.trustAsHtml(
+ *             '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+ *             'sanitization.&quot;">Hover over this text.</span>');
+ *       }]);
+   * </file>
+   *
+   * <file name="test_data.json">
+   * [
+   *   { "name": "Alice",
+ *     "htmlComment":
+ *         "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
+ *   },
+   *   { "name": "Bob",
+ *     "htmlComment": "<i>Yes!</i>  Am I the only other one?"
+ *   }
+   * ]
+   * </file>
+   *
+   * <file name="protractor.js" type="protractor">
+   *   describe('SCE doc demo', function() {
+ *     it('should sanitize untrusted values', function() {
+ *       expect(element.all(by.css('.htmlComment')).first().getAttribute('innerHTML'))
+ *           .toBe('<span>Is <i>anyone</i> reading this?</span>');
+ *     });
+ *
+ *     it('should NOT sanitize explicitly trusted values', function() {
+ *       expect(element(by.id('explicitlyTrustedHtml')).getAttribute('innerHTML')).toBe(
+ *           '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+ *           'sanitization.&quot;">Hover over this text.</span>');
+ *     });
+ *   });
+   * </file>
+   * </example>
    *
    *
    *
@@ -13012,37 +19645,36 @@
    * for little coding overhead.  It will be much harder to take an SCE disabled application and
    * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
    * for cases where you have a lot of existing code that was written before SCE was introduced and
-   * you're migrating them a module at a time.
+   * you're migrating them a module at a time. Also do note that this is an app-wide setting, so if
+   * you are writing a library, you will cause security bugs applications using it.
    *
    * That said, here's how you can completely disable SCE:
    *
-   * <pre class="prettyprint">
-   *   angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
- *     // Completely disable SCE.  For demonstration purposes only!
- *     // Do not use in new projects.
- *     $sceProvider.enabled(false);
- *   });
-   * </pre>
+   * ```
+   * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
+ *   // Completely disable SCE.  For demonstration purposes only!
+ *   // Do not use in new projects or libraries.
+ *   $sceProvider.enabled(false);
+ * });
+   * ```
    *
    */
-  /* jshint maxlen: 100 */
 
   function $SceProvider() {
     var enabled = true;
 
     /**
-     * @ngdoc function
-     * @name ng.sceProvider#enabled
-     * @methodOf ng.$sceProvider
-     * @function
+     * @ngdoc method
+     * @name $sceProvider#enabled
+     * @kind function
      *
-     * @param {boolean=} value If provided, then enables/disables SCE.
-     * @return {boolean} true if SCE is enabled, false otherwise.
+     * @param {boolean=} value If provided, then enables/disables SCE application-wide.
+     * @return {boolean} True if SCE is enabled, false otherwise.
      *
      * @description
      * Enables/disables SCE and returns the current value.
      */
-    this.enabled = function (value) {
+    this.enabled = function(value) {
       if (arguments.length) {
         enabled = !!value;
       }
@@ -13051,77 +19683,77 @@
 
 
     /* Design notes on the default implementation for SCE.
-     *
-     * The API contract for the SCE delegate
-     * -------------------------------------
-     * The SCE delegate object must provide the following 3 methods:
-     *
-     * - trustAs(contextEnum, value)
-     *     This method is used to tell the SCE service that the provided value is OK to use in the
-     *     contexts specified by contextEnum.  It must return an object that will be accepted by
-     *     getTrusted() for a compatible contextEnum and return this value.
-     *
-     * - valueOf(value)
-     *     For values that were not produced by trustAs(), return them as is.  For values that were
-     *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
-     *     trustAs is wrapping the given values into some type, this operation unwraps it when given
-     *     such a value.
-     *
-     * - getTrusted(contextEnum, value)
-     *     This function should return the a value that is safe to use in the context specified by
-     *     contextEnum or throw and exception otherwise.
-     *
-     * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
-     * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
-     * instance, an implementation could maintain a registry of all trusted objects by context.  In
-     * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
-     * return the same object passed in if it was found in the registry under a compatible context or
-     * throw an exception otherwise.  An implementation might only wrap values some of the time based
-     * on some criteria.  getTrusted() might return a value and not throw an exception for special
-     * constants or objects even if not wrapped.  All such implementations fulfill this contract.
-     *
-     *
-     * A note on the inheritance model for SCE contexts
-     * ------------------------------------------------
-     * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
-     * is purely an implementation details.
-     *
-     * The contract is simply this:
-     *
-     *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
-     *     will also succeed.
-     *
-     * Inheritance happens to capture this in a natural way.  In some future, we
-     * may not use inheritance anymore.  That is OK because no code outside of
-     * sce.js and sceSpecs.js would need to be aware of this detail.
-     */
+   *
+   * The API contract for the SCE delegate
+   * -------------------------------------
+   * The SCE delegate object must provide the following 3 methods:
+   *
+   * - trustAs(contextEnum, value)
+   *     This method is used to tell the SCE service that the provided value is OK to use in the
+   *     contexts specified by contextEnum.  It must return an object that will be accepted by
+   *     getTrusted() for a compatible contextEnum and return this value.
+   *
+   * - valueOf(value)
+   *     For values that were not produced by trustAs(), return them as is.  For values that were
+   *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
+   *     trustAs is wrapping the given values into some type, this operation unwraps it when given
+   *     such a value.
+   *
+   * - getTrusted(contextEnum, value)
+   *     This function should return the a value that is safe to use in the context specified by
+   *     contextEnum or throw and exception otherwise.
+   *
+   * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
+   * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
+   * instance, an implementation could maintain a registry of all trusted objects by context.  In
+   * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
+   * return the same object passed in if it was found in the registry under a compatible context or
+   * throw an exception otherwise.  An implementation might only wrap values some of the time based
+   * on some criteria.  getTrusted() might return a value and not throw an exception for special
+   * constants or objects even if not wrapped.  All such implementations fulfill this contract.
+   *
+   *
+   * A note on the inheritance model for SCE contexts
+   * ------------------------------------------------
+   * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
+   * is purely an implementation details.
+   *
+   * The contract is simply this:
+   *
+   *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
+   *     will also succeed.
+   *
+   * Inheritance happens to capture this in a natural way. In some future, we may not use
+   * inheritance anymore. That is OK because no code outside of sce.js and sceSpecs.js would need to
+   * be aware of this detail.
+   */
 
-    this.$get = ['$parse', '$sniffer', '$sceDelegate', function(
-        $parse,   $sniffer,   $sceDelegate) {
-      // Prereq: Ensure that we're not running in IE8 quirks mode.  In that mode, IE allows
+    this.$get = ['$parse', '$sceDelegate', function(
+      $parse,   $sceDelegate) {
+      // Support: IE 9-11 only
+      // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allow
       // the "expression(javascript expression)" syntax which is insecure.
-      if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) {
+      if (enabled && msie < 8) {
         throw $sceMinErr('iequirks',
-            'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' +
-                'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
-                'document.  See http://docs.angularjs.org/../api/ng.$sce for more information.');
+          'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
+          'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
+          'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
       }
 
-      var sce = copy(SCE_CONTEXTS);
+      var sce = shallowCopy(SCE_CONTEXTS);
 
       /**
-       * @ngdoc function
-       * @name ng.sce#isEnabled
-       * @methodOf ng.$sce
-       * @function
+       * @ngdoc method
+       * @name $sce#isEnabled
+       * @kind function
        *
-       * @return {Boolean} true if SCE is enabled, false otherwise.  If you want to set the value, you
-       * have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
+       * @return {Boolean} True if SCE is enabled, false otherwise.  If you want to set the value, you
+       *     have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
        *
        * @description
        * Returns a boolean indicating if SCE is enabled.
        */
-      sce.isEnabled = function () {
+      sce.isEnabled = function() {
         return enabled;
       };
       sce.trustAs = $sceDelegate.trustAs;
@@ -13135,307 +19767,300 @@
 
       /**
        * @ngdoc method
-       * @name ng.$sce#parse
-       * @methodOf ng.$sce
+       * @name $sce#parseAs
        *
        * @description
        * Converts Angular {@link guide/expression expression} into a function.  This is like {@link
-       * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
-       * wraps the expression in a call to {@link ng.$sce#methods_getTrusted $sce.getTrusted(*type*,
-       * *result*)}
+        * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
+       * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
+     * *result*)}
        *
-       * @param {string} type The kind of SCE context in which this result will be used.
+       * @param {string} type The SCE context in which this result will be used.
        * @param {string} expression String expression to compile.
-       * @returns {function(context, locals)} a function which represents the compiled expression:
+       * @return {function(context, locals)} A function which represents the compiled expression:
        *
-       *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-       *      are evaluated against (typically a scope object).
-       *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-       *      `context`.
+       *    * `context` – `{object}` – an object against which any expressions embedded in the
+       *      strings are evaluated against (typically a scope object).
+       *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+       *      in `context`.
        */
       sce.parseAs = function sceParseAs(type, expr) {
         var parsed = $parse(expr);
         if (parsed.literal && parsed.constant) {
           return parsed;
         } else {
-          return function sceParseAsTrusted(self, locals) {
-            return sce.getTrusted(type, parsed(self, locals));
-          };
+          return $parse(expr, function(value) {
+            return sce.getTrusted(type, value);
+          });
         }
       };
 
       /**
        * @ngdoc method
-       * @name ng.$sce#trustAs
-       * @methodOf ng.$sce
+       * @name $sce#trustAs
        *
        * @description
-       * Delegates to {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`}.  As such,
-       * returns an objectthat is trusted by angular for use in specified strict contextual
-       * escaping contexts (such as ng-html-bind-unsafe, ng-include, any src attribute
-       * interpolation, any dom event binding attribute interpolation such as for onclick,  etc.)
-       * that uses the provided value.  See * {@link ng.$sce $sce} for enabling strict contextual
-       * escaping.
+       * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, returns a
+       * wrapped object that represents your value, and the trust you have in its safety for the given
+       * context. AngularJS can then use that value as-is in bindings of the specified secure context.
+       * This is used in bindings for `ng-bind-html`, `ng-include`, and most `src` attribute
+       * interpolations. See {@link ng.$sce $sce} for strict contextual escaping.
        *
-       * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-       *   resource_url, html, js and css.
-       * @param {*} value The value that that should be considered trusted/safe.
-       * @returns {*} A value that can be used to stand in for the provided `value` in places
-       * where Angular expects a $sce.trustAs() return value.
+       * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
+       *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
+       *
+       * @param {*} value The value that that should be considered trusted.
+       * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+       *     in the context you specified.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#trustAsHtml
-       * @methodOf ng.$sce
+       * @name $sce#trustAsHtml
        *
        * @description
        * Shorthand method.  `$sce.trustAsHtml(value)` →
-       *     {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
+       *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
        *
-       * @param {*} value The value to trustAs.
-       * @returns {*} An object that can be passed to {@link ng.$sce#methods_getTrustedHtml
-       *     $sce.getTrustedHtml(value)} to obtain the original value.  (privileged directives
-       *     only accept expressions that are either literal constants or are the
-       *     return value of {@link ng.$sce#methods_trustAs $sce.trustAs}.)
+       * @param {*} value The value to mark as trusted for `$sce.HTML` context.
+       * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+       *     in `$sce.HTML` context (like `ng-bind-html`).
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#trustAsUrl
-       * @methodOf ng.$sce
+       * @name $sce#trustAsCss
+       *
+       * @description
+       * Shorthand method.  `$sce.trustAsCss(value)` →
+       *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.CSS, value)`}
+       *
+       * @param {*} value The value to mark as trusted for `$sce.CSS` context.
+       * @return {*} A wrapped version of value that can be used as a trusted variant
+       *     of your `value` in `$sce.CSS` context. This context is currently unused, so there are
+       *     almost no reasons to use this function so far.
+       */
+
+      /**
+       * @ngdoc method
+       * @name $sce#trustAsUrl
        *
        * @description
        * Shorthand method.  `$sce.trustAsUrl(value)` →
-       *     {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs($sce.URL, value)`}
+       *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
        *
-       * @param {*} value The value to trustAs.
-       * @returns {*} An object that can be passed to {@link ng.$sce#methods_getTrustedUrl
-       *     $sce.getTrustedUrl(value)} to obtain the original value.  (privileged directives
-       *     only accept expressions that are either literal constants or are the
-       *     return value of {@link ng.$sce#methods_trustAs $sce.trustAs}.)
+       * @param {*} value The value to mark as trusted for `$sce.URL` context.
+       * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+       *     in `$sce.URL` context. That context is currently unused, so there are almost no reasons
+       *     to use this function so far.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#trustAsResourceUrl
-       * @methodOf ng.$sce
+       * @name $sce#trustAsResourceUrl
        *
        * @description
        * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
-       *     {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
+       *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
        *
-       * @param {*} value The value to trustAs.
-       * @returns {*} An object that can be passed to {@link ng.$sce#methods_getTrustedResourceUrl
-       *     $sce.getTrustedResourceUrl(value)} to obtain the original value.  (privileged directives
-       *     only accept expressions that are either literal constants or are the return
-       *     value of {@link ng.$sce#methods_trustAs $sce.trustAs}.)
+       * @param {*} value The value to mark as trusted for `$sce.RESOURCE_URL` context.
+       * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+       *     in `$sce.RESOURCE_URL` context (template URLs in `ng-include`, most `src` attribute
+       *     bindings, ...)
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#trustAsJs
-       * @methodOf ng.$sce
+       * @name $sce#trustAsJs
        *
        * @description
        * Shorthand method.  `$sce.trustAsJs(value)` →
-       *     {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs($sce.JS, value)`}
+       *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
        *
-       * @param {*} value The value to trustAs.
-       * @returns {*} An object that can be passed to {@link ng.$sce#methods_getTrustedJs
-       *     $sce.getTrustedJs(value)} to obtain the original value.  (privileged directives
-       *     only accept expressions that are either literal constants or are the
-       *     return value of {@link ng.$sce#methods_trustAs $sce.trustAs}.)
+       * @param {*} value The value to mark as trusted for `$sce.JS` context.
+       * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+       *     in `$sce.JS` context. That context is currently unused, so there are almost no reasons to
+       *     use this function so far.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#getTrusted
-       * @methodOf ng.$sce
+       * @name $sce#getTrusted
        *
        * @description
-       * Delegates to {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted`}.  As such,
-       * takes the result of a {@link ng.$sce#methods_trustAs `$sce.trustAs`}() call and returns the
-       * originally supplied value if the queried context type is a supertype of the created type.
-       * If this condition isn't satisfied, throws an exception.
+       * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
+       * takes any input, and either returns a value that's safe to use in the specified context,
+       * or throws an exception. This function is aware of trusted values created by the `trustAs`
+       * function and its shorthands, and when contexts are appropriate, returns the unwrapped value
+       * as-is. Finally, this function can also throw when there is no way to turn `maybeTrusted` in a
+       * safe value (e.g., no sanitization is available or possible.)
        *
-       * @param {string} type The kind of context in which this value is to be used.
-       * @param {*} maybeTrusted The result of a prior {@link ng.$sce#methods_trustAs `$sce.trustAs`}
-       *                         call.
-       * @returns {*} The value the was originally provided to
-       *              {@link ng.$sce#methods_trustAs `$sce.trustAs`} if valid in this context.
-       *              Otherwise, throws an exception.
+       * @param {string} type The context in which this value is to be used.
+       * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs
+     *     `$sce.trustAs`} call, or anything else (which will not be considered trusted.)
+       * @return {*} A version of the value that's safe to use in the given context, or throws an
+       *     exception if this is impossible.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#getTrustedHtml
-       * @methodOf ng.$sce
+       * @name $sce#getTrustedHtml
        *
        * @description
        * Shorthand method.  `$sce.getTrustedHtml(value)` →
-       *     {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
+       *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
        *
        * @param {*} value The value to pass to `$sce.getTrusted`.
-       * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)`
+       * @return {*} The return value of `$sce.getTrusted($sce.HTML, value)`
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#getTrustedCss
-       * @methodOf ng.$sce
+       * @name $sce#getTrustedCss
        *
        * @description
        * Shorthand method.  `$sce.getTrustedCss(value)` →
-       *     {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
+       *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
        *
        * @param {*} value The value to pass to `$sce.getTrusted`.
-       * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)`
+       * @return {*} The return value of `$sce.getTrusted($sce.CSS, value)`
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#getTrustedUrl
-       * @methodOf ng.$sce
+       * @name $sce#getTrustedUrl
        *
        * @description
        * Shorthand method.  `$sce.getTrustedUrl(value)` →
-       *     {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
+       *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
        *
        * @param {*} value The value to pass to `$sce.getTrusted`.
-       * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)`
+       * @return {*} The return value of `$sce.getTrusted($sce.URL, value)`
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#getTrustedResourceUrl
-       * @methodOf ng.$sce
+       * @name $sce#getTrustedResourceUrl
        *
        * @description
        * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
-       *     {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
+       *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
        *
        * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
-       * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
+       * @return {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#getTrustedJs
-       * @methodOf ng.$sce
+       * @name $sce#getTrustedJs
        *
        * @description
        * Shorthand method.  `$sce.getTrustedJs(value)` →
-       *     {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
+       *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
        *
        * @param {*} value The value to pass to `$sce.getTrusted`.
-       * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)`
+       * @return {*} The return value of `$sce.getTrusted($sce.JS, value)`
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#parseAsHtml
-       * @methodOf ng.$sce
+       * @name $sce#parseAsHtml
        *
        * @description
        * Shorthand method.  `$sce.parseAsHtml(expression string)` →
-       *     {@link ng.$sce#methods_parse `$sce.parseAs($sce.HTML, value)`}
+       *     {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`}
        *
        * @param {string} expression String expression to compile.
-       * @returns {function(context, locals)} a function which represents the compiled expression:
+       * @return {function(context, locals)} A function which represents the compiled expression:
        *
-       *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-       *      are evaluated against (typically a scope object).
-       *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-       *      `context`.
+       *    * `context` – `{object}` – an object against which any expressions embedded in the
+       *      strings are evaluated against (typically a scope object).
+       *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+       *      in `context`.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#parseAsCss
-       * @methodOf ng.$sce
+       * @name $sce#parseAsCss
        *
        * @description
        * Shorthand method.  `$sce.parseAsCss(value)` →
-       *     {@link ng.$sce#methods_parse `$sce.parseAs($sce.CSS, value)`}
+       *     {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`}
        *
        * @param {string} expression String expression to compile.
-       * @returns {function(context, locals)} a function which represents the compiled expression:
+       * @return {function(context, locals)} A function which represents the compiled expression:
        *
-       *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-       *      are evaluated against (typically a scope object).
-       *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-       *      `context`.
+       *    * `context` – `{object}` – an object against which any expressions embedded in the
+       *      strings are evaluated against (typically a scope object).
+       *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+       *      in `context`.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#parseAsUrl
-       * @methodOf ng.$sce
+       * @name $sce#parseAsUrl
        *
        * @description
        * Shorthand method.  `$sce.parseAsUrl(value)` →
-       *     {@link ng.$sce#methods_parse `$sce.parseAs($sce.URL, value)`}
+       *     {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`}
        *
        * @param {string} expression String expression to compile.
-       * @returns {function(context, locals)} a function which represents the compiled expression:
+       * @return {function(context, locals)} A function which represents the compiled expression:
        *
-       *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-       *      are evaluated against (typically a scope object).
-       *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-       *      `context`.
+       *    * `context` – `{object}` – an object against which any expressions embedded in the
+       *      strings are evaluated against (typically a scope object).
+       *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+       *      in `context`.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#parseAsResourceUrl
-       * @methodOf ng.$sce
+       * @name $sce#parseAsResourceUrl
        *
        * @description
        * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
-       *     {@link ng.$sce#methods_parse `$sce.parseAs($sce.RESOURCE_URL, value)`}
+       *     {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`}
        *
        * @param {string} expression String expression to compile.
-       * @returns {function(context, locals)} a function which represents the compiled expression:
+       * @return {function(context, locals)} A function which represents the compiled expression:
        *
-       *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-       *      are evaluated against (typically a scope object).
-       *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-       *      `context`.
+       *    * `context` – `{object}` – an object against which any expressions embedded in the
+       *      strings are evaluated against (typically a scope object).
+       *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+       *      in `context`.
        */
 
       /**
        * @ngdoc method
-       * @name ng.$sce#parseAsJs
-       * @methodOf ng.$sce
+       * @name $sce#parseAsJs
        *
        * @description
        * Shorthand method.  `$sce.parseAsJs(value)` →
-       *     {@link ng.$sce#methods_parse `$sce.parseAs($sce.JS, value)`}
+       *     {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`}
        *
        * @param {string} expression String expression to compile.
-       * @returns {function(context, locals)} a function which represents the compiled expression:
+       * @return {function(context, locals)} A function which represents the compiled expression:
        *
-       *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-       *      are evaluated against (typically a scope object).
-       *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-       *      `context`.
+       *    * `context` – `{object}` – an object against which any expressions embedded in the
+       *      strings are evaluated against (typically a scope object).
+       *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+       *      in `context`.
        */
 
-      // Shorthand delegations.
+        // Shorthand delegations.
       var parse = sce.parseAs,
-          getTrusted = sce.getTrusted,
-          trustAs = sce.trustAs;
+        getTrusted = sce.getTrusted,
+        trustAs = sce.trustAs;
 
-      forEach(SCE_CONTEXTS, function (enumValue, name) {
+      forEach(SCE_CONTEXTS, function(enumValue, name) {
         var lName = lowercase(name);
-        sce[camelCase("parse_as_" + lName)] = function (expr) {
+        sce[snakeToCamel('parse_as_' + lName)] = function(expr) {
           return parse(enumValue, expr);
         };
-        sce[camelCase("get_trusted_" + lName)] = function (value) {
+        sce[snakeToCamel('get_trusted_' + lName)] = function(value) {
           return getTrusted(enumValue, value);
         };
-        sce[camelCase("trust_as_" + lName)] = function (value) {
+        sce[snakeToCamel('trust_as_' + lName)] = function(value) {
           return trustAs(enumValue, value);
         };
       });
@@ -13444,15 +20069,17 @@
     }];
   }
 
+  /* exported $SnifferProvider */
+
   /**
    * !!! This is an undocumented "private" service !!!
    *
-   * @name ng.$sniffer
+   * @name $sniffer
    * @requires $window
    * @requires $document
+   * @this
    *
    * @property {boolean} history Does the browser support html5 history api ?
-   * @property {boolean} hashchange Does the browser support hashchange event ?
    * @property {boolean} transitions Does the browser support CSS transition events ?
    * @property {boolean} animations Does the browser support CSS animation events ?
    *
@@ -13462,38 +20089,32 @@
   function $SnifferProvider() {
     this.$get = ['$window', '$document', function($window, $document) {
       var eventSupport = {},
-          android =
-              int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
-          boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
-          document = $document[0] || {},
-          documentMode = document.documentMode,
-          vendorPrefix,
-          vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/,
-          bodyStyle = document.body && document.body.style,
-          transitions = false,
-          animations = false,
-          match;
+        // Chrome Packaged Apps are not allowed to access `history.pushState`.
+        // If not sandboxed, they can be detected by the presence of `chrome.app.runtime`
+        // (see https://developer.chrome.com/apps/api_index). If sandboxed, they can be detected by
+        // the presence of an extension runtime ID and the absence of other Chrome runtime APIs
+        // (see https://developer.chrome.com/apps/manifest/sandbox).
+        // (NW.js apps have access to Chrome APIs, but do support `history`.)
+        isNw = $window.nw && $window.nw.process,
+        isChromePackagedApp =
+          !isNw &&
+          $window.chrome &&
+          ($window.chrome.app && $window.chrome.app.runtime ||
+            !$window.chrome.app && $window.chrome.runtime && $window.chrome.runtime.id),
+        hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState,
+        android =
+          toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
+        boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
+        document = $document[0] || {},
+        bodyStyle = document.body && document.body.style,
+        transitions = false,
+        animations = false;
 
       if (bodyStyle) {
-        for(var prop in bodyStyle) {
-          if(match = vendorRegex.exec(prop)) {
-            vendorPrefix = match[0];
-            vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1);
-            break;
-          }
-        }
-
-        if(!vendorPrefix) {
-          vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit';
-        }
-
-        transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle));
-        animations  = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle));
-
-        if (android && (!transitions||!animations)) {
-          transitions = isString(document.body.style.webkitTransition);
-          animations = isString(document.body.style.webkitAnimation);
-        }
+        // Support: Android <5, Blackberry Browser 10, default Chrome in Android 4.4.x
+        // Mentioned browsers need a -webkit- prefix for transitions & animations.
+        transitions = !!('transition' in bodyStyle || 'webkitTransition' in bodyStyle);
+        animations = !!('animation' in bodyStyle || 'webkitAnimation' in bodyStyle);
       }
 
 
@@ -13506,17 +20127,15 @@
         // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
         // so let's not use the history API also
         // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
-        // jshint -W018
-        history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
-        // jshint +W018
-        hashchange: 'onhashchange' in $window &&
-          // IE8 compatible mode lies
-            (!documentMode || documentMode > 7),
+        history: !!(hasHistoryPushState && !(android < 4) && !boxee),
         hasEvent: function(event) {
+          // Support: IE 9-11 only
           // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
           // it. In particular the event is not fired when backspace or delete key are pressed or
           // when cut operation is performed.
-          if (event == 'input' && msie == 9) return false;
+          // IE10+ implements 'input' event but it erroneously fires under various situations,
+          // e.g. when placeholder changes, or a form is focused.
+          if (event === 'input' && msie) return false;
 
           if (isUndefined(eventSupport[event])) {
             var divElm = document.createElement('div');
@@ -13526,62 +20145,303 @@
           return eventSupport[event];
         },
         csp: csp(),
-        vendorPrefix: vendorPrefix,
-        transitions : transitions,
-        animations : animations,
-        android: android,
-        msie : msie,
-        msieDocumentMode: documentMode
+        transitions: transitions,
+        animations: animations,
+        android: android
       };
     }];
   }
 
+  var $templateRequestMinErr = minErr('$compile');
+
+  /**
+   * @ngdoc provider
+   * @name $templateRequestProvider
+   * @this
+   *
+   * @description
+   * Used to configure the options passed to the {@link $http} service when making a template request.
+   *
+   * For example, it can be used for specifying the "Accept" header that is sent to the server, when
+   * requesting a template.
+   */
+  function $TemplateRequestProvider() {
+
+    var httpOptions;
+
+    /**
+     * @ngdoc method
+     * @name $templateRequestProvider#httpOptions
+     * @description
+     * The options to be passed to the {@link $http} service when making the request.
+     * You can use this to override options such as the "Accept" header for template requests.
+     *
+     * The {@link $templateRequest} will set the `cache` and the `transformResponse` properties of the
+     * options if not overridden here.
+     *
+     * @param {string=} value new value for the {@link $http} options.
+     * @returns {string|self} Returns the {@link $http} options when used as getter and self if used as setter.
+     */
+    this.httpOptions = function(val) {
+      if (val) {
+        httpOptions = val;
+        return this;
+      }
+      return httpOptions;
+    };
+
+    /**
+     * @ngdoc service
+     * @name $templateRequest
+     *
+     * @description
+     * The `$templateRequest` service runs security checks then downloads the provided template using
+     * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request
+     * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the
+     * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the
+     * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted
+     * when `tpl` is of type string and `$templateCache` has the matching entry.
+     *
+     * If you want to pass custom options to the `$http` service, such as setting the Accept header you
+     * can configure this via {@link $templateRequestProvider#httpOptions}.
+     *
+     * @param {string|TrustedResourceUrl} tpl The HTTP request template URL
+     * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
+     *
+     * @return {Promise} a promise for the HTTP response data of the given URL.
+     *
+     * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
+     */
+    this.$get = ['$exceptionHandler', '$templateCache', '$http', '$q', '$sce',
+      function($exceptionHandler, $templateCache, $http, $q, $sce) {
+
+        function handleRequestFn(tpl, ignoreRequestError) {
+          handleRequestFn.totalPendingRequests++;
+
+          // We consider the template cache holds only trusted templates, so
+          // there's no need to go through whitelisting again for keys that already
+          // are included in there. This also makes Angular accept any script
+          // directive, no matter its name. However, we still need to unwrap trusted
+          // types.
+          if (!isString(tpl) || isUndefined($templateCache.get(tpl))) {
+            tpl = $sce.getTrustedResourceUrl(tpl);
+          }
+
+          var transformResponse = $http.defaults && $http.defaults.transformResponse;
+
+          if (isArray(transformResponse)) {
+            transformResponse = transformResponse.filter(function(transformer) {
+              return transformer !== defaultHttpResponseTransform;
+            });
+          } else if (transformResponse === defaultHttpResponseTransform) {
+            transformResponse = null;
+          }
+
+          return $http.get(tpl, extend({
+            cache: $templateCache,
+            transformResponse: transformResponse
+          }, httpOptions))
+            .finally(function() {
+              handleRequestFn.totalPendingRequests--;
+            })
+            .then(function(response) {
+              $templateCache.put(tpl, response.data);
+              return response.data;
+            }, handleError);
+
+          function handleError(resp) {
+            if (!ignoreRequestError) {
+              resp = $templateRequestMinErr('tpload',
+                'Failed to load template: {0} (HTTP status: {1} {2})',
+                tpl, resp.status, resp.statusText);
+
+              $exceptionHandler(resp);
+            }
+
+            return $q.reject(resp);
+          }
+        }
+
+        handleRequestFn.totalPendingRequests = 0;
+
+        return handleRequestFn;
+      }
+    ];
+  }
+
+  /** @this */
+  function $$TestabilityProvider() {
+    this.$get = ['$rootScope', '$browser', '$location',
+      function($rootScope,   $browser,   $location) {
+
+        /**
+         * @name $testability
+         *
+         * @description
+         * The private $$testability service provides a collection of methods for use when debugging
+         * or by automated test and debugging tools.
+         */
+        var testability = {};
+
+        /**
+         * @name $$testability#findBindings
+         *
+         * @description
+         * Returns an array of elements that are bound (via ng-bind or {{}})
+         * to expressions matching the input.
+         *
+         * @param {Element} element The element root to search from.
+         * @param {string} expression The binding expression to match.
+         * @param {boolean} opt_exactMatch If true, only returns exact matches
+         *     for the expression. Filters and whitespace are ignored.
+         */
+        testability.findBindings = function(element, expression, opt_exactMatch) {
+          var bindings = element.getElementsByClassName('ng-binding');
+          var matches = [];
+          forEach(bindings, function(binding) {
+            var dataBinding = angular.element(binding).data('$binding');
+            if (dataBinding) {
+              forEach(dataBinding, function(bindingName) {
+                if (opt_exactMatch) {
+                  var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)');
+                  if (matcher.test(bindingName)) {
+                    matches.push(binding);
+                  }
+                } else {
+                  if (bindingName.indexOf(expression) !== -1) {
+                    matches.push(binding);
+                  }
+                }
+              });
+            }
+          });
+          return matches;
+        };
+
+        /**
+         * @name $$testability#findModels
+         *
+         * @description
+         * Returns an array of elements that are two-way found via ng-model to
+         * expressions matching the input.
+         *
+         * @param {Element} element The element root to search from.
+         * @param {string} expression The model expression to match.
+         * @param {boolean} opt_exactMatch If true, only returns exact matches
+         *     for the expression.
+         */
+        testability.findModels = function(element, expression, opt_exactMatch) {
+          var prefixes = ['ng-', 'data-ng-', 'ng\\:'];
+          for (var p = 0; p < prefixes.length; ++p) {
+            var attributeEquals = opt_exactMatch ? '=' : '*=';
+            var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]';
+            var elements = element.querySelectorAll(selector);
+            if (elements.length) {
+              return elements;
+            }
+          }
+        };
+
+        /**
+         * @name $$testability#getLocation
+         *
+         * @description
+         * Shortcut for getting the location in a browser agnostic way. Returns
+         *     the path, search, and hash. (e.g. /path?a=b#hash)
+         */
+        testability.getLocation = function() {
+          return $location.url();
+        };
+
+        /**
+         * @name $$testability#setLocation
+         *
+         * @description
+         * Shortcut for navigating to a location without doing a full page reload.
+         *
+         * @param {string} url The location url (path, search and hash,
+         *     e.g. /path?a=b#hash) to go to.
+         */
+        testability.setLocation = function(url) {
+          if (url !== $location.url()) {
+            $location.url(url);
+            $rootScope.$digest();
+          }
+        };
+
+        /**
+         * @name $$testability#whenStable
+         *
+         * @description
+         * Calls the callback when $timeout and $http requests are completed.
+         *
+         * @param {function} callback
+         */
+        testability.whenStable = function(callback) {
+          $browser.notifyWhenNoOutstandingRequests(callback);
+        };
+
+        return testability;
+      }];
+  }
+
+  /** @this */
   function $TimeoutProvider() {
-    this.$get = ['$rootScope', '$browser', '$q', '$exceptionHandler',
-      function($rootScope,   $browser,   $q,   $exceptionHandler) {
+    this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
+      function($rootScope,   $browser,   $q,   $$q,   $exceptionHandler) {
+
         var deferreds = {};
 
 
         /**
-         * @ngdoc function
-         * @name ng.$timeout
-         * @requires $browser
+         * @ngdoc service
+         * @name $timeout
          *
          * @description
          * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
          * block and delegates any exceptions to
          * {@link ng.$exceptionHandler $exceptionHandler} service.
          *
-         * The return value of registering a timeout function is a promise, which will be resolved when
-         * the timeout is reached and the timeout function is executed.
+         * The return value of calling `$timeout` is a promise, which will be resolved when
+         * the delay has passed and the timeout function, if provided, is executed.
          *
          * To cancel a timeout request, call `$timeout.cancel(promise)`.
          *
          * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
          * synchronously flush the queue of deferred functions.
          *
-         * @param {function()} fn A function, whose execution should be delayed.
+         * If you only want a promise that will be resolved after some specified delay
+         * then you can call `$timeout` without the `fn` function.
+         *
+         * @param {function()=} fn A function, whose execution should be delayed.
          * @param {number=} [delay=0] Delay in milliseconds.
          * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
-         *   will invoke `fn` within the {@link ng.$rootScope.Scope#methods_$apply $apply} block.
-         * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this
-         *   promise will be resolved with is the return value of the `fn` function.
+         *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+         * @param {...*=} Pass additional parameters to the executed function.
+         * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise
+         *   will be resolved with the return value of the `fn` function.
          *
          */
         function timeout(fn, delay, invokeApply) {
-          var deferred = $q.defer(),
-              promise = deferred.promise,
-              skipApply = (isDefined(invokeApply) && !invokeApply),
-              timeoutId;
+          if (!isFunction(fn)) {
+            invokeApply = delay;
+            delay = fn;
+            fn = noop;
+          }
+
+          var args = sliceArgs(arguments, 3),
+            skipApply = (isDefined(invokeApply) && !invokeApply),
+            deferred = (skipApply ? $$q : $q).defer(),
+            promise = deferred.promise,
+            timeoutId;
 
           timeoutId = $browser.defer(function() {
             try {
-              deferred.resolve(fn());
-            } catch(e) {
+              deferred.resolve(fn.apply(null, args));
+            } catch (e) {
               deferred.reject(e);
               $exceptionHandler(e);
-            }
-            finally {
+            } finally {
               delete deferreds[promise.$$timeoutId];
             }
 
@@ -13596,9 +20456,8 @@
 
 
         /**
-         * @ngdoc function
-         * @name ng.$timeout#cancel
-         * @methodOf ng.$timeout
+         * @ngdoc method
+         * @name $timeout#cancel
          *
          * @description
          * Cancels a task associated with the `promise`. As a result of this, the promise will be
@@ -13610,6 +20469,8 @@
          */
         timeout.cancel = function(promise) {
           if (promise && promise.$$timeoutId in deferreds) {
+            // Timeout cancels should not report an unhandled promise.
+            markQExceptionHandled(deferreds[promise.$$timeoutId].promise);
             deferreds[promise.$$timeoutId].reject('canceled');
             delete deferreds[promise.$$timeoutId];
             return $browser.defer.cancel(promise.$$timeoutId);
@@ -13628,8 +20489,8 @@
 // doesn't know about mocked locations and resolves URLs to the real document - which is
 // exactly the behavior needed here.  There is little value is mocking these out for this
 // service.
-  var urlParsingNode = document.createElement("a");
-  var originUrl = urlResolve(window.location.href, true);
+  var urlParsingNode = window.document.createElement('a');
+  var originUrl = urlResolve(window.location.href);
 
 
   /**
@@ -13641,33 +20502,26 @@
    * URL will be resolved into an absolute URL in the context of the application document.
    * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
    * properties are all populated to reflect the normalized URL.  This approach has wide
-   * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc.  See
-   * http://www.aptana.com/reference/html/../api/HTMLAnchorElement.html
+   * compatibility - Safari 1+, Mozilla 1+ etc.  See
+   * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
    *
    * Implementation Notes for IE
    * ---------------------------
-   * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other
+   * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other
    * browsers.  However, the parsed components will not be set if the URL assigned did not specify
    * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
    * work around that by performing the parsing in a 2nd step by taking a previously normalized
    * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
    * properties such as protocol, hostname, port, etc.
    *
-   * IE7 does not normalize the URL when assigned to an anchor node.  (Apparently, it does, if one
-   * uses the inner HTML approach to assign the URL as part of an HTML snippet -
-   * http://stackoverflow.com/a/472729)  However, setting img[src] does normalize the URL.
-   * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception.
-   * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that
-   * method and IE < 8 is unsupported.
-   *
    * References:
    *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
-   *   http://www.aptana.com/reference/html/../api/HTMLAnchorElement.html
+   *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
    *   http://url.spec.whatwg.org/#urlutils
    *   https://github.com/angular/angular.js/pull/2902
    *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
    *
-   * @function
+   * @kind function
    * @param {string} url The URL to be parsed.
    * @description Normalizes and parses a URL.
    * @returns {object} Returns the normalized URL as a dictionary.
@@ -13684,13 +20538,14 @@
    *   | pathname      | The pathname, beginning with "/"
    *
    */
-  function urlResolve(url, base) {
+  function urlResolve(url) {
     var href = url;
 
+    // Support: IE 9-11 only
     if (msie) {
       // Normalize before parse.  Refer Implementation Notes on why this is
       // done in two steps on IE.
-      urlParsingNode.setAttribute("href", href);
+      urlParsingNode.setAttribute('href', href);
       href = urlParsingNode.href;
     }
 
@@ -13706,8 +20561,8 @@
       hostname: urlParsingNode.hostname,
       port: urlParsingNode.port,
       pathname: (urlParsingNode.pathname.charAt(0) === '/')
-          ? urlParsingNode.pathname
-          : '/' + urlParsingNode.pathname
+        ? urlParsingNode.pathname
+        : '/' + urlParsingNode.pathname
     };
   }
 
@@ -13721,12 +20576,13 @@
   function urlIsSameOrigin(requestUrl) {
     var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
     return (parsed.protocol === originUrl.protocol &&
-        parsed.host === originUrl.host);
+      parsed.host === originUrl.host);
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$window
+   * @ngdoc service
+   * @name $window
+   * @this
    *
    * @description
    * A reference to the browser's `window` object. While `window`
@@ -13740,44 +20596,127 @@
    * expression.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="windowExample" name="window-service">
+   <file name="index.html">
    <script>
-   function Ctrl($scope, $window) {
-           $scope.greeting = 'Hello, World!';
-           $scope.doGreeting = function(greeting) {
+   angular.module('windowExample', [])
+   .controller('ExampleController', ['$scope', '$window', function($scope, $window) {
+             $scope.greeting = 'Hello, World!';
+             $scope.doGreeting = function(greeting) {
                $window.alert(greeting);
-           };
-         }
+             };
+           }]);
    </script>
-   <div ng-controller="Ctrl">
-   <input type="text" ng-model="greeting" />
+   <div ng-controller="ExampleController">
+   <input type="text" ng-model="greeting" aria-label="greeting" />
    <button ng-click="doGreeting(greeting)">ALERT</button>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should display the greeting in the input box', function() {
-       input('greeting').enter('Hello, E2E Tests');
+       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
        // If we click the button it will block the test runner
        // element(':button').click();
       });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
-  function $WindowProvider(){
+  function $WindowProvider() {
     this.$get = valueFn(window);
   }
 
   /**
-   * @ngdoc object
-   * @name ng.$filterProvider
+   * @name $$cookieReader
+   * @requires $document
+   *
+   * @description
+   * This is a private service for reading cookies used by $http and ngCookies
+   *
+   * @return {Object} a key/value map of the current cookies
+   */
+  function $$CookieReader($document) {
+    var rawDocument = $document[0] || {};
+    var lastCookies = {};
+    var lastCookieString = '';
+
+    function safeGetCookie(rawDocument) {
+      try {
+        return rawDocument.cookie || '';
+      } catch (e) {
+        return '';
+      }
+    }
+
+    function safeDecodeURIComponent(str) {
+      try {
+        return decodeURIComponent(str);
+      } catch (e) {
+        return str;
+      }
+    }
+
+    return function() {
+      var cookieArray, cookie, i, index, name;
+      var currentCookieString = safeGetCookie(rawDocument);
+
+      if (currentCookieString !== lastCookieString) {
+        lastCookieString = currentCookieString;
+        cookieArray = lastCookieString.split('; ');
+        lastCookies = {};
+
+        for (i = 0; i < cookieArray.length; i++) {
+          cookie = cookieArray[i];
+          index = cookie.indexOf('=');
+          if (index > 0) { //ignore nameless cookies
+            name = safeDecodeURIComponent(cookie.substring(0, index));
+            // the first value that is seen for a cookie is the most
+            // specific one.  values for the same cookie name that
+            // follow are for less specific paths.
+            if (isUndefined(lastCookies[name])) {
+              lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
+            }
+          }
+        }
+      }
+      return lastCookies;
+    };
+  }
+
+  $$CookieReader.$inject = ['$document'];
+
+  /** @this */
+  function $$CookieReaderProvider() {
+    this.$get = $$CookieReader;
+  }
+
+  /* global currencyFilter: true,
+ dateFilter: true,
+ filterFilter: true,
+ jsonFilter: true,
+ limitToFilter: true,
+ lowercaseFilter: true,
+ numberFilter: true,
+ orderByFilter: true,
+ uppercaseFilter: true,
+ */
+
+  /**
+   * @ngdoc provider
+   * @name $filterProvider
    * @description
    *
    * Filters are just functions which transform input to an output. However filters need to be
    * Dependency Injected. To achieve this a filter definition consists of a factory function which is
    * annotated with dependencies and is responsible for creating a filter function.
    *
-   * <pre>
+   * <div class="alert alert-warning">
+   * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+   * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+   * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+   * (`myapp_subsection_filterx`).
+   * </div>
+   *
+   * ```js
    *   // Filter registration
    *   function MyModule($provide, $filterProvider) {
  *     // create a service to demonstrate injection (not always needed)
@@ -13796,12 +20735,12 @@
  *       };
  *     });
  *   }
-   * </pre>
+   * ```
    *
    * The filter function is registered with the `$injector` under the filter name suffix with
    * `Filter`.
    *
-   * <pre>
+   * ```js
    *   it('should be the same instance', inject(
    *     function($filterProvider) {
  *       $filterProvider.register('reverse', function(){
@@ -13811,53 +20750,73 @@
    *     function($filter, reverseFilter) {
  *       expect($filter('reverse')).toBe(reverseFilter);
  *     });
-   * </pre>
+   * ```
    *
    *
    * For more information about how angular filters work, and how to create your own filters, see
    * {@link guide/filter Filters} in the Angular Developer Guide.
    */
-  /**
-   * @ngdoc method
-   * @name ng.$filterProvider#register
-   * @methodOf ng.$filterProvider
-   * @description
-   * Register filter factory function.
-   *
-   * @param {String} name Name of the filter.
-   * @param {function} fn The filter factory function which is injectable.
-   */
-
 
   /**
-   * @ngdoc function
-   * @name ng.$filter
-   * @function
+   * @ngdoc service
+   * @name $filter
+   * @kind function
    * @description
    * Filters are used for formatting data displayed to the user.
    *
+   * They can be used in view templates, controllers or services.Angular comes
+   * with a collection of [built-in filters](api/ng/filter), but it is easy to
+   * define your own as well.
+   *
    * The general syntax in templates is as follows:
    *
-   *         {{ expression [| filter_name[:parameter_value] ... ] }}
+   * ```html
+   * {{ expression [| filter_name[:parameter_value] ... ] }}
+   * ```
    *
    * @param {String} name Name of the filter function to retrieve
    * @return {Function} the filter function
+   * @example
+   <example name="$filter" module="filterExample">
+   <file name="index.html">
+   <div ng-controller="MainCtrl">
+   <h3>{{ originalText }}</h3>
+   <h3>{{ filteredText }}</h3>
+   </div>
+   </file>
+
+   <file name="script.js">
+   angular.module('filterExample', [])
+   .controller('MainCtrl', function($scope, $filter) {
+        $scope.originalText = 'hello';
+        $scope.filteredText = $filter('uppercase')($scope.originalText);
+      });
+   </file>
+   </example>
    */
   $FilterProvider.$inject = ['$provide'];
+  /** @this */
   function $FilterProvider($provide) {
     var suffix = 'Filter';
 
     /**
-     * @ngdoc function
-     * @name ng.$controllerProvider#register
-     * @methodOf ng.$controllerProvider
+     * @ngdoc method
+     * @name $filterProvider#register
      * @param {string|Object} name Name of the filter function, or an object map of filters where
      *    the keys are the filter names and the values are the filter factories.
+     *
+     *    <div class="alert alert-warning">
+     *    **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+     *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+     *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+     *    (`myapp_subsection_filterx`).
+     *    </div>
+     * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered.
      * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
      *    of the registered filter instances.
      */
     function register(name, factory) {
-      if(isObject(name)) {
+      if (isObject(name)) {
         var filters = {};
         forEach(name, function(filter, key) {
           filters[key] = register(key, filter);
@@ -13878,16 +20837,16 @@
     ////////////////////////////////////////
 
     /* global
-     currencyFilter: false,
-     dateFilter: false,
-     filterFilter: false,
-     jsonFilter: false,
-     limitToFilter: false,
-     lowercaseFilter: false,
-     numberFilter: false,
-     orderByFilter: false,
-     uppercaseFilter: false,
-     */
+    currencyFilter: false,
+    dateFilter: false,
+    filterFilter: false,
+    jsonFilter: false,
+    limitToFilter: false,
+    lowercaseFilter: false,
+    numberFilter: false,
+    orderByFilter: false,
+    uppercaseFilter: false
+  */
 
     register('currency', currencyFilter);
     register('date', dateFilter);
@@ -13902,52 +20861,75 @@
 
   /**
    * @ngdoc filter
-   * @name ng.filter:filter
-   * @function
+   * @name filter
+   * @kind function
    *
    * @description
    * Selects a subset of items from `array` and returns it as a new array.
    *
    * @param {Array} array The source array.
+   * <div class="alert alert-info">
+   *   **Note**: If the array contains objects that reference themselves, filtering is not possible.
+   * </div>
    * @param {string|Object|function()} expression The predicate to be used for selecting items from
    *   `array`.
    *
    *   Can be one of:
    *
-   *   - `string`: The string is evaluated as an expression and the resulting value is used for substring match against
-   *     the contents of the `array`. All strings or objects with string properties in `array` that contain this string
-   *     will be returned. The predicate can be negated by prefixing the string with `!`.
+   *   - `string`: The string is used for matching against the contents of the `array`. All strings or
+   *     objects with string properties in `array` that match this string will be returned. This also
+   *     applies to nested object properties.
+   *     The predicate can be negated by prefixing the string with `!`.
    *
    *   - `Object`: A pattern object can be used to filter specific properties on objects contained
    *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
    *     which have property `name` containing "M" and property `phone` containing "1". A special
-   *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
-   *     property of the object. That's equivalent to the simple substring match with a `string`
-   *     as described above.
+   *     property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
+   *     against any property of the object or its nested object properties. That's equivalent to the
+   *     simple substring match with a `string` as described above. The special property name can be
+   *     overwritten, using the `anyPropertyKey` parameter.
+   *     The predicate can be negated by prefixing the string with `!`.
+   *     For example `{name: "!M"}` predicate will return an array of items which have property `name`
+   *     not containing "M".
    *
-   *   - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
-   *     called for each element of `array`. The final result is an array of those elements that
-   *     the predicate returned true for.
+   *     Note that a named property will match properties on the same level only, while the special
+   *     `$` property will match properties on the same level or deeper. E.g. an array item like
+   *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
+   *     **will** be matched by `{$: 'John'}`.
    *
-   * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
-   *     determining if the expected value (from the filter expression) and actual value (from
-   *     the object in the array) should be considered a match.
+   *   - `function(value, index, array)`: A predicate function can be used to write arbitrary filters.
+   *     The function is called for each element of the array, with the element, its index, and
+   *     the entire array itself as arguments.
+   *
+   *     The final result is an array of those elements that the predicate returned true for.
+   *
+   * @param {function(actual, expected)|true|false} [comparator] Comparator which is used in
+   *     determining if values retrieved using `expression` (when it is not a function) should be
+   *     considered a match based on the expected value (from the filter expression) and actual
+   *     value (from the object in the array).
    *
    *   Can be one of:
    *
-   *     - `function(actual, expected)`:
-   *       The function will be given the object value and the predicate value to compare and
-   *       should return true if the item should be included in filtered result.
+   *   - `function(actual, expected)`:
+   *     The function will be given the object value and the predicate value to compare and
+   *     should return true if both values should be considered equal.
    *
-   *     - `true`: A shorthand for `function(actual, expected) { return angular.equals(expected, actual)}`.
-   *       this is essentially strict comparison of expected and actual.
+   *   - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`.
+   *     This is essentially strict comparison of expected and actual.
    *
-   *     - `false|undefined`: A short hand for a function which will look for a substring match in case
-   *       insensitive way.
+   *   - `false`: A short hand for a function which will look for a substring match in a case
+   *     insensitive way. Primitive values are converted to strings. Objects are not compared against
+   *     primitives, unless they have a custom `toString` method (e.g. `Date` objects).
+   *
+   *
+   *   Defaults to `false`.
+   *
+   * @param {string} [anyPropertyKey] The special property name that matches against any property.
+   *     By default `$`.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="filter-filter">
+   <file name="index.html">
    <div ng-init="friends = [{name:'John', phone:'555-1276'},
    {name:'Mary', phone:'800-BIG-MARY'},
    {name:'Mike', phone:'555-4321'},
@@ -13955,7 +20937,7 @@
    {name:'Julie', phone:'555-8765'},
    {name:'Juliette', phone:'555-5678'}]"></div>
 
-   Search: <input ng-model="searchText">
+   <label>Search: <input ng-model="searchText"></label>
    <table id="searchTextResults">
    <tr><th>Name</th><th>Phone</th></tr>
    <tr ng-repeat="friend in friends | filter:searchText">
@@ -13964,144 +20946,194 @@
    </tr>
    </table>
    <hr>
-   Any: <input ng-model="search.$"> <br>
-   Name only <input ng-model="search.name"><br>
-   Phone only <input ng-model="search.phone"><br>
-   Equality <input type="checkbox" ng-model="strict"><br>
+   <label>Any: <input ng-model="search.$"></label> <br>
+   <label>Name only <input ng-model="search.name"></label><br>
+   <label>Phone only <input ng-model="search.phone"></label><br>
+   <label>Equality <input type="checkbox" ng-model="strict"></label><br>
    <table id="searchObjResults">
    <tr><th>Name</th><th>Phone</th></tr>
-   <tr ng-repeat="friend in friends | filter:search:strict">
-   <td>{{friend.name}}</td>
-   <td>{{friend.phone}}</td>
+   <tr ng-repeat="friendObj in friends | filter:search:strict">
+   <td>{{friendObj.name}}</td>
+   <td>{{friendObj.phone}}</td>
    </tr>
    </table>
-   </doc:source>
-   <doc:scenario>
-   it('should search across all fields when filtering with a string', function() {
-         input('searchText').enter('m');
-         expect(repeater('#searchTextResults tr', 'friend in friends').column('friend.name')).
-           toEqual(['Mary', 'Mike', 'Adam']);
+   </file>
+   <file name="protractor.js" type="protractor">
+   var expectFriendNames = function(expectedNames, key) {
+         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
+           arr.forEach(function(wd, i) {
+             expect(wd.getText()).toMatch(expectedNames[i]);
+           });
+         });
+       };
 
-         input('searchText').enter('76');
-         expect(repeater('#searchTextResults tr', 'friend in friends').column('friend.name')).
-           toEqual(['John', 'Julie']);
+   it('should search across all fields when filtering with a string', function() {
+         var searchText = element(by.model('searchText'));
+         searchText.clear();
+         searchText.sendKeys('m');
+         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+
+         searchText.clear();
+         searchText.sendKeys('76');
+         expectFriendNames(['John', 'Julie'], 'friend');
        });
 
    it('should search in specific fields when filtering with a predicate object', function() {
-         input('search.$').enter('i');
-         expect(repeater('#searchObjResults tr', 'friend in friends').column('friend.name')).
-           toEqual(['Mary', 'Mike', 'Julie', 'Juliette']);
+         var searchAny = element(by.model('search.$'));
+         searchAny.clear();
+         searchAny.sendKeys('i');
+         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
        });
    it('should use a equal comparison when comparator is true', function() {
-         input('search.name').enter('Julie');
-         input('strict').check();
-         expect(repeater('#searchObjResults tr', 'friend in friends').column('friend.name')).
-           toEqual(['Julie']);
+         var searchName = element(by.model('search.name'));
+         var strict = element(by.model('strict'));
+         searchName.clear();
+         searchName.sendKeys('Julie');
+         strict.click();
+         expectFriendNames(['Julie'], 'friendObj');
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
+
   function filterFilter() {
-    return function(array, expression, comparator) {
-      if (!isArray(array)) return array;
-
-      var comparatorType = typeof(comparator),
-          predicates = [];
-
-      predicates.check = function(value) {
-        for (var j = 0; j < predicates.length; j++) {
-          if(!predicates[j](value)) {
-            return false;
-          }
-        }
-        return true;
-      };
-
-      if (comparatorType !== 'function') {
-        if (comparatorType === 'boolean' && comparator) {
-          comparator = function(obj, text) {
-            return angular.equals(obj, text);
-          };
+    return function(array, expression, comparator, anyPropertyKey) {
+      if (!isArrayLike(array)) {
+        if (array == null) {
+          return array;
         } else {
-          comparator = function(obj, text) {
-            text = (''+text).toLowerCase();
-            return (''+obj).toLowerCase().indexOf(text) > -1;
-          };
+          throw minErr('filter')('notarray', 'Expected array but received: {0}', array);
         }
       }
 
-      var search = function(obj, text){
-        if (typeof text == 'string' && text.charAt(0) === '!') {
-          return !search(obj, text.substr(1));
-        }
-        switch (typeof obj) {
-          case "boolean":
-          case "number":
-          case "string":
-            return comparator(obj, text);
-          case "object":
-            switch (typeof text) {
-              case "object":
-                return comparator(obj, text);
-              default:
-                for ( var objKey in obj) {
-                  if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
-                    return true;
-                  }
-                }
-                break;
-            }
-            return false;
-          case "array":
-            for ( var i = 0; i < obj.length; i++) {
-              if (search(obj[i], text)) {
-                return true;
-              }
-            }
-            return false;
-          default:
-            return false;
-        }
-      };
-      switch (typeof expression) {
-        case "boolean":
-        case "number":
-        case "string":
-          // Set up expression object and fall through
-          expression = {$:expression};
-        // jshint -W086
-        case "object":
-          // jshint +W086
-          for (var key in expression) {
-            (function(path) {
-              if (typeof expression[path] == 'undefined') return;
-              predicates.push(function(value) {
-                return search(path == '$' ? value : getter(value, path), expression[path]);
-              });
-            })(key);
-          }
-          break;
+      anyPropertyKey = anyPropertyKey || '$';
+      var expressionType = getTypeForFilter(expression);
+      var predicateFn;
+      var matchAgainstAnyProp;
+
+      switch (expressionType) {
         case 'function':
-          predicates.push(expression);
+          predicateFn = expression;
+          break;
+        case 'boolean':
+        case 'null':
+        case 'number':
+        case 'string':
+          matchAgainstAnyProp = true;
+        // falls through
+        case 'object':
+          predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
           break;
         default:
           return array;
       }
-      var filtered = [];
-      for ( var j = 0; j < array.length; j++) {
-        var value = array[j];
-        if (predicates.check(value)) {
-          filtered.push(value);
-        }
-      }
-      return filtered;
+
+      return Array.prototype.filter.call(array, predicateFn);
     };
   }
 
+// Helper functions for `filterFilter`
+  function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
+    var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+    var predicateFn;
+
+    if (comparator === true) {
+      comparator = equals;
+    } else if (!isFunction(comparator)) {
+      comparator = function(actual, expected) {
+        if (isUndefined(actual)) {
+          // No substring matching against `undefined`
+          return false;
+        }
+        if ((actual === null) || (expected === null)) {
+          // No substring matching against `null`; only match against `null`
+          return actual === expected;
+        }
+        if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
+          // Should not compare primitives against objects, unless they have custom `toString` method
+          return false;
+        }
+
+        actual = lowercase('' + actual);
+        expected = lowercase('' + expected);
+        return actual.indexOf(expected) !== -1;
+      };
+    }
+
+    predicateFn = function(item) {
+      if (shouldMatchPrimitives && !isObject(item)) {
+        return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+      }
+      return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+    };
+
+    return predicateFn;
+  }
+
+  function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+    var actualType = getTypeForFilter(actual);
+    var expectedType = getTypeForFilter(expected);
+
+    if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
+      return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+    } else if (isArray(actual)) {
+      // In case `actual` is an array, consider it a match
+      // if ANY of it's items matches `expected`
+      return actual.some(function(item) {
+        return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+      });
+    }
+
+    switch (actualType) {
+      case 'object':
+        var key;
+        if (matchAgainstAnyProp) {
+          for (key in actual) {
+            // Under certain, rare, circumstances, key may not be a string and `charAt` will be undefined
+            // See: https://github.com/angular/angular.js/issues/15644
+            if (key.charAt && (key.charAt(0) !== '$') &&
+              deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+              return true;
+            }
+          }
+          return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+        } else if (expectedType === 'object') {
+          for (key in expected) {
+            var expectedVal = expected[key];
+            if (isFunction(expectedVal) || isUndefined(expectedVal)) {
+              continue;
+            }
+
+            var matchAnyProperty = key === anyPropertyKey;
+            var actualVal = matchAnyProperty ? actual : actual[key];
+            if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+              return false;
+            }
+          }
+          return true;
+        } else {
+          return comparator(actual, expected);
+        }
+      case 'function':
+        return false;
+      default:
+        return comparator(actual, expected);
+    }
+  }
+
+// Used for easily differentiating between `null` and actual `object`
+  function getTypeForFilter(val) {
+    return (val === null) ? 'null' : typeof val;
+  }
+
+  var MAX_DIGITS = 22;
+  var DECIMAL_SEP = '.';
+  var ZERO_CHAR = '0';
+
   /**
    * @ngdoc filter
-   * @name ng.filter:currency
-   * @function
+   * @name currency
+   * @kind function
    *
    * @description
    * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
@@ -14109,235 +21141,441 @@
    *
    * @param {number} amount Input to filter.
    * @param {string=} symbol Currency symbol or identifier to be displayed.
+   * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
    * @returns {string} Formatted number.
    *
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="currencyExample" name="currency-filter">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.amount = 1234.56;
-         }
+   angular.module('currencyExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+             $scope.amount = 1234.56;
+           }]);
    </script>
-   <div ng-controller="Ctrl">
-   <input type="number" ng-model="amount"> <br>
-   default currency symbol ($): {{amount | currency}}<br>
-   custom currency identifier (USD$): {{amount | currency:"USD$"}}
+   <div ng-controller="ExampleController">
+   <input type="number" ng-model="amount" aria-label="amount"> <br>
+   default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
+   custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span><br>
+   no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should init with 1234.56', function() {
-         expect(binding('amount | currency')).toBe('$1,234.56');
-         expect(binding('amount | currency:"USD$"')).toBe('USD$1,234.56');
+         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
+         expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235');
        });
    it('should update', function() {
-         input('amount').enter('-1234');
-         expect(binding('amount | currency')).toBe('($1,234.00)');
-         expect(binding('amount | currency:"USD$"')).toBe('(USD$1,234.00)');
+         if (browser.params.browser === 'safari') {
+           // Safari does not understand the minus key. See
+           // https://github.com/angular/protractor/issues/481
+           return;
+         }
+         element(by.model('amount')).clear();
+         element(by.model('amount')).sendKeys('-1234');
+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
   currencyFilter.$inject = ['$locale'];
   function currencyFilter($locale) {
     var formats = $locale.NUMBER_FORMATS;
-    return function(amount, currencySymbol){
-      if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM;
-      return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2).
-          replace(/\u00A4/g, currencySymbol);
+    return function(amount, currencySymbol, fractionSize) {
+      if (isUndefined(currencySymbol)) {
+        currencySymbol = formats.CURRENCY_SYM;
+      }
+
+      if (isUndefined(fractionSize)) {
+        fractionSize = formats.PATTERNS[1].maxFrac;
+      }
+
+      // if null or undefined pass it through
+      return (amount == null)
+        ? amount
+        : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).
+        replace(/\u00A4/g, currencySymbol);
     };
   }
 
   /**
    * @ngdoc filter
-   * @name ng.filter:number
-   * @function
+   * @name number
+   * @kind function
    *
    * @description
    * Formats a number as text.
    *
+   * If the input is null or undefined, it will just be returned.
+   * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively.
    * If the input is not a number an empty string is returned.
    *
+   *
    * @param {number|string} number Number to format.
    * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
    * If this is not provided then the fraction size is computed from the current locale's number
    * formatting pattern. In the case of the default locale, it will be 3.
-   * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit.
+   * @returns {string} Number rounded to `fractionSize` appropriately formatted based on the current
+   *                   locale (e.g., in the en_US locale it will have "." as the decimal separator and
+   *                   include "," group separators after each third digit).
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="numberFilterExample" name="number-filter">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.val = 1234.56789;
-         }
+   angular.module('numberFilterExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+             $scope.val = 1234.56789;
+           }]);
    </script>
-   <div ng-controller="Ctrl">
-   Enter number: <input ng-model='val'><br>
-   Default formatting: {{val | number}}<br>
-   No fractions: {{val | number:0}}<br>
-   Negative number: {{-val | number:4}}
+   <div ng-controller="ExampleController">
+   <label>Enter number: <input ng-model='val'></label><br>
+   Default formatting: <span id='number-default'>{{val | number}}</span><br>
+   No fractions: <span>{{val | number:0}}</span><br>
+   Negative number: <span>{{-val | number:4}}</span>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should format numbers', function() {
-         expect(binding('val | number')).toBe('1,234.568');
-         expect(binding('val | number:0')).toBe('1,235');
-         expect(binding('-val | number:4')).toBe('-1,234.5679');
+         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
+         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
        });
 
    it('should update', function() {
-         input('val').enter('3374.333');
-         expect(binding('val | number')).toBe('3,374.333');
-         expect(binding('val | number:0')).toBe('3,374');
-         expect(binding('-val | number:4')).toBe('-3,374.3330');
-       });
-   </doc:scenario>
-   </doc:example>
+         element(by.model('val')).clear();
+         element(by.model('val')).sendKeys('3374.333');
+         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
+         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+      });
+   </file>
+   </example>
    */
-
-
   numberFilter.$inject = ['$locale'];
   function numberFilter($locale) {
     var formats = $locale.NUMBER_FORMATS;
     return function(number, fractionSize) {
-      return formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
+
+      // if null or undefined pass it through
+      return (number == null)
+        ? number
+        : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
           fractionSize);
     };
   }
 
-  var DECIMAL_SEP = '.';
-  function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
-    if (isNaN(number) || !isFinite(number)) return '';
+  /**
+   * Parse a number (as a string) into three components that can be used
+   * for formatting the number.
+   *
+   * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/)
+   *
+   * @param  {string} numStr The number to parse
+   * @return {object} An object describing this number, containing the following keys:
+   *  - d : an array of digits containing leading zeros as necessary
+   *  - i : the number of the digits in `d` that are to the left of the decimal point
+   *  - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d`
+   *
+   */
+  function parse(numStr) {
+    var exponent = 0, digits, numberOfIntegerDigits;
+    var i, j, zeros;
 
-    var isNegative = number < 0;
-    number = Math.abs(number);
-    var numStr = number + '',
-        formatedText = '',
-        parts = [];
-
-    var hasExponent = false;
-    if (numStr.indexOf('e') !== -1) {
-      var match = numStr.match(/([\d\.]+)e(-?)(\d+)/);
-      if (match && match[2] == '-' && match[3] > fractionSize + 1) {
-        numStr = '0';
-      } else {
-        formatedText = numStr;
-        hasExponent = true;
-      }
+    // Decimal point?
+    if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) {
+      numStr = numStr.replace(DECIMAL_SEP, '');
     }
 
-    if (!hasExponent) {
-      var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length;
+    // Exponential form?
+    if ((i = numStr.search(/e/i)) > 0) {
+      // Work out the exponent.
+      if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i;
+      numberOfIntegerDigits += +numStr.slice(i + 1);
+      numStr = numStr.substring(0, i);
+    } else if (numberOfIntegerDigits < 0) {
+      // There was no decimal point or exponent so it is an integer.
+      numberOfIntegerDigits = numStr.length;
+    }
 
-      // determine fractionSize if it is not specified
-      if (isUndefined(fractionSize)) {
-        fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac);
-      }
+    // Count the number of leading zeros.
+    for (i = 0; numStr.charAt(i) === ZERO_CHAR; i++) { /* empty */ }
 
-      var pow = Math.pow(10, fractionSize);
-      number = Math.round(number * pow) / pow;
-      var fraction = ('' + number).split(DECIMAL_SEP);
-      var whole = fraction[0];
-      fraction = fraction[1] || '';
-
-      var i, pos = 0,
-          lgroup = pattern.lgSize,
-          group = pattern.gSize;
-
-      if (whole.length >= (lgroup + group)) {
-        pos = whole.length - lgroup;
-        for (i = 0; i < pos; i++) {
-          if ((pos - i)%group === 0 && i !== 0) {
-            formatedText += groupSep;
-          }
-          formatedText += whole.charAt(i);
-        }
-      }
-
-      for (i = pos; i < whole.length; i++) {
-        if ((whole.length - i)%lgroup === 0 && i !== 0) {
-          formatedText += groupSep;
-        }
-        formatedText += whole.charAt(i);
-      }
-
-      // format fraction part.
-      while(fraction.length < fractionSize) {
-        fraction += '0';
-      }
-
-      if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize);
+    if (i === (zeros = numStr.length)) {
+      // The digits are all zero.
+      digits = [0];
+      numberOfIntegerDigits = 1;
     } else {
+      // Count the number of trailing zeros
+      zeros--;
+      while (numStr.charAt(zeros) === ZERO_CHAR) zeros--;
 
-      if (fractionSize > 0 && number > -1 && number < 1) {
-        formatedText = number.toFixed(fractionSize);
+      // Trailing zeros are insignificant so ignore them
+      numberOfIntegerDigits -= i;
+      digits = [];
+      // Convert string to array of digits without leading/trailing zeros.
+      for (j = 0; i <= zeros; i++, j++) {
+        digits[j] = +numStr.charAt(i);
       }
     }
 
-    parts.push(isNegative ? pattern.negPre : pattern.posPre);
-    parts.push(formatedText);
-    parts.push(isNegative ? pattern.negSuf : pattern.posSuf);
-    return parts.join('');
+    // If the number overflows the maximum allowed digits then use an exponent.
+    if (numberOfIntegerDigits > MAX_DIGITS) {
+      digits = digits.splice(0, MAX_DIGITS - 1);
+      exponent = numberOfIntegerDigits - 1;
+      numberOfIntegerDigits = 1;
+    }
+
+    return { d: digits, e: exponent, i: numberOfIntegerDigits };
   }
 
-  function padNumber(num, digits, trim) {
+  /**
+   * Round the parsed number to the specified number of decimal places
+   * This function changed the parsedNumber in-place
+   */
+  function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) {
+    var digits = parsedNumber.d;
+    var fractionLen = digits.length - parsedNumber.i;
+
+    // determine fractionSize if it is not specified; `+fractionSize` converts it to a number
+    fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize;
+
+    // The index of the digit to where rounding is to occur
+    var roundAt = fractionSize + parsedNumber.i;
+    var digit = digits[roundAt];
+
+    if (roundAt > 0) {
+      // Drop fractional digits beyond `roundAt`
+      digits.splice(Math.max(parsedNumber.i, roundAt));
+
+      // Set non-fractional digits beyond `roundAt` to 0
+      for (var j = roundAt; j < digits.length; j++) {
+        digits[j] = 0;
+      }
+    } else {
+      // We rounded to zero so reset the parsedNumber
+      fractionLen = Math.max(0, fractionLen);
+      parsedNumber.i = 1;
+      digits.length = Math.max(1, roundAt = fractionSize + 1);
+      digits[0] = 0;
+      for (var i = 1; i < roundAt; i++) digits[i] = 0;
+    }
+
+    if (digit >= 5) {
+      if (roundAt - 1 < 0) {
+        for (var k = 0; k > roundAt; k--) {
+          digits.unshift(0);
+          parsedNumber.i++;
+        }
+        digits.unshift(1);
+        parsedNumber.i++;
+      } else {
+        digits[roundAt - 1]++;
+      }
+    }
+
+    // Pad out with zeros to get the required fraction length
+    for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0);
+
+
+    // Do any carrying, e.g. a digit was rounded up to 10
+    var carry = digits.reduceRight(function(carry, d, i, digits) {
+      d = d + carry;
+      digits[i] = d % 10;
+      return Math.floor(d / 10);
+    }, 0);
+    if (carry) {
+      digits.unshift(carry);
+      parsedNumber.i++;
+    }
+  }
+
+  /**
+   * Format a number into a string
+   * @param  {number} number       The number to format
+   * @param  {{
+ *           minFrac, // the minimum number of digits required in the fraction part of the number
+ *           maxFrac, // the maximum number of digits required in the fraction part of the number
+ *           gSize,   // number of digits in each group of separated digits
+ *           lgSize,  // number of digits in the last group of digits before the decimal separator
+ *           negPre,  // the string to go in front of a negative number (e.g. `-` or `(`))
+ *           posPre,  // the string to go in front of a positive number
+ *           negSuf,  // the string to go after a negative number (e.g. `)`)
+ *           posSuf   // the string to go after a positive number
+ *         }} pattern
+   * @param  {string} groupSep     The string to separate groups of number (e.g. `,`)
+   * @param  {string} decimalSep   The string to act as the decimal separator (e.g. `.`)
+   * @param  {[type]} fractionSize The size of the fractional part of the number
+   * @return {string}              The number formatted as a string
+   */
+  function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
+
+    if (!(isString(number) || isNumber(number)) || isNaN(number)) return '';
+
+    var isInfinity = !isFinite(number);
+    var isZero = false;
+    var numStr = Math.abs(number) + '',
+      formattedText = '',
+      parsedNumber;
+
+    if (isInfinity) {
+      formattedText = '\u221e';
+    } else {
+      parsedNumber = parse(numStr);
+
+      roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac);
+
+      var digits = parsedNumber.d;
+      var integerLen = parsedNumber.i;
+      var exponent = parsedNumber.e;
+      var decimals = [];
+      isZero = digits.reduce(function(isZero, d) { return isZero && !d; }, true);
+
+      // pad zeros for small numbers
+      while (integerLen < 0) {
+        digits.unshift(0);
+        integerLen++;
+      }
+
+      // extract decimals digits
+      if (integerLen > 0) {
+        decimals = digits.splice(integerLen, digits.length);
+      } else {
+        decimals = digits;
+        digits = [0];
+      }
+
+      // format the integer digits with grouping separators
+      var groups = [];
+      if (digits.length >= pattern.lgSize) {
+        groups.unshift(digits.splice(-pattern.lgSize, digits.length).join(''));
+      }
+      while (digits.length > pattern.gSize) {
+        groups.unshift(digits.splice(-pattern.gSize, digits.length).join(''));
+      }
+      if (digits.length) {
+        groups.unshift(digits.join(''));
+      }
+      formattedText = groups.join(groupSep);
+
+      // append the decimal digits
+      if (decimals.length) {
+        formattedText += decimalSep + decimals.join('');
+      }
+
+      if (exponent) {
+        formattedText += 'e+' + exponent;
+      }
+    }
+    if (number < 0 && !isZero) {
+      return pattern.negPre + formattedText + pattern.negSuf;
+    } else {
+      return pattern.posPre + formattedText + pattern.posSuf;
+    }
+  }
+
+  function padNumber(num, digits, trim, negWrap) {
     var neg = '';
-    if (num < 0) {
-      neg =  '-';
-      num = -num;
+    if (num < 0 || (negWrap && num <= 0)) {
+      if (negWrap) {
+        num = -num + 1;
+      } else {
+        num = -num;
+        neg = '-';
+      }
     }
     num = '' + num;
-    while(num.length < digits) num = '0' + num;
-    if (trim)
+    while (num.length < digits) num = ZERO_CHAR + num;
+    if (trim) {
       num = num.substr(num.length - digits);
+    }
     return neg + num;
   }
 
 
-  function dateGetter(name, size, offset, trim) {
+  function dateGetter(name, size, offset, trim, negWrap) {
     offset = offset || 0;
     return function(date) {
       var value = date['get' + name]();
-      if (offset > 0 || value > -offset)
+      if (offset > 0 || value > -offset) {
         value += offset;
-      if (value === 0 && offset == -12 ) value = 12;
-      return padNumber(value, size, trim);
+      }
+      if (value === 0 && offset === -12) value = 12;
+      return padNumber(value, size, trim, negWrap);
     };
   }
 
-  function dateStrGetter(name, shortForm) {
+  function dateStrGetter(name, shortForm, standAlone) {
     return function(date, formats) {
       var value = date['get' + name]();
-      var get = uppercase(shortForm ? ('SHORT' + name) : name);
+      var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : '');
+      var get = uppercase(propPrefix + name);
 
       return formats[get][value];
     };
   }
 
-  function timeZoneGetter(date) {
-    var zone = -1 * date.getTimezoneOffset();
-    var paddedZone = (zone >= 0) ? "+" : "";
+  function timeZoneGetter(date, formats, offset) {
+    var zone = -1 * offset;
+    var paddedZone = (zone >= 0) ? '+' : '';
 
     paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
-        padNumber(Math.abs(zone % 60), 2);
+      padNumber(Math.abs(zone % 60), 2);
 
     return paddedZone;
   }
 
+  function getFirstThursdayOfYear(year) {
+    // 0 = index of January
+    var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay();
+    // 4 = index of Thursday (+1 to account for 1st = 5)
+    // 11 = index of *next* Thursday (+1 account for 1st = 12)
+    return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst);
+  }
+
+  function getThursdayThisWeek(datetime) {
+    return new Date(datetime.getFullYear(), datetime.getMonth(),
+      // 4 = index of Thursday
+      datetime.getDate() + (4 - datetime.getDay()));
+  }
+
+  function weekGetter(size) {
+    return function(date) {
+      var firstThurs = getFirstThursdayOfYear(date.getFullYear()),
+        thisThurs = getThursdayThisWeek(date);
+
+      var diff = +thisThurs - +firstThurs,
+        result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week
+
+      return padNumber(result, size);
+    };
+  }
+
   function ampmGetter(date, formats) {
     return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
   }
 
+  function eraGetter(date, formats) {
+    return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+  }
+
+  function longEraGetter(date, formats) {
+    return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+  }
+
   var DATE_FORMATS = {
-    yyyy: dateGetter('FullYear', 4),
-    yy: dateGetter('FullYear', 2, 0, true),
-    y: dateGetter('FullYear', 1),
+    yyyy: dateGetter('FullYear', 4, 0, false, true),
+    yy: dateGetter('FullYear', 2, 0, true, true),
+    y: dateGetter('FullYear', 1, 0, false, true),
     MMMM: dateStrGetter('Month'),
     MMM: dateStrGetter('Month', true),
     MM: dateGetter('Month', 2, 1),
     M: dateGetter('Month', 1, 1),
+    LLLL: dateStrGetter('Month', false, true),
     dd: dateGetter('Date', 2),
     d: dateGetter('Date', 1),
     HH: dateGetter('Hours', 2),
@@ -14354,16 +21592,22 @@
     EEEE: dateStrGetter('Day'),
     EEE: dateStrGetter('Day', true),
     a: ampmGetter,
-    Z: timeZoneGetter
+    Z: timeZoneGetter,
+    ww: weekGetter(2),
+    w: weekGetter(1),
+    G: eraGetter,
+    GG: eraGetter,
+    GGG: eraGetter,
+    GGGG: longEraGetter
   };
 
-  var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,
-      NUMBER_STRING = /^\-?\d+$/;
+  var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,
+    NUMBER_STRING = /^-?\d+$/;
 
   /**
    * @ngdoc filter
-   * @name ng.filter:date
-   * @function
+   * @name date
+   * @kind function
    *
    * @description
    *   Formats `date` to a string based on the requested `format`.
@@ -14377,69 +21621,84 @@
    *   * `'MMM'`: Month in year (Jan-Dec)
    *   * `'MM'`: Month in year, padded (01-12)
    *   * `'M'`: Month in year (1-12)
+   *   * `'LLLL'`: Stand-alone month in year (January-December)
    *   * `'dd'`: Day in month, padded (01-31)
    *   * `'d'`: Day in month (1-31)
    *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
    *   * `'EEE'`: Day in Week, (Sun-Sat)
    *   * `'HH'`: Hour in day, padded (00-23)
    *   * `'H'`: Hour in day (0-23)
-   *   * `'hh'`: Hour in am/pm, padded (01-12)
-   *   * `'h'`: Hour in am/pm, (1-12)
+   *   * `'hh'`: Hour in AM/PM, padded (01-12)
+   *   * `'h'`: Hour in AM/PM, (1-12)
    *   * `'mm'`: Minute in hour, padded (00-59)
    *   * `'m'`: Minute in hour (0-59)
    *   * `'ss'`: Second in minute, padded (00-59)
    *   * `'s'`: Second in minute (0-59)
-   *   * `'.sss' or ',sss'`: Millisecond in second, padded (000-999)
-   *   * `'a'`: am/pm marker
+   *   * `'sss'`: Millisecond in second, padded (000-999)
+   *   * `'a'`: AM/PM marker
    *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
+   *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
+   *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+   *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+   *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
    *
    *   `format` string can also be one of the following predefined
    *   {@link guide/i18n localizable formats}:
    *
    *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
-   *     (e.g. Sep 3, 2010 12:05:08 pm)
-   *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 pm)
-   *   * `'fullDate'`: equivalent to `'EEEE, MMMM d,y'` for en_US  locale
+   *     (e.g. Sep 3, 2010 12:05:08 PM)
+   *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 PM)
+   *   * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US  locale
    *     (e.g. Friday, September 3, 2010)
    *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
    *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
    *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
-   *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm)
-   *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm)
+   *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM)
+   *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM)
    *
-   *   `format` string can contain literal values. These need to be quoted with single quotes (e.g.
-   *   `"h 'in the morning'"`). In order to output single quote, use two single quotes in a sequence
+   *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
+   *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
    *   (e.g. `"h 'o''clock'"`).
    *
+   *   Any other characters in the `format` string will be output as-is.
+   *
    * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
-   *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.SSSZ and its
+   *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
    *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
    *    specified in the string input, the time is considered to be in the local timezone.
    * @param {string=} format Formatting rules (see Description). If not specified,
    *    `mediumDate` is used.
+   * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
+   *    continental US time zone abbreviations, but for general use, use a time zone offset, for
+   *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+   *    If not specified, the timezone of the browser will be used.
    * @returns {string} Formatted string or the input if input is not recognized as date/millis.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="filter-date">
+   <file name="index.html">
    <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
-   {{1288323623006 | date:'medium'}}<br>
+   <span>{{1288323623006 | date:'medium'}}</span><br>
    <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
-   {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}<br>
+   <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
    <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
-   {{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}<br>
-   </doc:source>
-   <doc:scenario>
+   <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
+   <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
+   <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should format date', function() {
-         expect(binding("1288323623006 | date:'medium'")).
+         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
             toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
-         expect(binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).
-            toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
-         expect(binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).
-   toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
-   });
-   </doc:scenario>
-   </doc:example>
+         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
+            toMatch(/2010-10-2\d \d{2}:\d{2}:\d{2} (-|\+)?\d{4}/);
+         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
+            toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
+       });
+   </file>
+   </example>
    */
   dateFilter.$inject = ['$locale'];
   function dateFilter($locale) {
@@ -14449,22 +21708,22 @@
     // 1        2       3         4          5          6          7          8  9     10      11
     function jsonStringToDate(string) {
       var match;
-      if (match = string.match(R_ISO8601_STR)) {
+      if ((match = string.match(R_ISO8601_STR))) {
         var date = new Date(0),
-            tzHour = 0,
-            tzMin  = 0,
-            dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
-            timeSetter = match[8] ? date.setUTCHours : date.setHours;
+          tzHour = 0,
+          tzMin  = 0,
+          dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
+          timeSetter = match[8] ? date.setUTCHours : date.setHours;
 
         if (match[9]) {
-          tzHour = int(match[9] + match[10]);
-          tzMin = int(match[9] + match[11]);
+          tzHour = toInt(match[9] + match[10]);
+          tzMin = toInt(match[9] + match[11]);
         }
-        dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3]));
-        var h = int(match[4]||0) - tzHour;
-        var m = int(match[5]||0) - tzMin;
-        var s = int(match[6]||0);
-        var ms = Math.round(parseFloat('0.' + (match[7]||0)) * 1000);
+        dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
+        var h = toInt(match[4] || 0) - tzHour;
+        var m = toInt(match[5] || 0) - tzMin;
+        var s = toInt(match[6] || 0);
+        var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
         timeSetter.call(date, h, m, s, ms);
         return date;
       }
@@ -14472,30 +21731,26 @@
     }
 
 
-    return function(date, format) {
+    return function(date, format, timezone) {
       var text = '',
-          parts = [],
-          fn, match;
+        parts = [],
+        fn, match;
 
       format = format || 'mediumDate';
       format = $locale.DATETIME_FORMATS[format] || format;
       if (isString(date)) {
-        if (NUMBER_STRING.test(date)) {
-          date = int(date);
-        } else {
-          date = jsonStringToDate(date);
-        }
+        date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date);
       }
 
       if (isNumber(date)) {
         date = new Date(date);
       }
 
-      if (!isDate(date)) {
+      if (!isDate(date) || !isFinite(date.getTime())) {
         return date;
       }
 
-      while(format) {
+      while (format) {
         match = DATE_FORMATS_SPLIT.exec(format);
         if (match) {
           parts = concat(parts, match, 1);
@@ -14506,10 +21761,15 @@
         }
       }
 
-      forEach(parts, function(value){
+      var dateTimezoneOffset = date.getTimezoneOffset();
+      if (timezone) {
+        dateTimezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+        date = convertTimezoneToLocal(date, timezone, true);
+      }
+      forEach(parts, function(value) {
         fn = DATE_FORMATS[value];
-        text += fn ? fn(date, $locale.DATETIME_FORMATS)
-            : value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
+        text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
+          : value === '\'\'' ? '\'' : value.replace(/(^'|'$)/g, '').replace(/''/g, '\'');
       });
 
       return text;
@@ -14519,8 +21779,8 @@
 
   /**
    * @ngdoc filter
-   * @name ng.filter:json
-   * @function
+   * @name json
+   * @kind function
    *
    * @description
    *   Allows you to convert a JavaScript object into JSON string.
@@ -14529,35 +21789,44 @@
    *   the binding is automatically converted to JSON.
    *
    * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
+   * @param {number=} spacing The number of spaces to use per indentation, defaults to 2.
    * @returns {string} JSON string.
    *
    *
-   * @example:
-   <doc:example>
-   <doc:source>
-   <pre>{{ {'name':'value'} | json }}</pre>
-   </doc:source>
-   <doc:scenario>
+   * @example
+   <example name="filter-json">
+   <file name="index.html">
+   <pre id="default-spacing">{{ {'name':'value'} | json }}</pre>
+   <pre id="custom-spacing">{{ {'name':'value'} | json:4 }}</pre>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should jsonify filtered objects', function() {
-         expect(binding("{'name':'value'}")).toMatch(/\{\n  "name": ?"value"\n}/);
+         expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n {2}"name": ?"value"\n}/);
+         expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n {4}"name": ?"value"\n}/);
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    */
   function jsonFilter() {
-    return function(object) {
-      return toJson(object, true);
+    return function(object, spacing) {
+      if (isUndefined(spacing)) {
+        spacing = 2;
+      }
+      return toJson(object, spacing);
     };
   }
 
 
   /**
    * @ngdoc filter
-   * @name ng.filter:lowercase
-   * @function
+   * @name lowercase
+   * @kind function
    * @description
    * Converts string to lowercase.
+   *
+   * See the {@link ng.uppercase uppercase filter documentation} for a functionally identical example.
+   *
    * @see angular.lowercase
    */
   var lowercaseFilter = valueFn(lowercase);
@@ -14565,247 +21834,857 @@
 
   /**
    * @ngdoc filter
-   * @name ng.filter:uppercase
-   * @function
+   * @name uppercase
+   * @kind function
    * @description
    * Converts string to uppercase.
-   * @see angular.uppercase
+   * @example
+   <example module="uppercaseFilterExample" name="filter-uppercase">
+   <file name="index.html">
+   <script>
+   angular.module('uppercaseFilterExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+             $scope.title = 'This is a title';
+           }]);
+   </script>
+   <div ng-controller="ExampleController">
+   <!-- This title should be formatted normally -->
+   <h1>{{title}}</h1>
+   <!-- This title should be capitalized -->
+   <h1>{{title | uppercase}}</h1>
+   </div>
+   </file>
+   </example>
    */
   var uppercaseFilter = valueFn(uppercase);
 
   /**
-   * @ngdoc function
-   * @name ng.filter:limitTo
-   * @function
+   * @ngdoc filter
+   * @name limitTo
+   * @kind function
    *
    * @description
-   * Creates a new array or string containing only a specified number of elements. The elements
-   * are taken from either the beginning or the end of the source array or string, as specified by
-   * the value and sign (positive or negative) of `limit`.
+   * Creates a new array or string containing only a specified number of elements. The elements are
+   * taken from either the beginning or the end of the source array, string or number, as specified by
+   * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
+   * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
+   * it is converted to a string.
    *
-   * @param {Array|string} input Source array or string to be limited.
-   * @param {string|number} limit The length of the returned array or string. If the `limit` number
+   * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
+   * @param {string|number} limit - The length of the returned array or string. If the `limit` number
    *     is positive, `limit` number of items from the beginning of the source array/string are copied.
    *     If the number is negative, `limit` number  of items from the end of the source array/string
-   *     are copied. The `limit` will be trimmed if it exceeds `array.length`
-   * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
-   *     had less than `limit` elements.
+   *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
+   *     the input will be returned unchanged.
+   * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
+   *     `begin` indicates an offset from the end of `input`. Defaults to `0`.
+   * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
+   *     less than `limit` elements.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="limitToExample" name="limit-to-filter">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.numbers = [1,2,3,4,5,6,7,8,9];
-           $scope.letters = "abcdefghi";
-           $scope.numLimit = 3;
-           $scope.letterLimit = 3;
-         }
+   angular.module('limitToExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+             $scope.numbers = [1,2,3,4,5,6,7,8,9];
+             $scope.letters = "abcdefghi";
+             $scope.longNumber = 2345432342;
+             $scope.numLimit = 3;
+             $scope.letterLimit = 3;
+             $scope.longNumberLimit = 3;
+           }]);
    </script>
-   <div ng-controller="Ctrl">
-   Limit {{numbers}} to: <input type="integer" ng-model="numLimit">
+   <div ng-controller="ExampleController">
+   <label>
+   Limit {{numbers}} to:
+   <input type="number" step="1" ng-model="numLimit">
+   </label>
    <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
-   Limit {{letters}} to: <input type="integer" ng-model="letterLimit">
+   <label>
+   Limit {{letters}} to:
+   <input type="number" step="1" ng-model="letterLimit">
+   </label>
    <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
+   <label>
+   Limit {{longNumber}} to:
+   <input type="number" step="1" ng-model="longNumberLimit">
+   </label>
+   <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
+   var numLimitInput = element(by.model('numLimit'));
+   var letterLimitInput = element(by.model('letterLimit'));
+   var longNumberLimitInput = element(by.model('longNumberLimit'));
+   var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
+   var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+   var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit'));
+
    it('should limit the number array to first three items', function() {
-         expect(element('.doc-example-live input[ng-model=numLimit]').val()).toBe('3');
-         expect(element('.doc-example-live input[ng-model=letterLimit]').val()).toBe('3');
-         expect(binding('numbers | limitTo:numLimit')).toEqual('[1,2,3]');
-         expect(binding('letters | limitTo:letterLimit')).toEqual('abc');
+         expect(numLimitInput.getAttribute('value')).toBe('3');
+         expect(letterLimitInput.getAttribute('value')).toBe('3');
+         expect(longNumberLimitInput.getAttribute('value')).toBe('3');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abc');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 234');
        });
 
-   it('should update the output when -3 is entered', function() {
-         input('numLimit').enter(-3);
-         input('letterLimit').enter(-3);
-         expect(binding('numbers | limitTo:numLimit')).toEqual('[7,8,9]');
-         expect(binding('letters | limitTo:letterLimit')).toEqual('ghi');
-       });
+   // There is a bug in safari and protractor that doesn't like the minus key
+   // it('should update the output when -3 is entered', function() {
+       //   numLimitInput.clear();
+       //   numLimitInput.sendKeys('-3');
+       //   letterLimitInput.clear();
+       //   letterLimitInput.sendKeys('-3');
+       //   longNumberLimitInput.clear();
+       //   longNumberLimitInput.sendKeys('-3');
+       //   expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
+       //   expect(limitedLetters.getText()).toEqual('Output letters: ghi');
+       //   expect(limitedLongNumber.getText()).toEqual('Output long number: 342');
+       // });
 
    it('should not exceed the maximum size of input array', function() {
-         input('numLimit').enter(100);
-         input('letterLimit').enter(100);
-         expect(binding('numbers | limitTo:numLimit')).toEqual('[1,2,3,4,5,6,7,8,9]');
-         expect(binding('letters | limitTo:letterLimit')).toEqual('abcdefghi');
+         numLimitInput.clear();
+         numLimitInput.sendKeys('100');
+         letterLimitInput.clear();
+         letterLimitInput.sendKeys('100');
+         longNumberLimitInput.clear();
+         longNumberLimitInput.sendKeys('100');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342');
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
-  function limitToFilter(){
-    return function(input, limit) {
-      if (!isArray(input) && !isString(input)) return input;
+  function limitToFilter() {
+    return function(input, limit, begin) {
+      if (Math.abs(Number(limit)) === Infinity) {
+        limit = Number(limit);
+      } else {
+        limit = toInt(limit);
+      }
+      if (isNumberNaN(limit)) return input;
 
-      limit = int(limit);
+      if (isNumber(input)) input = input.toString();
+      if (!isArrayLike(input)) return input;
 
-      if (isString(input)) {
-        //NaN check on limit
-        if (limit) {
-          return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length);
+      begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
+      begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
+
+      if (limit >= 0) {
+        return sliceFn(input, begin, begin + limit);
+      } else {
+        if (begin === 0) {
+          return sliceFn(input, limit, input.length);
         } else {
-          return "";
+          return sliceFn(input, Math.max(0, begin + limit), begin);
         }
       }
-
-      var out = [],
-          i, n;
-
-      // if abs(limit) exceeds maximum length, trim it
-      if (limit > input.length)
-        limit = input.length;
-      else if (limit < -input.length)
-        limit = -input.length;
-
-      if (limit > 0) {
-        i = 0;
-        n = limit;
-      } else {
-        i = input.length + limit;
-        n = input.length;
-      }
-
-      for (; i<n; i++) {
-        out.push(input[i]);
-      }
-
-      return out;
     };
   }
 
+  function sliceFn(input, begin, end) {
+    if (isString(input)) return input.slice(begin, end);
+
+    return slice.call(input, begin, end);
+  }
+
   /**
-   * @ngdoc function
-   * @name ng.filter:orderBy
-   * @function
+   * @ngdoc filter
+   * @name orderBy
+   * @kind function
    *
    * @description
-   * Orders a specified `array` by the `expression` predicate.
+   * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
+   * function based on the values computed using the `expression` predicate.
    *
-   * @param {Array} array The array to sort.
-   * @param {function(*)|string|Array.<(function(*)|string)>} expression A predicate to be
-   *    used by the comparator to determine the order of elements.
+   * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
+   * `[{id: 'bar'}, {id: 'foo'}]`.
+   *
+   * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
+   * String, etc).
+   *
+   * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
+   * for the preceding one. The `expression` is evaluated against each item and the output is used
+   * for comparing with other items.
+   *
+   * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
+   * ascending order.
+   *
+   * The comparison is done using the `comparator` function. If none is specified, a default, built-in
+   * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
+   * strings alphabetically).
+   *
+   * ### Under the hood
+   *
+   * Ordering the specified `collection` happens in two phases:
+   *
+   * 1. All items are passed through the predicate (or predicates), and the returned values are saved
+   *    along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
+   *    through a predicate that extracts the value of the `label` property, would be transformed to:
+   *    ```
+   *    {
+ *      value: 'foo',
+ *      type: 'string',
+ *      index: ...
+ *    }
+   *    ```
+   * 2. The comparator function is used to sort the items, based on the derived values, types and
+   *    indices.
+   *
+   * If you use a custom comparator, it will be called with pairs of objects of the form
+   * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
+   * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
+   * second, or `1` otherwise.
+   *
+   * In order to ensure that the sorting will be deterministic across platforms, if none of the
+   * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
+   * dummy predicate that returns the item's index as `value`.
+   * (If you are using a custom comparator, make sure it can handle this predicate as well.)
+   *
+   * If a custom comparator still can't distinguish between two items, then they will be sorted based
+   * on their index using the built-in comparator.
+   *
+   * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
+   * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
+   * it to the comparator. The following rules govern the conversion:
+   *
+   * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
+   *    used instead.<br />
+   *    (If the object has a `valueOf()` method that returns another object, then the returned object
+   *    will be used in subsequent steps.)
+   * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
+   *    returns a primitive, its return value will be used instead.<br />
+   *    (If the object has a `toString()` method that returns another object, then the returned object
+   *    will be used in subsequent steps.)
+   * 3. No conversion; the object itself is used.
+   *
+   * ### The default comparator
+   *
+   * The default, built-in comparator should be sufficient for most usecases. In short, it compares
+   * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
+   * using their index in the original collection, and sorts values of different types by type.
+   *
+   * More specifically, it follows these steps to determine the relative order of items:
+   *
+   * 1. If the compared values are of different types, compare the types themselves alphabetically.
+   * 2. If both values are of type `string`, compare them alphabetically in a case- and
+   *    locale-insensitive way.
+   * 3. If both values are objects, compare their indices instead.
+   * 4. Otherwise, return:
+   *    -  `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
+   *    - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
+   *    -  `1`, otherwise.
+   *
+   * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
+   *           saved as numbers and not strings.
+   * **Note:** For the purpose of sorting, `null` values are treated as the string `'null'` (i.e.
+   *           `type: 'string'`, `value: 'null'`). This may cause unexpected sort order relative to
+   *           other values.
+   *
+   * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
+   * @param {(Function|string|Array.<Function|string>)=} expression - A predicate (or list of
+   *    predicates) to be used by the comparator to determine the order of elements.
    *
    *    Can be one of:
    *
-   *    - `function`: Getter function. The result of this function will be sorted using the
-   *      `<`, `=`, `>` operator.
-   *    - `string`: An Angular expression which evaluates to an object to order by, such as 'name'
-   *      to sort by a property called 'name'. Optionally prefixed with `+` or `-` to control
-   *      ascending or descending sort order (for example, +name or -name).
-   *    - `Array`: An array of function or string predicates. The first predicate in the array
-   *      is used for sorting, but when two items are equivalent, the next predicate is used.
+   *    - `Function`: A getter function. This function will be called with each item as argument and
+   *      the return value will be used for sorting.
+   *    - `string`: An Angular expression. This expression will be evaluated against each item and the
+   *      result will be used for sorting. For example, use `'label'` to sort by a property called
+   *      `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
+   *      property.<br />
+   *      (The result of a constant expression is interpreted as a property name to be used for
+   *      comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
+   *      property called `special name`.)<br />
+   *      An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
+   *      ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
+   *      (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
+   *    - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
+   *      relative order of two items, the next predicate is used as a tie-breaker.
+   *
+   * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+   *
+   * @param {boolean=} reverse - If `true`, reverse the sorting order.
+   * @param {(Function)=} comparator - The comparator function used to determine the relative order of
+   *    value pairs. If omitted, the built-in comparator will be used.
+   *
+   * @returns {Array} - The sorted array.
    *
-   * @param {boolean=} reverse Reverse the order the array.
-   * @returns {Array} Sorted copy of the source array.
    *
    * @example
-   <doc:example>
-   <doc:source>
-   <script>
-   function Ctrl($scope) {
-           $scope.friends =
-               [{name:'John', phone:'555-1212', age:10},
-                {name:'Mary', phone:'555-9876', age:19},
-                {name:'Mike', phone:'555-4321', age:21},
-                {name:'Adam', phone:'555-5678', age:35},
-                {name:'Julie', phone:'555-8765', age:29}]
-           $scope.predicate = '-age';
-         }
-   </script>
-   <div ng-controller="Ctrl">
-   <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
-   <hr/>
-   [ <a href="" ng-click="predicate=''">unsorted</a> ]
-   <table class="friend">
+   * ### Ordering a table with `ngRepeat`
+   *
+   * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
+   * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
+   * it defaults to the built-in comparator.
+   *
+   <example name="orderBy-static" module="orderByExample1">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <table class="friends">
    <tr>
-   <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
-   (<a href="" ng-click="predicate = '-name'; reverse=false">^</a>)</th>
-   <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
-   <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
+   <th>Name</th>
+   <th>Phone Number</th>
+   <th>Age</th>
    </tr>
-   <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
+   <tr ng-repeat="friend in friends | orderBy:'-age'">
    <td>{{friend.name}}</td>
    <td>{{friend.phone}}</td>
    <td>{{friend.age}}</td>
    </tr>
    </table>
    </div>
-   </doc:source>
-   <doc:scenario>
-   it('should be reverse ordered by aged', function() {
-         expect(binding('predicate')).toBe('-age');
-         expect(repeater('table.friend', 'friend in friends').column('friend.age')).
-           toEqual(['35', '29', '21', '19', '10']);
-         expect(repeater('table.friend', 'friend in friends').column('friend.name')).
-           toEqual(['Adam', 'Julie', 'Mike', 'Mary', 'John']);
+   </file>
+   <file name="script.js">
+   angular.module('orderByExample1', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+         }]);
+   </file>
+   <file name="style.css">
+   .friends {
+         border-collapse: collapse;
+       }
+
+   .friends th {
+         border-bottom: 1px solid;
+       }
+   .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+   .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+   </file>
+   <file name="protractor.js" type="protractor">
+   // Element locators
+   var names = element.all(by.repeater('friends').column('friend.name'));
+
+   it('should sort friends by age in reverse order', function() {
+         expect(names.get(0).getText()).toBe('Adam');
+         expect(names.get(1).getText()).toBe('Julie');
+         expect(names.get(2).getText()).toBe('Mike');
+         expect(names.get(3).getText()).toBe('Mary');
+         expect(names.get(4).getText()).toBe('John');
+       });
+   </file>
+   </example>
+   * <hr />
+   *
+   * @example
+   * ### Changing parameters dynamically
+   *
+   * All parameters can be changed dynamically. The next example shows how you can make the columns of
+   * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
+   *
+   <example name="orderBy-dynamic" module="orderByExample2">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
+   <hr/>
+   <button ng-click="propertyName = null; reverse = false">Set to unsorted</button>
+   <hr/>
+   <table class="friends">
+   <tr>
+   <th>
+   <button ng-click="sortBy('name')">Name</button>
+   <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
+   </th>
+   <th>
+   <button ng-click="sortBy('phone')">Phone Number</button>
+   <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
+   </th>
+   <th>
+   <button ng-click="sortBy('age')">Age</button>
+   <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
+   </th>
+   </tr>
+   <tr ng-repeat="friend in friends | orderBy:propertyName:reverse">
+   <td>{{friend.name}}</td>
+   <td>{{friend.phone}}</td>
+   <td>{{friend.age}}</td>
+   </tr>
+   </table>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('orderByExample2', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+           var friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+
+           $scope.propertyName = 'age';
+           $scope.reverse = true;
+           $scope.friends = friends;
+
+           $scope.sortBy = function(propertyName) {
+             $scope.reverse = ($scope.propertyName === propertyName) ? !$scope.reverse : false;
+             $scope.propertyName = propertyName;
+           };
+         }]);
+   </file>
+   <file name="style.css">
+   .friends {
+         border-collapse: collapse;
+       }
+
+   .friends th {
+         border-bottom: 1px solid;
+       }
+   .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+   .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+
+   .sortorder:after {
+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
+       }
+   .sortorder.reverse:after {
+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
+       }
+   </file>
+   <file name="protractor.js" type="protractor">
+   // Element locators
+   var unsortButton = element(by.partialButtonText('unsorted'));
+   var nameHeader = element(by.partialButtonText('Name'));
+   var phoneHeader = element(by.partialButtonText('Phone'));
+   var ageHeader = element(by.partialButtonText('Age'));
+   var firstName = element(by.repeater('friends').column('friend.name').row(0));
+   var lastName = element(by.repeater('friends').column('friend.name').row(4));
+
+   it('should sort friends by some property, when clicking on the column header', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         phoneHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Mary');
+
+         nameHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('Mike');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
        });
 
-   it('should reorder the table when user selects different predicate', function() {
-         element('.doc-example-live a:contains("Name")').click();
-         expect(repeater('table.friend', 'friend in friends').column('friend.name')).
-           toEqual(['Adam', 'John', 'Julie', 'Mary', 'Mike']);
-         expect(repeater('table.friend', 'friend in friends').column('friend.age')).
-           toEqual(['35', '10', '29', '19', '21']);
+   it('should sort friends in reverse order, when clicking on the same column', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
 
-         element('.doc-example-live a:contains("Phone")').click();
-         expect(repeater('table.friend', 'friend in friends').column('friend.phone')).
-           toEqual(['555-9876', '555-8765', '555-5678', '555-4321', '555-1212']);
-         expect(repeater('table.friend', 'friend in friends').column('friend.name')).
-           toEqual(['Mary', 'Julie', 'Adam', 'Mike', 'John']);
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
        });
-   </doc:scenario>
-   </doc:example>
+
+   it('should restore the original order, when clicking "Set to unsorted"', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         unsortButton.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Julie');
+       });
+   </file>
+   </example>
+   * <hr />
+   *
+   * @example
+   * ### Using `orderBy` inside a controller
+   *
+   * It is also possible to call the `orderBy` filter manually, by injecting `orderByFilter`, and
+   * calling it with the desired parameters. (Alternatively, you could inject the `$filter` factory
+   * and retrieve the `orderBy` filter with `$filter('orderBy')`.)
+   *
+   <example name="orderBy-call-manually" module="orderByExample3">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
+   <hr/>
+   <button ng-click="sortBy(null)">Set to unsorted</button>
+   <hr/>
+   <table class="friends">
+   <tr>
+   <th>
+   <button ng-click="sortBy('name')">Name</button>
+   <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
+   </th>
+   <th>
+   <button ng-click="sortBy('phone')">Phone Number</button>
+   <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
+   </th>
+   <th>
+   <button ng-click="sortBy('age')">Age</button>
+   <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
+   </th>
+   </tr>
+   <tr ng-repeat="friend in friends">
+   <td>{{friend.name}}</td>
+   <td>{{friend.phone}}</td>
+   <td>{{friend.age}}</td>
+   </tr>
+   </table>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('orderByExample3', [])
+   .controller('ExampleController', ['$scope', 'orderByFilter', function($scope, orderBy) {
+           var friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+
+           $scope.propertyName = 'age';
+           $scope.reverse = true;
+           $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
+
+           $scope.sortBy = function(propertyName) {
+             $scope.reverse = (propertyName !== null && $scope.propertyName === propertyName)
+                 ? !$scope.reverse : false;
+             $scope.propertyName = propertyName;
+             $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
+           };
+         }]);
+   </file>
+   <file name="style.css">
+   .friends {
+         border-collapse: collapse;
+       }
+
+   .friends th {
+         border-bottom: 1px solid;
+       }
+   .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+   .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+
+   .sortorder:after {
+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
+       }
+   .sortorder.reverse:after {
+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
+       }
+   </file>
+   <file name="protractor.js" type="protractor">
+   // Element locators
+   var unsortButton = element(by.partialButtonText('unsorted'));
+   var nameHeader = element(by.partialButtonText('Name'));
+   var phoneHeader = element(by.partialButtonText('Phone'));
+   var ageHeader = element(by.partialButtonText('Age'));
+   var firstName = element(by.repeater('friends').column('friend.name').row(0));
+   var lastName = element(by.repeater('friends').column('friend.name').row(4));
+
+   it('should sort friends by some property, when clicking on the column header', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         phoneHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Mary');
+
+         nameHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('Mike');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+       });
+
+   it('should sort friends in reverse order, when clicking on the same column', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+       });
+
+   it('should restore the original order, when clicking "Set to unsorted"', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         unsortButton.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Julie');
+       });
+   </file>
+   </example>
+   * <hr />
+   *
+   * @example
+   * ### Using a custom comparator
+   *
+   * If you have very specific requirements about the way items are sorted, you can pass your own
+   * comparator function. For example, you might need to compare some strings in a locale-sensitive
+   * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
+   * argument - passing `false` retains the default sorting order, i.e. ascending.)
+   *
+   <example name="orderBy-custom-comparator" module="orderByExample4">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <div class="friends-container custom-comparator">
+   <h3>Locale-sensitive Comparator</h3>
+   <table class="friends">
+   <tr>
+   <th>Name</th>
+   <th>Favorite Letter</th>
+   </tr>
+   <tr ng-repeat="friend in friends | orderBy:'favoriteLetter':false:localeSensitiveComparator">
+   <td>{{friend.name}}</td>
+   <td>{{friend.favoriteLetter}}</td>
+   </tr>
+   </table>
+   </div>
+   <div class="friends-container default-comparator">
+   <h3>Default Comparator</h3>
+   <table class="friends">
+   <tr>
+   <th>Name</th>
+   <th>Favorite Letter</th>
+   </tr>
+   <tr ng-repeat="friend in friends | orderBy:'favoriteLetter'">
+   <td>{{friend.name}}</td>
+   <td>{{friend.favoriteLetter}}</td>
+   </tr>
+   </table>
+   </div>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('orderByExample4', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends = [
+             {name: 'John',   favoriteLetter: 'Ä'},
+             {name: 'Mary',   favoriteLetter: 'Ü'},
+             {name: 'Mike',   favoriteLetter: 'Ö'},
+             {name: 'Adam',   favoriteLetter: 'H'},
+             {name: 'Julie',  favoriteLetter: 'Z'}
+           ];
+
+           $scope.localeSensitiveComparator = function(v1, v2) {
+             // If we don't get strings, just compare by index
+             if (v1.type !== 'string' || v2.type !== 'string') {
+               return (v1.index < v2.index) ? -1 : 1;
+             }
+
+             // Compare strings alphabetically, taking locale into account
+             return v1.value.localeCompare(v2.value);
+           };
+         }]);
+   </file>
+   <file name="style.css">
+   .friends-container {
+         display: inline-block;
+         margin: 0 30px;
+       }
+
+   .friends {
+         border-collapse: collapse;
+       }
+
+   .friends th {
+         border-bottom: 1px solid;
+       }
+   .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+   .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+   </file>
+   <file name="protractor.js" type="protractor">
+   // Element locators
+   var container = element(by.css('.custom-comparator'));
+   var names = container.all(by.repeater('friends').column('friend.name'));
+
+   it('should sort friends by favorite letter (in correct alphabetical order)', function() {
+         expect(names.get(0).getText()).toBe('John');
+         expect(names.get(1).getText()).toBe('Adam');
+         expect(names.get(2).getText()).toBe('Mike');
+         expect(names.get(3).getText()).toBe('Mary');
+         expect(names.get(4).getText()).toBe('Julie');
+       });
+   </file>
+   </example>
+   *
    */
   orderByFilter.$inject = ['$parse'];
-  function orderByFilter($parse){
-    return function(array, sortPredicate, reverseOrder) {
-      if (!isArray(array)) return array;
-      if (!sortPredicate) return array;
-      sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
-      sortPredicate = map(sortPredicate, function(predicate){
-        var descending = false, get = predicate || identity;
-        if (isString(predicate)) {
-          if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
-            descending = predicate.charAt(0) == '-';
-            predicate = predicate.substring(1);
-          }
-          get = $parse(predicate);
-        }
-        return reverseComparator(function(a,b){
-          return compare(get(a),get(b));
-        }, descending);
-      });
-      var arrayCopy = [];
-      for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
-      return arrayCopy.sort(reverseComparator(comparator, reverseOrder));
+  function orderByFilter($parse) {
+    return function(array, sortPredicate, reverseOrder, compareFn) {
 
-      function comparator(o1, o2){
-        for ( var i = 0; i < sortPredicate.length; i++) {
-          var comp = sortPredicate[i](o1, o2);
-          if (comp !== 0) return comp;
-        }
-        return 0;
+      if (array == null) return array;
+      if (!isArrayLike(array)) {
+        throw minErr('orderBy')('notarray', 'Expected array but received: {0}', array);
       }
-      function reverseComparator(comp, descending) {
-        return toBoolean(descending)
-            ? function(a,b){return comp(b,a);}
-            : comp;
+
+      if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
+      if (sortPredicate.length === 0) { sortPredicate = ['+']; }
+
+      var predicates = processPredicates(sortPredicate);
+
+      var descending = reverseOrder ? -1 : 1;
+
+      // Define the `compare()` function. Use a default comparator if none is specified.
+      var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+
+      // The next three lines are a version of a Swartzian Transform idiom from Perl
+      // (sometimes called the Decorate-Sort-Undecorate idiom)
+      // See https://en.wikipedia.org/wiki/Schwartzian_transform
+      var compareValues = Array.prototype.map.call(array, getComparisonObject);
+      compareValues.sort(doComparison);
+      array = compareValues.map(function(item) { return item.value; });
+
+      return array;
+
+      function getComparisonObject(value, index) {
+        // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
+        // This will be used to keep the sort stable when none of the input predicates can
+        // distinguish between two elements.
+        return {
+          value: value,
+          tieBreaker: {value: index, type: 'number', index: index},
+          predicateValues: predicates.map(function(predicate) {
+            return getPredicateValue(predicate.get(value), index);
+          })
+        };
       }
-      function compare(v1, v2){
-        var t1 = typeof v1;
-        var t2 = typeof v2;
-        if (t1 == t2) {
-          if (t1 == "string") {
-            v1 = v1.toLowerCase();
-            v2 = v2.toLowerCase();
+
+      function doComparison(v1, v2) {
+        for (var i = 0, ii = predicates.length; i < ii; i++) {
+          var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
+          if (result) {
+            return result * predicates[i].descending * descending;
           }
-          if (v1 === v2) return 0;
-          return v1 < v2 ? -1 : 1;
-        } else {
-          return t1 < t2 ? -1 : 1;
         }
+
+        return (compare(v1.tieBreaker, v2.tieBreaker) || defaultCompare(v1.tieBreaker, v2.tieBreaker)) * descending;
       }
     };
+
+    function processPredicates(sortPredicates) {
+      return sortPredicates.map(function(predicate) {
+        var descending = 1, get = identity;
+
+        if (isFunction(predicate)) {
+          get = predicate;
+        } else if (isString(predicate)) {
+          if ((predicate.charAt(0) === '+' || predicate.charAt(0) === '-')) {
+            descending = predicate.charAt(0) === '-' ? -1 : 1;
+            predicate = predicate.substring(1);
+          }
+          if (predicate !== '') {
+            get = $parse(predicate);
+            if (get.constant) {
+              var key = get();
+              get = function(value) { return value[key]; };
+            }
+          }
+        }
+        return {get: get, descending: descending};
+      });
+    }
+
+    function isPrimitive(value) {
+      switch (typeof value) {
+        case 'number': /* falls through */
+        case 'boolean': /* falls through */
+        case 'string':
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    function objectValue(value) {
+      // If `valueOf` is a valid function use that
+      if (isFunction(value.valueOf)) {
+        value = value.valueOf();
+        if (isPrimitive(value)) return value;
+      }
+      // If `toString` is a valid function and not the one from `Object.prototype` use that
+      if (hasCustomToString(value)) {
+        value = value.toString();
+        if (isPrimitive(value)) return value;
+      }
+
+      return value;
+    }
+
+    function getPredicateValue(value, index) {
+      var type = typeof value;
+      if (value === null) {
+        type = 'string';
+        value = 'null';
+      } else if (type === 'object') {
+        value = objectValue(value);
+      }
+      return {value: value, type: type, index: index};
+    }
+
+    function defaultCompare(v1, v2) {
+      var result = 0;
+      var type1 = v1.type;
+      var type2 = v2.type;
+
+      if (type1 === type2) {
+        var value1 = v1.value;
+        var value2 = v2.value;
+
+        if (type1 === 'string') {
+          // Compare strings case-insensitively
+          value1 = value1.toLowerCase();
+          value2 = value2.toLowerCase();
+        } else if (type1 === 'object') {
+          // For basic objects, use the position of the object
+          // in the collection instead of the value
+          if (isObject(value1)) value1 = v1.index;
+          if (isObject(value2)) value2 = v2.index;
+        }
+
+        if (value1 !== value2) {
+          result = value1 < value2 ? -1 : 1;
+        }
+      } else {
+        result = type1 < type2 ? -1 : 1;
+      }
+
+      return result;
+    }
   }
 
   function ngDirective(directive) {
@@ -14820,41 +22699,29 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:a
+   * @name a
    * @restrict E
    *
    * @description
-   * Modifies the default behavior of the html A tag so that the default action is prevented when
+   * Modifies the default behavior of the html a tag so that the default action is prevented when
    * the href attribute is empty.
    *
-   * This change permits the easy creation of action links with the `ngClick` directive
-   * without changing the location or causing page reloads, e.g.:
-   * `<a href="" ng-click="list.addItem()">Add Item</a>`
+   * For dynamically creating `href` attributes for a tags, see the {@link ng.ngHref `ngHref`} directive.
    */
   var htmlAnchorDirective = valueFn({
     restrict: 'E',
     compile: function(element, attr) {
-
-      if (msie <= 8) {
-
-        // turn <a href ng-click="..">link</a> into a stylable link in IE
-        // but only if it doesn't have name attribute, in which case it's an anchor
-        if (!attr.href && !attr.name) {
-          attr.$set('href', '');
-        }
-
-        // add a comment node to anchors to workaround IE bug that causes element content to be reset
-        // to new attribute content if attribute is updated with value containing @ and element also
-        // contains value with @
-        // see issue #1949
-        element.append(document.createComment('IE fix'));
-      }
-
-      if (!attr.href && !attr.name) {
+      if (!attr.href && !attr.xlinkHref) {
         return function(scope, element) {
-          element.on('click', function(event){
+          // If the linked element is not an anchor tag anymore, do nothing
+          if (element[0].nodeName.toLowerCase() !== 'a') return;
+
+          // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
+          var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
+            'xlink:href' : 'href';
+          element.on('click', function(event) {
             // if we have no href url, then don't navigate anywhere.
-            if (!element.attr('href')) {
+            if (!element.attr(href)) {
               event.preventDefault();
             }
           });
@@ -14865,7 +22732,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngHref
+   * @name ngHref
    * @restrict A
    * @priority 99
    *
@@ -14874,19 +22741,18 @@
    * make the link go to the wrong URL if the user clicks it before
    * Angular has a chance to replace the `{{hash}}` markup with its
    * value. Until Angular replaces the markup the link will be broken
-   * and will most likely return a 404 error.
-   *
-   * The `ngHref` directive solves this problem.
+   * and will most likely return a 404 error. The `ngHref` directive
+   * solves this problem.
    *
    * The wrong way to write it:
-   * <pre>
-   * <a href="http://www.gravatar.com/avatar/{{hash}}"/>
-   * </pre>
+   * ```html
+   * <a href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+   * ```
    *
    * The correct way to write it:
-   * <pre>
-   * <a ng-href="http://www.gravatar.com/avatar/{{hash}}"/>
-   * </pre>
+   * ```html
+   * <a ng-href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+   * ```
    *
    * @element A
    * @param {template} ngHref any string which can contain `{{}}` markup.
@@ -14894,8 +22760,8 @@
    * @example
    * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
    * in links and their different behaviors:
-   <doc:example>
-   <doc:source>
+   <example name="ng-href">
+   <file name="index.html">
    <input ng-model="value" /><br />
    <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
    <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
@@ -14903,53 +22769,69 @@
    <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
    <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
    <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should execute ng-click but not reload when href without value', function() {
-          element('#link-1').click();
-          expect(input('value').val()).toEqual('1');
-          expect(element('#link-1').attr('href')).toBe("");
+          element(by.id('link-1')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
+          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
         });
 
    it('should execute ng-click but not reload when href empty string', function() {
-          element('#link-2').click();
-          expect(input('value').val()).toEqual('2');
-          expect(element('#link-2').attr('href')).toBe("");
+          element(by.id('link-2')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
+          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
         });
 
    it('should execute ng-click and change url when ng-href specified', function() {
-          expect(element('#link-3').attr('href')).toBe("/123");
+          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
 
-          element('#link-3').click();
-          expect(browser().window().path()).toEqual('/123');
+          element(by.id('link-3')).click();
+
+          // At this point, we navigate away from an Angular page, so we need
+          // to use browser.driver to get the base webdriver.
+
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/123$/);
+            });
+          }, 5000, 'page should navigate to /123');
         });
 
    it('should execute ng-click but not reload when href empty string and name specified', function() {
-          element('#link-4').click();
-          expect(input('value').val()).toEqual('4');
-          expect(element('#link-4').attr('href')).toBe('');
+          element(by.id('link-4')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
+          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
         });
 
    it('should execute ng-click but not reload when no href but name specified', function() {
-          element('#link-5').click();
-          expect(input('value').val()).toEqual('5');
-          expect(element('#link-5').attr('href')).toBe(undefined);
+          element(by.id('link-5')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
+          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
         });
 
    it('should only change url when only ng-href', function() {
-          input('value').enter('6');
-          expect(element('#link-6').attr('href')).toBe('6');
+          element(by.model('value')).clear();
+          element(by.model('value')).sendKeys('6');
+          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
 
-          element('#link-6').click();
-          expect(browser().location().url()).toEqual('/6');
+          element(by.id('link-6')).click();
+
+          // At this point, we navigate away from an Angular page, so we need
+          // to use browser.driver to get the base webdriver.
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/6$/);
+            });
+          }, 5000, 'page should navigate to /6');
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngSrc
+   * @name ngSrc
    * @restrict A
    * @priority 99
    *
@@ -14960,14 +22842,14 @@
    * `{{hash}}`. The `ngSrc` directive solves this problem.
    *
    * The buggy way to write it:
-   * <pre>
-   * <img src="http://www.gravatar.com/avatar/{{hash}}"/>
-   * </pre>
+   * ```html
+   * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
+   * ```
    *
    * The correct way to write it:
-   * <pre>
-   * <img ng-src="http://www.gravatar.com/avatar/{{hash}}"/>
-   * </pre>
+   * ```html
+   * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
+   * ```
    *
    * @element IMG
    * @param {template} ngSrc any string which can contain `{{}}` markup.
@@ -14975,7 +22857,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngSrcset
+   * @name ngSrcset
    * @restrict A
    * @priority 99
    *
@@ -14986,14 +22868,14 @@
    * `{{hash}}`. The `ngSrcset` directive solves this problem.
    *
    * The buggy way to write it:
-   * <pre>
-   * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
-   * </pre>
+   * ```html
+   * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
+   * ```
    *
    * The correct way to write it:
-   * <pre>
-   * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
-   * </pre>
+   * ```html
+   * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
+   * ```
    *
    * @element IMG
    * @param {template} ngSrcset any string which can contain `{{}}` markup.
@@ -15001,111 +22883,105 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngDisabled
+   * @name ngDisabled
    * @restrict A
    * @priority 100
    *
    * @description
    *
-   * The following markup will make the button enabled on Chrome/Firefox but not on IE8 and older IEs:
-   * <pre>
-   * <div ng-init="scope = { isDisabled: false }">
-   *  <button disabled="{{scope.isDisabled}}">Disabled</button>
-   * </div>
-   * </pre>
+   * This directive sets the `disabled` attribute on the element (typically a form control,
+   * e.g. `input`, `button`, `select` etc.) if the
+   * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
    *
-   * The HTML specification does not require browsers to preserve the values of boolean attributes
-   * such as disabled. (Their presence means true and their absence means false.)
-   * If we put an Angular interpolation expression into such an attribute then the
-   * binding information would be lost when the browser removes the attribute.
-   * The `ngDisabled` directive solves this problem for the `disabled` attribute.
-   * This complementary directive is not removed by the browser and so provides
-   * a permanent reliable place to store the binding information.
+   * A special directive is necessary because we cannot use interpolation inside the `disabled`
+   * attribute. See the {@link guide/interpolation interpolation guide} for more info.
    *
    * @example
-   <doc:example>
-   <doc:source>
-   Click me to toggle: <input type="checkbox" ng-model="checked"><br/>
+   <example name="ng-disabled">
+   <file name="index.html">
+   <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
    <button ng-model="button" ng-disabled="checked">Button</button>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should toggle button', function() {
-          expect(element('.doc-example-live :button').prop('disabled')).toBeFalsy();
-          input('checked').check();
-          expect(element('.doc-example-live :button').prop('disabled')).toBeTruthy();
+          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    * @element INPUT
    * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
-   *     then special attribute "disabled" will be set on the element
+   *     then the `disabled` attribute will be set on the element
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngChecked
+   * @name ngChecked
    * @restrict A
    * @priority 100
    *
    * @description
-   * The HTML specification does not require browsers to preserve the values of boolean attributes
-   * such as checked. (Their presence means true and their absence means false.)
-   * If we put an Angular interpolation expression into such an attribute then the
-   * binding information would be lost when the browser removes the attribute.
-   * The `ngChecked` directive solves this problem for the `checked` attribute.
-   * This complementary directive is not removed by the browser and so provides
-   * a permanent reliable place to store the binding information.
+   * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy.
+   *
+   * Note that this directive should not be used together with {@link ngModel `ngModel`},
+   * as this can lead to unexpected behavior.
+   *
+   * A special directive is necessary because we cannot use interpolation inside the `checked`
+   * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+   *
    * @example
-   <doc:example>
-   <doc:source>
-   Check me to check both: <input type="checkbox" ng-model="master"><br/>
-   <input id="checkSlave" type="checkbox" ng-checked="master">
-   </doc:source>
-   <doc:scenario>
+   <example name="ng-checked">
+   <file name="index.html">
+   <label>Check me to check both: <input type="checkbox" ng-model="master"></label><br/>
+   <input id="checkSlave" type="checkbox" ng-checked="master" aria-label="Slave input">
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should check both checkBoxes', function() {
-          expect(element('.doc-example-live #checkSlave').prop('checked')).toBeFalsy();
-          input('master').check();
-          expect(element('.doc-example-live #checkSlave').prop('checked')).toBeTruthy();
+          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
+          element(by.model('master')).click();
+          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    * @element INPUT
    * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
-   *     then special attribute "checked" will be set on the element
+   *     then the `checked` attribute will be set on the element
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngReadonly
+   * @name ngReadonly
    * @restrict A
    * @priority 100
    *
    * @description
-   * The HTML specification does not require browsers to preserve the values of boolean attributes
-   * such as readonly. (Their presence means true and their absence means false.)
-   * If we put an Angular interpolation expression into such an attribute then the
-   * binding information would be lost when the browser removes the attribute.
-   * The `ngReadonly` directive solves this problem for the `readonly` attribute.
-   * This complementary directive is not removed by the browser and so provides
-   * a permanent reliable place to store the binding information.
+   *
+   * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
+   * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
+   * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
+   *
+   * A special directive is necessary because we cannot use interpolation inside the `readonly`
+   * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+   *
    * @example
-   <doc:example>
-   <doc:source>
-   Check me to make text readonly: <input type="checkbox" ng-model="checked"><br/>
-   <input type="text" ng-readonly="checked" value="I'm Angular"/>
-   </doc:source>
-   <doc:scenario>
+   <example name="ng-readonly">
+   <file name="index.html">
+   <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
+   <input type="text" ng-readonly="checked" value="I'm Angular" aria-label="Readonly field" />
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should toggle readonly attr', function() {
-          expect(element('.doc-example-live :text').prop('readonly')).toBeFalsy();
-          input('checked').check();
-          expect(element('.doc-example-live :text').prop('readonly')).toBeTruthy();
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    * @element INPUT
    * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
@@ -15115,36 +22991,41 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngSelected
+   * @name ngSelected
    * @restrict A
    * @priority 100
    *
    * @description
-   * The HTML specification does not require browsers to preserve the values of boolean attributes
-   * such as selected. (Their presence means true and their absence means false.)
-   * If we put an Angular interpolation expression into such an attribute then the
-   * binding information would be lost when the browser removes the attribute.
-   * The `ngSelected` directive solves this problem for the `selected` atttribute.
-   * This complementary directive is not removed by the browser and so provides
-   * a permanent reliable place to store the binding information.
+   *
+   * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy.
+   *
+   * A special directive is necessary because we cannot use interpolation inside the `selected`
+   * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+   *
+   * <div class="alert alert-warning">
+   *   **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
+   *   sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
+   *   should not use `ngSelected` on the options, as `ngModel` will set the select value and
+   *   selected options.
+   * </div>
    *
    * @example
-   <doc:example>
-   <doc:source>
-   Check me to select: <input type="checkbox" ng-model="selected"><br/>
-   <select>
+   <example name="ng-selected">
+   <file name="index.html">
+   <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
+   <select aria-label="ngSelected demo">
    <option>Hello!</option>
    <option id="greet" ng-selected="selected">Greetings!</option>
    </select>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should select Greetings!', function() {
-          expect(element('.doc-example-live #greet').prop('selected')).toBeFalsy();
-          input('selected').check();
-          expect(element('.doc-example-live #greet').prop('selected')).toBeTruthy();
+          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
+          element(by.model('selected')).click();
+          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    * @element OPTION
    * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
@@ -15153,34 +23034,43 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngOpen
+   * @name ngOpen
    * @restrict A
    * @priority 100
    *
    * @description
-   * The HTML specification does not require browsers to preserve the values of boolean attributes
-   * such as open. (Their presence means true and their absence means false.)
-   * If we put an Angular interpolation expression into such an attribute then the
-   * binding information would be lost when the browser removes the attribute.
-   * The `ngOpen` directive solves this problem for the `open` attribute.
-   * This complementary directive is not removed by the browser and so provides
-   * a permanent reliable place to store the binding information.
+   *
+   * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy.
+   *
+   * A special directive is necessary because we cannot use interpolation inside the `open`
+   * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+   *
+   * ## A note about browser compatibility
+   *
+   * Internet Explorer and Edge do not support the `details` element, it is
+   * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
+   *
    * @example
-   <doc:example>
-   <doc:source>
-   Check me check multiple: <input type="checkbox" ng-model="open"><br/>
+   <example name="ng-open">
+   <file name="index.html">
+   <label>Toggle details: <input type="checkbox" ng-model="open"></label><br/>
    <details id="details" ng-open="open">
-   <summary>Show/Hide me</summary>
+   <summary>List</summary>
+   <ul>
+   <li>Apple</li>
+   <li>Orange</li>
+   <li>Durian</li>
+   </ul>
    </details>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should toggle open', function() {
-           expect(element('#details').prop('open')).toBeFalsy();
-           input('open').check();
-           expect(element('#details').prop('open')).toBeTruthy();
+           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
+           element(by.model('open')).click();
+           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
          });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    * @element DETAILS
    * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
@@ -15189,26 +23079,62 @@
 
   var ngAttributeAliasDirectives = {};
 
-
 // boolean attrs are evaluated
   forEach(BOOLEAN_ATTR, function(propName, attrName) {
     // binding to multiple is not supported
-    if (propName == "multiple") return;
+    if (propName === 'multiple') return;
+
+    function defaultLinkFn(scope, element, attr) {
+      scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
+        attr.$set(attrName, !!value);
+      });
+    }
 
     var normalized = directiveNormalize('ng-' + attrName);
+    var linkFn = defaultLinkFn;
+
+    if (propName === 'checked') {
+      linkFn = function(scope, element, attr) {
+        // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input
+        if (attr.ngModel !== attr[normalized]) {
+          defaultLinkFn(scope, element, attr);
+        }
+      };
+    }
+
     ngAttributeAliasDirectives[normalized] = function() {
+      return {
+        restrict: 'A',
+        priority: 100,
+        link: linkFn
+      };
+    };
+  });
+
+// aliased input attrs are evaluated
+  forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) {
+    ngAttributeAliasDirectives[ngAttr] = function() {
       return {
         priority: 100,
         link: function(scope, element, attr) {
-          scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
-            attr.$set(attrName, !!value);
+          //special case ngPattern when a literal regular expression value
+          //is used as the expression (this way we don't have to watch anything).
+          if (ngAttr === 'ngPattern' && attr.ngPattern.charAt(0) === '/') {
+            var match = attr.ngPattern.match(REGEX_STRING_REGEXP);
+            if (match) {
+              attr.$set('ngPattern', new RegExp(match[1], match[2]));
+              return;
+            }
+          }
+
+          scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) {
+            attr.$set(ngAttr, value);
           });
         }
       };
     };
   });
 
-
 // ng-src, ng-srcset, ng-href are interpolated
   forEach(['src', 'srcset', 'href'], function(attrName) {
     var normalized = directiveNormalize('ng-' + attrName);
@@ -15216,50 +23142,81 @@
       return {
         priority: 99, // it needs to run after the attributes are interpolated
         link: function(scope, element, attr) {
+          var propName = attrName,
+            name = attrName;
+
+          if (attrName === 'href' &&
+            toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
+            name = 'xlinkHref';
+            attr.$attr[name] = 'xlink:href';
+            propName = null;
+          }
+
           attr.$observe(normalized, function(value) {
-            if (!value)
+            if (!value) {
+              if (attrName === 'href') {
+                attr.$set(name, null);
+              }
               return;
+            }
 
-            attr.$set(attrName, value);
+            attr.$set(name, value);
 
-            // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
+            // Support: IE 9-11 only
+            // On IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
             // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
             // to set the property as well to achieve the desired effect.
-            // we use attr[attrName] value since $set can sanitize the url.
-            if (msie) element.prop(attrName, attr[attrName]);
+            // We use attr[attrName] value since $set can sanitize the url.
+            if (msie && propName) element.prop(propName, attr[name]);
           });
         }
       };
     };
   });
 
-  /* global -nullFormCtrl */
+  /* global -nullFormCtrl, -PENDING_CLASS, -SUBMITTED_CLASS
+ */
   var nullFormCtrl = {
-    $addControl: noop,
-    $removeControl: noop,
-    $setValidity: noop,
-    $setDirty: noop,
-    $setPristine: noop
-  };
+      $addControl: noop,
+      $$renameControl: nullFormRenameControl,
+      $removeControl: noop,
+      $setValidity: noop,
+      $setDirty: noop,
+      $setPristine: noop,
+      $setSubmitted: noop
+    },
+    PENDING_CLASS = 'ng-pending',
+    SUBMITTED_CLASS = 'ng-submitted';
+
+  function nullFormRenameControl(control, name) {
+    control.$name = name;
+  }
 
   /**
-   * @ngdoc object
-   * @name ng.directive:form.FormController
+   * @ngdoc type
+   * @name form.FormController
    *
    * @property {boolean} $pristine True if user has not interacted with the form yet.
    * @property {boolean} $dirty True if user has already interacted with the form.
    * @property {boolean} $valid True if all of the containing forms and controls are valid.
    * @property {boolean} $invalid True if at least one containing control or form is invalid.
+   * @property {boolean} $submitted True if user has submitted the form even if its invalid.
    *
-   * @property {Object} $error Is an object hash, containing references to all invalid controls or
-   *  forms, where:
+   * @property {Object} $pending An object hash, containing references to controls or forms with
+   *  pending validators, where:
+   *
+   *  - keys are validations tokens (error names).
+   *  - values are arrays of controls or forms that have a pending validator for the given error name.
+   *
+   * See {@link form.FormController#$error $error} for a list of built-in validation tokens.
+   *
+   * @property {Object} $error An object hash, containing references to controls or forms with failing
+   *  validators, where:
    *
    *  - keys are validation tokens (error names),
-   *  - values are arrays of controls or forms that are invalid for given error name.
-   *
+   *  - values are arrays of controls or forms that have a failing validator for the given error name.
    *
    *  Built-in validation tokens:
-   *
    *  - `email`
    *  - `max`
    *  - `maxlength`
@@ -15269,9 +23226,14 @@
    *  - `pattern`
    *  - `required`
    *  - `url`
+   *  - `date`
+   *  - `datetimelocal`
+   *  - `time`
+   *  - `week`
+   *  - `month`
    *
    * @description
-   * `FormController` keeps track of all its controls and nested forms as well as state of them,
+   * `FormController` keeps track of all its controls and nested forms as well as the state of them,
    * such as being valid/invalid or dirty/pristine.
    *
    * Each {@link ng.directive:form form} directive creates an instance
@@ -15279,129 +23241,148 @@
    *
    */
 //asks for $scope to fool the BC controller module
-  FormController.$inject = ['$element', '$attrs', '$scope'];
-  function FormController(element, attrs) {
-    var form = this,
-        parentForm = element.parent().controller('form') || nullFormCtrl,
-        invalidCount = 0, // used to easily determine if we are valid
-        errors = form.$error = {},
-        controls = [];
+  FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate'];
+  function FormController($element, $attrs, $scope, $animate, $interpolate) {
+    this.$$controls = [];
 
     // init state
-    form.$name = attrs.name || attrs.ngForm;
-    form.$dirty = false;
-    form.$pristine = true;
-    form.$valid = true;
-    form.$invalid = false;
+    this.$error = {};
+    this.$$success = {};
+    this.$pending = undefined;
+    this.$name = $interpolate($attrs.name || $attrs.ngForm || '')($scope);
+    this.$dirty = false;
+    this.$pristine = true;
+    this.$valid = true;
+    this.$invalid = false;
+    this.$submitted = false;
+    this.$$parentForm = nullFormCtrl;
 
-    parentForm.$addControl(form);
+    this.$$element = $element;
+    this.$$animate = $animate;
 
-    // Setup initial state of the control
-    element.addClass(PRISTINE_CLASS);
-    toggleValidCss(true);
-
-    // convenience method for easy toggling of classes
-    function toggleValidCss(isValid, validationErrorKey) {
-      validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-      element.
-          removeClass((isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey).
-          addClass((isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
-    }
+    setupValidity(this);
+  }
 
+  FormController.prototype = {
     /**
-     * @ngdoc function
-     * @name ng.directive:form.FormController#$addControl
-     * @methodOf ng.directive:form.FormController
+     * @ngdoc method
+     * @name form.FormController#$rollbackViewValue
      *
      * @description
-     * Register a control with the form.
+     * Rollback all form controls pending updates to the `$modelValue`.
      *
-     * Input elements using ngModelController do this automatically when they are linked.
+     * Updates may be pending by a debounced event or because the input is waiting for a some future
+     * event defined in `ng-model-options`. This method is typically needed by the reset button of
+     * a form that uses `ng-model-options` to pend updates.
      */
-    form.$addControl = function(control) {
+    $rollbackViewValue: function() {
+      forEach(this.$$controls, function(control) {
+        control.$rollbackViewValue();
+      });
+    },
+
+    /**
+     * @ngdoc method
+     * @name form.FormController#$commitViewValue
+     *
+     * @description
+     * Commit all form controls pending updates to the `$modelValue`.
+     *
+     * Updates may be pending by a debounced event or because the input is waiting for a some future
+     * event defined in `ng-model-options`. This method is rarely needed as `NgModelController`
+     * usually handles calling this in response to input events.
+     */
+    $commitViewValue: function() {
+      forEach(this.$$controls, function(control) {
+        control.$commitViewValue();
+      });
+    },
+
+    /**
+     * @ngdoc method
+     * @name form.FormController#$addControl
+     * @param {object} control control object, either a {@link form.FormController} or an
+     * {@link ngModel.NgModelController}
+     *
+     * @description
+     * Register a control with the form. Input elements using ngModelController do this automatically
+     * when they are linked.
+     *
+     * Note that the current state of the control will not be reflected on the new parent form. This
+     * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine`
+     * state.
+     *
+     * However, if the method is used programmatically, for example by adding dynamically created controls,
+     * or controls that have been previously removed without destroying their corresponding DOM element,
+     * it's the developers responsibility to make sure the current state propagates to the parent form.
+     *
+     * For example, if an input control is added that is already `$dirty` and has `$error` properties,
+     * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form.
+     */
+    $addControl: function(control) {
       // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
       // and not added to the scope.  Now we throw an error.
       assertNotHasOwnProperty(control.$name, 'input');
-      controls.push(control);
+      this.$$controls.push(control);
 
       if (control.$name) {
-        form[control.$name] = control;
+        this[control.$name] = control;
       }
-    };
+
+      control.$$parentForm = this;
+    },
+
+    // Private API: rename a form control
+    $$renameControl: function(control, newName) {
+      var oldName = control.$name;
+
+      if (this[oldName] === control) {
+        delete this[oldName];
+      }
+      this[newName] = control;
+      control.$name = newName;
+    },
 
     /**
-     * @ngdoc function
-     * @name ng.directive:form.FormController#$removeControl
-     * @methodOf ng.directive:form.FormController
+     * @ngdoc method
+     * @name form.FormController#$removeControl
+     * @param {object} control control object, either a {@link form.FormController} or an
+     * {@link ngModel.NgModelController}
      *
      * @description
      * Deregister a control from the form.
      *
      * Input elements using ngModelController do this automatically when they are destroyed.
+     *
+     * Note that only the removed control's validation state (`$errors`etc.) will be removed from the
+     * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be
+     * different from case to case. For example, removing the only `$dirty` control from a form may or
+     * may not mean that the form is still `$dirty`.
      */
-    form.$removeControl = function(control) {
-      if (control.$name && form[control.$name] === control) {
-        delete form[control.$name];
+    $removeControl: function(control) {
+      if (control.$name && this[control.$name] === control) {
+        delete this[control.$name];
       }
-      forEach(errors, function(queue, validationToken) {
-        form.$setValidity(validationToken, true, control);
-      });
+      forEach(this.$pending, function(value, name) {
+        // eslint-disable-next-line no-invalid-this
+        this.$setValidity(name, null, control);
+      }, this);
+      forEach(this.$error, function(value, name) {
+        // eslint-disable-next-line no-invalid-this
+        this.$setValidity(name, null, control);
+      }, this);
+      forEach(this.$$success, function(value, name) {
+        // eslint-disable-next-line no-invalid-this
+        this.$setValidity(name, null, control);
+      }, this);
 
-      arrayRemove(controls, control);
-    };
+      arrayRemove(this.$$controls, control);
+      control.$$parentForm = nullFormCtrl;
+    },
 
     /**
-     * @ngdoc function
-     * @name ng.directive:form.FormController#$setValidity
-     * @methodOf ng.directive:form.FormController
-     *
-     * @description
-     * Sets the validity of a form control.
-     *
-     * This method will also propagate to parent forms.
-     */
-    form.$setValidity = function(validationToken, isValid, control) {
-      var queue = errors[validationToken];
-
-      if (isValid) {
-        if (queue) {
-          arrayRemove(queue, control);
-          if (!queue.length) {
-            invalidCount--;
-            if (!invalidCount) {
-              toggleValidCss(isValid);
-              form.$valid = true;
-              form.$invalid = false;
-            }
-            errors[validationToken] = false;
-            toggleValidCss(true, validationToken);
-            parentForm.$setValidity(validationToken, true, form);
-          }
-        }
-
-      } else {
-        if (!invalidCount) {
-          toggleValidCss(isValid);
-        }
-        if (queue) {
-          if (includes(queue, control)) return;
-        } else {
-          errors[validationToken] = queue = [];
-          invalidCount++;
-          toggleValidCss(false, validationToken);
-          parentForm.$setValidity(validationToken, false, form);
-        }
-        queue.push(control);
-
-        form.$valid = false;
-        form.$invalid = true;
-      }
-    };
-
-    /**
-     * @ngdoc function
-     * @name ng.directive:form.FormController#$setDirty
-     * @methodOf ng.directive:form.FormController
+     * @ngdoc method
+     * @name form.FormController#$setDirty
      *
      * @description
      * Sets the form to a dirty state.
@@ -15409,42 +23390,125 @@
      * This method can be called to add the 'ng-dirty' class and set the form to a dirty
      * state (ng-dirty class). This method will also propagate to parent forms.
      */
-    form.$setDirty = function() {
-      element.removeClass(PRISTINE_CLASS).addClass(DIRTY_CLASS);
-      form.$dirty = true;
-      form.$pristine = false;
-      parentForm.$setDirty();
-    };
+    $setDirty: function() {
+      this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
+      this.$$animate.addClass(this.$$element, DIRTY_CLASS);
+      this.$dirty = true;
+      this.$pristine = false;
+      this.$$parentForm.$setDirty();
+    },
 
     /**
-     * @ngdoc function
-     * @name ng.directive:form.FormController#$setPristine
-     * @methodOf ng.directive:form.FormController
+     * @ngdoc method
+     * @name form.FormController#$setPristine
      *
      * @description
      * Sets the form to its pristine state.
      *
-     * This method can be called to remove the 'ng-dirty' class and set the form to its pristine
-     * state (ng-pristine class). This method will also propagate to all the controls contained
-     * in this form.
+     * This method sets the form's `$pristine` state to true, the `$dirty` state to false, removes
+     * the `ng-dirty` class and adds the `ng-pristine` class. Additionally, it sets the `$submitted`
+     * state to false.
+     *
+     * This method will also propagate to all the controls contained in this form.
      *
      * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
      * saving or resetting it.
      */
-    form.$setPristine = function () {
-      element.removeClass(DIRTY_CLASS).addClass(PRISTINE_CLASS);
-      form.$dirty = false;
-      form.$pristine = true;
-      forEach(controls, function(control) {
+    $setPristine: function() {
+      this.$$animate.setClass(this.$$element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS);
+      this.$dirty = false;
+      this.$pristine = true;
+      this.$submitted = false;
+      forEach(this.$$controls, function(control) {
         control.$setPristine();
       });
-    };
-  }
+    },
 
+    /**
+     * @ngdoc method
+     * @name form.FormController#$setUntouched
+     *
+     * @description
+     * Sets the form to its untouched state.
+     *
+     * This method can be called to remove the 'ng-touched' class and set the form controls to their
+     * untouched state (ng-untouched class).
+     *
+     * Setting a form controls back to their untouched state is often useful when setting the form
+     * back to its pristine state.
+     */
+    $setUntouched: function() {
+      forEach(this.$$controls, function(control) {
+        control.$setUntouched();
+      });
+    },
+
+    /**
+     * @ngdoc method
+     * @name form.FormController#$setSubmitted
+     *
+     * @description
+     * Sets the form to its submitted state.
+     */
+    $setSubmitted: function() {
+      this.$$animate.addClass(this.$$element, SUBMITTED_CLASS);
+      this.$submitted = true;
+      this.$$parentForm.$setSubmitted();
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setValidity
+   *
+   * @description
+   * Change the validity state of the form, and notify the parent form (if any).
+   *
+   * Application developers will rarely need to call this method directly. It is used internally, by
+   * {@link ngModel.NgModelController#$setValidity NgModelController.$setValidity()}, to propagate a
+   * control's validity state to the parent `FormController`.
+   *
+   * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be
+   *        assigned to either `$error[validationErrorKey]` or `$pending[validationErrorKey]` (for
+   *        unfulfilled `$asyncValidators`), so that it is available for data-binding. The
+   *        `validationErrorKey` should be in camelCase and will get converted into dash-case for
+   *        class name. Example: `myError` will result in `ng-valid-my-error` and
+   *        `ng-invalid-my-error` classes and can be bound to as `{{ someForm.$error.myError }}`.
+   * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending
+   *        (undefined),  or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+   *        Skipped is used by AngularJS when validators do not run because of parse errors and when
+   *        `$asyncValidators` do not run because any of the `$validators` failed.
+   * @param {NgModelController | FormController} controller - The controller whose validity state is
+   *        triggering the change.
+   */
+  addSetValidityMethod({
+    clazz: FormController,
+    set: function(object, property, controller) {
+      var list = object[property];
+      if (!list) {
+        object[property] = [controller];
+      } else {
+        var index = list.indexOf(controller);
+        if (index === -1) {
+          list.push(controller);
+        }
+      }
+    },
+    unset: function(object, property, controller) {
+      var list = object[property];
+      if (!list) {
+        return;
+      }
+      arrayRemove(list, controller);
+      if (list.length === 0) {
+        delete object[property];
+      }
+    }
+  });
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngForm
+   * @name ngForm
    * @restrict EAC
    *
    * @description
@@ -15452,6 +23516,10 @@
    * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
    * sub-group of controls needs to be determined.
    *
+   * Note: the purpose of `ngForm` is to group controls,
+   * but not to be a replacement for the `<form>` tag with all of its capabilities
+   * (e.g. posting to the server, ...).
+   *
    * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
    *                       related scope, under this name.
    *
@@ -15459,33 +23527,33 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:form
+   * @name form
    * @restrict E
    *
    * @description
    * Directive that instantiates
-   * {@link ng.directive:form.FormController FormController}.
+   * {@link form.FormController FormController}.
    *
    * If the `name` attribute is specified, the form controller is published onto the current scope under
    * this name.
    *
    * # Alias: {@link ng.directive:ngForm `ngForm`}
    *
-   * In Angular forms can be nested. This means that the outer form is valid when all of the child
+   * In Angular, forms can be nested. This means that the outer form is valid when all of the child
    * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
-   * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to
-   * `<form>` but can be nested.  This allows you to have nested forms, which is very useful when
-   * using Angular validation directives in forms that are dynamically generated using the
-   * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name`
-   * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an
-   * `ngForm` directive and nest these in an outer `form` element.
-   *
+   * Angular provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to
+   * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group
+   * of controls needs to be determined.
    *
    * # CSS classes
    *  - `ng-valid` is set if the form is valid.
    *  - `ng-invalid` is set if the form is invalid.
+   *  - `ng-pending` is set if the form is pending.
    *  - `ng-pristine` is set if the form is pristine.
    *  - `ng-dirty` is set if the form is dirty.
+   *  - `ng-submitted` is set if the form was submitted.
+   *
+   * Keep in mind that ngAnimate can detect each of these classes when added and removed.
    *
    *
    * # Submitting a form and preventing the default action
@@ -15517,121 +23585,325 @@
    * hitting enter in any of the input fields will trigger the click handler on the *first* button or
    * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
    *
-   * @param {string=} name Name of the form. If specified, the form controller will be published into
-   *                       related scope, under this name.
+   * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
+   * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+   * to have access to the updated model.
+   *
+   * ## Animation Hooks
+   *
+   * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
+   * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
+   * other validations that are performed within the form. Animations in ngForm are similar to how
+   * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
+   * as JS animations.
+   *
+   * The following example shows a simple way to utilize CSS transitions to style a form element
+   * that has been rendered as invalid after it has been validated:
+   *
+   * <pre>
+   * //be sure to include ngAnimate as a module to hook into more
+   * //advanced animations
+   * .my-form {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+   * .my-form.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+   * </pre>
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-form" deps="angular-animate.js" animations="true" fixBase="true" module="formExample">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.userType = 'guest';
-         }
+   angular.module('formExample', [])
+   .controller('FormController', ['$scope', function($scope) {
+             $scope.userType = 'guest';
+           }]);
    </script>
-   <form name="myForm" ng-controller="Ctrl">
+   <style>
+   .my-form {
+          transition:all linear 0.5s;
+          background: transparent;
+        }
+   .my-form.ng-invalid {
+          background: red;
+        }
+   </style>
+   <form name="myForm" ng-controller="FormController" class="my-form">
    userType: <input name="input" ng-model="userType" required>
    <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
-   <tt>userType = {{userType}}</tt><br>
-   <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br>
-   <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br>
-   <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-   <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
+   <code>userType = {{userType}}</code><br>
+   <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
+   <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
+   <code>myForm.$valid = {{myForm.$valid}}</code><br>
+   <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
    </form>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should initialize to model', function() {
-         expect(binding('userType')).toEqual('guest');
-         expect(binding('myForm.input.$valid')).toEqual('true');
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+
+          expect(userType.getText()).toContain('guest');
+          expect(valid.getText()).toContain('true');
         });
 
    it('should be invalid if empty', function() {
-         input('userType').enter('');
-         expect(binding('userType')).toEqual('');
-         expect(binding('myForm.input.$valid')).toEqual('false');
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var userInput = element(by.model('userType'));
+
+          userInput.clear();
+          userInput.sendKeys('');
+
+          expect(userType.getText()).toEqual('userType =');
+          expect(valid.getText()).toContain('false');
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
+   *
+   * @param {string=} name Name of the form. If specified, the form controller will be published into
+   *                       related scope, under this name.
    */
   var formDirectiveFactory = function(isNgForm) {
-    return ['$timeout', function($timeout) {
+    return ['$timeout', '$parse', function($timeout, $parse) {
       var formDirective = {
         name: 'form',
         restrict: isNgForm ? 'EAC' : 'E',
+        require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
         controller: FormController,
-        compile: function() {
+        compile: function ngFormCompile(formElement, attr) {
+          // Setup initial state of the control
+          formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
+
+          var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
           return {
-            pre: function(scope, formElement, attr, controller) {
-              if (!attr.action) {
+            pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
+              var controller = ctrls[0];
+
+              // if `action` attr is not present on the form, prevent the default action (submission)
+              if (!('action' in attr)) {
                 // we can't use jq events because if a form is destroyed during submission the default
                 // action is not prevented. see #1238
                 //
                 // IE 9 is not affected because it doesn't fire a submit event and try to do a full
                 // page reload if the form was destroyed by submission of the form via a click handler
                 // on a button in the form. Looks like an IE9 specific bug.
-                var preventDefaultListener = function(event) {
-                  event.preventDefault
-                      ? event.preventDefault()
-                      : event.returnValue = false; // IE
+                var handleFormSubmission = function(event) {
+                  scope.$apply(function() {
+                    controller.$commitViewValue();
+                    controller.$setSubmitted();
+                  });
+
+                  event.preventDefault();
                 };
 
-                addEventListenerFn(formElement[0], 'submit', preventDefaultListener);
+                formElement[0].addEventListener('submit', handleFormSubmission);
 
                 // unregister the preventDefault listener so that we don't not leak memory but in a
                 // way that will achieve the prevention of the default action.
                 formElement.on('$destroy', function() {
                   $timeout(function() {
-                    removeEventListenerFn(formElement[0], 'submit', preventDefaultListener);
+                    formElement[0].removeEventListener('submit', handleFormSubmission);
                   }, 0, false);
                 });
               }
 
-              var parentFormCtrl = formElement.parent().controller('form'),
-                  alias = attr.name || attr.ngForm;
+              var parentFormCtrl = ctrls[1] || controller.$$parentForm;
+              parentFormCtrl.$addControl(controller);
 
-              if (alias) {
-                setter(scope, alias, controller, alias);
-              }
-              if (parentFormCtrl) {
-                formElement.on('$destroy', function() {
-                  parentFormCtrl.$removeControl(controller);
-                  if (alias) {
-                    setter(scope, alias, undefined, alias);
-                  }
-                  extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+              var setter = nameAttr ? getSetter(controller.$name) : noop;
+
+              if (nameAttr) {
+                setter(scope, controller);
+                attr.$observe(nameAttr, function(newValue) {
+                  if (controller.$name === newValue) return;
+                  setter(scope, undefined);
+                  controller.$$parentForm.$$renameControl(controller, newValue);
+                  setter = getSetter(controller.$name);
+                  setter(scope, controller);
                 });
               }
+              formElement.on('$destroy', function() {
+                controller.$$parentForm.$removeControl(controller);
+                setter(scope, undefined);
+                extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+              });
             }
           };
         }
       };
 
       return formDirective;
+
+      function getSetter(expression) {
+        if (expression === '') {
+          //create an assignable expression, so forms with an empty name can be renamed later
+          return $parse('this[""]').assign;
+        }
+        return $parse(expression).assign || noop;
+      }
     }];
   };
 
   var formDirective = formDirectiveFactory();
   var ngFormDirective = formDirectiveFactory(true);
 
+
+
+// helper methods
+  function setupValidity(instance) {
+    instance.$$classCache = {};
+    instance.$$classCache[INVALID_CLASS] = !(instance.$$classCache[VALID_CLASS] = instance.$$element.hasClass(VALID_CLASS));
+  }
+  function addSetValidityMethod(context) {
+    var clazz = context.clazz,
+      set = context.set,
+      unset = context.unset;
+
+    clazz.prototype.$setValidity = function(validationErrorKey, state, controller) {
+      if (isUndefined(state)) {
+        createAndSet(this, '$pending', validationErrorKey, controller);
+      } else {
+        unsetAndCleanup(this, '$pending', validationErrorKey, controller);
+      }
+      if (!isBoolean(state)) {
+        unset(this.$error, validationErrorKey, controller);
+        unset(this.$$success, validationErrorKey, controller);
+      } else {
+        if (state) {
+          unset(this.$error, validationErrorKey, controller);
+          set(this.$$success, validationErrorKey, controller);
+        } else {
+          set(this.$error, validationErrorKey, controller);
+          unset(this.$$success, validationErrorKey, controller);
+        }
+      }
+      if (this.$pending) {
+        cachedToggleClass(this, PENDING_CLASS, true);
+        this.$valid = this.$invalid = undefined;
+        toggleValidationCss(this, '', null);
+      } else {
+        cachedToggleClass(this, PENDING_CLASS, false);
+        this.$valid = isObjectEmpty(this.$error);
+        this.$invalid = !this.$valid;
+        toggleValidationCss(this, '', this.$valid);
+      }
+
+      // re-read the state as the set/unset methods could have
+      // combined state in this.$error[validationError] (used for forms),
+      // where setting/unsetting only increments/decrements the value,
+      // and does not replace it.
+      var combinedState;
+      if (this.$pending && this.$pending[validationErrorKey]) {
+        combinedState = undefined;
+      } else if (this.$error[validationErrorKey]) {
+        combinedState = false;
+      } else if (this.$$success[validationErrorKey]) {
+        combinedState = true;
+      } else {
+        combinedState = null;
+      }
+
+      toggleValidationCss(this, validationErrorKey, combinedState);
+      this.$$parentForm.$setValidity(validationErrorKey, combinedState, this);
+    };
+
+    function createAndSet(ctrl, name, value, controller) {
+      if (!ctrl[name]) {
+        ctrl[name] = {};
+      }
+      set(ctrl[name], value, controller);
+    }
+
+    function unsetAndCleanup(ctrl, name, value, controller) {
+      if (ctrl[name]) {
+        unset(ctrl[name], value, controller);
+      }
+      if (isObjectEmpty(ctrl[name])) {
+        ctrl[name] = undefined;
+      }
+    }
+
+    function cachedToggleClass(ctrl, className, switchValue) {
+      if (switchValue && !ctrl.$$classCache[className]) {
+        ctrl.$$animate.addClass(ctrl.$$element, className);
+        ctrl.$$classCache[className] = true;
+      } else if (!switchValue && ctrl.$$classCache[className]) {
+        ctrl.$$animate.removeClass(ctrl.$$element, className);
+        ctrl.$$classCache[className] = false;
+      }
+    }
+
+    function toggleValidationCss(ctrl, validationErrorKey, isValid) {
+      validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
+
+      cachedToggleClass(ctrl, VALID_CLASS + validationErrorKey, isValid === true);
+      cachedToggleClass(ctrl, INVALID_CLASS + validationErrorKey, isValid === false);
+    }
+  }
+
+  function isObjectEmpty(obj) {
+    if (obj) {
+      for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
   /* global
+  VALID_CLASS: false,
+  INVALID_CLASS: false,
+  PRISTINE_CLASS: false,
+  DIRTY_CLASS: false,
+  ngModelMinErr: false
+*/
 
-   -VALID_CLASS,
-   -INVALID_CLASS,
-   -PRISTINE_CLASS,
-   -DIRTY_CLASS
-   */
+// Regex code was initially obtained from SO prior to modification: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
+  var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
+// See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
+// Note: We are being more lenient, because browsers are too.
+//   1. Scheme
+//   2. Slashes
+//   3. Username
+//   4. Password
+//   5. Hostname
+//   6. Port
+//   7. Path
+//   8. Query
+//   9. Fragment
+//                 1111111111111111 222   333333    44444        55555555555555555555555     666     77777777     8888888     999
+  var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
+// eslint-disable-next-line max-len
+  var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
+  var NUMBER_REGEXP = /^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
+  var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
+  var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+  var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
+  var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
+  var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
 
-  var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
-  var EMAIL_REGEXP = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}$/;
-  var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
+  var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
+  var PARTIAL_VALIDATION_TYPES = createMap();
+  forEach('date,datetime-local,month,time,week'.split(','), function(type) {
+    PARTIAL_VALIDATION_TYPES[type] = true;
+  });
 
   var inputType = {
 
     /**
-     * @ngdoc inputType
-     * @name ng.directive:input.text
+     * @ngdoc input
+     * @name input[text]
      *
      * @description
-     * Standard HTML text input with angular data binding.
+     * Standard HTML text input with angular data binding, inherited by most of the `input` elements.
+     *
      *
      * @param {string} ngModel Assignable angular expression to data-bind to.
      * @param {string=} name Property name of the form under which the control is published.
@@ -15642,78 +23914,639 @@
      * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
      *    minlength.
      * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+     *    any length.
+     * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+     *    that contains the regular expression body that will be converted to a regular expression
+     *    as in the ngPattern directive.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
      * @param {string=} ngChange Angular expression to be executed when input changes due to user
      *    interaction with the input element.
      * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+     *    This parameter is ignored for input[type=password] controls, which will never trim the
+     *    input.
      *
      * @example
-     <doc:example>
-     <doc:source>
+     <example name="text-input-directive" module="textInputExample">
+     <file name="index.html">
      <script>
-     function Ctrl($scope) {
-             $scope.text = 'guest';
-             $scope.word = /^\s*\w*\s*$/;
-           }
+     angular.module('textInputExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 text: 'guest',
+                 word: /^\s*\w*\s*$/
+               };
+             }]);
      </script>
-     <form name="myForm" ng-controller="Ctrl">
-     Single word: <input type="text" name="input" ng-model="text"
-     ng-pattern="word" required ng-trim="false">
+     <form name="myForm" ng-controller="ExampleController">
+     <label>Single word:
+     <input type="text" name="input" ng-model="example.text"
+     ng-pattern="example.word" required ng-trim="false">
+     </label>
+     <div role="alert">
      <span class="error" ng-show="myForm.input.$error.required">
      Required!</span>
      <span class="error" ng-show="myForm.input.$error.pattern">
      Single word only!</span>
+     </div>
+     <code>text = {{example.text}}</code><br/>
+     <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br/>
+     <code>myForm.input.$error = {{myForm.input.$error}}</code><br/>
+     <code>myForm.$valid = {{myForm.$valid}}</code><br/>
+     <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br/>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var text = element(by.binding('example.text'));
+     var valid = element(by.binding('myForm.input.$valid'));
+     var input = element(by.model('example.text'));
 
-     <tt>text = {{text}}</tt><br/>
+     it('should initialize to model', function() {
+            expect(text.getText()).toContain('guest');
+            expect(valid.getText()).toContain('true');
+          });
+
+     it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+     it('should be invalid if multi word', function() {
+            input.clear();
+            input.sendKeys('hello world');
+
+            expect(valid.getText()).toContain('false');
+          });
+     </file>
+     </example>
+     */
+    'text': textInputType,
+
+    /**
+     * @ngdoc input
+     * @name input[date]
+     *
+     * @description
+     * Input with date validation and transformation. In browsers that do not yet support
+     * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
+     * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
+     * modern browsers do not yet support this input type, it is important to provide cues to users on the
+     * expected input format via a placeholder or label.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+     *   valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+     *   (e.g. `min="{{minDate | date:'yyyy-MM-dd'}}"`). Note that `min` will also add native HTML5
+     *   constraint validation.
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+     *   a valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+     *   (e.g. `max="{{maxDate | date:'yyyy-MM-dd'}}"`). Note that `max` will also add native HTML5
+     *   constraint validation.
+     * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO date string
+     *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+     * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO date string
+     *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="date-input-directive" module="dateInputExample">
+     <file name="index.html">
+     <script>
+     angular.module('dateInputExample', [])
+     .controller('DateController', ['$scope', function($scope) {
+              $scope.example = {
+                value: new Date(2013, 9, 22)
+              };
+            }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+     <label for="exampleInput">Pick a date in 2013:</label>
+     <input type="date" id="exampleInput" name="input" ng-model="example.value"
+     placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
+     <div role="alert">
+     <span class="error" ng-show="myForm.input.$error.required">
+     Required!</span>
+     <span class="error" ng-show="myForm.input.$error.date">
+     Not a valid date!</span>
+     </div>
+     <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
      <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
      <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
      </form>
-     </doc:source>
-     <doc:scenario>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
+     var valid = element(by.binding('myForm.input.$valid'));
+
+     // currently protractor/webdriver does not support
+     // sending keys to all known HTML5 input controls
+     // for various browsers (see https://github.com/angular/protractor/issues/562).
+     function setInput(val) {
+          // set the value of the element and force validation.
+          var scr = "var ipt = document.getElementById('exampleInput'); " +
+          "ipt.value = '" + val + "';" +
+          "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+          browser.executeScript(scr);
+        }
+
      it('should initialize to model', function() {
-            expect(binding('text')).toEqual('guest');
-            expect(binding('myForm.input.$valid')).toEqual('true');
-          });
+          expect(value.getText()).toContain('2013-10-22');
+          expect(valid.getText()).toContain('myForm.input.$valid = true');
+        });
 
      it('should be invalid if empty', function() {
-            input('text').enter('');
-            expect(binding('text')).toEqual('');
-            expect(binding('myForm.input.$valid')).toEqual('false');
-          });
+          setInput('');
+          expect(value.getText()).toEqual('value =');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
 
-     it('should be invalid if multi word', function() {
-            input('text').enter('hello world');
-            expect(binding('myForm.input.$valid')).toEqual('false');
-          });
-
-     it('should not be trimmed', function() {
-            input('text').enter('untrimmed ');
-            expect(binding('text')).toEqual('untrimmed ');
-            expect(binding('myForm.input.$valid')).toEqual('true');
-          });
-     </doc:scenario>
-     </doc:example>
+     it('should be invalid if over max', function() {
+          setInput('2015-01-01');
+          expect(value.getText()).toContain('');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+     </file>
+     </example>
      */
-    'text': textInputType,
-
+    'date': createDateInputType('date', DATE_REGEXP,
+      createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
+      'yyyy-MM-dd'),
 
     /**
-     * @ngdoc inputType
-     * @name ng.directive:input.number
+     * @ngdoc input
+     * @name input[datetime-local]
+     *
+     * @description
+     * Input with datetime validation and transformation. In browsers that do not yet support
+     * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+     * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+     *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+     *   inside this attribute (e.g. `min="{{minDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+     *   Note that `min` will also add native HTML5 constraint validation.
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+     *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+     *   inside this attribute (e.g. `max="{{maxDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+     *   Note that `max` will also add native HTML5 constraint validation.
+     * @param {(date|string)=} ngMin Sets the `min` validation error key to the Date / ISO datetime string
+     *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+     * @param {(date|string)=} ngMax Sets the `max` validation error key to the Date / ISO datetime string
+     *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="datetimelocal-input-directive" module="dateExample">
+     <file name="index.html">
+     <script>
+     angular.module('dateExample', [])
+     .controller('DateController', ['$scope', function($scope) {
+            $scope.example = {
+              value: new Date(2010, 11, 28, 14, 57)
+            };
+          }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+     <label for="exampleInput">Pick a date between in 2013:</label>
+     <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
+     placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
+     <div role="alert">
+     <span class="error" ng-show="myForm.input.$error.required">
+     Required!</span>
+     <span class="error" ng-show="myForm.input.$error.datetimelocal">
+     Not a valid date!</span>
+     </div>
+     <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
+     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
+     var valid = element(by.binding('myForm.input.$valid'));
+
+     // currently protractor/webdriver does not support
+     // sending keys to all known HTML5 input controls
+     // for various browsers (https://github.com/angular/protractor/issues/562).
+     function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+     it('should initialize to model', function() {
+        expect(value.getText()).toContain('2010-12-28T14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+     it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+     it('should be invalid if over max', function() {
+        setInput('2015-01-01T23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+     </file>
+     </example>
+     */
+    'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
+      createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
+      'yyyy-MM-ddTHH:mm:ss.sss'),
+
+    /**
+     * @ngdoc input
+     * @name input[time]
+     *
+     * @description
+     * Input with time validation and transformation. In browsers that do not yet support
+     * the HTML5 time input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+     * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
+     * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+     *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+     *   attribute (e.g. `min="{{minTime | date:'HH:mm:ss'}}"`). Note that `min` will also add
+     *   native HTML5 constraint validation.
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+     *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+     *   attribute (e.g. `max="{{maxTime | date:'HH:mm:ss'}}"`). Note that `max` will also add
+     *   native HTML5 constraint validation.
+     * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO time string the
+     *   `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+     * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO time string the
+     *   `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="time-input-directive" module="timeExample">
+     <file name="index.html">
+     <script>
+     angular.module('timeExample', [])
+     .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(1970, 0, 1, 14, 57, 0)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+     <label for="exampleInput">Pick a time between 8am and 5pm:</label>
+     <input type="time" id="exampleInput" name="input" ng-model="example.value"
+     placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
+     <div role="alert">
+     <span class="error" ng-show="myForm.input.$error.required">
+     Required!</span>
+     <span class="error" ng-show="myForm.input.$error.time">
+     Not a valid date!</span>
+     </div>
+     <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
+     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var value = element(by.binding('example.value | date: "HH:mm:ss"'));
+     var valid = element(by.binding('myForm.input.$valid'));
+
+     // currently protractor/webdriver does not support
+     // sending keys to all known HTML5 input controls
+     // for various browsers (https://github.com/angular/protractor/issues/562).
+     function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+     it('should initialize to model', function() {
+        expect(value.getText()).toContain('14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+     it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+     it('should be invalid if over max', function() {
+        setInput('23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+     </file>
+     </example>
+     */
+    'time': createDateInputType('time', TIME_REGEXP,
+      createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
+      'HH:mm:ss.sss'),
+
+    /**
+     * @ngdoc input
+     * @name input[week]
+     *
+     * @description
+     * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
+     * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+     * week format (yyyy-W##), for example: `2013-W02`.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+     *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+     *   attribute (e.g. `min="{{minWeek | date:'yyyy-Www'}}"`). Note that `min` will also add
+     *   native HTML5 constraint validation.
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+     *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+     *   attribute (e.g. `max="{{maxWeek | date:'yyyy-Www'}}"`). Note that `max` will also add
+     *   native HTML5 constraint validation.
+     * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+     *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+     * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+     *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="week-input-directive" module="weekExample">
+     <file name="index.html">
+     <script>
+     angular.module('weekExample', [])
+     .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 0, 3)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+     <label>Pick a date between in 2013:
+     <input id="exampleInput" type="week" name="input" ng-model="example.value"
+     placeholder="YYYY-W##" min="2012-W32"
+     max="2013-W52" required />
+     </label>
+     <div role="alert">
+     <span class="error" ng-show="myForm.input.$error.required">
+     Required!</span>
+     <span class="error" ng-show="myForm.input.$error.week">
+     Not a valid date!</span>
+     </div>
+     <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
+     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var value = element(by.binding('example.value | date: "yyyy-Www"'));
+     var valid = element(by.binding('myForm.input.$valid'));
+
+     // currently protractor/webdriver does not support
+     // sending keys to all known HTML5 input controls
+     // for various browsers (https://github.com/angular/protractor/issues/562).
+     function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+     it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-W01');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+     it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+     it('should be invalid if over max', function() {
+        setInput('2015-W01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+     </file>
+     </example>
+     */
+    'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
+
+    /**
+     * @ngdoc input
+     * @name input[month]
+     *
+     * @description
+     * Input with month validation and transformation. In browsers that do not yet support
+     * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+     * month format (yyyy-MM), for example: `2009-01`.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     * If the model is not set to the first of the month, the next view to model update will set it
+     * to the first of the month.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+     *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+     *   attribute (e.g. `min="{{minMonth | date:'yyyy-MM'}}"`). Note that `min` will also add
+     *   native HTML5 constraint validation.
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+     *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+     *   attribute (e.g. `max="{{maxMonth | date:'yyyy-MM'}}"`). Note that `max` will also add
+     *   native HTML5 constraint validation.
+     * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+     *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+     * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+     *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="month-input-directive" module="monthExample">
+     <file name="index.html">
+     <script>
+     angular.module('monthExample', [])
+     .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 9, 1)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+     <label for="exampleInput">Pick a month in 2013:</label>
+     <input id="exampleInput" type="month" name="input" ng-model="example.value"
+     placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
+     <div role="alert">
+     <span class="error" ng-show="myForm.input.$error.required">
+     Required!</span>
+     <span class="error" ng-show="myForm.input.$error.month">
+     Not a valid month!</span>
+     </div>
+     <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
+     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var value = element(by.binding('example.value | date: "yyyy-MM"'));
+     var valid = element(by.binding('myForm.input.$valid'));
+
+     // currently protractor/webdriver does not support
+     // sending keys to all known HTML5 input controls
+     // for various browsers (https://github.com/angular/protractor/issues/562).
+     function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+     it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-10');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+     it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+     it('should be invalid if over max', function() {
+        setInput('2015-01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+     </file>
+     </example>
+     */
+    'month': createDateInputType('month', MONTH_REGEXP,
+      createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
+      'yyyy-MM'),
+
+    /**
+     * @ngdoc input
+     * @name input[number]
      *
      * @description
      * Text input with number validation and transformation. Sets the `number` validation
      * error if not a valid number.
      *
+     * <div class="alert alert-warning">
+     * The model must always be of type `number` otherwise Angular will throw an error.
+     * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+     * error docs for more information and an example of how to convert your model if necessary.
+     * </div>
+     *
+     * ## Issues with HTML5 constraint validation
+     *
+     * In browsers that follow the
+     * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
+     * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
+     * If a non-number is entered in the input, the browser will report the value as an empty string,
+     * which means the view / model values in `ngModel` and subsequently the scope value
+     * will also be an empty string.
+     *
+     *
      * @param {string} ngModel Assignable angular expression to data-bind to.
      * @param {string=} name Property name of the form under which the control is published.
      * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+     *    Can be interpolated.
      * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+     *    Can be interpolated.
+     * @param {string=} ngMin Like `min`, sets the `min` validation error key if the value entered is less than `ngMin`,
+     *    but does not trigger HTML5 native validation. Takes an expression.
+     * @param {string=} ngMax Like `max`, sets the `max` validation error key if the value entered is greater than `ngMax`,
+     *    but does not trigger HTML5 native validation. Takes an expression.
+     * @param {string=} step Sets the `step` validation error key if the value entered does not fit the `step` constraint.
+     *    Can be interpolated.
+     * @param {string=} ngStep Like `step`, sets the `step` validation error key if the value entered does not fit the `ngStep` constraint,
+     *    but does not trigger HTML5 native validation. Takes an expression.
      * @param {string=} required Sets `required` validation error key if the value is not entered.
      * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
      *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
@@ -15721,66 +24554,95 @@
      * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
      *    minlength.
      * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+     *    any length.
+     * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+     *    that contains the regular expression body that will be converted to a regular expression
+     *    as in the ngPattern directive.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
      * @param {string=} ngChange Angular expression to be executed when input changes due to user
      *    interaction with the input element.
      *
      * @example
-     <doc:example>
-     <doc:source>
+     <example name="number-input-directive" module="numberExample">
+     <file name="index.html">
      <script>
-     function Ctrl($scope) {
-             $scope.value = 12;
-           }
+     angular.module('numberExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 value: 12
+               };
+             }]);
      </script>
-     <form name="myForm" ng-controller="Ctrl">
-     Number: <input type="number" name="input" ng-model="value"
+     <form name="myForm" ng-controller="ExampleController">
+     <label>Number:
+     <input type="number" name="input" ng-model="example.value"
      min="0" max="99" required>
+     </label>
+     <div role="alert">
      <span class="error" ng-show="myForm.input.$error.required">
      Required!</span>
      <span class="error" ng-show="myForm.input.$error.number">
      Not valid number!</span>
-     <tt>value = {{value}}</tt><br/>
+     </div>
+     <tt>value = {{example.value}}</tt><br/>
      <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
      <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
      </form>
-     </doc:source>
-     <doc:scenario>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var value = element(by.binding('example.value'));
+     var valid = element(by.binding('myForm.input.$valid'));
+     var input = element(by.model('example.value'));
+
      it('should initialize to model', function() {
-           expect(binding('value')).toEqual('12');
-           expect(binding('myForm.input.$valid')).toEqual('true');
+            expect(value.getText()).toContain('12');
+            expect(valid.getText()).toContain('true');
           });
 
      it('should be invalid if empty', function() {
-           input('value').enter('');
-           expect(binding('value')).toEqual('');
-           expect(binding('myForm.input.$valid')).toEqual('false');
+            input.clear();
+            input.sendKeys('');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
           });
 
      it('should be invalid if over max', function() {
-           input('value').enter('123');
-           expect(binding('value')).toEqual('');
-           expect(binding('myForm.input.$valid')).toEqual('false');
+            input.clear();
+            input.sendKeys('123');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
           });
-     </doc:scenario>
-     </doc:example>
+     </file>
+     </example>
      */
     'number': numberInputType,
 
 
     /**
-     * @ngdoc inputType
-     * @name ng.directive:input.url
+     * @ngdoc input
+     * @name input[url]
      *
      * @description
      * Text input with URL validation. Sets the `url` validation error key if the content is not a
      * valid URL.
      *
+     * <div class="alert alert-warning">
+     * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
+     * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
+     * the built-in validators (see the {@link guide/forms Forms guide})
+     * </div>
+     *
      * @param {string} ngModel Assignable angular expression to data-bind to.
      * @param {string=} name Property name of the form under which the control is published.
      * @param {string=} required Sets `required` validation error key if the value is not entered.
@@ -15790,65 +24652,96 @@
      * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
      *    minlength.
      * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+     *    any length.
+     * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+     *    that contains the regular expression body that will be converted to a regular expression
+     *    as in the ngPattern directive.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
      * @param {string=} ngChange Angular expression to be executed when input changes due to user
      *    interaction with the input element.
      *
      * @example
-     <doc:example>
-     <doc:source>
+     <example name="url-input-directive" module="urlExample">
+     <file name="index.html">
      <script>
-     function Ctrl($scope) {
-             $scope.text = 'http://google.com';
-           }
+     angular.module('urlExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+               $scope.url = {
+                 text: 'http://google.com'
+               };
+             }]);
      </script>
-     <form name="myForm" ng-controller="Ctrl">
-     URL: <input type="url" name="input" ng-model="text" required>
+     <form name="myForm" ng-controller="ExampleController">
+     <label>URL:
+     <input type="url" name="input" ng-model="url.text" required>
+     <label>
+     <div role="alert">
      <span class="error" ng-show="myForm.input.$error.required">
      Required!</span>
      <span class="error" ng-show="myForm.input.$error.url">
      Not valid url!</span>
-     <tt>text = {{text}}</tt><br/>
+     </div>
+     <tt>text = {{url.text}}</tt><br/>
      <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
      <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
      <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
      </form>
-     </doc:source>
-     <doc:scenario>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var text = element(by.binding('url.text'));
+     var valid = element(by.binding('myForm.input.$valid'));
+     var input = element(by.model('url.text'));
+
      it('should initialize to model', function() {
-            expect(binding('text')).toEqual('http://google.com');
-            expect(binding('myForm.input.$valid')).toEqual('true');
+            expect(text.getText()).toContain('http://google.com');
+            expect(valid.getText()).toContain('true');
           });
 
      it('should be invalid if empty', function() {
-            input('text').enter('');
-            expect(binding('text')).toEqual('');
-            expect(binding('myForm.input.$valid')).toEqual('false');
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
           });
 
      it('should be invalid if not url', function() {
-            input('text').enter('xxx');
-            expect(binding('myForm.input.$valid')).toEqual('false');
+            input.clear();
+            input.sendKeys('box');
+
+            expect(valid.getText()).toContain('false');
           });
-     </doc:scenario>
-     </doc:example>
+     </file>
+     </example>
      */
     'url': urlInputType,
 
 
     /**
-     * @ngdoc inputType
-     * @name ng.directive:input.email
+     * @ngdoc input
+     * @name input[email]
      *
      * @description
      * Text input with email validation. Sets the `email` validation error key if not a valid email
      * address.
      *
+     * <div class="alert alert-warning">
+     * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
+     * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
+     * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
+     * </div>
+     *
      * @param {string} ngModel Assignable angular expression to data-bind to.
      * @param {string=} name Property name of the form under which the control is published.
      * @param {string=} required Sets `required` validation error key if the value is not entered.
@@ -15858,192 +24751,385 @@
      * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
      *    minlength.
      * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+     *    any length.
+     * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+     *    that contains the regular expression body that will be converted to a regular expression
+     *    as in the ngPattern directive.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
      * @param {string=} ngChange Angular expression to be executed when input changes due to user
      *    interaction with the input element.
      *
      * @example
-     <doc:example>
-     <doc:source>
+     <example name="email-input-directive" module="emailExample">
+     <file name="index.html">
      <script>
-     function Ctrl($scope) {
-             $scope.text = 'me@example.com';
-     }
+     angular.module('emailExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+               $scope.email = {
+                 text: 'me@example.com'
+               };
+             }]);
      </script>
-     <form name="myForm" ng-controller="Ctrl">
-     Email: <input type="email" name="input" ng-model="text" required>
+     <form name="myForm" ng-controller="ExampleController">
+     <label>Email:
+     <input type="email" name="input" ng-model="email.text" required>
+     </label>
+     <div role="alert">
      <span class="error" ng-show="myForm.input.$error.required">
      Required!</span>
      <span class="error" ng-show="myForm.input.$error.email">
      Not valid email!</span>
-     <tt>text = {{text}}</tt><br/>
+     </div>
+     <tt>text = {{email.text}}</tt><br/>
      <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
      <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
      <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
      </form>
-     </doc:source>
-     <doc:scenario>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var text = element(by.binding('email.text'));
+     var valid = element(by.binding('myForm.input.$valid'));
+     var input = element(by.model('email.text'));
+
      it('should initialize to model', function() {
-            expect(binding('text')).toEqual('me@example.com');
-     expect(binding('myForm.input.$valid')).toEqual('true');
-     });
+            expect(text.getText()).toContain('me@example.com');
+            expect(valid.getText()).toContain('true');
+          });
 
      it('should be invalid if empty', function() {
-            input('text').enter('');
-            expect(binding('text')).toEqual('');
-            expect(binding('myForm.input.$valid')).toEqual('false');
+            input.clear();
+            input.sendKeys('');
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
           });
 
      it('should be invalid if not email', function() {
-            input('text').enter('xxx');
-            expect(binding('myForm.input.$valid')).toEqual('false');
+            input.clear();
+            input.sendKeys('xxx');
+
+            expect(valid.getText()).toContain('false');
           });
-     </doc:scenario>
-     </doc:example>
+     </file>
+     </example>
      */
     'email': emailInputType,
 
 
     /**
-     * @ngdoc inputType
-     * @name ng.directive:input.radio
+     * @ngdoc input
+     * @name input[radio]
      *
      * @description
      * HTML radio button.
      *
      * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string} value The value to which the expression should be set when selected.
+     * @param {string} value The value to which the `ngModel` expression should be set when selected.
+     *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
+     *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
      * @param {string=} name Property name of the form under which the control is published.
      * @param {string=} ngChange Angular expression to be executed when input changes due to user
      *    interaction with the input element.
+     * @param {string} ngValue Angular expression to which `ngModel` will be be set when the radio
+     *    is selected. Should be used instead of the `value` attribute if you need
+     *    a non-string `ngModel` (`boolean`, `array`, ...).
      *
      * @example
-     <doc:example>
-     <doc:source>
+     <example name="radio-input-directive" module="radioExample">
+     <file name="index.html">
      <script>
-     function Ctrl($scope) {
-             $scope.color = 'blue';
-           }
+     angular.module('radioExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+               $scope.color = {
+                 name: 'blue'
+               };
+               $scope.specialValue = {
+                 "id": "12345",
+                 "value": "green"
+               };
+             }]);
      </script>
-     <form name="myForm" ng-controller="Ctrl">
-     <input type="radio" ng-model="color" value="red">  Red <br/>
-     <input type="radio" ng-model="color" value="green"> Green <br/>
-     <input type="radio" ng-model="color" value="blue"> Blue <br/>
-     <tt>color = {{color}}</tt><br/>
+     <form name="myForm" ng-controller="ExampleController">
+     <label>
+     <input type="radio" ng-model="color.name" value="red">
+     Red
+     </label><br/>
+     <label>
+     <input type="radio" ng-model="color.name" ng-value="specialValue">
+     Green
+     </label><br/>
+     <label>
+     <input type="radio" ng-model="color.name" value="blue">
+     Blue
+     </label><br/>
+     <tt>color = {{color.name | json}}</tt><br/>
      </form>
-     </doc:source>
-     <doc:scenario>
+     Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
+     </file>
+     <file name="protractor.js" type="protractor">
      it('should change state', function() {
-            expect(binding('color')).toEqual('blue');
+            var inputs = element.all(by.model('color.name'));
+            var color = element(by.binding('color.name'));
 
-            input('color').select('red');
-            expect(binding('color')).toEqual('red');
+            expect(color.getText()).toContain('blue');
+
+            inputs.get(0).click();
+            expect(color.getText()).toContain('red');
+
+            inputs.get(1).click();
+            expect(color.getText()).toContain('green');
           });
-     </doc:scenario>
-     </doc:example>
+     </file>
+     </example>
      */
     'radio': radioInputType,
 
+    /**
+     * @ngdoc input
+     * @name input[range]
+     *
+     * @description
+     * Native range input with validation and transformation.
+     *
+     * The model for the range input must always be a `Number`.
+     *
+     * IE9 and other browsers that do not support the `range` type fall back
+     * to a text input without any default values for `min`, `max` and `step`. Model binding,
+     * validation and number parsing are nevertheless supported.
+     *
+     * Browsers that support range (latest Chrome, Safari, Firefox, Edge) treat `input[range]`
+     * in a way that never allows the input to hold an invalid value. That means:
+     * - any non-numerical value is set to `(max + min) / 2`.
+     * - any numerical value that is less than the current min val, or greater than the current max val
+     * is set to the min / max val respectively.
+     * - additionally, the current `step` is respected, so the nearest value that satisfies a step
+     * is used.
+     *
+     * See the [HTML Spec on input[type=range]](https://www.w3.org/TR/html5/forms.html#range-state-(type=range))
+     * for more info.
+     *
+     * This has the following consequences for Angular:
+     *
+     * Since the element value should always reflect the current model value, a range input
+     * will set the bound ngModel expression to the value that the browser has set for the
+     * input element. For example, in the following input `<input type="range" ng-model="model.value">`,
+     * if the application sets `model.value = null`, the browser will set the input to `'50'`.
+     * Angular will then set the model to `50`, to prevent input and model value being out of sync.
+     *
+     * That means the model for range will immediately be set to `50` after `ngModel` has been
+     * initialized. It also means a range input can never have the required error.
+     *
+     * This does not only affect changes to the model value, but also to the values of the `min`,
+     * `max`, and `step` attributes. When these change in a way that will cause the browser to modify
+     * the input value, Angular will also update the model value.
+     *
+     * Automatic value adjustment also means that a range input element can never have the `required`,
+     * `min`, or `max` errors.
+     *
+     * However, `step` is currently only fully implemented by Firefox. Other browsers have problems
+     * when the step value changes dynamically - they do not adjust the element value correctly, but
+     * instead may set the `stepMismatch` error. If that's the case, the Angular will set the `step`
+     * error on the input, and set the model to `undefined`.
+     *
+     * Note that `input[range]` is not compatible with`ngMax`, `ngMin`, and `ngStep`, because they do
+     * not set the `min` and `max` attributes, which means that the browser won't automatically adjust
+     * the input value based on their values, and will always assume min = 0, max = 100, and step = 1.
+     *
+     * @param {string}  ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation to ensure that the value entered is greater
+     *                  than `min`. Can be interpolated.
+     * @param {string=} max Sets the `max` validation to ensure that the value entered is less than `max`.
+     *                  Can be interpolated.
+     * @param {string=} step Sets the `step` validation to ensure that the value entered matches the `step`
+     *                  Can be interpolated.
+     * @param {string=} ngChange Angular expression to be executed when the ngModel value changes due
+     *                  to user interaction with the input element.
+     * @param {expression=} ngChecked If the expression is truthy, then the `checked` attribute will be set on the
+     *                      element. **Note** : `ngChecked` should not be used alongside `ngModel`.
+     *                      Checkout {@link ng.directive:ngChecked ngChecked} for usage.
+     *
+     * @example
+     <example name="range-input-directive" module="rangeExample">
+     <file name="index.html">
+     <script>
+     angular.module('rangeExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+     </script>
+     <form name="myForm" ng-controller="ExampleController">
+
+     Model as range: <input type="range" name="range" ng-model="value" min="{{min}}"  max="{{max}}">
+     <hr>
+     Model as number: <input type="number" ng-model="value"><br>
+     Min: <input type="number" ng-model="min"><br>
+     Max: <input type="number" ng-model="max"><br>
+     value = <code>{{value}}</code><br/>
+     myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+     myForm.range.$error = <code>{{myForm.range.$error}}</code>
+     </form>
+     </file>
+     </example>
+
+     * ## Range Input with ngMin & ngMax attributes
+
+     * @example
+     <example name="range-input-directive-ng" module="rangeExample">
+     <file name="index.html">
+     <script>
+     angular.module('rangeExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+     </script>
+     <form name="myForm" ng-controller="ExampleController">
+     Model as range: <input type="range" name="range" ng-model="value" ng-min="min" ng-max="max">
+     <hr>
+     Model as number: <input type="number" ng-model="value"><br>
+     Min: <input type="number" ng-model="min"><br>
+     Max: <input type="number" ng-model="max"><br>
+     value = <code>{{value}}</code><br/>
+     myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+     myForm.range.$error = <code>{{myForm.range.$error}}</code>
+     </form>
+     </file>
+     </example>
+
+     */
+    'range': rangeInputType,
 
     /**
-     * @ngdoc inputType
-     * @name ng.directive:input.checkbox
+     * @ngdoc input
+     * @name input[checkbox]
      *
      * @description
      * HTML checkbox.
      *
      * @param {string} ngModel Assignable angular expression to data-bind to.
      * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} ngTrueValue The value to which the expression should be set when selected.
-     * @param {string=} ngFalseValue The value to which the expression should be set when not selected.
+     * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
+     * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
      * @param {string=} ngChange Angular expression to be executed when input changes due to user
      *    interaction with the input element.
      *
      * @example
-     <doc:example>
-     <doc:source>
+     <example name="checkbox-input-directive" module="checkboxExample">
+     <file name="index.html">
      <script>
-     function Ctrl($scope) {
-             $scope.value1 = true;
-             $scope.value2 = 'YES'
-           }
+     angular.module('checkboxExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+               $scope.checkboxModel = {
+                value1 : true,
+                value2 : 'YES'
+              };
+             }]);
      </script>
-     <form name="myForm" ng-controller="Ctrl">
-     Value1: <input type="checkbox" ng-model="value1"> <br/>
-     Value2: <input type="checkbox" ng-model="value2"
-     ng-true-value="YES" ng-false-value="NO"> <br/>
-     <tt>value1 = {{value1}}</tt><br/>
-     <tt>value2 = {{value2}}</tt><br/>
+     <form name="myForm" ng-controller="ExampleController">
+     <label>Value1:
+     <input type="checkbox" ng-model="checkboxModel.value1">
+     </label><br/>
+     <label>Value2:
+     <input type="checkbox" ng-model="checkboxModel.value2"
+     ng-true-value="'YES'" ng-false-value="'NO'">
+     </label><br/>
+     <tt>value1 = {{checkboxModel.value1}}</tt><br/>
+     <tt>value2 = {{checkboxModel.value2}}</tt><br/>
      </form>
-     </doc:source>
-     <doc:scenario>
+     </file>
+     <file name="protractor.js" type="protractor">
      it('should change state', function() {
-            expect(binding('value1')).toEqual('true');
-            expect(binding('value2')).toEqual('YES');
+            var value1 = element(by.binding('checkboxModel.value1'));
+            var value2 = element(by.binding('checkboxModel.value2'));
 
-            input('value1').check();
-            input('value2').check();
-            expect(binding('value1')).toEqual('false');
-            expect(binding('value2')).toEqual('NO');
+            expect(value1.getText()).toContain('true');
+            expect(value2.getText()).toContain('YES');
+
+            element(by.model('checkboxModel.value1')).click();
+            element(by.model('checkboxModel.value2')).click();
+
+            expect(value1.getText()).toContain('false');
+            expect(value2.getText()).toContain('NO');
           });
-     </doc:scenario>
-     </doc:example>
+     </file>
+     </example>
      */
     'checkbox': checkboxInputType,
 
     'hidden': noop,
     'button': noop,
     'submit': noop,
-    'reset': noop
+    'reset': noop,
+    'file': noop
   };
 
-// A helper function to call $setValidity and return the value / undefined,
-// a pattern that is repeated a lot in the input validation logic.
-  function validate(ctrl, validatorName, validity, value){
-    ctrl.$setValidity(validatorName, validity);
-    return validity ? value : undefined;
+  function stringBasedInputType(ctrl) {
+    ctrl.$formatters.push(function(value) {
+      return ctrl.$isEmpty(value) ? value : value.toString();
+    });
   }
 
   function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-    // In composition mode, users are still inputing intermediate text buffer,
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    stringBasedInputType(ctrl);
+  }
+
+  function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+    var type = lowercase(element[0].type);
+
+    // In composition mode, users are still inputting intermediate text buffer,
     // hold the listener until composition is done.
     // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
     if (!$sniffer.android) {
       var composing = false;
 
-      element.on('compositionstart', function(data) {
+      element.on('compositionstart', function() {
         composing = true;
       });
 
       element.on('compositionend', function() {
         composing = false;
+        listener();
       });
     }
 
-    var listener = function() {
+    var timeout;
+
+    var listener = function(ev) {
+      if (timeout) {
+        $browser.defer.cancel(timeout);
+        timeout = null;
+      }
       if (composing) return;
-      var value = element.val();
+      var value = element.val(),
+        event = ev && ev.type;
 
       // By default we will trim the value
       // If the attribute ng-trim exists we will avoid trimming
-      // e.g. <input ng-model="foo" ng-trim="false">
-      if (toBoolean(attr.ngTrim || 'T')) {
+      // If input type is 'password', the value is never trimmed
+      if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
         value = trim(value);
       }
 
-      if (ctrl.$viewValue !== value) {
-        if (scope.$$phase) {
-          ctrl.$setViewValue(value);
-        } else {
-          scope.$apply(function() {
-            ctrl.$setViewValue(value);
-          });
-        }
+      // If a control is suffering from bad input (due to native validators), browsers discard its
+      // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
+      // control's value is the same empty value twice in a row.
+      if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
+        ctrl.$setViewValue(value, event);
       }
     };
 
@@ -16052,25 +25138,25 @@
     if ($sniffer.hasEvent('input')) {
       element.on('input', listener);
     } else {
-      var timeout;
-
-      var deferListener = function() {
+      var deferListener = function(ev, input, origValue) {
         if (!timeout) {
           timeout = $browser.defer(function() {
-            listener();
             timeout = null;
+            if (!input || input.value !== origValue) {
+              listener(ev);
+            }
           });
         }
       };
 
-      element.on('keydown', function(event) {
+      element.on('keydown', /** @this */ function(event) {
         var key = event.keyCode;
 
         // ignore
         //    command            modifiers                   arrows
         if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
 
-        deferListener();
+        deferListener(event, this, this.value);
       });
 
       // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
@@ -16083,176 +25169,559 @@
     // or form autocomplete on newer browser, we need "change" event to catch it
     element.on('change', listener);
 
+    // Some native input types (date-family) have the ability to change validity without
+    // firing any input/change events.
+    // For these event types, when native validators are present and the browser supports the type,
+    // check for validity changes on various DOM events.
+    if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) {
+      element.on(PARTIAL_VALIDATION_EVENTS, /** @this */ function(ev) {
+        if (!timeout) {
+          var validity = this[VALIDITY_STATE_PROPERTY];
+          var origBadInput = validity.badInput;
+          var origTypeMismatch = validity.typeMismatch;
+          timeout = $browser.defer(function() {
+            timeout = null;
+            if (validity.badInput !== origBadInput || validity.typeMismatch !== origTypeMismatch) {
+              listener(ev);
+            }
+          });
+        }
+      });
+    }
+
     ctrl.$render = function() {
-      element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue);
+      // Workaround for Firefox validation #12102.
+      var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
+      if (element.val() !== value) {
+        element.val(value);
+      }
     };
+  }
 
-    // pattern validator
-    var pattern = attr.ngPattern,
-        patternValidator,
-        match;
+  function weekParser(isoWeek, existingDate) {
+    if (isDate(isoWeek)) {
+      return isoWeek;
+    }
 
-    if (pattern) {
-      var validateRegex = function(regexp, value) {
-        return validate(ctrl, 'pattern', ctrl.$isEmpty(value) || regexp.test(value), value);
-      };
-      match = pattern.match(/^\/(.*)\/([gim]*)$/);
-      if (match) {
-        pattern = new RegExp(match[1], match[2]);
-        patternValidator = function(value) {
-          return validateRegex(pattern, value);
-        };
-      } else {
-        patternValidator = function(value) {
-          var patternObj = scope.$eval(pattern);
+    if (isString(isoWeek)) {
+      WEEK_REGEXP.lastIndex = 0;
+      var parts = WEEK_REGEXP.exec(isoWeek);
+      if (parts) {
+        var year = +parts[1],
+          week = +parts[2],
+          hours = 0,
+          minutes = 0,
+          seconds = 0,
+          milliseconds = 0,
+          firstThurs = getFirstThursdayOfYear(year),
+          addDays = (week - 1) * 7;
 
-          if (!patternObj || !patternObj.test) {
-            throw minErr('ngPattern')('noregexp',
-                'Expected {0} to be a RegExp but was {1}. Element: {2}', pattern,
-                patternObj, startingTag(element));
-          }
-          return validateRegex(patternObj, value);
-        };
+        if (existingDate) {
+          hours = existingDate.getHours();
+          minutes = existingDate.getMinutes();
+          seconds = existingDate.getSeconds();
+          milliseconds = existingDate.getMilliseconds();
+        }
+
+        return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+      }
+    }
+
+    return NaN;
+  }
+
+  function createDateParser(regexp, mapping) {
+    return function(iso, date) {
+      var parts, map;
+
+      if (isDate(iso)) {
+        return iso;
       }
 
-      ctrl.$formatters.push(patternValidator);
-      ctrl.$parsers.push(patternValidator);
+      if (isString(iso)) {
+        // When a date is JSON'ified to wraps itself inside of an extra
+        // set of double quotes. This makes the date parsing code unable
+        // to match the date string and parse it as a date.
+        if (iso.charAt(0) === '"' && iso.charAt(iso.length - 1) === '"') {
+          iso = iso.substring(1, iso.length - 1);
+        }
+        if (ISO_DATE_REGEXP.test(iso)) {
+          return new Date(iso);
+        }
+        regexp.lastIndex = 0;
+        parts = regexp.exec(iso);
+
+        if (parts) {
+          parts.shift();
+          if (date) {
+            map = {
+              yyyy: date.getFullYear(),
+              MM: date.getMonth() + 1,
+              dd: date.getDate(),
+              HH: date.getHours(),
+              mm: date.getMinutes(),
+              ss: date.getSeconds(),
+              sss: date.getMilliseconds() / 1000
+            };
+          } else {
+            map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
+          }
+
+          forEach(parts, function(part, index) {
+            if (index < mapping.length) {
+              map[mapping[index]] = +part;
+            }
+          });
+          return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
+        }
+      }
+
+      return NaN;
+    };
+  }
+
+  function createDateInputType(type, regexp, parseDate, format) {
+    return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
+      badInputChecker(scope, element, attr, ctrl);
+      baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+      var timezone = ctrl && ctrl.$options.getOption('timezone');
+      var previousDate;
+
+      ctrl.$$parserName = type;
+      ctrl.$parsers.push(function(value) {
+        if (ctrl.$isEmpty(value)) return null;
+        if (regexp.test(value)) {
+          // Note: We cannot read ctrl.$modelValue, as there might be a different
+          // parser/formatter in the processing chain so that the model
+          // contains some different data format!
+          var parsedDate = parseDate(value, previousDate);
+          if (timezone) {
+            parsedDate = convertTimezoneToLocal(parsedDate, timezone);
+          }
+          return parsedDate;
+        }
+        return undefined;
+      });
+
+      ctrl.$formatters.push(function(value) {
+        if (value && !isDate(value)) {
+          throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
+        }
+        if (isValidDate(value)) {
+          previousDate = value;
+          if (previousDate && timezone) {
+            previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+          }
+          return $filter('date')(value, format, timezone);
+        } else {
+          previousDate = null;
+          return '';
+        }
+      });
+
+      if (isDefined(attr.min) || attr.ngMin) {
+        var minVal;
+        ctrl.$validators.min = function(value) {
+          return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
+        };
+        attr.$observe('min', function(val) {
+          minVal = parseObservedDateValue(val);
+          ctrl.$validate();
+        });
+      }
+
+      if (isDefined(attr.max) || attr.ngMax) {
+        var maxVal;
+        ctrl.$validators.max = function(value) {
+          return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
+        };
+        attr.$observe('max', function(val) {
+          maxVal = parseObservedDateValue(val);
+          ctrl.$validate();
+        });
+      }
+
+      function isValidDate(value) {
+        // Invalid Date: getTime() returns NaN
+        return value && !(value.getTime && value.getTime() !== value.getTime());
+      }
+
+      function parseObservedDateValue(val) {
+        return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
+      }
+    };
+  }
+
+  function badInputChecker(scope, element, attr, ctrl) {
+    var node = element[0];
+    var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
+    if (nativeValidation) {
+      ctrl.$parsers.push(function(value) {
+        var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
+        return validity.badInput || validity.typeMismatch ? undefined : value;
+      });
+    }
+  }
+
+  function numberFormatterParser(ctrl) {
+    ctrl.$$parserName = 'number';
+    ctrl.$parsers.push(function(value) {
+      if (ctrl.$isEmpty(value))      return null;
+      if (NUMBER_REGEXP.test(value)) return parseFloat(value);
+      return undefined;
+    });
+
+    ctrl.$formatters.push(function(value) {
+      if (!ctrl.$isEmpty(value)) {
+        if (!isNumber(value)) {
+          throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
+        }
+        value = value.toString();
+      }
+      return value;
+    });
+  }
+
+  function parseNumberAttrVal(val) {
+    if (isDefined(val) && !isNumber(val)) {
+      val = parseFloat(val);
+    }
+    return !isNumberNaN(val) ? val : undefined;
+  }
+
+  function isNumberInteger(num) {
+    // See http://stackoverflow.com/questions/14636536/how-to-check-if-a-variable-is-an-integer-in-javascript#14794066
+    // (minus the assumption that `num` is a number)
+
+    // eslint-disable-next-line no-bitwise
+    return (num | 0) === num;
+  }
+
+  function countDecimals(num) {
+    var numString = num.toString();
+    var decimalSymbolIndex = numString.indexOf('.');
+
+    if (decimalSymbolIndex === -1) {
+      if (-1 < num && num < 1) {
+        // It may be in the exponential notation format (`1e-X`)
+        var match = /e-(\d+)$/.exec(numString);
+
+        if (match) {
+          return Number(match[1]);
+        }
+      }
+
+      return 0;
     }
 
-    // min length validator
-    if (attr.ngMinlength) {
-      var minlength = int(attr.ngMinlength);
-      var minLengthValidator = function(value) {
-        return validate(ctrl, 'minlength', ctrl.$isEmpty(value) || value.length >= minlength, value);
-      };
+    return numString.length - decimalSymbolIndex - 1;
+  }
 
-      ctrl.$parsers.push(minLengthValidator);
-      ctrl.$formatters.push(minLengthValidator);
+  function isValidForStep(viewValue, stepBase, step) {
+    // At this point `stepBase` and `step` are expected to be non-NaN values
+    // and `viewValue` is expected to be a valid stringified number.
+    var value = Number(viewValue);
+
+    var isNonIntegerValue = !isNumberInteger(value);
+    var isNonIntegerStepBase = !isNumberInteger(stepBase);
+    var isNonIntegerStep = !isNumberInteger(step);
+
+    // Due to limitations in Floating Point Arithmetic (e.g. `0.3 - 0.2 !== 0.1` or
+    // `0.5 % 0.1 !== 0`), we need to convert all numbers to integers.
+    if (isNonIntegerValue || isNonIntegerStepBase || isNonIntegerStep) {
+      var valueDecimals = isNonIntegerValue ? countDecimals(value) : 0;
+      var stepBaseDecimals = isNonIntegerStepBase ? countDecimals(stepBase) : 0;
+      var stepDecimals = isNonIntegerStep ? countDecimals(step) : 0;
+
+      var decimalCount = Math.max(valueDecimals, stepBaseDecimals, stepDecimals);
+      var multiplier = Math.pow(10, decimalCount);
+
+      value = value * multiplier;
+      stepBase = stepBase * multiplier;
+      step = step * multiplier;
+
+      if (isNonIntegerValue) value = Math.round(value);
+      if (isNonIntegerStepBase) stepBase = Math.round(stepBase);
+      if (isNonIntegerStep) step = Math.round(step);
     }
 
-    // max length validator
-    if (attr.ngMaxlength) {
-      var maxlength = int(attr.ngMaxlength);
-      var maxLengthValidator = function(value) {
-        return validate(ctrl, 'maxlength', ctrl.$isEmpty(value) || value.length <= maxlength, value);
-      };
-
-      ctrl.$parsers.push(maxLengthValidator);
-      ctrl.$formatters.push(maxLengthValidator);
-    }
+    return (value - stepBase) % step === 0;
   }
 
   function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-    textInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    badInputChecker(scope, element, attr, ctrl);
+    numberFormatterParser(ctrl);
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
 
-    ctrl.$parsers.push(function(value) {
-      var empty = ctrl.$isEmpty(value);
-      if (empty || NUMBER_REGEXP.test(value)) {
-        ctrl.$setValidity('number', true);
-        return value === '' ? null : (empty ? value : parseFloat(value));
-      } else {
-        ctrl.$setValidity('number', false);
-        return undefined;
+    var minVal;
+    var maxVal;
+
+    if (isDefined(attr.min) || attr.ngMin) {
+      ctrl.$validators.min = function(value) {
+        return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
+      };
+
+      attr.$observe('min', function(val) {
+        minVal = parseNumberAttrVal(val);
+        // TODO(matsko): implement validateLater to reduce number of validations
+        ctrl.$validate();
+      });
+    }
+
+    if (isDefined(attr.max) || attr.ngMax) {
+      ctrl.$validators.max = function(value) {
+        return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
+      };
+
+      attr.$observe('max', function(val) {
+        maxVal = parseNumberAttrVal(val);
+        // TODO(matsko): implement validateLater to reduce number of validations
+        ctrl.$validate();
+      });
+    }
+
+    if (isDefined(attr.step) || attr.ngStep) {
+      var stepVal;
+      ctrl.$validators.step = function(modelValue, viewValue) {
+        return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
+          isValidForStep(viewValue, minVal || 0, stepVal);
+      };
+
+      attr.$observe('step', function(val) {
+        stepVal = parseNumberAttrVal(val);
+        // TODO(matsko): implement validateLater to reduce number of validations
+        ctrl.$validate();
+      });
+    }
+  }
+
+  function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+    badInputChecker(scope, element, attr, ctrl);
+    numberFormatterParser(ctrl);
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+    var supportsRange = ctrl.$$hasNativeValidators && element[0].type === 'range',
+      minVal = supportsRange ? 0 : undefined,
+      maxVal = supportsRange ? 100 : undefined,
+      stepVal = supportsRange ? 1 : undefined,
+      validity = element[0].validity,
+      hasMinAttr = isDefined(attr.min),
+      hasMaxAttr = isDefined(attr.max),
+      hasStepAttr = isDefined(attr.step);
+
+    var originalRender = ctrl.$render;
+
+    ctrl.$render = supportsRange && isDefined(validity.rangeUnderflow) && isDefined(validity.rangeOverflow) ?
+      //Browsers that implement range will set these values automatically, but reading the adjusted values after
+      //$render would cause the min / max validators to be applied with the wrong value
+      function rangeRender() {
+        originalRender();
+        ctrl.$setViewValue(element.val());
+      } :
+      originalRender;
+
+    if (hasMinAttr) {
+      ctrl.$validators.min = supportsRange ?
+        // Since all browsers set the input to a valid value, we don't need to check validity
+        function noopMinValidator() { return true; } :
+        // non-support browsers validate the min val
+        function minValidator(modelValue, viewValue) {
+          return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal;
+        };
+
+      setInitialValueAndObserver('min', minChange);
+    }
+
+    if (hasMaxAttr) {
+      ctrl.$validators.max = supportsRange ?
+        // Since all browsers set the input to a valid value, we don't need to check validity
+        function noopMaxValidator() { return true; } :
+        // non-support browsers validate the max val
+        function maxValidator(modelValue, viewValue) {
+          return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal;
+        };
+
+      setInitialValueAndObserver('max', maxChange);
+    }
+
+    if (hasStepAttr) {
+      ctrl.$validators.step = supportsRange ?
+        function nativeStepValidator() {
+          // Currently, only FF implements the spec on step change correctly (i.e. adjusting the
+          // input element value to a valid value). It's possible that other browsers set the stepMismatch
+          // validity error instead, so we can at least report an error in that case.
+          return !validity.stepMismatch;
+        } :
+        // ngStep doesn't set the setp attr, so the browser doesn't adjust the input value as setting step would
+        function stepValidator(modelValue, viewValue) {
+          return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
+            isValidForStep(viewValue, minVal || 0, stepVal);
+        };
+
+      setInitialValueAndObserver('step', stepChange);
+    }
+
+    function setInitialValueAndObserver(htmlAttrName, changeFn) {
+      // interpolated attributes set the attribute value only after a digest, but we need the
+      // attribute value when the input is first rendered, so that the browser can adjust the
+      // input value based on the min/max value
+      element.attr(htmlAttrName, attr[htmlAttrName]);
+      attr.$observe(htmlAttrName, changeFn);
+    }
+
+    function minChange(val) {
+      minVal = parseNumberAttrVal(val);
+      // ignore changes before model is initialized
+      if (isNumberNaN(ctrl.$modelValue)) {
+        return;
       }
-    });
 
-    ctrl.$formatters.push(function(value) {
-      return ctrl.$isEmpty(value) ? '' : '' + value;
-    });
-
-    if (attr.min) {
-      var minValidator = function(value) {
-        var min = parseFloat(attr.min);
-        return validate(ctrl, 'min', ctrl.$isEmpty(value) || value >= min, value);
-      };
-
-      ctrl.$parsers.push(minValidator);
-      ctrl.$formatters.push(minValidator);
+      if (supportsRange) {
+        var elVal = element.val();
+        // IE11 doesn't set the el val correctly if the minVal is greater than the element value
+        if (minVal > elVal) {
+          elVal = minVal;
+          element.val(elVal);
+        }
+        ctrl.$setViewValue(elVal);
+      } else {
+        // TODO(matsko): implement validateLater to reduce number of validations
+        ctrl.$validate();
+      }
     }
 
-    if (attr.max) {
-      var maxValidator = function(value) {
-        var max = parseFloat(attr.max);
-        return validate(ctrl, 'max', ctrl.$isEmpty(value) || value <= max, value);
-      };
+    function maxChange(val) {
+      maxVal = parseNumberAttrVal(val);
+      // ignore changes before model is initialized
+      if (isNumberNaN(ctrl.$modelValue)) {
+        return;
+      }
 
-      ctrl.$parsers.push(maxValidator);
-      ctrl.$formatters.push(maxValidator);
+      if (supportsRange) {
+        var elVal = element.val();
+        // IE11 doesn't set the el val correctly if the maxVal is less than the element value
+        if (maxVal < elVal) {
+          element.val(maxVal);
+          // IE11 and Chrome don't set the value to the minVal when max < min
+          elVal = maxVal < minVal ? minVal : maxVal;
+        }
+        ctrl.$setViewValue(elVal);
+      } else {
+        // TODO(matsko): implement validateLater to reduce number of validations
+        ctrl.$validate();
+      }
     }
 
-    ctrl.$formatters.push(function(value) {
-      return validate(ctrl, 'number', ctrl.$isEmpty(value) || isNumber(value), value);
-    });
+    function stepChange(val) {
+      stepVal = parseNumberAttrVal(val);
+      // ignore changes before model is initialized
+      if (isNumberNaN(ctrl.$modelValue)) {
+        return;
+      }
+
+      // Some browsers don't adjust the input value correctly, but set the stepMismatch error
+      if (supportsRange && ctrl.$viewValue !== element.val()) {
+        ctrl.$setViewValue(element.val());
+      } else {
+        // TODO(matsko): implement validateLater to reduce number of validations
+        ctrl.$validate();
+      }
+    }
   }
 
   function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-    textInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    // Note: no badInputChecker here by purpose as `url` is only a validation
+    // in browsers, i.e. we can always read out input.value even if it is not valid!
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    stringBasedInputType(ctrl);
 
-    var urlValidator = function(value) {
-      return validate(ctrl, 'url', ctrl.$isEmpty(value) || URL_REGEXP.test(value), value);
+    ctrl.$$parserName = 'url';
+    ctrl.$validators.url = function(modelValue, viewValue) {
+      var value = modelValue || viewValue;
+      return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
     };
-
-    ctrl.$formatters.push(urlValidator);
-    ctrl.$parsers.push(urlValidator);
   }
 
   function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-    textInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    // Note: no badInputChecker here by purpose as `url` is only a validation
+    // in browsers, i.e. we can always read out input.value even if it is not valid!
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    stringBasedInputType(ctrl);
 
-    var emailValidator = function(value) {
-      return validate(ctrl, 'email', ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value), value);
+    ctrl.$$parserName = 'email';
+    ctrl.$validators.email = function(modelValue, viewValue) {
+      var value = modelValue || viewValue;
+      return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
     };
-
-    ctrl.$formatters.push(emailValidator);
-    ctrl.$parsers.push(emailValidator);
   }
 
   function radioInputType(scope, element, attr, ctrl) {
+    var doTrim = !attr.ngTrim || trim(attr.ngTrim) !== 'false';
     // make the name unique, if not defined
     if (isUndefined(attr.name)) {
       element.attr('name', nextUid());
     }
 
-    element.on('click', function() {
+    var listener = function(ev) {
+      var value;
       if (element[0].checked) {
-        scope.$apply(function() {
-          ctrl.$setViewValue(attr.value);
-        });
+        value = attr.value;
+        if (doTrim) {
+          value = trim(value);
+        }
+        ctrl.$setViewValue(value, ev && ev.type);
       }
-    });
+    };
+
+    element.on('click', listener);
 
     ctrl.$render = function() {
       var value = attr.value;
-      element[0].checked = (value == ctrl.$viewValue);
+      if (doTrim) {
+        value = trim(value);
+      }
+      element[0].checked = (value === ctrl.$viewValue);
     };
 
     attr.$observe('value', ctrl.$render);
   }
 
-  function checkboxInputType(scope, element, attr, ctrl) {
-    var trueValue = attr.ngTrueValue,
-        falseValue = attr.ngFalseValue;
+  function parseConstantExpr($parse, context, name, expression, fallback) {
+    var parseFn;
+    if (isDefined(expression)) {
+      parseFn = $parse(expression);
+      if (!parseFn.constant) {
+        throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
+          '`{1}`.', name, expression);
+      }
+      return parseFn(context);
+    }
+    return fallback;
+  }
 
-    if (!isString(trueValue)) trueValue = true;
-    if (!isString(falseValue)) falseValue = false;
+  function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
+    var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
+    var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
 
-    element.on('click', function() {
-      scope.$apply(function() {
-        ctrl.$setViewValue(element[0].checked);
-      });
-    });
+    var listener = function(ev) {
+      ctrl.$setViewValue(element[0].checked, ev && ev.type);
+    };
+
+    element.on('click', listener);
 
     ctrl.$render = function() {
       element[0].checked = ctrl.$viewValue;
     };
 
-    // Override the standard `$isEmpty` because a value of `false` means empty in a checkbox.
+    // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
+    // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
+    // it to a boolean.
     ctrl.$isEmpty = function(value) {
-      return value !== trueValue;
+      return value === false;
     };
 
     ctrl.$formatters.push(function(value) {
-      return value === trueValue;
+      return equals(value, trueValue);
     });
 
     ctrl.$parsers.push(function(value) {
@@ -16263,7 +25732,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:textarea
+   * @name textarea
    * @restrict E
    *
    * @description
@@ -16280,23 +25749,51 @@
    * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
    *    minlength.
    * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-   *    maxlength.
-   * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-   *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-   *    patterns defined as scope expressions.
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+   *    length.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+   *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
+   * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+   *
+   * @knownIssue
+   *
+   * When specifying the `placeholder` attribute of `<textarea>`, Internet Explorer will temporarily
+   * insert the placeholder value as the textarea's content. If the placeholder value contains
+   * interpolation (`{{ ... }}`), an error will be logged in the console when Angular tries to update
+   * the value of the by-then-removed text node. This doesn't affect the functionality of the
+   * textarea, but can be undesirable.
+   *
+   * You can work around this Internet Explorer issue by using `ng-attr-placeholder` instead of
+   * `placeholder` on textareas, whenever you need interpolation in the placeholder value. You can
+   * find more details on `ngAttr` in the
+   * [Interpolation](guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes) section of the
+   * Developer Guide.
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:input
+   * @name input
    * @restrict E
    *
    * @description
-   * HTML input element control with angular data-binding. Input control follows HTML5 input types
-   * and polyfills the HTML5 validation behavior for older browsers.
+   * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
+   * input state control, and validation.
+   * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
+   *
+   * <div class="alert alert-warning">
+   * **Note:** Not every feature offered is available for all input types.
+   * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
+   * </div>
    *
    * @param {string} ngModel Assignable angular expression to data-bind to.
    * @param {string=} name Property name of the form under which the control is published.
@@ -16305,698 +25802,170 @@
    * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
    *    minlength.
    * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-   *    maxlength.
-   * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-   *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-   *    patterns defined as scope expressions.
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+   *    length.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+   *    value does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
+   * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+   *    This parameter is ignored for input[type=password] controls, which will never trim the
+   *    input.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="input-directive" module="inputExample">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.user = {name: 'guest', last: 'visitor'};
-         }
+   angular.module('inputExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+              $scope.user = {name: 'guest', last: 'visitor'};
+            }]);
    </script>
-   <div ng-controller="Ctrl">
+   <div ng-controller="ExampleController">
    <form name="myForm">
-   User name: <input type="text" name="userName" ng-model="user.name" required>
+   <label>
+   User name:
+   <input type="text" name="userName" ng-model="user.name" required>
+   </label>
+   <div role="alert">
    <span class="error" ng-show="myForm.userName.$error.required">
-   Required!</span><br>
-   Last name: <input type="text" name="lastName" ng-model="user.last"
+   Required!</span>
+   </div>
+   <label>
+   Last name:
+   <input type="text" name="lastName" ng-model="user.last"
    ng-minlength="3" ng-maxlength="10">
+   </label>
+   <div role="alert">
    <span class="error" ng-show="myForm.lastName.$error.minlength">
    Too short!</span>
    <span class="error" ng-show="myForm.lastName.$error.maxlength">
-   Too long!</span><br>
+   Too long!</span>
+   </div>
    </form>
    <hr>
    <tt>user = {{user}}</tt><br/>
-   <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br>
-   <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br>
-   <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br>
-   <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br>
-   <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-   <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
-   <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br>
-   <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br>
+   <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
+   <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
+   <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
+   <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
+   <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+   <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+   <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
+   <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
+   var user = element(by.exactBinding('user'));
+   var userNameValid = element(by.binding('myForm.userName.$valid'));
+   var lastNameValid = element(by.binding('myForm.lastName.$valid'));
+   var lastNameError = element(by.binding('myForm.lastName.$error'));
+   var formValid = element(by.binding('myForm.$valid'));
+   var userNameInput = element(by.model('user.name'));
+   var userLastInput = element(by.model('user.last'));
+
    it('should initialize to model', function() {
-          expect(binding('user')).toEqual('{"name":"guest","last":"visitor"}');
-          expect(binding('myForm.userName.$valid')).toEqual('true');
-          expect(binding('myForm.$valid')).toEqual('true');
+          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
+          expect(userNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
         });
 
    it('should be invalid if empty when required', function() {
-          input('user.name').enter('');
-          expect(binding('user')).toEqual('{"last":"visitor"}');
-          expect(binding('myForm.userName.$valid')).toEqual('false');
-          expect(binding('myForm.$valid')).toEqual('false');
+          userNameInput.clear();
+          userNameInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"last":"visitor"}');
+          expect(userNameValid.getText()).toContain('false');
+          expect(formValid.getText()).toContain('false');
         });
 
    it('should be valid if empty when min length is set', function() {
-          input('user.last').enter('');
-          expect(binding('user')).toEqual('{"name":"guest","last":""}');
-          expect(binding('myForm.lastName.$valid')).toEqual('true');
-          expect(binding('myForm.$valid')).toEqual('true');
+          userLastInput.clear();
+          userLastInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"name":"guest","last":""}');
+          expect(lastNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
         });
 
    it('should be invalid if less than required min length', function() {
-          input('user.last').enter('xx');
-          expect(binding('user')).toEqual('{"name":"guest"}');
-          expect(binding('myForm.lastName.$valid')).toEqual('false');
-          expect(binding('myForm.lastName.$error')).toMatch(/minlength/);
-          expect(binding('myForm.$valid')).toEqual('false');
+          userLastInput.clear();
+          userLastInput.sendKeys('xx');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('minlength');
+          expect(formValid.getText()).toContain('false');
         });
 
    it('should be invalid if longer than max length', function() {
-          input('user.last').enter('some ridiculously long name');
-          expect(binding('user'))
-            .toEqual('{"name":"guest"}');
-          expect(binding('myForm.lastName.$valid')).toEqual('false');
-          expect(binding('myForm.lastName.$error')).toMatch(/maxlength/);
-          expect(binding('myForm.$valid')).toEqual('false');
+          userLastInput.clear();
+          userLastInput.sendKeys('some ridiculously long name');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('maxlength');
+          expect(formValid.getText()).toContain('false');
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
-  var inputDirective = ['$browser', '$sniffer', function($browser, $sniffer) {
-    return {
-      restrict: 'E',
-      require: '?ngModel',
-      link: function(scope, element, attr, ctrl) {
-        if (ctrl) {
-          (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrl, $sniffer,
-              $browser);
-        }
-      }
-    };
-  }];
-
-  var VALID_CLASS = 'ng-valid',
-      INVALID_CLASS = 'ng-invalid',
-      PRISTINE_CLASS = 'ng-pristine',
-      DIRTY_CLASS = 'ng-dirty';
-
-  /**
-   * @ngdoc object
-   * @name ng.directive:ngModel.NgModelController
-   *
-   * @property {string} $viewValue Actual string value in the view.
-   * @property {*} $modelValue The value in the model, that the control is bound to.
-   * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
-   the control reads value from the DOM.  Each function is called, in turn, passing the value
-   through to the next. Used to sanitize / convert the value as well as validation.
-   For validation, the parsers should update the validity state using
-   {@link ng.directive:ngModel.NgModelController#methods_$setValidity $setValidity()},
-   and return `undefined` for invalid values.
-
-   *
-   * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
-   the model value changes. Each function is called, in turn, passing the value through to the
-   next. Used to format / convert values for display in the control and validation.
-   *      <pre>
-   *      function formatter(value) {
- *        if (value) {
- *          return value.toUpperCase();
- *        }
- *      }
-   *      ngModel.$formatters.push(formatter);
-   *      </pre>
-   *
-   * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
-   *     view value has changed. It is called with no arguments, and its return value is ignored.
-   *     This can be used in place of additional $watches against the model value.
-   *
-   * @property {Object} $error An object hash with all errors as keys.
-   *
-   * @property {boolean} $pristine True if user has not interacted with the control yet.
-   * @property {boolean} $dirty True if user has already interacted with the control.
-   * @property {boolean} $valid True if there is no error.
-   * @property {boolean} $invalid True if at least one error on the control.
-   *
-   * @description
-   *
-   * `NgModelController` provides API for the `ng-model` directive. The controller contains
-   * services for data-binding, validation, CSS updates, and value formatting and parsing. It
-   * purposefully does not contain any logic which deals with DOM rendering or listening to
-   * DOM events. Such DOM related logic should be provided by other directives which make use of
-   * `NgModelController` for data-binding.
-   *
-   * ## Custom Control Example
-   * This example shows how to use `NgModelController` with a custom control to achieve
-   * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
-   * collaborate together to achieve the desired result.
-   *
-   * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element
-   * contents be edited in place by the user.  This will not work on older browsers.
-   *
-   * <example module="customControl">
-   <file name="style.css">
-   [contenteditable] {
-        border: 1px solid black;
-        background-color: white;
-        min-height: 20px;
-      }
-
-   .ng-invalid {
-        border: 1px solid red;
-      }
-
-   </file>
-   <file name="script.js">
-   angular.module('customControl', []).
-   directive('contenteditable', function() {
-          return {
-            restrict: 'A', // only activate on element attribute
-            require: '?ngModel', // get a hold of NgModelController
-            link: function(scope, element, attrs, ngModel) {
-              if(!ngModel) return; // do nothing if no ng-model
-
-              // Specify how UI should be updated
-              ngModel.$render = function() {
-                element.html(ngModel.$viewValue || '');
-              };
-
-              // Listen for change events to enable binding
-              element.on('blur keyup change', function() {
-                scope.$apply(read);
-              });
-              read(); // initialize
-
-              // Write data to the model
-              function read() {
-                var html = element.html();
-                // When we clear the content editable the browser leaves a <br> behind
-                // If strip-br attribute is provided then we strip this out
-                if( attrs.stripBr && html == '<br>' ) {
-                  html = '';
-                }
-                ngModel.$setViewValue(html);
-              }
+  var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
+    function($browser, $sniffer, $filter, $parse) {
+      return {
+        restrict: 'E',
+        require: ['?ngModel'],
+        link: {
+          pre: function(scope, element, attr, ctrls) {
+            if (ctrls[0]) {
+              (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
+                $browser, $filter, $parse);
             }
-          };
-        });
-   </file>
-   <file name="index.html">
-   <form name="myForm">
-   <div contenteditable
-   name="myWidget" ng-model="userContent"
-   strip-br="true"
-   required>Change me!</div>
-   <span ng-show="myForm.myWidget.$error.required">Required!</span>
-   <hr>
-   <textarea ng-model="userContent"></textarea>
-   </form>
-   </file>
-   <file name="scenario.js">
-   it('should data-bind and become invalid', function() {
-        var contentEditable = element('[contenteditable]');
-
-        expect(contentEditable.text()).toEqual('Change me!');
-        input('userContent').enter('');
-        expect(contentEditable.text()).toEqual('');
-        expect(contentEditable.prop('className')).toMatch(/ng-invalid-required/);
-      });
-   </file>
-   * </example>
-   *
-   *
-   */
-  var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse',
-    function($scope, $exceptionHandler, $attr, $element, $parse) {
-      this.$viewValue = Number.NaN;
-      this.$modelValue = Number.NaN;
-      this.$parsers = [];
-      this.$formatters = [];
-      this.$viewChangeListeners = [];
-      this.$pristine = true;
-      this.$dirty = false;
-      this.$valid = true;
-      this.$invalid = false;
-      this.$name = $attr.name;
-
-      var ngModelGet = $parse($attr.ngModel),
-          ngModelSet = ngModelGet.assign;
-
-      if (!ngModelSet) {
-        throw minErr('ngModel')('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
-            $attr.ngModel, startingTag($element));
-      }
-
-      /**
-       * @ngdoc function
-       * @name ng.directive:ngModel.NgModelController#$render
-       * @methodOf ng.directive:ngModel.NgModelController
-       *
-       * @description
-       * Called when the view needs to be updated. It is expected that the user of the ng-model
-       * directive will implement this method.
-       */
-      this.$render = noop;
-
-      /**
-       * @ngdoc function
-       * @name { ng.directive:ngModel.NgModelController#$isEmpty
-   * @methodOf ng.directive:ngModel.NgModelController
-       *
-       * @description
-       * This is called when we need to determine if the value of the input is empty.
-       *
-       * For instance, the required directive does this to work out if the input has data or not.
-       * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
-       *
-       * You can override this for input directives whose concept of being empty is different to the
-       * default. The `checkboxInputType` directive does this because in its case a value of `false`
-       * implies empty.
-       */
-      this.$isEmpty = function(value) {
-        return isUndefined(value) || value === '' || value === null || value !== value;
-      };
-
-      var parentForm = $element.inheritedData('$formController') || nullFormCtrl,
-          invalidCount = 0, // used to easily determine if we are valid
-          $error = this.$error = {}; // keep invalid keys here
-
-
-      // Setup initial state of the control
-      $element.addClass(PRISTINE_CLASS);
-      toggleValidCss(true);
-
-      // convenience method for easy toggling of classes
-      function toggleValidCss(isValid, validationErrorKey) {
-        validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-        $element.
-            removeClass((isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey).
-            addClass((isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
-      }
-
-      /**
-       * @ngdoc function
-       * @name ng.directive:ngModel.NgModelController#$setValidity
-       * @methodOf ng.directive:ngModel.NgModelController
-       *
-       * @description
-       * Change the validity state, and notifies the form when the control changes validity. (i.e. it
-       * does not notify form if given validator is already marked as invalid).
-       *
-       * This method should be called by validators - i.e. the parser or formatter functions.
-       *
-       * @param {string} validationErrorKey Name of the validator. the `validationErrorKey` will assign
-       *        to `$error[validationErrorKey]=isValid` so that it is available for data-binding.
-       *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
-       *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
-       *        class and can be bound to as  `{{someForm.someControl.$error.myError}}` .
-       * @param {boolean} isValid Whether the current state is valid (true) or invalid (false).
-       */
-      this.$setValidity = function(validationErrorKey, isValid) {
-        // Purposeful use of ! here to cast isValid to boolean in case it is undefined
-        // jshint -W018
-        if ($error[validationErrorKey] === !isValid) return;
-        // jshint +W018
-
-        if (isValid) {
-          if ($error[validationErrorKey]) invalidCount--;
-          if (!invalidCount) {
-            toggleValidCss(true);
-            this.$valid = true;
-            this.$invalid = false;
-          }
-        } else {
-          toggleValidCss(false);
-          this.$invalid = true;
-          this.$valid = false;
-          invalidCount++;
-        }
-
-        $error[validationErrorKey] = !isValid;
-        toggleValidCss(isValid, validationErrorKey);
-
-        parentForm.$setValidity(validationErrorKey, isValid, this);
-      };
-
-      /**
-       * @ngdoc function
-       * @name ng.directive:ngModel.NgModelController#$setPristine
-       * @methodOf ng.directive:ngModel.NgModelController
-       *
-       * @description
-       * Sets the control to its pristine state.
-       *
-       * This method can be called to remove the 'ng-dirty' class and set the control to its pristine
-       * state (ng-pristine class).
-       */
-      this.$setPristine = function () {
-        this.$dirty = false;
-        this.$pristine = true;
-        $element.removeClass(DIRTY_CLASS).addClass(PRISTINE_CLASS);
-      };
-
-      /**
-       * @ngdoc function
-       * @name ng.directive:ngModel.NgModelController#$setViewValue
-       * @methodOf ng.directive:ngModel.NgModelController
-       *
-       * @description
-       * Update the view value.
-       *
-       * This method should be called when the view value changes, typically from within a DOM event handler.
-       * For example {@link ng.directive:input input} and
-       * {@link ng.directive:select select} directives call it.
-       *
-       * It will update the $viewValue, then pass this value through each of the functions in `$parsers`,
-       * which includes any validators. The value that comes out of this `$parsers` pipeline, be applied to
-       * `$modelValue` and the **expression** specified in the `ng-model` attribute.
-       *
-       * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called.
-       *
-       * Note that calling this function does not trigger a `$digest`.
-       *
-       * @param {string} value Value from the view.
-       */
-      this.$setViewValue = function(value) {
-        this.$viewValue = value;
-
-        // change to dirty
-        if (this.$pristine) {
-          this.$dirty = true;
-          this.$pristine = false;
-          $element.removeClass(PRISTINE_CLASS).addClass(DIRTY_CLASS);
-          parentForm.$setDirty();
-        }
-
-        forEach(this.$parsers, function(fn) {
-          value = fn(value);
-        });
-
-        if (this.$modelValue !== value) {
-          this.$modelValue = value;
-          ngModelSet($scope, value);
-          forEach(this.$viewChangeListeners, function(listener) {
-            try {
-              listener();
-            } catch(e) {
-              $exceptionHandler(e);
-            }
-          });
-        }
-      };
-
-      // model -> value
-      var ctrl = this;
-
-      $scope.$watch(function ngModelWatch() {
-        var value = ngModelGet($scope);
-
-        // if scope model value and ngModel value are out of sync
-        if (ctrl.$modelValue !== value) {
-
-          var formatters = ctrl.$formatters,
-              idx = formatters.length;
-
-          ctrl.$modelValue = value;
-          while(idx--) {
-            value = formatters[idx](value);
-          }
-
-          if (ctrl.$viewValue !== value) {
-            ctrl.$viewValue = value;
-            ctrl.$render();
           }
         }
-
-        return value;
-      });
+      };
     }];
 
 
-  /**
-   * @ngdoc directive
-   * @name ng.directive:ngModel
-   *
-   * @element input
-   *
-   * @description
-   * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
-   * property on the scope using {@link ng.directive:ngModel.NgModelController NgModelController},
-   * which is created and exposed by this directive.
-   *
-   * `ngModel` is responsible for:
-   *
-   * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
-   *   require.
-   * - Providing validation behavior (i.e. required, number, email, url).
-   * - Keeping the state of the control (valid/invalid, dirty/pristine, validation errors).
-   * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`).
-   * - Registering the control with its parent {@link ng.directive:form form}.
-   *
-   * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
-   * current scope. If the property doesn't already exist on this scope, it will be created
-   * implicitly and added to the scope.
-   *
-   * For best practices on using `ngModel`, see:
-   *
-   *  - {@link https://github.com/angular/angular.js/wiki/Understanding-Scopes}
-   *
-   * For basic examples, how to use `ngModel`, see:
-   *
-   *  - {@link ng.directive:input input}
-   *    - {@link ng.directive:input.text text}
-   *    - {@link ng.directive:input.checkbox checkbox}
-   *    - {@link ng.directive:input.radio radio}
-   *    - {@link ng.directive:input.number number}
-   *    - {@link ng.directive:input.email email}
-   *    - {@link ng.directive:input.url url}
-   *  - {@link ng.directive:select select}
-   *  - {@link ng.directive:textarea textarea}
-   *
-   */
-  var ngModelDirective = function() {
-    return {
-      require: ['ngModel', '^?form'],
-      controller: NgModelController,
-      link: function(scope, element, attr, ctrls) {
-        // notify others, especially parent forms
-
-        var modelCtrl = ctrls[0],
-            formCtrl = ctrls[1] || nullFormCtrl;
-
-        formCtrl.$addControl(modelCtrl);
-
-        scope.$on('$destroy', function() {
-          formCtrl.$removeControl(modelCtrl);
-        });
-      }
-    };
-  };
-
-
-  /**
-   * @ngdoc directive
-   * @name ng.directive:ngChange
-   *
-   * @description
-   * Evaluate given expression when user changes the input.
-   * The expression is not evaluated when the value change is coming from the model.
-   *
-   * Note, this directive requires `ngModel` to be present.
-   *
-   * @element input
-   * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
-   * in input value.
-   *
-   * @example
-   * <doc:example>
-   *   <doc:source>
-   *     <script>
-   *       function Controller($scope) {
- *         $scope.counter = 0;
- *         $scope.change = function() {
- *           $scope.counter++;
- *         };
- *       }
-   *     </script>
-   *     <div ng-controller="Controller">
-   *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
-   *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
-   *       <label for="ng-change-example2">Confirmed</label><br />
-   *       debug = {{confirmed}}<br />
-   *       counter = {{counter}}
-   *     </div>
-   *   </doc:source>
-   *   <doc:scenario>
-   *     it('should evaluate the expression if changing from view', function() {
- *       expect(binding('counter')).toEqual('0');
- *       element('#ng-change-example1').click();
- *       expect(binding('counter')).toEqual('1');
- *       expect(binding('confirmed')).toEqual('true');
- *     });
-   *
-   *     it('should not evaluate the expression if changing from model', function() {
- *       element('#ng-change-example2').click();
- *       expect(binding('counter')).toEqual('0');
- *       expect(binding('confirmed')).toEqual('true');
- *     });
-   *   </doc:scenario>
-   * </doc:example>
-   */
-  var ngChangeDirective = valueFn({
-    require: 'ngModel',
-    link: function(scope, element, attr, ctrl) {
-      ctrl.$viewChangeListeners.push(function() {
-        scope.$eval(attr.ngChange);
-      });
-    }
-  });
-
-
-  var requiredDirective = function() {
-    return {
-      require: '?ngModel',
-      link: function(scope, elm, attr, ctrl) {
-        if (!ctrl) return;
-        attr.required = true; // force truthy in case we are on non input element
-
-        var validator = function(value) {
-          if (attr.required && ctrl.$isEmpty(value)) {
-            ctrl.$setValidity('required', false);
-            return;
-          } else {
-            ctrl.$setValidity('required', true);
-            return value;
-          }
-        };
-
-        ctrl.$formatters.push(validator);
-        ctrl.$parsers.unshift(validator);
-
-        attr.$observe('required', function() {
-          validator(ctrl.$viewValue);
-        });
-      }
-    };
-  };
-
-
-  /**
-   * @ngdoc directive
-   * @name ng.directive:ngList
-   *
-   * @description
-   * Text input that converts between a delimited string and an array of strings. The delimiter
-   * can be a fixed string (by default a comma) or a regular expression.
-   *
-   * @element input
-   * @param {string=} ngList optional delimiter that should be used to split the value. If
-   *   specified in form `/something/` then the value will be converted into a regular expression.
-   *
-   * @example
-   <doc:example>
-   <doc:source>
-   <script>
-   function Ctrl($scope) {
-           $scope.names = ['igor', 'misko', 'vojta'];
-         }
-   </script>
-   <form name="myForm" ng-controller="Ctrl">
-   List: <input name="namesInput" ng-model="names" ng-list required>
-   <span class="error" ng-show="myForm.namesInput.$error.required">
-   Required!</span>
-   <br>
-   <tt>names = {{names}}</tt><br/>
-   <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
-   <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
-   <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-   <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-   </form>
-   </doc:source>
-   <doc:scenario>
-   it('should initialize to model', function() {
-          expect(binding('names')).toEqual('["igor","misko","vojta"]');
-          expect(binding('myForm.namesInput.$valid')).toEqual('true');
-          expect(element('span.error').css('display')).toBe('none');
-        });
-
-   it('should be invalid if empty', function() {
-          input('names').enter('');
-          expect(binding('names')).toEqual('');
-          expect(binding('myForm.namesInput.$valid')).toEqual('false');
-          expect(element('span.error').css('display')).not().toBe('none');
-        });
-   </doc:scenario>
-   </doc:example>
-   */
-  var ngListDirective = function() {
-    return {
-      require: 'ngModel',
-      link: function(scope, element, attr, ctrl) {
-        var match = /\/(.*)\//.exec(attr.ngList),
-            separator = match && new RegExp(match[1]) || attr.ngList || ',';
-
-        var parse = function(viewValue) {
-          // If the viewValue is invalid (say required but empty) it will be `undefined`
-          if (isUndefined(viewValue)) return;
-
-          var list = [];
-
-          if (viewValue) {
-            forEach(viewValue.split(separator), function(value) {
-              if (value) list.push(trim(value));
-            });
-          }
-
-          return list;
-        };
-
-        ctrl.$parsers.push(parse);
-        ctrl.$formatters.push(function(value) {
-          if (isArray(value)) {
-            return value.join(', ');
-          }
-
-          return undefined;
-        });
-
-        // Override the standard $isEmpty because an empty array means the input is empty.
-        ctrl.$isEmpty = function(value) {
-          return !value || !value.length;
-        };
-      }
-    };
-  };
-
 
   var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
   /**
    * @ngdoc directive
-   * @name ng.directive:ngValue
+   * @name ngValue
    *
    * @description
-   * Binds the given expression to the value of `input[select]` or `input[radio]`, so
-   * that when the element is selected, the `ngModel` of that element is set to the
-   * bound value.
+   * Binds the given expression to the value of the element.
    *
-   * `ngValue` is useful when dynamically generating lists of radio buttons using `ng-repeat`, as
-   * shown below.
+   * It is mainly used on {@link input[radio] `input[radio]`} and option elements,
+   * so that when the element is selected, the {@link ngModel `ngModel`} of that element (or its
+   * {@link select `select`} parent element) is set to the bound value. It is especially useful
+   * for dynamically generated lists using {@link ngRepeat `ngRepeat`}, as shown below.
+   *
+   * It can also be used to achieve one-way binding of a given expression to an input element
+   * such as an `input[text]` or a `textarea`, when that element does not use ngModel.
    *
    * @element input
    * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute
-   *   of the `input` element
+   * and `value` property of the element.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ngValue-directive" module="valueExample">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-            $scope.names = ['pizza', 'unicorns', 'robots'];
-            $scope.my = { favorite: 'unicorns' };
-          }
+   angular.module('valueExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+              $scope.names = ['pizza', 'unicorns', 'robots'];
+              $scope.my = { favorite: 'unicorns' };
+            }]);
    </script>
-   <form ng-controller="Ctrl">
+   <form ng-controller="ExampleController">
    <h2>Which is your favorite?</h2>
    <label ng-repeat="name in names" for="{{name}}">
    {{name}}
@@ -17008,30 +25977,48 @@
    </label>
    <div>You chose {{my.favorite}}</div>
    </form>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
+   var favorite = element(by.binding('my.favorite'));
+
    it('should initialize to model', function() {
-          expect(binding('my.favorite')).toEqual('unicorns');
+          expect(favorite.getText()).toContain('unicorns');
         });
    it('should bind the values to the inputs', function() {
-          input('my.favorite').select('pizza');
-          expect(binding('my.favorite')).toEqual('pizza');
+          element.all(by.model('my.favorite')).get(0).click();
+          expect(favorite.getText()).toContain('pizza');
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
   var ngValueDirective = function() {
+    /**
+     *  inputs use the value attribute as their default value if the value property is not set.
+     *  Once the value property has been set (by adding input), it will not react to changes to
+     *  the value attribute anymore. Setting both attribute and property fixes this behavior, and
+     *  makes it possible to use ngValue as a sort of one-way bind.
+     */
+    function updateElementValue(element, attr, value) {
+      // Support: IE9 only
+      // In IE9 values are converted to string (e.g. `input.value = null` results in `input.value === 'null'`).
+      var propValue = isDefined(value) ? value : (msie === 9) ? '' : null;
+      element.prop('value', propValue);
+      attr.$set('value', value);
+    }
+
     return {
+      restrict: 'A',
       priority: 100,
       compile: function(tpl, tplAttr) {
         if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
           return function ngValueConstantLink(scope, elm, attr) {
-            attr.$set('value', scope.$eval(attr.ngValue));
+            var value = scope.$eval(attr.ngValue);
+            updateElementValue(elm, attr, value);
           };
         } else {
           return function ngValueLink(scope, elm, attr) {
             scope.$watch(attr.ngValue, function valueWatchAction(value) {
-              attr.$set('value', value);
+              updateElementValue(elm, attr, value);
             });
           };
         }
@@ -17041,7 +26028,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngBind
+   * @name ngBind
    * @restrict AC
    *
    * @description
@@ -17052,7 +26039,7 @@
    * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
    * `{{ expression }}` which is similar but less verbose.
    *
-   * It is preferrable to use `ngBind` instead of `{{ expression }}` when a template is momentarily
+   * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
    * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
    * element attribute, it makes the bindings invisible to the user while the page is loading.
    *
@@ -17065,41 +26052,51 @@
    *
    * @example
    * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
-   <doc:example>
-   <doc:source>
+   <example module="bindExample" name="ng-bind">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.name = 'Whirled';
-         }
+   angular.module('bindExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+             $scope.name = 'Whirled';
+           }]);
    </script>
-   <div ng-controller="Ctrl">
-   Enter name: <input type="text" ng-model="name"><br>
+   <div ng-controller="ExampleController">
+   <label>Enter name: <input type="text" ng-model="name"></label><br>
    Hello <span ng-bind="name"></span>!
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should check ng-bind', function() {
-         expect(using('.doc-example-live').binding('name')).toBe('Whirled');
-         using('.doc-example-live').input('name').enter('world');
-         expect(using('.doc-example-live').binding('name')).toBe('world');
+         var nameInput = element(by.model('name'));
+
+         expect(element(by.binding('name')).getText()).toBe('Whirled');
+         nameInput.clear();
+         nameInput.sendKeys('world');
+         expect(element(by.binding('name')).getText()).toBe('world');
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
-  var ngBindDirective = ngDirective(function(scope, element, attr) {
-    element.addClass('ng-binding').data('$binding', attr.ngBind);
-    scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
-      // We are purposefully using == here rather than === because we want to
-      // catch when value is "null or undefined"
-      // jshint -W041
-      element.text(value == undefined ? '' : value);
-    });
-  });
+  var ngBindDirective = ['$compile', function($compile) {
+    return {
+      restrict: 'AC',
+      compile: function ngBindCompile(templateElement) {
+        $compile.$$addBindingClass(templateElement);
+        return function ngBindLink(scope, element, attr) {
+          $compile.$$addBindingInfo(element, attr.ngBind);
+          element = element[0];
+          scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
+            element.textContent = stringify(value);
+          });
+        };
+      }
+    };
+  }];
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngBindTemplate
+   * @name ngBindTemplate
    *
    * @description
    * The `ngBindTemplate` directive specifies that the element
@@ -17115,60 +26112,70 @@
    *
    * @example
    * Try it here: enter text in text box and watch the greeting change.
-   <doc:example>
-   <doc:source>
+   <example module="bindExample" name="ng-bind-template">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-           $scope.salutation = 'Hello';
-           $scope.name = 'World';
-         }
+   angular.module('bindExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+             $scope.salutation = 'Hello';
+             $scope.name = 'World';
+           }]);
    </script>
-   <div ng-controller="Ctrl">
-   Salutation: <input type="text" ng-model="salutation"><br>
-   Name: <input type="text" ng-model="name"><br>
+   <div ng-controller="ExampleController">
+   <label>Salutation: <input type="text" ng-model="salutation"></label><br>
+   <label>Name: <input type="text" ng-model="name"></label><br>
    <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should check ng-bind', function() {
-         expect(using('.doc-example-live').binding('salutation')).
-           toBe('Hello');
-         expect(using('.doc-example-live').binding('name')).
-           toBe('World');
-         using('.doc-example-live').input('salutation').enter('Greetings');
-         using('.doc-example-live').input('name').enter('user');
-         expect(using('.doc-example-live').binding('salutation')).
-           toBe('Greetings');
-         expect(using('.doc-example-live').binding('name')).
-           toBe('user');
+         var salutationElem = element(by.binding('salutation'));
+         var salutationInput = element(by.model('salutation'));
+         var nameInput = element(by.model('name'));
+
+         expect(salutationElem.getText()).toBe('Hello World!');
+
+         salutationInput.clear();
+         salutationInput.sendKeys('Greetings');
+         nameInput.clear();
+         nameInput.sendKeys('user');
+
+         expect(salutationElem.getText()).toBe('Greetings user!');
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
-  var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
-    return function(scope, element, attr) {
-      // TODO: move this to scenario runner
-      var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
-      element.addClass('ng-binding').data('$binding', interpolateFn);
-      attr.$observe('ngBindTemplate', function(value) {
-        element.text(value);
-      });
+  var ngBindTemplateDirective = ['$interpolate', '$compile', function($interpolate, $compile) {
+    return {
+      compile: function ngBindTemplateCompile(templateElement) {
+        $compile.$$addBindingClass(templateElement);
+        return function ngBindTemplateLink(scope, element, attr) {
+          var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
+          $compile.$$addBindingInfo(element, interpolateFn.expressions);
+          element = element[0];
+          attr.$observe('ngBindTemplate', function(value) {
+            element.textContent = isUndefined(value) ? '' : value;
+          });
+        };
+      }
     };
   }];
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngBindHtml
+   * @name ngBindHtml
    *
    * @description
-   * Creates a binding that will innerHTML the result of evaluating the `expression` into the current
-   * element in a secure way.  By default, the innerHTML-ed content will be sanitized using the {@link
-   * ngSanitize.$sanitize $sanitize} service.  To utilize this functionality, ensure that `$sanitize`
-   * is available, for example, by including {@link ngSanitize} in your module's dependencies (not in
-   * core Angular.)  You may also bypass sanitization for values you know are safe. To do so, bind to
-   * an explicitly trusted value via {@link ng.$sce#methods_trustAsHtml $sce.trustAsHtml}.  See the example
-   * under {@link ng.$sce#Example Strict Contextual Escaping (SCE)}.
+   * Evaluates the expression and inserts the resulting HTML into the element in a secure way. By default,
+   * the resulting HTML content will be sanitized using the {@link ngSanitize.$sanitize $sanitize} service.
+   * To utilize this functionality, ensure that `$sanitize` is available, for example, by including {@link
+    * ngSanitize} in your module's dependencies (not in core Angular). In order to use {@link ngSanitize}
+   * in your module's dependencies, you need to include "angular-sanitize.js" in your application.
+   *
+   * You may also bypass sanitization for values you know are safe. To do so, bind to
+   * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
+   * under {@link ng.$sce#show-me-an-example-using-sce- Strict Contextual Escaping (SCE)}.
    *
    * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
    * will have an exception (instead of an exploit.)
@@ -17177,126 +26184,352 @@
    * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
    *
    * @example
-   Try it here: enter text in text box and watch the greeting change.
 
-   <example module="ngBindHtmlExample" deps="angular-sanitize.js">
+   <example module="bindHtmlExample" deps="angular-sanitize.js" name="ng-bind-html">
    <file name="index.html">
-   <div ng-controller="ngBindHtmlCtrl">
+   <div ng-controller="ExampleController">
    <p ng-bind-html="myHTML"></p>
    </div>
    </file>
 
    <file name="script.js">
-   angular.module('ngBindHtmlExample', ['ngSanitize'])
-
-   .controller('ngBindHtmlCtrl', ['$scope', function ngBindHtmlCtrl($scope) {
-         $scope.myHTML =
-            'I am an <code>HTML</code>string with <a href="#">links!</a> and other <em>stuff</em>';
-       }]);
+   angular.module('bindHtmlExample', ['ngSanitize'])
+   .controller('ExampleController', ['$scope', function($scope) {
+           $scope.myHTML =
+              'I am an <code>HTML</code>string with ' +
+              '<a href="#">links!</a> and other <em>stuff</em>';
+         }]);
    </file>
 
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
    it('should check ng-bind-html', function() {
-         expect(using('.doc-example-live').binding('myHTML')).
-           toBe(
-           'I am an <code>HTML</code>string with <a href="#">links!</a> and other <em>stuff</em>'
-           );
+         expect(element(by.binding('myHTML')).getText()).toBe(
+             'I am an HTMLstring with links! and other stuff');
        });
    </file>
    </example>
    */
-  var ngBindHtmlDirective = ['$sce', '$parse', function($sce, $parse) {
-    return function(scope, element, attr) {
-      element.addClass('ng-binding').data('$binding', attr.ngBindHtml);
+  var ngBindHtmlDirective = ['$sce', '$parse', '$compile', function($sce, $parse, $compile) {
+    return {
+      restrict: 'A',
+      compile: function ngBindHtmlCompile(tElement, tAttrs) {
+        var ngBindHtmlGetter = $parse(tAttrs.ngBindHtml);
+        var ngBindHtmlWatch = $parse(tAttrs.ngBindHtml, function sceValueOf(val) {
+          // Unwrap the value to compare the actual inner safe value, not the wrapper object.
+          return $sce.valueOf(val);
+        });
+        $compile.$$addBindingClass(tElement);
 
-      var parsed = $parse(attr.ngBindHtml);
-      function getStringValue() { return (parsed(scope) || '').toString(); }
+        return function ngBindHtmlLink(scope, element, attr) {
+          $compile.$$addBindingInfo(element, attr.ngBindHtml);
 
-      scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
-        element.html($sce.getTrustedHtml(parsed(scope)) || '');
-      });
+          scope.$watch(ngBindHtmlWatch, function ngBindHtmlWatchAction() {
+            // The watched value is the unwrapped value. To avoid re-escaping, use the direct getter.
+            var value = ngBindHtmlGetter(scope);
+            element.html($sce.getTrustedHtml(value) || '');
+          });
+        };
+      }
     };
   }];
 
+  /**
+   * @ngdoc directive
+   * @name ngChange
+   *
+   * @description
+   * Evaluate the given expression when the user changes the input.
+   * The expression is evaluated immediately, unlike the JavaScript onchange event
+   * which only triggers at the end of a change (usually, when the user leaves the
+   * form element or presses the return key).
+   *
+   * The `ngChange` expression is only evaluated when a change in the input value causes
+   * a new value to be committed to the model.
+   *
+   * It will not be evaluated:
+   * * if the value returned from the `$parsers` transformation pipeline has not changed
+   * * if the input has continued to be invalid since the model will stay `null`
+   * * if the model is changed programmatically and not by a change to the input value
+   *
+   *
+   * Note, this directive requires `ngModel` to be present.
+   *
+   * @element input
+   * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
+   * in input value.
+   *
+   * @example
+   * <example name="ngChange-directive" module="changeExample">
+   *   <file name="index.html">
+   *     <script>
+   *       angular.module('changeExample', [])
+   *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.counter = 0;
+ *           $scope.change = function() {
+ *             $scope.counter++;
+ *           };
+ *         }]);
+   *     </script>
+   *     <div ng-controller="ExampleController">
+   *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
+   *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
+   *       <label for="ng-change-example2">Confirmed</label><br />
+   *       <tt>debug = {{confirmed}}</tt><br/>
+   *       <tt>counter = {{counter}}</tt><br/>
+   *     </div>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *     var counter = element(by.binding('counter'));
+   *     var debug = element(by.binding('confirmed'));
+   *
+   *     it('should evaluate the expression if changing from view', function() {
+ *       expect(counter.getText()).toContain('0');
+ *
+ *       element(by.id('ng-change-example1')).click();
+ *
+ *       expect(counter.getText()).toContain('1');
+ *       expect(debug.getText()).toContain('true');
+ *     });
+   *
+   *     it('should not evaluate the expression if changing from model', function() {
+ *       element(by.id('ng-change-example2')).click();
+
+ *       expect(counter.getText()).toContain('0');
+ *       expect(debug.getText()).toContain('true');
+ *     });
+   *   </file>
+   * </example>
+   */
+  var ngChangeDirective = valueFn({
+    restrict: 'A',
+    require: 'ngModel',
+    link: function(scope, element, attr, ctrl) {
+      ctrl.$viewChangeListeners.push(function() {
+        scope.$eval(attr.ngChange);
+      });
+    }
+  });
+
+  /* exported
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective
+*/
+
   function classDirective(name, selector) {
     name = 'ngClass' + name;
-    return function() {
+    var indexWatchExpression;
+
+    return ['$parse', function($parse) {
       return {
         restrict: 'AC',
         link: function(scope, element, attr) {
-          var oldVal;
+          var expression = attr[name].trim();
+          var isOneTime = (expression.charAt(0) === ':') && (expression.charAt(1) === ':');
 
-          scope.$watch(attr[name], ngClassWatchAction, true);
+          var watchInterceptor = isOneTime ? toFlatValue : toClassString;
+          var watchExpression = $parse(expression, watchInterceptor);
+          var watchAction = isOneTime ? ngClassOneTimeWatchAction : ngClassWatchAction;
 
-          attr.$observe('class', function(value) {
-            ngClassWatchAction(scope.$eval(attr[name]));
-          });
+          var classCounts = element.data('$classCounts');
+          var oldModulo = true;
+          var oldClassString;
 
+          if (!classCounts) {
+            // Use createMap() to prevent class assumptions involving property
+            // names in Object.prototype
+            classCounts = createMap();
+            element.data('$classCounts', classCounts);
+          }
 
           if (name !== 'ngClass') {
-            scope.$watch('$index', function($index, old$index) {
-              // jshint bitwise: false
-              var mod = $index & 1;
-              if (mod !== old$index & 1) {
-                var classes = flattenClasses(scope.$eval(attr[name]));
-                mod === selector ?
-                    attr.$addClass(classes) :
-                    attr.$removeClass(classes);
+            if (!indexWatchExpression) {
+              indexWatchExpression = $parse('$index', function moduloTwo($index) {
+                // eslint-disable-next-line no-bitwise
+                return $index & 1;
+              });
+            }
+
+            scope.$watch(indexWatchExpression, ngClassIndexWatchAction);
+          }
+
+          scope.$watch(watchExpression, watchAction, isOneTime);
+
+          function addClasses(classString) {
+            classString = digestClassCounts(split(classString), 1);
+            attr.$addClass(classString);
+          }
+
+          function removeClasses(classString) {
+            classString = digestClassCounts(split(classString), -1);
+            attr.$removeClass(classString);
+          }
+
+          function updateClasses(oldClassString, newClassString) {
+            var oldClassArray = split(oldClassString);
+            var newClassArray = split(newClassString);
+
+            var toRemoveArray = arrayDifference(oldClassArray, newClassArray);
+            var toAddArray = arrayDifference(newClassArray, oldClassArray);
+
+            var toRemoveString = digestClassCounts(toRemoveArray, -1);
+            var toAddString = digestClassCounts(toAddArray, 1);
+
+            attr.$addClass(toAddString);
+            attr.$removeClass(toRemoveString);
+          }
+
+          function digestClassCounts(classArray, count) {
+            var classesToUpdate = [];
+
+            forEach(classArray, function(className) {
+              if (count > 0 || classCounts[className]) {
+                classCounts[className] = (classCounts[className] || 0) + count;
+                if (classCounts[className] === +(count > 0)) {
+                  classesToUpdate.push(className);
+                }
               }
             });
+
+            return classesToUpdate.join(' ');
           }
 
-
-          function ngClassWatchAction(newVal) {
-            if (selector === true || scope.$index % 2 === selector) {
-              var newClasses = flattenClasses(newVal || '');
-              if(!oldVal) {
-                attr.$addClass(newClasses);
-              } else if(!equals(newVal,oldVal)) {
-                attr.$updateClass(newClasses, flattenClasses(oldVal));
-              }
+          function ngClassIndexWatchAction(newModulo) {
+            // This watch-action should run before the `ngClass[OneTime]WatchAction()`, thus it
+            // adds/removes `oldClassString`. If the `ngClass` expression has changed as well, the
+            // `ngClass[OneTime]WatchAction()` will update the classes.
+            if (newModulo === selector) {
+              addClasses(oldClassString);
+            } else {
+              removeClasses(oldClassString);
             }
-            oldVal = copy(newVal);
+
+            oldModulo = newModulo;
           }
 
+          function ngClassOneTimeWatchAction(newClassValue) {
+            var newClassString = toClassString(newClassValue);
 
-          function flattenClasses(classVal) {
-            if(isArray(classVal)) {
-              return classVal.join(' ');
-            } else if (isObject(classVal)) {
-              var classes = [], i = 0;
-              forEach(classVal, function(v, k) {
-                if (v) {
-                  classes.push(k);
-                }
-              });
-              return classes.join(' ');
+            if (newClassString !== oldClassString) {
+              ngClassWatchAction(newClassString);
+            }
+          }
+
+          function ngClassWatchAction(newClassString) {
+            if (oldModulo === selector) {
+              updateClasses(oldClassString, newClassString);
             }
 
-            return classVal;
+            oldClassString = newClassString;
           }
         }
       };
-    };
+    }];
+
+    // Helpers
+    function arrayDifference(tokens1, tokens2) {
+      if (!tokens1 || !tokens1.length) return [];
+      if (!tokens2 || !tokens2.length) return tokens1;
+
+      var values = [];
+
+      outer:
+        for (var i = 0; i < tokens1.length; i++) {
+          var token = tokens1[i];
+          for (var j = 0; j < tokens2.length; j++) {
+            if (token === tokens2[j]) continue outer;
+          }
+          values.push(token);
+        }
+
+      return values;
+    }
+
+    function split(classString) {
+      return classString && classString.split(' ');
+    }
+
+    function toClassString(classValue) {
+      var classString = classValue;
+
+      if (isArray(classValue)) {
+        classString = classValue.map(toClassString).join(' ');
+      } else if (isObject(classValue)) {
+        classString = Object.keys(classValue).
+        filter(function(key) { return classValue[key]; }).
+        join(' ');
+      }
+
+      return classString;
+    }
+
+    function toFlatValue(classValue) {
+      var flatValue = classValue;
+
+      if (isArray(classValue)) {
+        flatValue = classValue.map(toFlatValue);
+      } else if (isObject(classValue)) {
+        var hasUndefined = false;
+
+        flatValue = Object.keys(classValue).filter(function(key) {
+          var value = classValue[key];
+
+          if (!hasUndefined && isUndefined(value)) {
+            hasUndefined = true;
+          }
+
+          return value;
+        });
+
+        if (hasUndefined) {
+          // Prevent the `oneTimeLiteralWatchInterceptor` from unregistering
+          // the watcher, by including at least one `undefined` value.
+          flatValue.push(undefined);
+        }
+      }
+
+      return flatValue;
+    }
   }
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngClass
+   * @name ngClass
    * @restrict AC
    *
    * @description
    * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
    * an expression that represents all classes to be added.
    *
+   * The directive operates in three different ways, depending on which of three types the expression
+   * evaluates to:
+   *
+   * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
+   * names.
+   *
+   * 2. If the expression evaluates to an object, then for each key-value pair of the
+   * object with a truthy value the corresponding key is used as a class name.
+   *
+   * 3. If the expression evaluates to an array, each element of the array should either be a string as in
+   * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
+   * to give you more control over what CSS classes appear. See the code below for an example of this.
+   *
+   *
    * The directive won't add duplicate classes if a particular class was already set.
    *
-   * When the expression changes, the previously added classes are removed and only then the
-   * new classes are added.
+   * When the expression changes, the previously added classes are removed and only then are the
+   * new classes added.
+   *
+   * @knownIssue
+   * You should not use {@link guide/interpolation interpolation} in the value of the `class`
+   * attribute, when using the `ngClass` directive on the same element.
+   * See {@link guide/interpolation#known-issues here} for more info.
    *
    * @animations
-   * add - happens just before the class is applied to the element
-   * remove - happens just before the class is removed from the element
+   * | Animation                        | Occurs                              |
+   * |----------------------------------|-------------------------------------|
+   * | {@link ng.$animate#addClass addClass}       | just before the class is applied to the element   |
+   * | {@link ng.$animate#removeClass removeClass} | just before the class is removed from the element |
    *
    * @element ANY
    * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
@@ -17306,24 +26539,41 @@
    *   element.
    *
    * @example Example that demonstrates basic bindings via ngClass directive.
-   <example>
+   <example name="ng-class">
    <file name="index.html">
-   <p ng-class="{strike: deleted, bold: important, red: error}">Map Syntax Example</p>
-   <input type="checkbox" ng-model="deleted"> deleted (apply "strike" class)<br>
-   <input type="checkbox" ng-model="important"> important (apply "bold" class)<br>
-   <input type="checkbox" ng-model="error"> error (apply "red" class)
+   <p ng-class="{strike: deleted, bold: important, 'has-error': error}">Map Syntax Example</p>
+   <label>
+   <input type="checkbox" ng-model="deleted">
+   deleted (apply "strike" class)
+   </label><br>
+   <label>
+   <input type="checkbox" ng-model="important">
+   important (apply "bold" class)
+   </label><br>
+   <label>
+   <input type="checkbox" ng-model="error">
+   error (apply "has-error" class)
+   </label>
    <hr>
    <p ng-class="style">Using String Syntax</p>
-   <input type="text" ng-model="style" placeholder="Type: bold strike red">
+   <input type="text" ng-model="style"
+   placeholder="Type: bold strike red" aria-label="Type: bold strike red">
    <hr>
    <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
-   <input ng-model="style1" placeholder="Type: bold, strike or red"><br>
-   <input ng-model="style2" placeholder="Type: bold, strike or red"><br>
-   <input ng-model="style3" placeholder="Type: bold, strike or red"><br>
+   <input ng-model="style1"
+   placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
+   <input ng-model="style2"
+   placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
+   <input ng-model="style3"
+   placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
+   <hr>
+   <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
+   <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
+   <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
    </file>
    <file name="style.css">
    .strike {
-         text-decoration: line-through;
+           text-decoration: line-through;
        }
    .bold {
            font-weight: bold;
@@ -17331,32 +26581,49 @@
    .red {
            color: red;
        }
+   .has-error {
+           color: red;
+           background-color: yellow;
+       }
+   .orange {
+           color: orange;
+       }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
+   var ps = element.all(by.css('p'));
+
    it('should let you toggle the class', function() {
 
-         expect(element('.doc-example-live p:first').prop('className')).not().toMatch(/bold/);
-         expect(element('.doc-example-live p:first').prop('className')).not().toMatch(/red/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/has-error/);
 
-         input('important').check();
-         expect(element('.doc-example-live p:first').prop('className')).toMatch(/bold/);
+         element(by.model('important')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
 
-         input('error').check();
-         expect(element('.doc-example-live p:first').prop('className')).toMatch(/red/);
+         element(by.model('error')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/has-error/);
        });
 
    it('should let you toggle string example', function() {
-         expect(element('.doc-example-live p:nth-of-type(2)').prop('className')).toBe('');
-         input('style').enter('red');
-         expect(element('.doc-example-live p:nth-of-type(2)').prop('className')).toBe('red');
+         expect(ps.get(1).getAttribute('class')).toBe('');
+         element(by.model('style')).clear();
+         element(by.model('style')).sendKeys('red');
+         expect(ps.get(1).getAttribute('class')).toBe('red');
        });
 
    it('array example should have 3 classes', function() {
-         expect(element('.doc-example-live p:last').prop('className')).toBe('');
-         input('style1').enter('bold');
-         input('style2').enter('strike');
-         input('style3').enter('red');
-         expect(element('.doc-example-live p:last').prop('className')).toBe('bold strike red');
+         expect(ps.get(2).getAttribute('class')).toBe('');
+         element(by.model('style1')).sendKeys('bold');
+         element(by.model('style2')).sendKeys('strike');
+         element(by.model('style3')).sendKeys('red');
+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
+       });
+
+   it('array with map example should have 2 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style4')).sendKeys('bold');
+         element(by.model('warning')).click();
+         expect(ps.last().getAttribute('class')).toBe('bold orange');
        });
    </file>
    </example>
@@ -17365,16 +26632,15 @@
 
    The example below demonstrates how to perform animations using ngClass.
 
-   <example animations="true">
+   <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-class">
    <file name="index.html">
-   <input type="button" value="set" ng-click="myVar='my-class'">
-   <input type="button" value="clear" ng-click="myVar=''">
+   <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
+   <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
    <br>
    <span class="base-class" ng-class="myVar">Sample Text</span>
    </file>
    <file name="style.css">
    .base-class {
-         -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
          transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
        }
 
@@ -17383,19 +26649,19 @@
          font-size:3em;
        }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
    it('should check ng-class', function() {
-         expect(element('.doc-example-live span').prop('className')).not().
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
            toMatch(/my-class/);
 
-         using('.doc-example-live').element(':button:first').click();
+         element(by.id('setbtn')).click();
 
-         expect(element('.doc-example-live span').prop('className')).
+         expect(element(by.css('.base-class')).getAttribute('class')).
            toMatch(/my-class/);
 
-         using('.doc-example-live').element(':button:last').click();
+         element(by.id('clearbtn')).click();
 
-         expect(element('.doc-example-live span').prop('className')).not().
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
            toMatch(/my-class/);
        });
    </file>
@@ -17406,14 +26672,14 @@
    The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
    Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
    any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
-   to view the step by step details of {@link ngAnimate.$animate#methods_addclass $animate.addClass} and
-   {@link ngAnimate.$animate#methods_removeclass $animate.removeClass}.
+   to view the step by step details of {@link $animate#addClass $animate.addClass} and
+   {@link $animate#removeClass $animate.removeClass}.
    */
   var ngClassDirective = classDirective('', true);
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngClassOdd
+   * @name ngClassOdd
    * @restrict AC
    *
    * @description
@@ -17429,7 +26695,7 @@
    *   of the evaluation can be a string representing space delimited class names or an array.
    *
    * @example
-   <example>
+   <example name="ng-class-odd">
    <file name="index.html">
    <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
    <li ng-repeat="name in names">
@@ -17447,11 +26713,11 @@
          color: blue;
        }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
    it('should check ng-class-odd and ng-class-even', function() {
-         expect(element('.doc-example-live li:first span').prop('className')).
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
            toMatch(/odd/);
-         expect(element('.doc-example-live li:last span').prop('className')).
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
            toMatch(/even/);
        });
    </file>
@@ -17461,7 +26727,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngClassEven
+   * @name ngClassEven
    * @restrict AC
    *
    * @description
@@ -17477,7 +26743,7 @@
    *   result of the evaluation can be a string representing space delimited class names or an array.
    *
    * @example
-   <example>
+   <example name="ng-class-even">
    <file name="index.html">
    <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
    <li ng-repeat="name in names">
@@ -17495,11 +26761,11 @@
          color: blue;
        }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
    it('should check ng-class-odd and ng-class-even', function() {
-         expect(element('.doc-example-live li:first span').prop('className')).
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
            toMatch(/odd/);
-         expect(element('.doc-example-live li:last span').prop('className')).
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
            toMatch(/even/);
        });
    </file>
@@ -17509,7 +26775,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngCloak
+   * @name ngCloak
    * @restrict AC
    *
    * @description
@@ -17525,11 +26791,11 @@
    * `angular.min.js`.
    * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
    *
-   * <pre>
+   * ```css
    * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
  *   display: none !important;
  * }
-   * </pre>
+   * ```
    *
    * When this css rule is loaded by the browser, all html elements (including their children) that
    * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
@@ -17540,27 +26806,23 @@
    * document; alternatively, the css rule above must be included in the external stylesheet of the
    * application.
    *
-   * Legacy browsers, like IE7, do not provide attribute selector support (added in CSS 2.1) so they
-   * cannot match the `[ng\:cloak]` selector. To work around this limitation, you must add the css
-   * class `ng-cloak` in addition to the `ngCloak` directive as shown in the example below.
-   *
    * @element ANY
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-cloak">
+   <file name="index.html">
    <div id="template1" ng-cloak>{{ 'hello' }}</div>
-   <div id="template2" ng-cloak class="ng-cloak">{{ 'hello IE7' }}</div>
-   </doc:source>
-   <doc:scenario>
+   <div id="template2" class="ng-cloak">{{ 'world' }}</div>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should remove the template directive and css class', function() {
-         expect(element('.doc-example-live #template1').attr('ng-cloak')).
-           not().toBeDefined();
-         expect(element('.doc-example-live #template2').attr('ng-cloak')).
-           not().toBeDefined();
+         expect($('#template1').getAttribute('ng-cloak')).
+           toBeNull();
+         expect($('#template2').getAttribute('ng-cloak')).
+           toBeNull();
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    *
    */
   var ngCloakDirective = ngDirective({
@@ -17572,7 +26834,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngController
+   * @name ngController
    *
    * @description
    * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
@@ -17580,7 +26842,7 @@
    *
    * MVC components in angular:
    *
-   * * Model — The Model is scope properties; scopes are attached to the DOM where scope properties
+   * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
    *   are accessed through bindings.
    * * View — The template (HTML with data bindings) that is rendered into the View.
    * * Controller — The `ngController` directive specifies a Controller class; the class contains business
@@ -17593,149 +26855,214 @@
    *
    * @element ANY
    * @scope
-   * @param {expression} ngController Name of a globally accessible constructor function or an
-   *     {@link guide/expression expression} that on the current scope evaluates to a
-   *     constructor function. The controller instance can be published into a scope property
-   *     by specifying `as propertyName`.
+   * @priority 500
+   * @param {expression} ngController Name of a constructor function registered with the current
+   * {@link ng.$controllerProvider $controllerProvider} or an {@link guide/expression expression}
+   * that on the current scope evaluates to a constructor function.
+   *
+   * The controller instance can be published into a scope property by specifying
+   * `ng-controller="as propertyName"`.
+   *
+   * If the current `$controllerProvider` is configured to use globals (via
+   * {@link ng.$controllerProvider#allowGlobals `$controllerProvider.allowGlobals()` }), this may
+   * also be the name of a globally accessible constructor function (deprecated, not recommended).
    *
    * @example
    * Here is a simple form for editing user contact information. Adding, removing, clearing, and
    * greeting are methods declared on the controller (see source tab). These methods can
-   * easily be called from the angular markup. Notice that the scope becomes the `this` for the
-   * controller's instance. This allows for easy access to the view data from the controller. Also
-   * notice that any changes to the data are automatically reflected in the View without the need
-   * for a manual update. The example is shown in two different declaration styles you may use
-   * according to preference.
-   <doc:example>
-   <doc:source>
-   <script>
-   function SettingsController1() {
-          this.name = "John Smith";
-          this.contacts = [
-            {type: 'phone', value: '408 555 1212'},
-            {type: 'email', value: 'john.smith@example.org'} ];
-   };
-
-   SettingsController1.prototype.greet = function() {
-          alert(this.name);
-        };
-
-   SettingsController1.prototype.addContact = function() {
-          this.contacts.push({type: 'email', value: 'yourname@example.org'});
-   };
-
-   SettingsController1.prototype.removeContact = function(contactToRemove) {
-         var index = this.contacts.indexOf(contactToRemove);
-          this.contacts.splice(index, 1);
-        };
-
-   SettingsController1.prototype.clearContact = function(contact) {
-          contact.type = 'phone';
-          contact.value = '';
-        };
-   </script>
-   <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
-   Name: <input type="text" ng-model="settings.name"/>
-   [ <a href="" ng-click="settings.greet()">greet</a> ]<br/>
-   Contact:
-   <ul>
-   <li ng-repeat="contact in settings.contacts">
-   <select ng-model="contact.type">
-   <option>phone</option>
-   <option>email</option>
-   </select>
-   <input type="text" ng-model="contact.value"/>
-   [ <a href="" ng-click="settings.clearContact(contact)">clear</a>
-   | <a href="" ng-click="settings.removeContact(contact)">X</a> ]
-   </li>
-   <li>[ <a href="" ng-click="settings.addContact()">add</a> ]</li>
-   </ul>
-   </div>
-   </doc:source>
-   <doc:scenario>
-   it('should check controller as', function() {
-         expect(element('#ctrl-as-exmpl>:input').val()).toBe('John Smith');
-         expect(element('#ctrl-as-exmpl li:nth-child(1) input').val())
-           .toBe('408 555 1212');
-         expect(element('#ctrl-as-exmpl li:nth-child(2) input').val())
-           .toBe('john.smith@example.org');
-
-   element('#ctrl-as-exmpl li:first a:contains("clear")').click();
-   expect(element('#ctrl-as-exmpl li:first input').val()).toBe('');
-
-   element('#ctrl-as-exmpl li:last a:contains("add")').click();
-   expect(element('#ctrl-as-exmpl li:nth-child(3) input').val())
-   .toBe('yourname@example.org');
-   });
-   </doc:scenario>
-   </doc:example>
-   <doc:example>
-   <doc:source>
-   <script>
-   function SettingsController2($scope) {
-          $scope.name = "John Smith";
-          $scope.contacts = [
-            {type:'phone', value:'408 555 1212'},
-            {type:'email', value:'john.smith@example.org'} ];
-
-   $scope.greet = function() {
-           alert(this.name);
-          };
-
-   $scope.addContact = function() {
-           this.contacts.push({type:'email', value:'yourname@example.org'});
-   };
-
-   $scope.removeContact = function(contactToRemove) {
-           var index = this.contacts.indexOf(contactToRemove);
-           this.contacts.splice(index, 1);
-          };
-
-   $scope.clearContact = function(contact) {
-           contact.type = 'phone';
-           contact.value = '';
-          };
-   }
-   </script>
-   <div id="ctrl-exmpl" ng-controller="SettingsController2">
-   Name: <input type="text" ng-model="name"/>
-   [ <a href="" ng-click="greet()">greet</a> ]<br/>
-   Contact:
-   <ul>
-   <li ng-repeat="contact in contacts">
-   <select ng-model="contact.type">
-   <option>phone</option>
-   <option>email</option>
-   </select>
-   <input type="text" ng-model="contact.value"/>
-   [ <a href="" ng-click="clearContact(contact)">clear</a>
-   | <a href="" ng-click="removeContact(contact)">X</a> ]
-   </li>
-   <li>[ <a href="" ng-click="addContact()">add</a> ]</li>
-   </ul>
-   </div>
-   </doc:source>
-   <doc:scenario>
-   it('should check controller', function() {
-         expect(element('#ctrl-exmpl>:input').val()).toBe('John Smith');
-         expect(element('#ctrl-exmpl li:nth-child(1) input').val())
-           .toBe('408 555 1212');
-         expect(element('#ctrl-exmpl li:nth-child(2) input').val())
-           .toBe('john.smith@example.org');
-
-   element('#ctrl-exmpl li:first a:contains("clear")').click();
-   expect(element('#ctrl-exmpl li:first input').val()).toBe('');
-
-   element('#ctrl-exmpl li:last a:contains("add")').click();
-   expect(element('#ctrl-exmpl li:nth-child(3) input').val())
-   .toBe('yourname@example.org');
-   });
-   </doc:scenario>
-   </doc:example>
+   * easily be called from the angular markup. Any changes to the data are automatically reflected
+   * in the View without the need for a manual update.
+   *
+   * Two different declaration styles are included below:
+   *
+   * * one binds methods and properties directly onto the controller using `this`:
+   * `ng-controller="SettingsController1 as settings"`
+   * * one injects `$scope` into the controller:
+   * `ng-controller="SettingsController2"`
+   *
+   * The second option is more common in the Angular community, and is generally used in boilerplates
+   * and in this guide. However, there are advantages to binding properties directly to the controller
+   * and avoiding scope.
+   *
+   * * Using `controller as` makes it obvious which controller you are accessing in the template when
+   * multiple controllers apply to an element.
+   * * If you are writing your controllers as classes you have easier access to the properties and
+   * methods, which will appear on the scope, from inside the controller code.
+   * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
+   * inheritance masking primitives.
+   *
+   * This example demonstrates the `controller as` syntax.
+   *
+   * <example name="ngControllerAs" module="controllerAsExample">
+   *   <file name="index.html">
+   *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
+   *      <label>Name: <input type="text" ng-model="settings.name"/></label>
+   *      <button ng-click="settings.greet()">greet</button><br/>
+   *      Contact:
+   *      <ul>
+   *        <li ng-repeat="contact in settings.contacts">
+   *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
+   *             <option>phone</option>
+   *             <option>email</option>
+   *          </select>
+   *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+   *          <button ng-click="settings.clearContact(contact)">clear</button>
+   *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
+   *        </li>
+   *        <li><button ng-click="settings.addContact()">add</button></li>
+   *     </ul>
+   *    </div>
+   *   </file>
+   *   <file name="app.js">
+   *    angular.module('controllerAsExample', [])
+   *      .controller('SettingsController1', SettingsController1);
+   *
+   *    function SettingsController1() {
+ *      this.name = 'John Smith';
+ *      this.contacts = [
+ *        {type: 'phone', value: '408 555 1212'},
+ *        {type: 'email', value: 'john.smith@example.org'}
+ *      ];
+ *    }
+   *
+   *    SettingsController1.prototype.greet = function() {
+ *      alert(this.name);
+ *    };
+   *
+   *    SettingsController1.prototype.addContact = function() {
+ *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
+ *    };
+   *
+   *    SettingsController1.prototype.removeContact = function(contactToRemove) {
+ *     var index = this.contacts.indexOf(contactToRemove);
+ *      this.contacts.splice(index, 1);
+ *    };
+   *
+   *    SettingsController1.prototype.clearContact = function(contact) {
+ *      contact.type = 'phone';
+ *      contact.value = '';
+ *    };
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *     it('should check controller as', function() {
+ *       var container = element(by.id('ctrl-as-exmpl'));
+ *         expect(container.element(by.model('settings.name'))
+ *           .getAttribute('value')).toBe('John Smith');
+ *
+ *       var firstRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(0));
+ *       var secondRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(1));
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('408 555 1212');
+ *
+ *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('john.smith@example.org');
+ *
+ *       firstRepeat.element(by.buttonText('clear')).click();
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('');
+ *
+ *       container.element(by.buttonText('add')).click();
+ *
+ *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
+ *           .element(by.model('contact.value'))
+ *           .getAttribute('value'))
+ *           .toBe('yourname@example.org');
+ *     });
+   *   </file>
+   * </example>
+   *
+   * This example demonstrates the "attach to `$scope`" style of controller.
+   *
+   * <example name="ngController" module="controllerExample">
+   *  <file name="index.html">
+   *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
+   *     <label>Name: <input type="text" ng-model="name"/></label>
+   *     <button ng-click="greet()">greet</button><br/>
+   *     Contact:
+   *     <ul>
+   *       <li ng-repeat="contact in contacts">
+   *         <select ng-model="contact.type" id="select_{{$index}}">
+   *            <option>phone</option>
+   *            <option>email</option>
+   *         </select>
+   *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+   *         <button ng-click="clearContact(contact)">clear</button>
+   *         <button ng-click="removeContact(contact)">X</button>
+   *       </li>
+   *       <li>[ <button ng-click="addContact()">add</button> ]</li>
+   *    </ul>
+   *   </div>
+   *  </file>
+   *  <file name="app.js">
+   *   angular.module('controllerExample', [])
+   *     .controller('SettingsController2', ['$scope', SettingsController2]);
+   *
+   *   function SettingsController2($scope) {
+ *     $scope.name = 'John Smith';
+ *     $scope.contacts = [
+ *       {type:'phone', value:'408 555 1212'},
+ *       {type:'email', value:'john.smith@example.org'}
+ *     ];
+ *
+ *     $scope.greet = function() {
+ *       alert($scope.name);
+ *     };
+ *
+ *     $scope.addContact = function() {
+ *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
+ *     };
+ *
+ *     $scope.removeContact = function(contactToRemove) {
+ *       var index = $scope.contacts.indexOf(contactToRemove);
+ *       $scope.contacts.splice(index, 1);
+ *     };
+ *
+ *     $scope.clearContact = function(contact) {
+ *       contact.type = 'phone';
+ *       contact.value = '';
+ *     };
+ *   }
+   *  </file>
+   *  <file name="protractor.js" type="protractor">
+   *    it('should check controller', function() {
+ *      var container = element(by.id('ctrl-exmpl'));
+ *
+ *      expect(container.element(by.model('name'))
+ *          .getAttribute('value')).toBe('John Smith');
+ *
+ *      var firstRepeat =
+ *          container.element(by.repeater('contact in contacts').row(0));
+ *      var secondRepeat =
+ *          container.element(by.repeater('contact in contacts').row(1));
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('408 555 1212');
+ *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('john.smith@example.org');
+ *
+ *      firstRepeat.element(by.buttonText('clear')).click();
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('');
+ *
+ *      container.element(by.buttonText('add')).click();
+ *
+ *      expect(container.element(by.repeater('contact in contacts').row(2))
+ *          .element(by.model('contact.value'))
+ *          .getAttribute('value'))
+ *          .toBe('yourname@example.org');
+ *    });
+   *  </file>
+   *</example>
 
    */
   var ngControllerDirective = [function() {
     return {
+      restrict: 'A',
       scope: true,
       controller: '@',
       priority: 500
@@ -17744,389 +27071,604 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngCsp
+   * @name ngCsp
    *
-   * @element html
+   * @restrict A
+   * @element ANY
    * @description
-   * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
    *
-   * This is necessary when developing things like Google Chrome Extensions.
+   * Angular has some features that can conflict with certain restrictions that are applied when using
+   * [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) rules.
    *
-   * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
-   * For us to be compatible, we just need to implement the "getterFn" in $parse without violating
-   * any of these restrictions.
+   * If you intend to implement CSP with these rules then you must tell Angular not to use these
+   * features.
    *
-   * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
-   * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
-   * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
-   * be raised.
+   * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
    *
-   * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
-   * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
-   * To make those directives work in CSP mode, include the `angular-csp.css` manually.
    *
-   * In order to use this feature put the `ngCsp` directive on the root element of the application.
+   * The following default rules in CSP affect Angular:
+   *
+   * * The use of `eval()`, `Function(string)` and similar functions to dynamically create and execute
+   * code from strings is forbidden. Angular makes use of this in the {@link $parse} service to
+   * provide a 30% increase in the speed of evaluating Angular expressions. (This CSP rule can be
+   * disabled with the CSP keyword `unsafe-eval`, but it is generally not recommended as it would
+   * weaken the protections offered by CSP.)
+   *
+   * * The use of inline resources, such as inline `<script>` and `<style>` elements, are forbidden.
+   * This prevents apps from injecting custom styles directly into the document. Angular makes use of
+   * this to include some CSS rules (e.g. {@link ngCloak} and {@link ngHide}). To make these
+   * directives work when a CSP rule is blocking inline styles, you must link to the `angular-csp.css`
+   * in your HTML manually. (This CSP rule can be disabled with the CSP keyword `unsafe-inline`, but
+   * it is generally not recommended as it would weaken the protections offered by CSP.)
+   *
+   * If you do not provide `ngCsp` then Angular tries to autodetect if CSP is blocking dynamic code
+   * creation from strings (e.g., `unsafe-eval` not specified in CSP header) and automatically
+   * deactivates this feature in the {@link $parse} service. This autodetection, however, triggers a
+   * CSP error to be logged in the console:
+   *
+   * ```
+   * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+   * script in the following Content Security Policy directive: "default-src 'self'". Note that
+   * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+   * ```
+   *
+   * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+   * directive on an element of the HTML document that appears before the `<script>` tag that loads
+   * the `angular.js` file.
    *
    * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
    *
+   * You can specify which of the CSP related Angular features should be deactivated by providing
+   * a value for the `ng-csp` attribute. The options are as follows:
+   *
+   * * no-inline-style: this stops Angular from injecting CSS styles into the DOM
+   *
+   * * no-unsafe-eval: this stops Angular from optimizing $parse with unsafe eval of strings
+   *
+   * You can use these values in the following combinations:
+   *
+   *
+   * * No declaration means that Angular will assume that you can do inline styles, but it will do
+   * a runtime check for unsafe-eval. E.g. `<body>`. This is backwardly compatible with previous
+   * versions of Angular.
+   *
+   * * A simple `ng-csp` (or `data-ng-csp`) attribute will tell Angular to deactivate both inline
+   * styles and unsafe eval. E.g. `<body ng-csp>`. This is backwardly compatible with previous
+   * versions of Angular.
+   *
+   * * Specifying only `no-unsafe-eval` tells Angular that we must not use eval, but that we can
+   * inject inline styles. E.g. `<body ng-csp="no-unsafe-eval">`.
+   *
+   * * Specifying only `no-inline-style` tells Angular that we must not inject styles, but that we can
+   * run eval - no automatic check for unsafe eval will occur. E.g. `<body ng-csp="no-inline-style">`
+   *
+   * * Specifying both `no-unsafe-eval` and `no-inline-style` tells Angular that we must not inject
+   * styles nor use eval, which is the same as an empty: ng-csp.
+   * E.g.`<body ng-csp="no-inline-style;no-unsafe-eval">`
+   *
    * @example
    * This example shows how to apply the `ngCsp` directive to the `html` tag.
-   <pre>
+   ```html
    <!doctype html>
    <html ng-app ng-csp>
    ...
    ...
    </html>
-   </pre>
+   ```
+   * @example
+   <!-- Note: the `.csp` suffix in the example name triggers CSP mode in our http server! -->
+   <example name="example.csp" module="cspExample" ng-csp="true">
+   <file name="index.html">
+   <div ng-controller="MainController as ctrl">
+   <div>
+   <button ng-click="ctrl.inc()" id="inc">Increment</button>
+   <span id="counter">
+   {{ctrl.counter}}
+   </span>
+   </div>
+
+   <div>
+   <button ng-click="ctrl.evil()" id="evil">Evil</button>
+   <span id="evilError">
+   {{ctrl.evilError}}
+   </span>
+   </div>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('cspExample', [])
+   .controller('MainController', function MainController() {
+                this.counter = 0;
+                this.inc = function() {
+                  this.counter++;
+                };
+                this.evil = function() {
+                  try {
+                    eval('1+2'); // eslint-disable-line no-eval
+                  } catch (e) {
+                    this.evilError = e.message;
+                  }
+                };
+              });
+   </file>
+   <file name="protractor.js" type="protractor">
+   var util, webdriver;
+
+   var incBtn = element(by.id('inc'));
+   var counter = element(by.id('counter'));
+   var evilBtn = element(by.id('evil'));
+   var evilError = element(by.id('evilError'));
+
+   function getAndClearSevereErrors() {
+            return browser.manage().logs().get('browser').then(function(browserLog) {
+              return browserLog.filter(function(logEntry) {
+                return logEntry.level.value > webdriver.logging.Level.WARNING.value;
+              });
+            });
+          }
+
+   function clearErrors() {
+            getAndClearSevereErrors();
+          }
+
+   function expectNoErrors() {
+            getAndClearSevereErrors().then(function(filteredLog) {
+              expect(filteredLog.length).toEqual(0);
+              if (filteredLog.length) {
+                console.log('browser console errors: ' + util.inspect(filteredLog));
+              }
+            });
+          }
+
+   function expectError(regex) {
+            getAndClearSevereErrors().then(function(filteredLog) {
+              var found = false;
+              filteredLog.forEach(function(log) {
+                if (log.message.match(regex)) {
+                  found = true;
+                }
+              });
+              if (!found) {
+                throw new Error('expected an error that matches ' + regex);
+              }
+            });
+          }
+
+   beforeEach(function() {
+            util = require('util');
+            webdriver = require('selenium-webdriver');
+          });
+
+   // For now, we only test on Chrome,
+   // as Safari does not load the page with Protractor's injected scripts,
+   // and Firefox webdriver always disables content security policy (#6358)
+   if (browser.params.browser !== 'chrome') {
+            return;
+          }
+
+   it('should not report errors when the page is loaded', function() {
+            // clear errors so we are not dependent on previous tests
+            clearErrors();
+            // Need to reload the page as the page is already loaded when
+            // we come here
+            browser.driver.getCurrentUrl().then(function(url) {
+              browser.get(url);
+            });
+            expectNoErrors();
+          });
+
+   it('should evaluate expressions', function() {
+            expect(counter.getText()).toEqual('0');
+            incBtn.click();
+            expect(counter.getText()).toEqual('1');
+            expectNoErrors();
+          });
+
+   it('should throw and report an error when using "eval"', function() {
+            evilBtn.click();
+            expect(evilError.getText()).toMatch(/Content Security Policy/);
+            expectError(/Content Security Policy/);
+          });
+   </file>
+   </example>
    */
 
-// ngCsp is not implemented as a proper directive any more, because we need it be processed while we bootstrap
-// the system (before $parse is instantiated), for this reason we just have a csp() fn that looks for ng-csp attribute
-// anywhere in the current doc
+// `ngCsp` is not implemented as a proper directive any more, because we need it be processed while
+// we bootstrap the app (before `$parse` is instantiated). For this reason, we just have the `csp()`
+// fn that looks for the `ng-csp` attribute anywhere in the current doc.
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngClick
+   * @name ngClick
    *
    * @description
    * The ngClick directive allows you to specify custom behavior when
    * an element is clicked.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
-   * click. (Event object is available as `$event`)
+   * click. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-click">
+   <file name="index.html">
    <button ng-click="count = count + 1" ng-init="count=0">
    Increment
    </button>
+   <span>
    count: {{count}}
-   </doc:source>
-   <doc:protractor>
+   </span>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should check ng-click', function() {
          expect(element(by.binding('count')).getText()).toMatch('0');
-         element(by.css('.doc-example-live button')).click();
+         element(by.css('button')).click();
          expect(element(by.binding('count')).getText()).toMatch('1');
        });
-   </doc:protractor>
-   </doc:example>
+   </file>
+   </example>
    */
   /*
-   * A directive that allows creation of custom onclick handlers that are defined as angular
-   * expressions and are compiled and executed within the current scope.
-   *
-   * Events that are handled via these handler are always configured not to propagate further.
-   */
+ * A collection of directives that allows creation of custom event handlers that are defined as
+ * angular expressions and are compiled and executed within the current scope.
+ */
   var ngEventDirectives = {};
+
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+  var forceAsyncEvents = {
+    'blur': true,
+    'focus': true
+  };
   forEach(
-      'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
-      function(name) {
-        var directiveName = directiveNormalize('ng-' + name);
-        ngEventDirectives[directiveName] = ['$parse', function($parse) {
-          return {
-            compile: function($element, attr) {
-              var fn = $parse(attr[directiveName]);
-              return function(scope, element, attr) {
-                element.on(lowercase(name), function(event) {
-                  scope.$apply(function() {
-                    fn(scope, {$event:event});
-                  });
-                });
-              };
-            }
-          };
-        }];
-      }
+    'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+    function(eventName) {
+      var directiveName = directiveNormalize('ng-' + eventName);
+      ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+        return {
+          restrict: 'A',
+          compile: function($element, attr) {
+            // NOTE:
+            // We expose the powerful `$event` object on the scope that provides access to the Window,
+            // etc. This is OK, because expressions are not sandboxed any more (and the expression
+            // sandbox was never meant to be a security feature anyway).
+            var fn = $parse(attr[directiveName]);
+            return function ngEventHandler(scope, element) {
+              element.on(eventName, function(event) {
+                var callback = function() {
+                  fn(scope, {$event: event});
+                };
+                if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                  scope.$evalAsync(callback);
+                } else {
+                  scope.$apply(callback);
+                }
+              });
+            };
+          }
+        };
+      }];
+    }
   );
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngDblclick
+   * @name ngDblclick
    *
    * @description
    * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
    * a dblclick. (The Event object is available as `$event`)
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-dblclick">
+   <file name="index.html">
    <button ng-dblclick="count = count + 1" ng-init="count=0">
    Increment (on double click)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngMousedown
+   * @name ngMousedown
    *
    * @description
    * The ngMousedown directive allows you to specify custom behavior on mousedown event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
-   * mousedown. (Event object is available as `$event`)
+   * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-mousedown">
+   <file name="index.html">
    <button ng-mousedown="count = count + 1" ng-init="count=0">
    Increment (on mouse down)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngMouseup
+   * @name ngMouseup
    *
    * @description
    * Specify custom behavior on mouseup event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
-   * mouseup. (Event object is available as `$event`)
+   * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-mouseup">
+   <file name="index.html">
    <button ng-mouseup="count = count + 1" ng-init="count=0">
    Increment (on mouse up)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngMouseover
+   * @name ngMouseover
    *
    * @description
    * Specify custom behavior on mouseover event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
-   * mouseover. (Event object is available as `$event`)
+   * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-mouseover">
+   <file name="index.html">
    <button ng-mouseover="count = count + 1" ng-init="count=0">
    Increment (when mouse is over)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngMouseenter
+   * @name ngMouseenter
    *
    * @description
    * Specify custom behavior on mouseenter event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
-   * mouseenter. (Event object is available as `$event`)
+   * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-mouseenter">
+   <file name="index.html">
    <button ng-mouseenter="count = count + 1" ng-init="count=0">
    Increment (when mouse enters)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngMouseleave
+   * @name ngMouseleave
    *
    * @description
    * Specify custom behavior on mouseleave event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
-   * mouseleave. (Event object is available as `$event`)
+   * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-mouseleave">
+   <file name="index.html">
    <button ng-mouseleave="count = count + 1" ng-init="count=0">
    Increment (when mouse leaves)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngMousemove
+   * @name ngMousemove
    *
    * @description
    * Specify custom behavior on mousemove event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
-   * mousemove. (Event object is available as `$event`)
+   * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-mousemove">
+   <file name="index.html">
    <button ng-mousemove="count = count + 1" ng-init="count=0">
    Increment (when mouse moves)
    </button>
    count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngKeydown
+   * @name ngKeydown
    *
    * @description
    * Specify custom behavior on keydown event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
    * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-keydown">
+   <file name="index.html">
    <input ng-keydown="count = count + 1" ng-init="count=0">
    key down count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngKeyup
+   * @name ngKeyup
    *
    * @description
    * Specify custom behavior on keyup event.
    *
    * @element ANY
+   * @priority 0
    * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
    * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
    *
    * @example
-   <doc:example>
-   <doc:source>
-   <input ng-keyup="count = count + 1" ng-init="count=0">
-   key up count: {{count}}
-   </doc:source>
-   </doc:example>
+   <example name="ng-keyup">
+   <file name="index.html">
+   <p>Typing in the input box below updates the key count</p>
+   <input ng-keyup="count = count + 1" ng-init="count=0"> key up count: {{count}}
+
+   <p>Typing in the input box below updates the keycode</p>
+   <input ng-keyup="event=$event">
+   <p>event keyCode: {{ event.keyCode }}</p>
+   <p>event altKey: {{ event.altKey }}</p>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngKeypress
+   * @name ngKeypress
    *
    * @description
    * Specify custom behavior on keypress event.
    *
    * @element ANY
    * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
-   * keypress. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+   * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
+   * and can be interrogated for keyCode, altKey, etc.)
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-keypress">
+   <file name="index.html">
    <input ng-keypress="count = count + 1" ng-init="count=0">
    key press count: {{count}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngSubmit
+   * @name ngSubmit
    *
    * @description
    * Enables binding angular expressions to onsubmit events.
    *
    * Additionally it prevents the default action (which for form means sending the request to the
-   * server and reloading the current page) **but only if the form does not contain an `action`
-   * attribute**.
+   * server and reloading the current page), but only if the form does not contain `action`,
+   * `data-action`, or `x-action` attributes.
+   *
+   * <div class="alert alert-warning">
+   * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+   * `ngSubmit` handlers together. See the
+   * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+   * for a detailed discussion of when `ngSubmit` may be triggered.
+   * </div>
    *
    * @element form
-   * @param {expression} ngSubmit {@link guide/expression Expression} to eval. (Event object is available as `$event`)
+   * @priority 0
+   * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
+   * ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="submitExample" name="ng-submit">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-          $scope.list = [];
-          $scope.text = 'hello';
-          $scope.submit = function() {
-            if (this.text) {
-              this.list.push(this.text);
-              this.text = '';
-            }
-          };
-        }
+   angular.module('submitExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+            $scope.list = [];
+            $scope.text = 'hello';
+            $scope.submit = function() {
+              if ($scope.text) {
+                $scope.list.push(this.text);
+                $scope.text = '';
+              }
+            };
+          }]);
    </script>
-   <form ng-submit="submit()" ng-controller="Ctrl">
+   <form ng-submit="submit()" ng-controller="ExampleController">
    Enter text and hit enter:
    <input type="text" ng-model="text" name="text" />
    <input type="submit" id="submit" value="Submit" />
    <pre>list={{list}}</pre>
    </form>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should check ng-submit', function() {
-         expect(binding('list')).toBe('[]');
-         element('.doc-example-live #submit').click();
-         expect(binding('list')).toBe('["hello"]');
-         expect(input('text').val()).toBe('');
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+         expect(element(by.model('text')).getAttribute('value')).toBe('');
        });
    it('should ignore empty strings', function() {
-         expect(binding('list')).toBe('[]');
-         element('.doc-example-live #submit').click();
-         element('.doc-example-live #submit').click();
-         expect(binding('list')).toBe('["hello"]');
-       });
-   </doc:scenario>
-   </doc:example>
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+        });
+   </file>
+   </example>
    */
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngFocus
+   * @name ngFocus
    *
    * @description
    * Specify custom behavior on focus event.
    *
+   * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+   * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+   * during an `$apply` to ensure a consistent state.
+   *
    * @element window, input, select, textarea, a
+   * @priority 0
    * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
-   * focus. (Event object is available as `$event`)
+   * focus. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
    * See {@link ng.directive:ngClick ngClick}
@@ -18134,14 +27676,23 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngBlur
+   * @name ngBlur
    *
    * @description
    * Specify custom behavior on blur event.
    *
+   * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+   * an element has lost focus.
+   *
+   * Note: As the `blur` event is executed synchronously also during DOM manipulations
+   * (e.g. removing a focussed input),
+   * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+   * during an `$apply` to ensure a consistent state.
+   *
    * @element window, input, select, textarea, a
+   * @priority 0
    * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
-   * blur. (Event object is available as `$event`)
+   * blur. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
    * See {@link ng.directive:ngClick ngClick}
@@ -18149,68 +27700,72 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngCopy
+   * @name ngCopy
    *
    * @description
    * Specify custom behavior on copy event.
    *
    * @element window, input, select, textarea, a
+   * @priority 0
    * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
-   * copy. (Event object is available as `$event`)
+   * copy. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-copy">
+   <file name="index.html">
    <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
    copied: {{copied}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngCut
+   * @name ngCut
    *
    * @description
    * Specify custom behavior on cut event.
    *
    * @element window, input, select, textarea, a
+   * @priority 0
    * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
-   * cut. (Event object is available as `$event`)
+   * cut. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-cut">
+   <file name="index.html">
    <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
    cut: {{cut}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngPaste
+   * @name ngPaste
    *
    * @description
    * Specify custom behavior on paste event.
    *
    * @element window, input, select, textarea, a
+   * @priority 0
    * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
-   * paste. (Event object is available as `$event`)
+   * paste. ({@link guide/expression#-event- Event object is available as `$event`})
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-paste">
+   <file name="index.html">
    <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
    pasted: {{paste}}
-   </doc:source>
-   </doc:example>
+   </file>
+   </example>
    */
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngIf
+   * @name ngIf
    * @restrict A
+   * @multiElement
    *
    * @description
    * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
@@ -18226,7 +27781,7 @@
    * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
    * is created when the element is restored.  The scope created within `ngIf` inherits from
    * its parent scope using
-   * {@link https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-Prototypal-Inheritance prototypal inheritance}.
+   * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
    * An important implication of this is if `ngModel` is used within `ngIf` to bind to
    * a javascript primitive defined in the parent scope. In this case any modifications made to the
    * variable within the child scope will override (hide) the value in the parent scope.
@@ -18240,8 +27795,10 @@
    * and `leave` effects.
    *
    * @animations
-   * enter - happens just after the ngIf contents change and a new DOM element is created and injected into the ngIf container
-   * leave - happens just before the ngIf contents are removed from the DOM
+   * | Animation                        | Occurs                               |
+   * |----------------------------------|-------------------------------------|
+   * | {@link ng.$animate#enter enter}  | just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container |
+   * | {@link ng.$animate#leave leave}  | just before the `ngIf` contents are removed from the DOM |
    *
    * @element ANY
    * @scope
@@ -18251,12 +27808,12 @@
    *     element is added to the DOM tree.
    *
    * @example
-   <example animations="true">
+   <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-if">
    <file name="index.html">
-   Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /><br/>
+   <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
    Show when checked:
    <span ng-if="checked" class="animate-if">
-   I'm removed when the checkbox is unchecked.
+   This is removed when the checkbox is unchecked.
    </span>
    </file>
    <file name="animations.css">
@@ -18267,7 +27824,6 @@
       }
 
    .animate-if.ng-enter, .animate-if.ng-leave {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
       }
 
@@ -18283,25 +27839,26 @@
    </file>
    </example>
    */
-  var ngIfDirective = ['$animate', function($animate) {
+  var ngIfDirective = ['$animate', '$compile', function($animate, $compile) {
     return {
+      multiElement: true,
       transclude: 'element',
       priority: 600,
       terminal: true,
       restrict: 'A',
       $$tlb: true,
-      link: function ($scope, $element, $attr, ctrl, $transclude) {
-        var block, childScope;
+      link: function($scope, $element, $attr, ctrl, $transclude) {
+        var block, childScope, previousElements;
         $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
 
-          if (toBoolean(value)) {
+          if (value) {
             if (!childScope) {
-              childScope = $scope.$new();
-              $transclude(childScope, function (clone) {
-                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
+              $transclude(function(clone, newScope) {
+                childScope = newScope;
+                clone[clone.length++] = $compile.$$createComment('end ngIf', $attr.ngIf);
                 // Note: We only need the first/last node of the cloned nodes.
                 // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-                // by a directive with templateUrl when it's template arrives.
+                // by a directive with templateUrl when its template arrives.
                 block = {
                   clone: clone
                 };
@@ -18309,14 +27866,19 @@
               });
             }
           } else {
-
+            if (previousElements) {
+              previousElements.remove();
+              previousElements = null;
+            }
             if (childScope) {
               childScope.$destroy();
               childScope = null;
             }
-
             if (block) {
-              $animate.leave(getBlockElements(block.clone));
+              previousElements = getBlockNodes(block.clone);
+              $animate.leave(previousElements).done(function(response) {
+                if (response !== false) previousElements = null;
+              });
               block = null;
             }
           }
@@ -18327,29 +27889,31 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngInclude
+   * @name ngInclude
    * @restrict ECA
    *
    * @description
    * Fetches, compiles and includes an external HTML fragment.
    *
    * By default, the template URL is restricted to the same domain and protocol as the
-   * application document. This is done by calling {@link ng.$sce#methods_getTrustedResourceUrl
-   * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
-   * you may either {@link ng.$sceDelegateProvider#methods_resourceUrlWhitelist whitelist them} or
-   * {@link ng.$sce#methods_trustAsResourceUrl wrap them} as trusted values. Refer to Angular's {@link
-   * ng.$sce Strict Contextual Escaping}.
+   * application document. This is done by calling {@link $sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
+   * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
+   * {@link $sce#trustAsResourceUrl wrap them} as trusted values. Refer to Angular's {@link
+    * ng.$sce Strict Contextual Escaping}.
    *
    * In addition, the browser's
-   * {@link https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest
-   * Same Origin Policy} and {@link http://www.w3.org/TR/cors/ Cross-Origin Resource Sharing
-   * (CORS)} policy may further restrict whether the template is successfully loaded.
+   * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+   * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+   * policy may further restrict whether the template is successfully loaded.
    * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
    * access on some browsers.
    *
    * @animations
-   * enter - animation is used to bring new content into the browser.
-   * leave - animation is used to animate existing content away.
+   * | Animation                        | Occurs                              |
+   * |----------------------------------|-------------------------------------|
+   * | {@link ng.$animate#enter enter}  | when the expression changes, on the new include |
+   * | {@link ng.$animate#leave leave}  | when the expression changes, on the old include |
    *
    * The enter and leave animation occur concurrently.
    *
@@ -18357,24 +27921,30 @@
    * @priority 400
    *
    * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
-   *                 make sure you wrap it in quotes, e.g. `src="'myPartialTemplate.html'"`.
+   *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
    * @param {string=} onload Expression to evaluate when a new partial is loaded.
+   *                  <div class="alert alert-warning">
+   *                  **Note:** When using onload on SVG elements in IE11, the browser will try to call
+   *                  a function with the name on the window element, which will usually throw a
+   *                  "function is undefined" error. To fix this, you can instead use `data-onload` or a
+   *                  different form that {@link guide/directive#normalization matches} `onload`.
+   *                  </div>
    *
    * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
-   *                  $anchorScroll} to scroll the viewport after the content is loaded.
+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
    *
    *                  - If the attribute is not set, disable scrolling.
    *                  - If the attribute is set without value, enable scrolling.
    *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
    *
    * @example
-   <example animations="true">
+   <example module="includeExample" deps="angular-animate.js" animations="true" name="ng-include">
    <file name="index.html">
-   <div ng-controller="Ctrl">
+   <div ng-controller="ExampleController">
    <select ng-model="template" ng-options="t.name for t in templates">
    <option value="">(blank)</option>
    </select>
-   url of the template: <tt>{{template.url}}</tt>
+   url of the template: <code>{{template.url}}</code>
    <hr/>
    <div class="slide-animate-container">
    <div class="slide-animate" ng-include="template.url"></div>
@@ -18382,12 +27952,13 @@
    </div>
    </file>
    <file name="script.js">
-   function Ctrl($scope) {
-        $scope.templates =
-          [ { name: 'template1.html', url: 'template1.html'}
-          , { name: 'template2.html', url: 'template2.html'} ];
-        $scope.template = $scope.templates[0];
-      }
+   angular.module('includeExample', ['ngAnimate'])
+   .controller('ExampleController', ['$scope', function($scope) {
+          $scope.templates =
+            [{ name: 'template1.html', url: 'template1.html'},
+             { name: 'template2.html', url: 'template2.html'}];
+          $scope.template = $scope.templates[0];
+        }]);
    </file>
    <file name="template1.html">
    Content of template1.html
@@ -18409,7 +27980,6 @@
       }
 
    .slide-animate.ng-enter, .slide-animate.ng-leave {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
 
         position:absolute;
@@ -18435,19 +28005,33 @@
         top:50px;
       }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
+   var templateSelect = element(by.model('template'));
+   var includeElem = element(by.css('[ng-include]'));
+
    it('should load template1.html', function() {
-       expect(element('.doc-example-live [ng-include]').text()).
-         toMatch(/Content of template1.html/);
+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
       });
+
    it('should load template2.html', function() {
-       select('template').option('1');
-       expect(element('.doc-example-live [ng-include]').text()).
-         toMatch(/Content of template2.html/);
+        if (browser.params.browser === 'firefox') {
+          // Firefox can't handle using selects
+          // See https://github.com/angular/protractor/issues/480
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(2).click();
+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
       });
+
    it('should change to blank', function() {
-       select('template').option('');
-       expect(element('.doc-example-live [ng-include]')).toBe(undefined);
+        if (browser.params.browser === 'firefox') {
+          // Firefox can't handle using selects
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(0).click();
+        expect(includeElem.isPresent()).toBe(false);
       });
    </file>
    </example>
@@ -18456,24 +28040,40 @@
 
   /**
    * @ngdoc event
-   * @name ng.directive:ngInclude#$includeContentRequested
-   * @eventOf ng.directive:ngInclude
+   * @name ngInclude#$includeContentRequested
    * @eventType emit on the scope ngInclude was declared in
    * @description
    * Emitted every time the ngInclude content is requested.
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {String} src URL of content to load.
    */
 
 
   /**
    * @ngdoc event
-   * @name ng.directive:ngInclude#$includeContentLoaded
-   * @eventOf ng.directive:ngInclude
+   * @name ngInclude#$includeContentLoaded
    * @eventType emit on the current ngInclude scope
    * @description
    * Emitted every time the ngInclude content is reloaded.
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {String} src URL of content to load.
    */
-  var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$animate', '$sce',
-    function($http,   $templateCache,   $anchorScroll,   $animate,   $sce) {
+
+
+  /**
+   * @ngdoc event
+   * @name ngInclude#$includeContentError
+   * @eventType emit on the scope ngInclude was declared in
+   * @description
+   * Emitted when a template HTTP request yields an erroneous response (status < 200 || status > 299)
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {String} src URL of content to load.
+   */
+  var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate',
+    function($templateRequest,   $anchorScroll,   $animate) {
       return {
         restrict: 'ECA',
         priority: 400,
@@ -18482,35 +28082,48 @@
         controller: angular.noop,
         compile: function(element, attr) {
           var srcExp = attr.ngInclude || attr.src,
-              onloadExp = attr.onload || '',
-              autoScrollExp = attr.autoscroll;
+            onloadExp = attr.onload || '',
+            autoScrollExp = attr.autoscroll;
 
           return function(scope, $element, $attr, ctrl, $transclude) {
             var changeCounter = 0,
-                currentScope,
-                currentElement;
+              currentScope,
+              previousElement,
+              currentElement;
 
             var cleanupLastIncludeContent = function() {
+              if (previousElement) {
+                previousElement.remove();
+                previousElement = null;
+              }
               if (currentScope) {
                 currentScope.$destroy();
                 currentScope = null;
               }
-              if(currentElement) {
-                $animate.leave(currentElement);
+              if (currentElement) {
+                $animate.leave(currentElement).done(function(response) {
+                  if (response !== false) previousElement = null;
+                });
+                previousElement = currentElement;
                 currentElement = null;
               }
             };
 
-            scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
-              var afterAnimation = function() {
-                if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
+            scope.$watch(srcExp, function ngIncludeWatchAction(src) {
+              var afterAnimation = function(response) {
+                if (response !== false && isDefined(autoScrollExp) &&
+                  (!autoScrollExp || scope.$eval(autoScrollExp))) {
                   $anchorScroll();
                 }
               };
               var thisChangeId = ++changeCounter;
 
               if (src) {
-                $http.get(src, {cache: $templateCache}).success(function(response) {
+                //set the 2nd param to true to ignore the template request error so that the inner
+                //contents and scope can be cleaned up.
+                $templateRequest(src, true).then(function(response) {
+                  if (scope.$$destroyed) return;
+
                   if (thisChangeId !== changeCounter) return;
                   var newScope = scope.$new();
                   ctrl.template = response;
@@ -18523,18 +28136,23 @@
                   // directives to non existing elements.
                   var clone = $transclude(newScope, function(clone) {
                     cleanupLastIncludeContent();
-                    $animate.enter(clone, null, $element, afterAnimation);
+                    $animate.enter(clone, null, $element).done(afterAnimation);
                   });
 
                   currentScope = newScope;
                   currentElement = clone;
 
-                  currentScope.$emit('$includeContentLoaded');
+                  currentScope.$emit('$includeContentLoaded', src);
                   scope.$eval(onloadExp);
-                }).error(function() {
-                      if (thisChangeId === changeCounter) cleanupLastIncludeContent();
-                    });
-                scope.$emit('$includeContentRequested');
+                }, function() {
+                  if (scope.$$destroyed) return;
+
+                  if (thisChangeId === changeCounter) {
+                    cleanupLastIncludeContent();
+                    scope.$emit('$includeContentError', src);
+                  }
+                });
+                scope.$emit('$includeContentRequested', src);
               } else {
                 cleanupLastIncludeContent();
                 ctrl.template = null;
@@ -18557,6 +28175,18 @@
         priority: -400,
         require: 'ngInclude',
         link: function(scope, $element, $attr, ctrl) {
+          if (toString.call($element[0]).match(/SVG/)) {
+            // WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not
+            // support innerHTML, so detect this here and try to generate the contents
+            // specially.
+            $element.empty();
+            $compile(jqLiteBuildFragment(ctrl.template, window.document).childNodes)(scope,
+              function namespaceAdaptedClone(clone) {
+                $element.append(clone);
+              }, {futureParentElement: $element});
+            return;
+          }
+
           $element.html(ctrl.template);
           $compile($element.contents())(scope);
         }
@@ -18565,18 +28195,27 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngInit
+   * @name ngInit
    * @restrict AC
    *
    * @description
    * The `ngInit` directive allows you to evaluate an expression in the
    * current scope.
    *
-   * <div class="alert alert-error">
-   * The only appropriate use of `ngInit` is for aliasing special properties of
-   * {@link ../api/ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
-   * should use {@link guide/controller controllers} rather than `ngInit`
-   * to initialize values on a scope.
+   * <div class="alert alert-danger">
+   * This directive can be abused to add unnecessary amounts of logic into your templates.
+   * There are only a few appropriate uses of `ngInit`, such as for aliasing special properties of
+   * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below; and for injecting data via
+   * server side scripting. Besides these few cases, you should use {@link guide/controller controllers}
+   * rather than `ngInit` to initialize values on a scope.
+   * </div>
+   *
+   * <div class="alert alert-warning">
+   * **Note**: If you have assignment in `ngInit` along with a {@link ng.$filter `filter`}, make
+   * sure you have parentheses to ensure correct operator precedence:
+   * <pre class="prettyprint">
+   * `<div ng-init="test1 = ($index | toString)"></div>`
+   * </pre>
    * </div>
    *
    * @priority 450
@@ -18585,31 +28224,32 @@
    * @param {expression} ngInit {@link guide/expression Expression} to eval.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="initExample" name="ng-init">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-       $scope.list = [['a', 'b'], ['c', 'd']];
-     }
+   angular.module('initExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+         $scope.list = [['a', 'b'], ['c', 'd']];
+       }]);
    </script>
-   <div ng-controller="Ctrl">
+   <div ng-controller="ExampleController">
    <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
    <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
    <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
    </div>
    </div>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should alias index positions', function() {
-         expect(element('.example-init').text())
-           .toBe('list[ 0 ][ 0 ] = a;' +
-                 'list[ 0 ][ 1 ] = b;' +
-                 'list[ 1 ][ 0 ] = c;' +
-                 'list[ 1 ][ 1 ] = d;');
+         var elements = element.all(by.css('.example-init'));
+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
   var ngInitDirective = ngDirective({
     priority: 450,
@@ -18624,7 +28264,1709 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngNonBindable
+   * @name ngList
+   *
+   * @description
+   * Text input that converts between a delimited string and an array of strings. The default
+   * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom
+   * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`.
+   *
+   * The behaviour of the directive is affected by the use of the `ngTrim` attribute.
+   * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each
+   *   list item is respected. This implies that the user of the directive is responsible for
+   *   dealing with whitespace but also allows you to use whitespace as a delimiter, such as a
+   *   tab or newline character.
+   * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected
+   *   when joining the list items back together) and whitespace around each list item is stripped
+   *   before it is added to the model.
+   *
+   * ### Example with Validation
+   *
+   * <example name="ngList-directive" module="listExample">
+   *   <file name="app.js">
+   *      angular.module('listExample', [])
+   *        .controller('ExampleController', ['$scope', function($scope) {
+ *          $scope.names = ['morpheus', 'neo', 'trinity'];
+ *        }]);
+   *   </file>
+   *   <file name="index.html">
+   *    <form name="myForm" ng-controller="ExampleController">
+   *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
+   *      <span role="alert">
+   *        <span class="error" ng-show="myForm.namesInput.$error.required">
+   *        Required!</span>
+   *      </span>
+   *      <br>
+   *      <tt>names = {{names}}</tt><br/>
+   *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
+   *      <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
+   *      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+   *      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+   *     </form>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *     var listInput = element(by.model('names'));
+   *     var names = element(by.exactBinding('names'));
+   *     var valid = element(by.binding('myForm.namesInput.$valid'));
+   *     var error = element(by.css('span.error'));
+   *
+   *     it('should initialize to model', function() {
+ *       expect(names.getText()).toContain('["morpheus","neo","trinity"]');
+ *       expect(valid.getText()).toContain('true');
+ *       expect(error.getCssValue('display')).toBe('none');
+ *     });
+   *
+   *     it('should be invalid if empty', function() {
+ *       listInput.clear();
+ *       listInput.sendKeys('');
+ *
+ *       expect(names.getText()).toContain('');
+ *       expect(valid.getText()).toContain('false');
+ *       expect(error.getCssValue('display')).not.toBe('none');
+ *     });
+   *   </file>
+   * </example>
+   *
+   * ### Example - splitting on newline
+   * <example name="ngList-directive-newlines">
+   *   <file name="index.html">
+   *    <textarea ng-model="list" ng-list="&#10;" ng-trim="false"></textarea>
+   *    <pre>{{ list | json }}</pre>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *     it("should split the text by newlines", function() {
+ *       var listInput = element(by.model('list'));
+ *       var output = element(by.binding('list | json'));
+ *       listInput.sendKeys('abc\ndef\nghi');
+ *       expect(output.getText()).toContain('[\n  "abc",\n  "def",\n  "ghi"\n]');
+ *     });
+   *   </file>
+   * </example>
+   *
+   * @element input
+   * @param {string=} ngList optional delimiter that should be used to split the value.
+   */
+  var ngListDirective = function() {
+    return {
+      restrict: 'A',
+      priority: 100,
+      require: 'ngModel',
+      link: function(scope, element, attr, ctrl) {
+        var ngList = attr.ngList || ', ';
+        var trimValues = attr.ngTrim !== 'false';
+        var separator = trimValues ? trim(ngList) : ngList;
+
+        var parse = function(viewValue) {
+          // If the viewValue is invalid (say required but empty) it will be `undefined`
+          if (isUndefined(viewValue)) return;
+
+          var list = [];
+
+          if (viewValue) {
+            forEach(viewValue.split(separator), function(value) {
+              if (value) list.push(trimValues ? trim(value) : value);
+            });
+          }
+
+          return list;
+        };
+
+        ctrl.$parsers.push(parse);
+        ctrl.$formatters.push(function(value) {
+          if (isArray(value)) {
+            return value.join(ngList);
+          }
+
+          return undefined;
+        });
+
+        // Override the standard $isEmpty because an empty array means the input is empty.
+        ctrl.$isEmpty = function(value) {
+          return !value || !value.length;
+        };
+      }
+    };
+  };
+
+  /* global VALID_CLASS: true,
+  INVALID_CLASS: true,
+  PRISTINE_CLASS: true,
+  DIRTY_CLASS: true,
+  UNTOUCHED_CLASS: true,
+  TOUCHED_CLASS: true,
+  PENDING_CLASS: true,
+  addSetValidityMethod: true,
+  setupValidity: true,
+  defaultModelOptions: false
+*/
+
+
+  var VALID_CLASS = 'ng-valid',
+    INVALID_CLASS = 'ng-invalid',
+    PRISTINE_CLASS = 'ng-pristine',
+    DIRTY_CLASS = 'ng-dirty',
+    UNTOUCHED_CLASS = 'ng-untouched',
+    TOUCHED_CLASS = 'ng-touched',
+    EMPTY_CLASS = 'ng-empty',
+    NOT_EMPTY_CLASS = 'ng-not-empty';
+
+  var ngModelMinErr = minErr('ngModel');
+
+  /**
+   * @ngdoc type
+   * @name ngModel.NgModelController
+   *
+   * @property {*} $viewValue The actual value from the control's view. For `input` elements, this is a
+   * String. See {@link ngModel.NgModelController#$setViewValue} for information about when the $viewValue
+   * is set.
+   *
+   * @property {*} $modelValue The value in the model that the control is bound to.
+   *
+   * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
+   *  the control updates the ngModelController with a new {@link ngModel.NgModelController#$viewValue
+    `$viewValue`} from the DOM, usually via user input.
+   See {@link ngModel.NgModelController#$setViewValue `$setViewValue()`} for a detailed lifecycle explanation.
+   Note that the `$parsers` are not called when the bound ngModel expression changes programmatically.
+
+   The functions are called in array order, each passing
+   its return value through to the next. The last return value is forwarded to the
+   {@link ngModel.NgModelController#$validators `$validators`} collection.
+
+   Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue
+    `$viewValue`}.
+
+   Returning `undefined` from a parser means a parse error occurred. In that case,
+   no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel`
+   will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`}
+   is set to `true`. The parse error is stored in `ngModel.$error.parse`.
+
+   This simple example shows a parser that would convert text input value to lowercase:
+   * ```js
+   * function parse(value) {
+ *   if (value) {
+ *     return value.toLowerCase();
+ *   }
+ * }
+   * ngModelController.$parsers.push(parse);
+   * ```
+
+   *
+   * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
+   the bound ngModel expression changes programmatically. The `$formatters` are not called when the
+   value of the control is changed by user interaction.
+
+   Formatters are used to format / convert the {@link ngModel.NgModelController#$modelValue
+    `$modelValue`} for display in the control.
+
+   The functions are called in reverse array order, each passing the value through to the
+   next. The last return value is used as the actual DOM value.
+
+   This simple example shows a formatter that would convert the model value to uppercase:
+
+   * ```js
+   * function format(value) {
+ *   if (value) {
+ *     return value.toUpperCase();
+ *   }
+ * }
+   * ngModel.$formatters.push(format);
+   * ```
+   *
+   * @property {Object.<string, function>} $validators A collection of validators that are applied
+   *      whenever the model value changes. The key value within the object refers to the name of the
+   *      validator while the function refers to the validation operation. The validation operation is
+   *      provided with the model value as an argument and must return a true or false value depending
+   *      on the response of that validation.
+   *
+   * ```js
+   * ngModel.$validators.validCharacters = function(modelValue, viewValue) {
+ *   var value = modelValue || viewValue;
+ *   return /[0-9]+/.test(value) &&
+ *          /[a-z]+/.test(value) &&
+ *          /[A-Z]+/.test(value) &&
+ *          /\W+/.test(value);
+ * };
+   * ```
+   *
+   * @property {Object.<string, function>} $asyncValidators A collection of validations that are expected to
+   *      perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided
+   *      is expected to return a promise when it is run during the model validation process. Once the promise
+   *      is delivered then the validation status will be set to true when fulfilled and false when rejected.
+   *      When the asynchronous validators are triggered, each of the validators will run in parallel and the model
+   *      value will only be updated once all validators have been fulfilled. As long as an asynchronous validator
+   *      is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators
+   *      will only run once all synchronous validators have passed.
+   *
+   * Please note that if $http is used then it is important that the server returns a success HTTP response code
+   * in order to fulfill the validation and a status level of `4xx` in order to reject the validation.
+   *
+   * ```js
+   * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) {
+ *   var value = modelValue || viewValue;
+ *
+ *   // Lookup user by username
+ *   return $http.get('/api/users/' + value).
+ *      then(function resolved() {
+ *        //username exists, this means validation fails
+ *        return $q.reject('exists');
+ *      }, function rejected() {
+ *        //username does not exist, therefore this validation passes
+ *        return true;
+ *      });
+ * };
+   * ```
+   *
+   * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
+   *     view value has changed. It is called with no arguments, and its return value is ignored.
+   *     This can be used in place of additional $watches against the model value.
+   *
+   * @property {Object} $error An object hash with all failing validator ids as keys.
+   * @property {Object} $pending An object hash with all pending validator ids as keys.
+   *
+   * @property {boolean} $untouched True if control has not lost focus yet.
+   * @property {boolean} $touched True if control has lost focus.
+   * @property {boolean} $pristine True if user has not interacted with the control yet.
+   * @property {boolean} $dirty True if user has already interacted with the control.
+   * @property {boolean} $valid True if there is no error.
+   * @property {boolean} $invalid True if at least one error on the control.
+   * @property {string} $name The name attribute of the control.
+   *
+   * @description
+   *
+   * `NgModelController` provides API for the {@link ngModel `ngModel`} directive.
+   * The controller contains services for data-binding, validation, CSS updates, and value formatting
+   * and parsing. It purposefully does not contain any logic which deals with DOM rendering or
+   * listening to DOM events.
+   * Such DOM related logic should be provided by other directives which make use of
+   * `NgModelController` for data-binding to control elements.
+   * Angular provides this DOM logic for most {@link input `input`} elements.
+   * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example
+ * custom control example} that uses `ngModelController` to bind to `contenteditable` elements.
+   *
+   * @example
+   * ### Custom Control Example
+   * This example shows how to use `NgModelController` with a custom control to achieve
+   * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
+   * collaborate together to achieve the desired result.
+   *
+   * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
+   * contents be edited in place by the user.
+   *
+   * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
+   * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
+   * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
+   * that content using the `$sce` service.
+   *
+   * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
+   <file name="style.css">
+   [contenteditable] {
+        border: 1px solid black;
+        background-color: white;
+        min-height: 20px;
+      }
+
+   .ng-invalid {
+        border: 1px solid red;
+      }
+
+   </file>
+   <file name="script.js">
+   angular.module('customControl', ['ngSanitize']).
+   directive('contenteditable', ['$sce', function($sce) {
+          return {
+            restrict: 'A', // only activate on element attribute
+            require: '?ngModel', // get a hold of NgModelController
+            link: function(scope, element, attrs, ngModel) {
+              if (!ngModel) return; // do nothing if no ng-model
+
+              // Specify how UI should be updated
+              ngModel.$render = function() {
+                element.html($sce.getTrustedHtml(ngModel.$viewValue || ''));
+              };
+
+              // Listen for change events to enable binding
+              element.on('blur keyup change', function() {
+                scope.$evalAsync(read);
+              });
+              read(); // initialize
+
+              // Write data to the model
+              function read() {
+                var html = element.html();
+                // When we clear the content editable the browser leaves a <br> behind
+                // If strip-br attribute is provided then we strip this out
+                if (attrs.stripBr && html === '<br>') {
+                  html = '';
+                }
+                ngModel.$setViewValue(html);
+              }
+            }
+          };
+        }]);
+   </file>
+   <file name="index.html">
+   <form name="myForm">
+   <div contenteditable
+   name="myWidget" ng-model="userContent"
+   strip-br="true"
+   required>Change me!</div>
+   <span ng-show="myForm.myWidget.$error.required">Required!</span>
+   <hr>
+   <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
+   </form>
+   </file>
+   <file name="protractor.js" type="protractor">
+   it('should data-bind and become invalid', function() {
+      if (browser.params.browser === 'safari' || browser.params.browser === 'firefox') {
+        // SafariDriver can't handle contenteditable
+        // and Firefox driver can't clear contenteditables very well
+        return;
+      }
+      var contentEditable = element(by.css('[contenteditable]'));
+      var content = 'Change me!';
+
+      expect(contentEditable.getText()).toEqual(content);
+
+      contentEditable.clear();
+      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
+      expect(contentEditable.getText()).toEqual('');
+      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
+    });
+   </file>
+   * </example>
+   *
+   *
+   */
+  NgModelController.$inject = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$q', '$interpolate'];
+  function NgModelController($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $q, $interpolate) {
+    this.$viewValue = Number.NaN;
+    this.$modelValue = Number.NaN;
+    this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
+    this.$validators = {};
+    this.$asyncValidators = {};
+    this.$parsers = [];
+    this.$formatters = [];
+    this.$viewChangeListeners = [];
+    this.$untouched = true;
+    this.$touched = false;
+    this.$pristine = true;
+    this.$dirty = false;
+    this.$valid = true;
+    this.$invalid = false;
+    this.$error = {}; // keep invalid keys here
+    this.$$success = {}; // keep valid keys here
+    this.$pending = undefined; // keep pending keys here
+    this.$name = $interpolate($attr.name || '', false)($scope);
+    this.$$parentForm = nullFormCtrl;
+    this.$options = defaultModelOptions;
+
+    this.$$parsedNgModel = $parse($attr.ngModel);
+    this.$$parsedNgModelAssign = this.$$parsedNgModel.assign;
+    this.$$ngModelGet = this.$$parsedNgModel;
+    this.$$ngModelSet = this.$$parsedNgModelAssign;
+    this.$$pendingDebounce = null;
+    this.$$parserValid = undefined;
+
+    this.$$currentValidationRunId = 0;
+
+    // https://github.com/angular/angular.js/issues/15833
+    // Prevent `$$scope` from being iterated over by `copy` when NgModelController is deep watched
+    Object.defineProperty(this, '$$scope', {value: $scope});
+    this.$$attr = $attr;
+    this.$$element = $element;
+    this.$$animate = $animate;
+    this.$$timeout = $timeout;
+    this.$$parse = $parse;
+    this.$$q = $q;
+    this.$$exceptionHandler = $exceptionHandler;
+
+    setupValidity(this);
+    setupModelWatcher(this);
+  }
+
+  NgModelController.prototype = {
+    $$initGetterSetters: function() {
+      if (this.$options.getOption('getterSetter')) {
+        var invokeModelGetter = this.$$parse(this.$$attr.ngModel + '()'),
+          invokeModelSetter = this.$$parse(this.$$attr.ngModel + '($$$p)');
+
+        this.$$ngModelGet = function($scope) {
+          var modelValue = this.$$parsedNgModel($scope);
+          if (isFunction(modelValue)) {
+            modelValue = invokeModelGetter($scope);
+          }
+          return modelValue;
+        };
+        this.$$ngModelSet = function($scope, newValue) {
+          if (isFunction(this.$$parsedNgModel($scope))) {
+            invokeModelSetter($scope, {$$$p: newValue});
+          } else {
+            this.$$parsedNgModelAssign($scope, newValue);
+          }
+        };
+      } else if (!this.$$parsedNgModel.assign) {
+        throw ngModelMinErr('nonassign', 'Expression \'{0}\' is non-assignable. Element: {1}',
+          this.$$attr.ngModel, startingTag(this.$$element));
+      }
+    },
+
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$render
+     *
+     * @description
+     * Called when the view needs to be updated. It is expected that the user of the ng-model
+     * directive will implement this method.
+     *
+     * The `$render()` method is invoked in the following situations:
+     *
+     * * `$rollbackViewValue()` is called.  If we are rolling back the view value to the last
+     *   committed value then `$render()` is called to update the input control.
+     * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
+     *   the `$viewValue` are different from last time.
+     *
+     * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
+     * `$modelValue` and `$viewValue` are actually different from their previous values. If `$modelValue`
+     * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
+     * invoked if you only change a property on the objects.
+     */
+    $render: noop,
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$isEmpty
+     *
+     * @description
+     * This is called when we need to determine if the value of an input is empty.
+     *
+     * For instance, the required directive does this to work out if the input has data or not.
+     *
+     * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
+     *
+     * You can override this for input directives whose concept of being empty is different from the
+     * default. The `checkboxInputType` directive does this because in its case a value of `false`
+     * implies empty.
+     *
+     * @param {*} value The value of the input to check for emptiness.
+     * @returns {boolean} True if `value` is "empty".
+     */
+    $isEmpty: function(value) {
+      // eslint-disable-next-line no-self-compare
+      return isUndefined(value) || value === '' || value === null || value !== value;
+    },
+
+    $$updateEmptyClasses: function(value) {
+      if (this.$isEmpty(value)) {
+        this.$$animate.removeClass(this.$$element, NOT_EMPTY_CLASS);
+        this.$$animate.addClass(this.$$element, EMPTY_CLASS);
+      } else {
+        this.$$animate.removeClass(this.$$element, EMPTY_CLASS);
+        this.$$animate.addClass(this.$$element, NOT_EMPTY_CLASS);
+      }
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setPristine
+     *
+     * @description
+     * Sets the control to its pristine state.
+     *
+     * This method can be called to remove the `ng-dirty` class and set the control to its pristine
+     * state (`ng-pristine` class). A model is considered to be pristine when the control
+     * has not been changed from when first compiled.
+     */
+    $setPristine: function() {
+      this.$dirty = false;
+      this.$pristine = true;
+      this.$$animate.removeClass(this.$$element, DIRTY_CLASS);
+      this.$$animate.addClass(this.$$element, PRISTINE_CLASS);
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setDirty
+     *
+     * @description
+     * Sets the control to its dirty state.
+     *
+     * This method can be called to remove the `ng-pristine` class and set the control to its dirty
+     * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed
+     * from when first compiled.
+     */
+    $setDirty: function() {
+      this.$dirty = true;
+      this.$pristine = false;
+      this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
+      this.$$animate.addClass(this.$$element, DIRTY_CLASS);
+      this.$$parentForm.$setDirty();
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setUntouched
+     *
+     * @description
+     * Sets the control to its untouched state.
+     *
+     * This method can be called to remove the `ng-touched` class and set the control to its
+     * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched
+     * by default, however this function can be used to restore that state if the model has
+     * already been touched by the user.
+     */
+    $setUntouched: function() {
+      this.$touched = false;
+      this.$untouched = true;
+      this.$$animate.setClass(this.$$element, UNTOUCHED_CLASS, TOUCHED_CLASS);
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setTouched
+     *
+     * @description
+     * Sets the control to its touched state.
+     *
+     * This method can be called to remove the `ng-untouched` class and set the control to its
+     * touched state (`ng-touched` class). A model is considered to be touched when the user has
+     * first focused the control element and then shifted focus away from the control (blur event).
+     */
+    $setTouched: function() {
+      this.$touched = true;
+      this.$untouched = false;
+      this.$$animate.setClass(this.$$element, TOUCHED_CLASS, UNTOUCHED_CLASS);
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$rollbackViewValue
+     *
+     * @description
+     * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`,
+     * which may be caused by a pending debounced event or because the input is waiting for some
+     * future event.
+     *
+     * If you have an input that uses `ng-model-options` to set up debounced updates or updates that
+     * depend on special events such as `blur`, there can be a period when the `$viewValue` is out of
+     * sync with the ngModel's `$modelValue`.
+     *
+     * In this case, you can use `$rollbackViewValue()` to manually cancel the debounced / future update
+     * and reset the input to the last committed view value.
+     *
+     * It is also possible that you run into difficulties if you try to update the ngModel's `$modelValue`
+     * programmatically before these debounced/future events have resolved/occurred, because Angular's
+     * dirty checking mechanism is not able to tell whether the model has actually changed or not.
+     *
+     * The `$rollbackViewValue()` method should be called before programmatically changing the model of an
+     * input which may have such events pending. This is important in order to make sure that the
+     * input field will be updated with the new model value and any pending operations are cancelled.
+     *
+     * <example name="ng-model-cancel-update" module="cancel-update-example">
+     *   <file name="app.js">
+     *     angular.module('cancel-update-example', [])
+     *
+     *     .controller('CancelUpdateController', ['$scope', function($scope) {
+   *       $scope.model = {value1: '', value2: ''};
+   *
+   *       $scope.setEmpty = function(e, value, rollback) {
+   *         if (e.keyCode === 27) {
+   *           e.preventDefault();
+   *           if (rollback) {
+   *             $scope.myForm[value].$rollbackViewValue();
+   *           }
+   *           $scope.model[value] = '';
+   *         }
+   *       };
+   *     }]);
+     *   </file>
+     *   <file name="index.html">
+     *     <div ng-controller="CancelUpdateController">
+     *       <p>Both of these inputs are only updated if they are blurred. Hitting escape should
+     *       empty them. Follow these steps and observe the difference:</p>
+     *       <ol>
+     *         <li>Type something in the input. You will see that the model is not yet updated</li>
+     *         <li>Press the Escape key.
+     *           <ol>
+     *             <li> In the first example, nothing happens, because the model is already '', and no
+     *             update is detected. If you blur the input, the model will be set to the current view.
+     *             </li>
+     *             <li> In the second example, the pending update is cancelled, and the input is set back
+     *             to the last committed view value (''). Blurring the input does nothing.
+     *             </li>
+     *           </ol>
+     *         </li>
+     *       </ol>
+     *
+     *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
+     *         <div>
+     *           <p id="inputDescription1">Without $rollbackViewValue():</p>
+     *           <input name="value1" aria-describedby="inputDescription1" ng-model="model.value1"
+     *                  ng-keydown="setEmpty($event, 'value1')">
+     *           value1: "{{ model.value1 }}"
+     *         </div>
+     *
+     *         <div>
+     *           <p id="inputDescription2">With $rollbackViewValue():</p>
+     *           <input name="value2" aria-describedby="inputDescription2" ng-model="model.value2"
+     *                  ng-keydown="setEmpty($event, 'value2', true)">
+     *           value2: "{{ model.value2 }}"
+     *         </div>
+     *       </form>
+     *     </div>
+     *   </file>
+     <file name="style.css">
+     div {
+            display: table-cell;
+          }
+     div:nth-child(1) {
+            padding-right: 30px;
+          }
+
+     </file>
+     * </example>
+     */
+    $rollbackViewValue: function() {
+      this.$$timeout.cancel(this.$$pendingDebounce);
+      this.$viewValue = this.$$lastCommittedViewValue;
+      this.$render();
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$validate
+     *
+     * @description
+     * Runs each of the registered validators (first synchronous validators and then
+     * asynchronous validators).
+     * If the validity changes to invalid, the model will be set to `undefined`,
+     * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
+     * If the validity changes to valid, it will set the model to the last available valid
+     * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
+     */
+    $validate: function() {
+      // ignore $validate before model is initialized
+      if (isNumberNaN(this.$modelValue)) {
+        return;
+      }
+
+      var viewValue = this.$$lastCommittedViewValue;
+      // Note: we use the $$rawModelValue as $modelValue might have been
+      // set to undefined during a view -> model update that found validation
+      // errors. We can't parse the view here, since that could change
+      // the model although neither viewValue nor the model on the scope changed
+      var modelValue = this.$$rawModelValue;
+
+      var prevValid = this.$valid;
+      var prevModelValue = this.$modelValue;
+
+      var allowInvalid = this.$options.getOption('allowInvalid');
+
+      var that = this;
+      this.$$runValidators(modelValue, viewValue, function(allValid) {
+        // If there was no change in validity, don't update the model
+        // This prevents changing an invalid modelValue to undefined
+        if (!allowInvalid && prevValid !== allValid) {
+          // Note: Don't check this.$valid here, as we could have
+          // external validators (e.g. calculated on the server),
+          // that just call $setValidity and need the model value
+          // to calculate their validity.
+          that.$modelValue = allValid ? modelValue : undefined;
+
+          if (that.$modelValue !== prevModelValue) {
+            that.$$writeModelToScope();
+          }
+        }
+      });
+    },
+
+    $$runValidators: function(modelValue, viewValue, doneCallback) {
+      this.$$currentValidationRunId++;
+      var localValidationRunId = this.$$currentValidationRunId;
+      var that = this;
+
+      // check parser error
+      if (!processParseErrors()) {
+        validationDone(false);
+        return;
+      }
+      if (!processSyncValidators()) {
+        validationDone(false);
+        return;
+      }
+      processAsyncValidators();
+
+      function processParseErrors() {
+        var errorKey = that.$$parserName || 'parse';
+        if (isUndefined(that.$$parserValid)) {
+          setValidity(errorKey, null);
+        } else {
+          if (!that.$$parserValid) {
+            forEach(that.$validators, function(v, name) {
+              setValidity(name, null);
+            });
+            forEach(that.$asyncValidators, function(v, name) {
+              setValidity(name, null);
+            });
+          }
+          // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
+          setValidity(errorKey, that.$$parserValid);
+          return that.$$parserValid;
+        }
+        return true;
+      }
+
+      function processSyncValidators() {
+        var syncValidatorsValid = true;
+        forEach(that.$validators, function(validator, name) {
+          var result = Boolean(validator(modelValue, viewValue));
+          syncValidatorsValid = syncValidatorsValid && result;
+          setValidity(name, result);
+        });
+        if (!syncValidatorsValid) {
+          forEach(that.$asyncValidators, function(v, name) {
+            setValidity(name, null);
+          });
+          return false;
+        }
+        return true;
+      }
+
+      function processAsyncValidators() {
+        var validatorPromises = [];
+        var allValid = true;
+        forEach(that.$asyncValidators, function(validator, name) {
+          var promise = validator(modelValue, viewValue);
+          if (!isPromiseLike(promise)) {
+            throw ngModelMinErr('nopromise',
+              'Expected asynchronous validator to return a promise but got \'{0}\' instead.', promise);
+          }
+          setValidity(name, undefined);
+          validatorPromises.push(promise.then(function() {
+            setValidity(name, true);
+          }, function() {
+            allValid = false;
+            setValidity(name, false);
+          }));
+        });
+        if (!validatorPromises.length) {
+          validationDone(true);
+        } else {
+          that.$$q.all(validatorPromises).then(function() {
+            validationDone(allValid);
+          }, noop);
+        }
+      }
+
+      function setValidity(name, isValid) {
+        if (localValidationRunId === that.$$currentValidationRunId) {
+          that.$setValidity(name, isValid);
+        }
+      }
+
+      function validationDone(allValid) {
+        if (localValidationRunId === that.$$currentValidationRunId) {
+
+          doneCallback(allValid);
+        }
+      }
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$commitViewValue
+     *
+     * @description
+     * Commit a pending update to the `$modelValue`.
+     *
+     * Updates may be pending by a debounced event or because the input is waiting for a some future
+     * event defined in `ng-model-options`. this method is rarely needed as `NgModelController`
+     * usually handles calling this in response to input events.
+     */
+    $commitViewValue: function() {
+      var viewValue = this.$viewValue;
+
+      this.$$timeout.cancel(this.$$pendingDebounce);
+
+      // If the view value has not changed then we should just exit, except in the case where there is
+      // a native validator on the element. In this case the validation state may have changed even though
+      // the viewValue has stayed empty.
+      if (this.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !this.$$hasNativeValidators)) {
+        return;
+      }
+      this.$$updateEmptyClasses(viewValue);
+      this.$$lastCommittedViewValue = viewValue;
+
+      // change to dirty
+      if (this.$pristine) {
+        this.$setDirty();
+      }
+      this.$$parseAndValidate();
+    },
+
+    $$parseAndValidate: function() {
+      var viewValue = this.$$lastCommittedViewValue;
+      var modelValue = viewValue;
+      var that = this;
+
+      this.$$parserValid = isUndefined(modelValue) ? undefined : true;
+
+      if (this.$$parserValid) {
+        for (var i = 0; i < this.$parsers.length; i++) {
+          modelValue = this.$parsers[i](modelValue);
+          if (isUndefined(modelValue)) {
+            this.$$parserValid = false;
+            break;
+          }
+        }
+      }
+      if (isNumberNaN(this.$modelValue)) {
+        // this.$modelValue has not been touched yet...
+        this.$modelValue = this.$$ngModelGet(this.$$scope);
+      }
+      var prevModelValue = this.$modelValue;
+      var allowInvalid = this.$options.getOption('allowInvalid');
+      this.$$rawModelValue = modelValue;
+
+      if (allowInvalid) {
+        this.$modelValue = modelValue;
+        writeToModelIfNeeded();
+      }
+
+      // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
+      // This can happen if e.g. $setViewValue is called from inside a parser
+      this.$$runValidators(modelValue, this.$$lastCommittedViewValue, function(allValid) {
+        if (!allowInvalid) {
+          // Note: Don't check this.$valid here, as we could have
+          // external validators (e.g. calculated on the server),
+          // that just call $setValidity and need the model value
+          // to calculate their validity.
+          that.$modelValue = allValid ? modelValue : undefined;
+          writeToModelIfNeeded();
+        }
+      });
+
+      function writeToModelIfNeeded() {
+        if (that.$modelValue !== prevModelValue) {
+          that.$$writeModelToScope();
+        }
+      }
+    },
+
+    $$writeModelToScope: function() {
+      this.$$ngModelSet(this.$$scope, this.$modelValue);
+      forEach(this.$viewChangeListeners, function(listener) {
+        try {
+          listener();
+        } catch (e) {
+          // eslint-disable-next-line no-invalid-this
+          this.$$exceptionHandler(e);
+        }
+      }, this);
+    },
+
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setViewValue
+     *
+     * @description
+     * Update the view value.
+     *
+     * This method should be called when a control wants to change the view value; typically,
+     * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
+     * directive calls it when the value of the input changes and {@link ng.directive:select select}
+     * calls it when an option is selected.
+     *
+     * When `$setViewValue` is called, the new `value` will be staged for committing through the `$parsers`
+     * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged
+     * value is sent directly for processing through the `$parsers` pipeline. After this, the `$validators` and
+     * `$asyncValidators` are called and the value is applied to `$modelValue`.
+     * Finally, the value is set to the **expression** specified in the `ng-model` attribute and
+     * all the registered change listeners, in the `$viewChangeListeners` list are called.
+     *
+     * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn`
+     * and the `default` trigger is not listed, all those actions will remain pending until one of the
+     * `updateOn` events is triggered on the DOM element.
+     * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions}
+     * directive is used with a custom debounce for this particular event.
+     * Note that a `$digest` is only triggered once the `updateOn` events are fired, or if `debounce`
+     * is specified, once the timer runs out.
+     *
+     * When used with standard inputs, the view value will always be a string (which is in some cases
+     * parsed into another type, such as a `Date` object for `input[date]`.)
+     * However, custom controls might also pass objects to this method. In this case, we should make
+     * a copy of the object before passing it to `$setViewValue`. This is because `ngModel` does not
+     * perform a deep watch of objects, it only looks for a change of identity. If you only change
+     * the property of the object then ngModel will not realize that the object has changed and
+     * will not invoke the `$parsers` and `$validators` pipelines. For this reason, you should
+     * not change properties of the copy once it has been passed to `$setViewValue`.
+     * Otherwise you may cause the model value on the scope to change incorrectly.
+     *
+     * <div class="alert alert-info">
+     * In any case, the value passed to the method should always reflect the current value
+     * of the control. For example, if you are calling `$setViewValue` for an input element,
+     * you should pass the input DOM value. Otherwise, the control and the scope model become
+     * out of sync. It's also important to note that `$setViewValue` does not call `$render` or change
+     * the control's DOM value in any way. If we want to change the control's DOM value
+     * programmatically, we should update the `ngModel` scope expression. Its new value will be
+     * picked up by the model controller, which will run it through the `$formatters`, `$render` it
+     * to update the DOM, and finally call `$validate` on it.
+     * </div>
+     *
+     * @param {*} value value from the view.
+     * @param {string} trigger Event that triggered the update.
+     */
+    $setViewValue: function(value, trigger) {
+      this.$viewValue = value;
+      if (this.$options.getOption('updateOnDefault')) {
+        this.$$debounceViewValueCommit(trigger);
+      }
+    },
+
+    $$debounceViewValueCommit: function(trigger) {
+      var debounceDelay = this.$options.getOption('debounce');
+
+      if (isNumber(debounceDelay[trigger])) {
+        debounceDelay = debounceDelay[trigger];
+      } else if (isNumber(debounceDelay['default'])) {
+        debounceDelay = debounceDelay['default'];
+      }
+
+      this.$$timeout.cancel(this.$$pendingDebounce);
+      var that = this;
+      if (debounceDelay > 0) { // this fails if debounceDelay is an object
+        this.$$pendingDebounce = this.$$timeout(function() {
+          that.$commitViewValue();
+        }, debounceDelay);
+      } else if (this.$$scope.$root.$$phase) {
+        this.$commitViewValue();
+      } else {
+        this.$$scope.$apply(function() {
+          that.$commitViewValue();
+        });
+      }
+    },
+
+    /**
+     * @ngdoc method
+     *
+     * @name ngModel.NgModelController#$overrideModelOptions
+     *
+     * @description
+     *
+     * Override the current model options settings programmatically.
+     *
+     * The previous `ModelOptions` value will not be modified. Instead, a
+     * new `ModelOptions` object will inherit from the previous one overriding
+     * or inheriting settings that are defined in the given parameter.
+     *
+     * See {@link ngModelOptions} for information about what options can be specified
+     * and how model option inheritance works.
+     *
+     * @param {Object} options a hash of settings to override the previous options
+     *
+     */
+    $overrideModelOptions: function(options) {
+      this.$options = this.$options.createChild(options);
+    }
+  };
+
+  function setupModelWatcher(ctrl) {
+    // model -> value
+    // Note: we cannot use a normal scope.$watch as we want to detect the following:
+    // 1. scope value is 'a'
+    // 2. user enters 'b'
+    // 3. ng-change kicks in and reverts scope value to 'a'
+    //    -> scope value did not change since the last digest as
+    //       ng-change executes in apply phase
+    // 4. view should be changed back to 'a'
+    ctrl.$$scope.$watch(function ngModelWatch(scope) {
+      var modelValue = ctrl.$$ngModelGet(scope);
+
+      // if scope model value and ngModel value are out of sync
+      // TODO(perf): why not move this to the action fn?
+      if (modelValue !== ctrl.$modelValue &&
+        // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
+        // eslint-disable-next-line no-self-compare
+        (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
+      ) {
+        ctrl.$modelValue = ctrl.$$rawModelValue = modelValue;
+        ctrl.$$parserValid = undefined;
+
+        var formatters = ctrl.$formatters,
+          idx = formatters.length;
+
+        var viewValue = modelValue;
+        while (idx--) {
+          viewValue = formatters[idx](viewValue);
+        }
+        if (ctrl.$viewValue !== viewValue) {
+          ctrl.$$updateEmptyClasses(viewValue);
+          ctrl.$viewValue = ctrl.$$lastCommittedViewValue = viewValue;
+          ctrl.$render();
+
+          // It is possible that model and view value have been updated during render
+          ctrl.$$runValidators(ctrl.$modelValue, ctrl.$viewValue, noop);
+        }
+      }
+
+      return modelValue;
+    });
+  }
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setValidity
+   *
+   * @description
+   * Change the validity state, and notify the form.
+   *
+   * This method can be called within $parsers/$formatters or a custom validation implementation.
+   * However, in most cases it should be sufficient to use the `ngModel.$validators` and
+   * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically.
+   *
+   * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned
+   *        to either `$error[validationErrorKey]` or `$pending[validationErrorKey]`
+   *        (for unfulfilled `$asyncValidators`), so that it is available for data-binding.
+   *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
+   *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
+   *        classes and can be bound to as `{{ someForm.someControl.$error.myError }}`.
+   * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined),
+   *                          or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+   *                          Skipped is used by Angular when validators do not run because of parse errors and
+   *                          when `$asyncValidators` do not run because any of the `$validators` failed.
+   */
+  addSetValidityMethod({
+    clazz: NgModelController,
+    set: function(object, property) {
+      object[property] = true;
+    },
+    unset: function(object, property) {
+      delete object[property];
+    }
+  });
+
+
+  /**
+   * @ngdoc directive
+   * @name ngModel
+   *
+   * @element input
+   * @priority 1
+   *
+   * @description
+   * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
+   * property on the scope using {@link ngModel.NgModelController NgModelController},
+   * which is created and exposed by this directive.
+   *
+   * `ngModel` is responsible for:
+   *
+   * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
+   *   require.
+   * - Providing validation behavior (i.e. required, number, email, url).
+   * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors).
+   * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`,
+   *   `ng-untouched`, `ng-empty`, `ng-not-empty`) including animations.
+   * - Registering the control with its parent {@link ng.directive:form form}.
+   *
+   * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
+   * current scope. If the property doesn't already exist on this scope, it will be created
+   * implicitly and added to the scope.
+   *
+   * For best practices on using `ngModel`, see:
+   *
+   *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
+   *
+   * For basic examples, how to use `ngModel`, see:
+   *
+   *  - {@link ng.directive:input input}
+   *    - {@link input[text] text}
+   *    - {@link input[checkbox] checkbox}
+   *    - {@link input[radio] radio}
+   *    - {@link input[number] number}
+   *    - {@link input[email] email}
+   *    - {@link input[url] url}
+   *    - {@link input[date] date}
+   *    - {@link input[datetime-local] datetime-local}
+   *    - {@link input[time] time}
+   *    - {@link input[month] month}
+   *    - {@link input[week] week}
+   *  - {@link ng.directive:select select}
+   *  - {@link ng.directive:textarea textarea}
+   *
+   * # Complex Models (objects or collections)
+   *
+   * By default, `ngModel` watches the model by reference, not value. This is important to know when
+   * binding inputs to models that are objects (e.g. `Date`) or collections (e.g. arrays). If only properties of the
+   * object or collection change, `ngModel` will not be notified and so the input will not be  re-rendered.
+   *
+   * The model must be assigned an entirely new object or collection before a re-rendering will occur.
+   *
+   * Some directives have options that will cause them to use a custom `$watchCollection` on the model expression
+   * - for example, `ngOptions` will do so when a `track by` clause is included in the comprehension expression or
+   * if the select is given the `multiple` attribute.
+   *
+   * The `$watchCollection()` method only does a shallow comparison, meaning that changing properties deeper than the
+   * first level of the object (or only changing the properties of an item in the collection if it's an array) will still
+   * not trigger a re-rendering of the model.
+   *
+   * # CSS classes
+   * The following CSS classes are added and removed on the associated input/select/textarea element
+   * depending on the validity of the model.
+   *
+   *  - `ng-valid`: the model is valid
+   *  - `ng-invalid`: the model is invalid
+   *  - `ng-valid-[key]`: for each valid key added by `$setValidity`
+   *  - `ng-invalid-[key]`: for each invalid key added by `$setValidity`
+   *  - `ng-pristine`: the control hasn't been interacted with yet
+   *  - `ng-dirty`: the control has been interacted with
+   *  - `ng-touched`: the control has been blurred
+   *  - `ng-untouched`: the control hasn't been blurred
+   *  - `ng-pending`: any `$asyncValidators` are unfulfilled
+   *  - `ng-empty`: the view does not contain a value or the value is deemed "empty", as defined
+   *     by the {@link ngModel.NgModelController#$isEmpty} method
+   *  - `ng-not-empty`: the view contains a non-empty value
+   *
+   * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+   *
+   * ## Animation Hooks
+   *
+   * Animations within models are triggered when any of the associated CSS classes are added and removed
+   * on the input element which is attached to the model. These classes include: `.ng-pristine`, `.ng-dirty`,
+   * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
+   * The animations that are triggered within ngModel are similar to how they work in ngClass and
+   * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+   *
+   * The following example shows a simple way to utilize CSS transitions to style an input element
+   * that has been rendered as invalid after it has been validated:
+   *
+   * <pre>
+   * //be sure to include ngAnimate as a module to hook into more
+   * //advanced animations
+   * .my-input {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+   * .my-input.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+   * </pre>
+   *
+   * @example
+   * <example deps="angular-animate.js" animations="true" fixBase="true" module="inputExample" name="ng-model">
+   <file name="index.html">
+   <script>
+   angular.module('inputExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+            $scope.val = '1';
+          }]);
+   </script>
+   <style>
+   .my-input {
+           transition:all linear 0.5s;
+           background: transparent;
+         }
+   .my-input.ng-invalid {
+           color:white;
+           background: red;
+         }
+   </style>
+   <p id="inputDescription">
+   Update input to see transitions when valid/invalid.
+   Integer is a valid value.
+   </p>
+   <form name="testForm" ng-controller="ExampleController">
+   <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
+   aria-describedby="inputDescription" />
+   </form>
+   </file>
+   * </example>
+   *
+   * ## Binding to a getter/setter
+   *
+   * Sometimes it's helpful to bind `ngModel` to a getter/setter function.  A getter/setter is a
+   * function that returns a representation of the model when called with zero arguments, and sets
+   * the internal state of a model when called with an argument. It's sometimes useful to use this
+   * for models that have an internal representation that's different from what the model exposes
+   * to the view.
+   *
+   * <div class="alert alert-success">
+   * **Best Practice:** It's best to keep getters fast because Angular is likely to call them more
+   * frequently than other parts of your code.
+   * </div>
+   *
+   * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that
+   * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to
+   * a `<form>`, which will enable this behavior for all `<input>`s within it. See
+   * {@link ng.directive:ngModelOptions `ngModelOptions`} for more.
+   *
+   * The following example shows how to use `ngModel` with a getter/setter:
+   *
+   * @example
+   * <example name="ngModel-getter-setter" module="getterSetterExample">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   <form name="userForm">
+   <label>Name:
+   <input type="text" name="userName"
+   ng-model="user.name"
+   ng-model-options="{ getterSetter: true }" />
+   </label>
+   </form>
+   <pre>user.name = <span ng-bind="user.name()"></span></pre>
+   </div>
+   </file>
+   <file name="app.js">
+   angular.module('getterSetterExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+           var _name = 'Brian';
+           $scope.user = {
+             name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+             }
+           };
+         }]);
+   </file>
+   * </example>
+   */
+  var ngModelDirective = ['$rootScope', function($rootScope) {
+    return {
+      restrict: 'A',
+      require: ['ngModel', '^?form', '^?ngModelOptions'],
+      controller: NgModelController,
+      // Prelink needs to run before any input directive
+      // so that we can set the NgModelOptions in NgModelController
+      // before anyone else uses it.
+      priority: 1,
+      compile: function ngModelCompile(element) {
+        // Setup initial state of the control
+        element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS);
+
+        return {
+          pre: function ngModelPreLink(scope, element, attr, ctrls) {
+            var modelCtrl = ctrls[0],
+              formCtrl = ctrls[1] || modelCtrl.$$parentForm,
+              optionsCtrl = ctrls[2];
+
+            if (optionsCtrl) {
+              modelCtrl.$options = optionsCtrl.$options;
+            }
+
+            modelCtrl.$$initGetterSetters();
+
+            // notify others, especially parent forms
+            formCtrl.$addControl(modelCtrl);
+
+            attr.$observe('name', function(newValue) {
+              if (modelCtrl.$name !== newValue) {
+                modelCtrl.$$parentForm.$$renameControl(modelCtrl, newValue);
+              }
+            });
+
+            scope.$on('$destroy', function() {
+              modelCtrl.$$parentForm.$removeControl(modelCtrl);
+            });
+          },
+          post: function ngModelPostLink(scope, element, attr, ctrls) {
+            var modelCtrl = ctrls[0];
+            if (modelCtrl.$options.getOption('updateOn')) {
+              element.on(modelCtrl.$options.getOption('updateOn'), function(ev) {
+                modelCtrl.$$debounceViewValueCommit(ev && ev.type);
+              });
+            }
+
+            function setTouched() {
+              modelCtrl.$setTouched();
+            }
+
+            element.on('blur', function() {
+              if (modelCtrl.$touched) return;
+
+              if ($rootScope.$$phase) {
+                scope.$evalAsync(setTouched);
+              } else {
+                scope.$apply(setTouched);
+              }
+            });
+          }
+        };
+      }
+    };
+  }];
+
+  /* exported defaultModelOptions */
+  var defaultModelOptions;
+  var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
+
+  /**
+   * @ngdoc type
+   * @name ModelOptions
+   * @description
+   * A container for the options set by the {@link ngModelOptions} directive
+   */
+  function ModelOptions(options) {
+    this.$$options = options;
+  }
+
+  ModelOptions.prototype = {
+
+    /**
+     * @ngdoc method
+     * @name ModelOptions#getOption
+     * @param {string} name the name of the option to retrieve
+     * @returns {*} the value of the option
+     * @description
+     * Returns the value of the given option
+     */
+    getOption: function(name) {
+      return this.$$options[name];
+    },
+
+    /**
+     * @ngdoc method
+     * @name ModelOptions#createChild
+     * @param {Object} options a hash of options for the new child that will override the parent's options
+     * @return {ModelOptions} a new `ModelOptions` object initialized with the given options.
+     */
+    createChild: function(options) {
+      var inheritAll = false;
+
+      // make a shallow copy
+      options = extend({}, options);
+
+      // Inherit options from the parent if specified by the value `"$inherit"`
+      forEach(options, /* @this */ function(option, key) {
+        if (option === '$inherit') {
+          if (key === '*') {
+            inheritAll = true;
+          } else {
+            options[key] = this.$$options[key];
+            // `updateOn` is special so we must also inherit the `updateOnDefault` option
+            if (key === 'updateOn') {
+              options.updateOnDefault = this.$$options.updateOnDefault;
+            }
+          }
+        } else {
+          if (key === 'updateOn') {
+            // If the `updateOn` property contains the `default` event then we have to remove
+            // it from the event list and set the `updateOnDefault` flag.
+            options.updateOnDefault = false;
+            options[key] = trim(option.replace(DEFAULT_REGEXP, function() {
+              options.updateOnDefault = true;
+              return ' ';
+            }));
+          }
+        }
+      }, this);
+
+      if (inheritAll) {
+        // We have a property of the form: `"*": "$inherit"`
+        delete options['*'];
+        defaults(options, this.$$options);
+      }
+
+      // Finally add in any missing defaults
+      defaults(options, defaultModelOptions.$$options);
+
+      return new ModelOptions(options);
+    }
+  };
+
+
+  defaultModelOptions = new ModelOptions({
+    updateOn: '',
+    updateOnDefault: true,
+    debounce: 0,
+    getterSetter: false,
+    allowInvalid: false,
+    timezone: null
+  });
+
+
+  /**
+   * @ngdoc directive
+   * @name ngModelOptions
+   *
+   * @description
+   * This directive allows you to modify the behaviour of {@link ngModel} directives within your
+   * application. You can specify an `ngModelOptions` directive on any element. All {@link ngModel}
+   * directives will use the options of their nearest `ngModelOptions` ancestor.
+   *
+   * The `ngModelOptions` settings are found by evaluating the value of the attribute directive as
+   * an Angular expression. This expression should evaluate to an object, whose properties contain
+   * the settings. For example: `<div "ng-model-options"="{ debounce: 100 }"`.
+   *
+   * ## Inheriting Options
+   *
+   * You can specify that an `ngModelOptions` setting should be inherited from a parent `ngModelOptions`
+   * directive by giving it the value of `"$inherit"`.
+   * Then it will inherit that setting from the first `ngModelOptions` directive found by traversing up the
+   * DOM tree. If there is no ancestor element containing an `ngModelOptions` directive then default settings
+   * will be used.
+   *
+   * For example given the following fragment of HTML
+   *
+   *
+   * ```html
+   * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
+   *   <form ng-model-options="{ updateOn: 'blur', allowInvalid: '$inherit' }">
+   *     <input ng-model-options="{ updateOn: 'default', allowInvalid: '$inherit' }" />
+   *   </form>
+   * </div>
+   * ```
+   *
+   * the `input` element will have the following settings
+   *
+   * ```js
+   * { allowInvalid: true, updateOn: 'default', debounce: 0 }
+   * ```
+   *
+   * Notice that the `debounce` setting was not inherited and used the default value instead.
+   *
+   * You can specify that all undefined settings are automatically inherited from an ancestor by
+   * including a property with key of `"*"` and value of `"$inherit"`.
+   *
+   * For example given the following fragment of HTML
+   *
+   *
+   * ```html
+   * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
+   *   <form ng-model-options="{ updateOn: 'blur', "*": '$inherit' }">
+   *     <input ng-model-options="{ updateOn: 'default', "*": '$inherit' }" />
+   *   </form>
+   * </div>
+   * ```
+   *
+   * the `input` element will have the following settings
+   *
+   * ```js
+   * { allowInvalid: true, updateOn: 'default', debounce: 200 }
+   * ```
+   *
+   * Notice that the `debounce` setting now inherits the value from the outer `<div>` element.
+   *
+   * If you are creating a reusable component then you should be careful when using `"*": "$inherit"`
+   * since you may inadvertently inherit a setting in the future that changes the behavior of your component.
+   *
+   *
+   * ## Triggering and debouncing model updates
+   *
+   * The `updateOn` and `debounce` properties allow you to specify a custom list of events that will
+   * trigger a model update and/or a debouncing delay so that the actual update only takes place when
+   * a timer expires; this timer will be reset after another change takes place.
+   *
+   * Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
+   * be different from the value in the actual model. This means that if you update the model you
+   * should also invoke {@link ngModel.NgModelController#$rollbackViewValue} on the relevant input field in
+   * order to make sure it is synchronized with the model and that any debounced action is canceled.
+   *
+   * The easiest way to reference the control's {@link ngModel.NgModelController#$rollbackViewValue}
+   * method is by making sure the input is placed inside a form that has a `name` attribute. This is
+   * important because `form` controllers are published to the related scope under the name in their
+   * `name` attribute.
+   *
+   * Any pending changes will take place immediately when an enclosing form is submitted via the
+   * `submit` event. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+   * to have access to the updated model.
+   *
+   * The following example shows how to override immediate updates. Changes on the inputs within the
+   * form will update the model only when the control loses focus (blur event). If `escape` key is
+   * pressed while the input field is focused, the value is reset to the value in the current model.
+   *
+   * <example name="ngModelOptions-directive-blur" module="optionsExample">
+   *   <file name="index.html">
+   *     <div ng-controller="ExampleController">
+   *       <form name="userForm">
+   *         <label>
+   *           Name:
+   *           <input type="text" name="userName"
+   *                  ng-model="user.name"
+   *                  ng-model-options="{ updateOn: 'blur' }"
+   *                  ng-keyup="cancel($event)" />
+   *         </label><br />
+   *         <label>
+   *           Other data:
+   *           <input type="text" ng-model="user.data" />
+   *         </label><br />
+   *       </form>
+   *       <pre>user.name = <span ng-bind="user.name"></span></pre>
+   *     </div>
+   *   </file>
+   *   <file name="app.js">
+   *     angular.module('optionsExample', [])
+   *       .controller('ExampleController', ['$scope', function($scope) {
+ *         $scope.user = { name: 'say', data: '' };
+ *
+ *         $scope.cancel = function(e) {
+ *           if (e.keyCode === 27) {
+ *             $scope.userForm.userName.$rollbackViewValue();
+ *           }
+ *         };
+ *       }]);
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *     var model = element(by.binding('user.name'));
+   *     var input = element(by.model('user.name'));
+   *     var other = element(by.model('user.data'));
+   *
+   *     it('should allow custom events', function() {
+ *       input.sendKeys(' hello');
+ *       input.click();
+ *       expect(model.getText()).toEqual('say');
+ *       other.click();
+ *       expect(model.getText()).toEqual('say hello');
+ *     });
+   *
+   *     it('should $rollbackViewValue when model changes', function() {
+ *       input.sendKeys(' hello');
+ *       expect(input.getAttribute('value')).toEqual('say hello');
+ *       input.sendKeys(protractor.Key.ESCAPE);
+ *       expect(input.getAttribute('value')).toEqual('say');
+ *       other.click();
+ *       expect(model.getText()).toEqual('say');
+ *     });
+   *   </file>
+   * </example>
+   *
+   * The next example shows how to debounce model changes. Model will be updated only 1 sec after last change.
+   * If the `Clear` button is pressed, any debounced action is canceled and the value becomes empty.
+   *
+   * <example name="ngModelOptions-directive-debounce" module="optionsExample">
+   *   <file name="index.html">
+   *     <div ng-controller="ExampleController">
+   *       <form name="userForm">
+   *         Name:
+   *         <input type="text" name="userName"
+   *                ng-model="user.name"
+   *                ng-model-options="{ debounce: 1000 }" />
+   *         <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button><br />
+   *       </form>
+   *       <pre>user.name = <span ng-bind="user.name"></span></pre>
+   *     </div>
+   *   </file>
+   *   <file name="app.js">
+   *     angular.module('optionsExample', [])
+   *       .controller('ExampleController', ['$scope', function($scope) {
+ *         $scope.user = { name: 'say' };
+ *       }]);
+   *   </file>
+   * </example>
+   *
+   * ## Model updates and validation
+   *
+   * The default behaviour in `ngModel` is that the model value is set to `undefined` when the
+   * validation determines that the value is invalid. By setting the `allowInvalid` property to true,
+   * the model will still be updated even if the value is invalid.
+   *
+   *
+   * ## Connecting to the scope
+   *
+   * By setting the `getterSetter` property to true you are telling ngModel that the `ngModel` expression
+   * on the scope refers to a "getter/setter" function rather than the value itself.
+   *
+   * The following example shows how to bind to getter/setters:
+   *
+   * <example name="ngModelOptions-directive-getter-setter" module="getterSetterExample">
+   *   <file name="index.html">
+   *     <div ng-controller="ExampleController">
+   *       <form name="userForm">
+   *         <label>
+   *           Name:
+   *           <input type="text" name="userName"
+   *                  ng-model="user.name"
+   *                  ng-model-options="{ getterSetter: true }" />
+   *         </label>
+   *       </form>
+   *       <pre>user.name = <span ng-bind="user.name()"></span></pre>
+   *     </div>
+   *   </file>
+   *   <file name="app.js">
+   *     angular.module('getterSetterExample', [])
+   *       .controller('ExampleController', ['$scope', function($scope) {
+ *         var _name = 'Brian';
+ *         $scope.user = {
+ *           name: function(newName) {
+ *             return angular.isDefined(newName) ? (_name = newName) : _name;
+ *           }
+ *         };
+ *       }]);
+   *   </file>
+   * </example>
+   *
+   *
+   * ## Specifying timezones
+   *
+   * You can specify the timezone that date/time input directives expect by providing its name in the
+   * `timezone` property.
+   *
+   * @param {Object} ngModelOptions options to apply to {@link ngModel} directives on this element and
+   *   and its descendents. Valid keys are:
+   *   - `updateOn`: string specifying which event should the input be bound to. You can set several
+   *     events using an space delimited list. There is a special event called `default` that
+   *     matches the default events belonging to the control.
+   *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
+   *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
+   *     custom value for each event. For example:
+   *     ```
+   *     ng-model-options="{
+ *       updateOn: 'default blur',
+ *       debounce: { 'default': 500, 'blur': 0 }
+ *     }"
+   *     ```
+   *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
+   *     not validate correctly instead of the default behavior of setting the model to undefined.
+   *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
+   *     `ngModel` as getters/setters.
+   *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
+   *     `<input type="date" />`, `<input type="time" />`, ... . It understands UTC/GMT and the
+   *     continental US time zone abbreviations, but for general use, use a time zone offset, for
+   *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+   *     If not specified, the timezone of the browser will be used.
+   *
+   */
+  var ngModelOptionsDirective = function() {
+    NgModelOptionsController.$inject = ['$attrs', '$scope'];
+    function NgModelOptionsController($attrs, $scope) {
+      this.$$attrs = $attrs;
+      this.$$scope = $scope;
+    }
+    NgModelOptionsController.prototype = {
+      $onInit: function() {
+        var parentOptions = this.parentCtrl ? this.parentCtrl.$options : defaultModelOptions;
+        var modelOptionsDefinition = this.$$scope.$eval(this.$$attrs.ngModelOptions);
+
+        this.$options = parentOptions.createChild(modelOptionsDefinition);
+      }
+    };
+
+    return {
+      restrict: 'A',
+      // ngModelOptions needs to run before ngModel and input directives
+      priority: 10,
+      require: {parentCtrl: '?^^ngModelOptions'},
+      bindToController: true,
+      controller: NgModelOptionsController
+    };
+  };
+
+
+// shallow copy over values from `src` that are not already specified on `dst`
+  function defaults(dst, src) {
+    forEach(src, function(value, key) {
+      if (!isDefined(dst[key])) {
+        dst[key] = value;
+      }
+    });
+  }
+
+  /**
+   * @ngdoc directive
+   * @name ngNonBindable
    * @restrict AC
    * @priority 1000
    *
@@ -18641,40 +29983,754 @@
    * but the one wrapped in `ngNonBindable` is left alone.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example name="ng-non-bindable">
+   <file name="index.html">
    <div>Normal: {{1 + 2}}</div>
    <div ng-non-bindable>Ignored: {{1 + 2}}</div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should check ng-non-bindable', function() {
-         expect(using('.doc-example-live').binding('1 + 2')).toBe('3');
-         expect(using('.doc-example-live').element('div:last').text()).
-           toMatch(/1 \+ 2/);
+         expect(element(by.binding('1 + 2')).getText()).toContain('3');
+         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
        });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
   var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
 
+  /* exported ngOptionsDirective */
+
+  /* global jqLiteRemove */
+
+  var ngOptionsMinErr = minErr('ngOptions');
+
   /**
    * @ngdoc directive
-   * @name ng.directive:ngPluralize
+   * @name ngOptions
+   * @restrict A
+   *
+   * @description
+   *
+   * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
+   * elements for the `<select>` element using the array or object obtained by evaluating the
+   * `ngOptions` comprehension expression.
+   *
+   * In many cases, {@link ng.directive:ngRepeat ngRepeat} can be used on `<option>` elements instead of
+   * `ngOptions` to achieve a similar result. However, `ngOptions` provides some benefits:
+   * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+   * comprehension expression
+   * - reduced memory consumption by not creating a new scope for each repeated instance
+   * - increased render speed by creating the options in a documentFragment instead of individually
+   *
+   * When an item in the `<select>` menu is selected, the array element or object property
+   * represented by the selected option will be bound to the model identified by the `ngModel`
+   * directive.
+   *
+   * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+   * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+   * option. See example below for demonstration.
+   *
+   * ## Complex Models (objects or collections)
+   *
+   * By default, `ngModel` watches the model by reference, not value. This is important to know when
+   * binding the select to a model that is an object or a collection.
+   *
+   * One issue occurs if you want to preselect an option. For example, if you set
+   * the model to an object that is equal to an object in your collection, `ngOptions` won't be able to set the selection,
+   * because the objects are not identical. So by default, you should always reference the item in your collection
+   * for preselections, e.g.: `$scope.selected = $scope.collection[3]`.
+   *
+   * Another solution is to use a `track by` clause, because then `ngOptions` will track the identity
+   * of the item not by reference, but by the result of the `track by` expression. For example, if your
+   * collection items have an id property, you would `track by item.id`.
+   *
+   * A different issue with objects or collections is that ngModel won't detect if an object property or
+   * a collection item changes. For that reason, `ngOptions` additionally watches the model using
+   * `$watchCollection`, when the expression contains a `track by` clause or the the select has the `multiple` attribute.
+   * This allows ngOptions to trigger a re-rendering of the options even if the actual object/collection
+   * has not changed identity, but only a property on the object or an item in the collection changes.
+   *
+   * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
+   * if the model is an array). This means that changing a property deeper than the first level inside the
+   * object/collection will not trigger a re-rendering.
+   *
+   * ## `select` **`as`**
+   *
+   * Using `select` **`as`** will bind the result of the `select` expression to the model, but
+   * the value of the `<select>` and `<option>` html elements will be either the index (for array data sources)
+   * or property name (for object data sources) of the value within the collection. If a **`track by`** expression
+   * is used, the result of that expression will be set as the value of the `option` and `select` elements.
+   *
+   *
+   * ### `select` **`as`** and **`track by`**
+   *
+   * <div class="alert alert-warning">
+   * Be careful when using `select` **`as`** and **`track by`** in the same expression.
+   * </div>
+   *
+   * Given this array of items on the $scope:
+   *
+   * ```js
+   * $scope.items = [{
+ *   id: 1,
+ *   label: 'aLabel',
+ *   subItem: { name: 'aSubItem' }
+ * }, {
+ *   id: 2,
+ *   label: 'bLabel',
+ *   subItem: { name: 'bSubItem' }
+ * }];
+   * ```
+   *
+   * This will work:
+   *
+   * ```html
+   * <select ng-options="item as item.label for item in items track by item.id" ng-model="selected"></select>
+   * ```
+   * ```js
+   * $scope.selected = $scope.items[0];
+   * ```
+   *
+   * but this will not work:
+   *
+   * ```html
+   * <select ng-options="item.subItem as item.label for item in items track by item.id" ng-model="selected"></select>
+   * ```
+   * ```js
+   * $scope.selected = $scope.items[0].subItem;
+   * ```
+   *
+   * In both examples, the **`track by`** expression is applied successfully to each `item` in the
+   * `items` array. Because the selected option has been set programmatically in the controller, the
+   * **`track by`** expression is also applied to the `ngModel` value. In the first example, the
+   * `ngModel` value is `items[0]` and the **`track by`** expression evaluates to `items[0].id` with
+   * no issue. In the second example, the `ngModel` value is `items[0].subItem` and the **`track by`**
+   * expression evaluates to `items[0].subItem.id` (which is undefined). As a result, the model value
+   * is not matched against any `<option>` and the `<select>` appears as having no selected value.
+   *
+   *
+   * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+   * @param {comprehension_expression} ngOptions in one of the following forms:
+   *
+   *   * for array data sources:
+   *     * `label` **`for`** `value` **`in`** `array`
+   *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
+   *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
+   *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
+   *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+   *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+   *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
+   *        (for including a filter with `track by`)
+   *   * for object data sources:
+   *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+   *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+   *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
+   *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
+   *     * `select` **`as`** `label` **`group by`** `group`
+   *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+   *     * `select` **`as`** `label` **`disable when`** `disable`
+   *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+   *
+   * Where:
+   *
+   *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
+   *   * `value`: local variable which will refer to each item in the `array` or each property value
+   *      of `object` during iteration.
+   *   * `key`: local variable which will refer to a property name in `object` during iteration.
+   *   * `label`: The result of this expression will be the label for `<option>` element. The
+   *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
+   *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
+   *      element. If not specified, `select` expression will default to `value`.
+   *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
+   *      DOM element.
+   *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
+   *      element. Return `true` to disable.
+   *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
+   *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
+   *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
+   *      even when the options are recreated (e.g. reloaded from the server).
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required The control is considered valid only if value is entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
+   * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
+   *
+   * @example
+   <example module="selectExample" name="select">
+   <file name="index.html">
+   <script>
+   angular.module('selectExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+            $scope.colors = [
+              {name:'black', shade:'dark'},
+              {name:'white', shade:'light', notAnOption: true},
+              {name:'red', shade:'dark'},
+              {name:'blue', shade:'dark', notAnOption: true},
+              {name:'yellow', shade:'light', notAnOption: false}
+            ];
+            $scope.myColor = $scope.colors[2]; // red
+          }]);
+   </script>
+   <div ng-controller="ExampleController">
+   <ul>
+   <li ng-repeat="color in colors">
+   <label>Name: <input ng-model="color.name"></label>
+   <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
+   <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
+   </li>
+   <li>
+   <button ng-click="colors.push({})">add</button>
+   </li>
+   </ul>
+   <hr/>
+   <label>Color (null not allowed):
+   <select ng-model="myColor" ng-options="color.name for color in colors"></select>
+   </label><br/>
+   <label>Color (null allowed):
+   <span  class="nullable">
+   <select ng-model="myColor" ng-options="color.name for color in colors">
+   <option value="">-- choose color --</option>
+   </select>
+   </span></label><br/>
+
+   <label>Color grouped by shade:
+   <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
+   </select>
+   </label><br/>
+
+   <label>Color grouped by shade, with some disabled:
+   <select ng-model="myColor"
+   ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
+   </select>
+   </label><br/>
+
+
+
+   Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
+   <br/>
+   <hr/>
+   Currently selected: {{ {selected_color:myColor} }}
+   <div style="border:solid 1px black; height:20px"
+   ng-style="{'background-color':myColor.name}">
+   </div>
+   </div>
+   </file>
+   <file name="protractor.js" type="protractor">
+   it('should check ng-options', function() {
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
+           element.all(by.model('myColor')).first().click();
+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
+           element(by.css('.nullable select[ng-model="myColor"]')).click();
+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
+         });
+   </file>
+   </example>
+   */
+
+  /* eslint-disable max-len */
+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555000000000666666666666600000007777777777777000000000000000888888888800000000000000000009999999999
+  var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
+  // 1: value expression (valueFn)
+  // 2: label expression (displayFn)
+  // 3: group by expression (groupByFn)
+  // 4: disable when expression (disableWhenFn)
+  // 5: array item variable name
+  // 6: object item key variable name
+  // 7: object item value variable name
+  // 8: collection expression
+  // 9: track by expression
+  /* eslint-enable */
+
+
+  var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile, $document, $parse) {
+
+    function parseOptionsExpression(optionsExp, selectElement, scope) {
+
+      var match = optionsExp.match(NG_OPTIONS_REGEXP);
+      if (!(match)) {
+        throw ngOptionsMinErr('iexp',
+          'Expected expression in form of ' +
+          '\'_select_ (as _label_)? for (_key_,)?_value_ in _collection_\'' +
+          ' but got \'{0}\'. Element: {1}',
+          optionsExp, startingTag(selectElement));
+      }
+
+      // Extract the parts from the ngOptions expression
+
+      // The variable name for the value of the item in the collection
+      var valueName = match[5] || match[7];
+      // The variable name for the key of the item in the collection
+      var keyName = match[6];
+
+      // An expression that generates the viewValue for an option if there is a label expression
+      var selectAs = / as /.test(match[0]) && match[1];
+      // An expression that is used to track the id of each object in the options collection
+      var trackBy = match[9];
+      // An expression that generates the viewValue for an option if there is no label expression
+      var valueFn = $parse(match[2] ? match[1] : valueName);
+      var selectAsFn = selectAs && $parse(selectAs);
+      var viewValueFn = selectAsFn || valueFn;
+      var trackByFn = trackBy && $parse(trackBy);
+
+      // Get the value by which we are going to track the option
+      // if we have a trackFn then use that (passing scope and locals)
+      // otherwise just hash the given viewValue
+      var getTrackByValueFn = trackBy ?
+        function(value, locals) { return trackByFn(scope, locals); } :
+        function getHashOfValue(value) { return hashKey(value); };
+      var getTrackByValue = function(value, key) {
+        return getTrackByValueFn(value, getLocals(value, key));
+      };
+
+      var displayFn = $parse(match[2] || match[1]);
+      var groupByFn = $parse(match[3] || '');
+      var disableWhenFn = $parse(match[4] || '');
+      var valuesFn = $parse(match[8]);
+
+      var locals = {};
+      var getLocals = keyName ? function(value, key) {
+        locals[keyName] = key;
+        locals[valueName] = value;
+        return locals;
+      } : function(value) {
+        locals[valueName] = value;
+        return locals;
+      };
+
+
+      function Option(selectValue, viewValue, label, group, disabled) {
+        this.selectValue = selectValue;
+        this.viewValue = viewValue;
+        this.label = label;
+        this.group = group;
+        this.disabled = disabled;
+      }
+
+      function getOptionValuesKeys(optionValues) {
+        var optionValuesKeys;
+
+        if (!keyName && isArrayLike(optionValues)) {
+          optionValuesKeys = optionValues;
+        } else {
+          // if object, extract keys, in enumeration order, unsorted
+          optionValuesKeys = [];
+          for (var itemKey in optionValues) {
+            if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+              optionValuesKeys.push(itemKey);
+            }
+          }
+        }
+        return optionValuesKeys;
+      }
+
+      return {
+        trackBy: trackBy,
+        getTrackByValue: getTrackByValue,
+        getWatchables: $parse(valuesFn, function(optionValues) {
+          // Create a collection of things that we would like to watch (watchedArray)
+          // so that they can all be watched using a single $watchCollection
+          // that only runs the handler once if anything changes
+          var watchedArray = [];
+          optionValues = optionValues || [];
+
+          var optionValuesKeys = getOptionValuesKeys(optionValues);
+          var optionValuesLength = optionValuesKeys.length;
+          for (var index = 0; index < optionValuesLength; index++) {
+            var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+            var value = optionValues[key];
+
+            var locals = getLocals(value, key);
+            var selectValue = getTrackByValueFn(value, locals);
+            watchedArray.push(selectValue);
+
+            // Only need to watch the displayFn if there is a specific label expression
+            if (match[2] || match[1]) {
+              var label = displayFn(scope, locals);
+              watchedArray.push(label);
+            }
+
+            // Only need to watch the disableWhenFn if there is a specific disable expression
+            if (match[4]) {
+              var disableWhen = disableWhenFn(scope, locals);
+              watchedArray.push(disableWhen);
+            }
+          }
+          return watchedArray;
+        }),
+
+        getOptions: function() {
+
+          var optionItems = [];
+          var selectValueMap = {};
+
+          // The option values were already computed in the `getWatchables` fn,
+          // which must have been called to trigger `getOptions`
+          var optionValues = valuesFn(scope) || [];
+          var optionValuesKeys = getOptionValuesKeys(optionValues);
+          var optionValuesLength = optionValuesKeys.length;
+
+          for (var index = 0; index < optionValuesLength; index++) {
+            var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+            var value = optionValues[key];
+            var locals = getLocals(value, key);
+            var viewValue = viewValueFn(scope, locals);
+            var selectValue = getTrackByValueFn(viewValue, locals);
+            var label = displayFn(scope, locals);
+            var group = groupByFn(scope, locals);
+            var disabled = disableWhenFn(scope, locals);
+            var optionItem = new Option(selectValue, viewValue, label, group, disabled);
+
+            optionItems.push(optionItem);
+            selectValueMap[selectValue] = optionItem;
+          }
+
+          return {
+            items: optionItems,
+            selectValueMap: selectValueMap,
+            getOptionFromViewValue: function(value) {
+              return selectValueMap[getTrackByValue(value)];
+            },
+            getViewValueFromOption: function(option) {
+              // If the viewValue could be an object that may be mutated by the application,
+              // we need to make a copy and not return the reference to the value on the option.
+              return trackBy ? copy(option.viewValue) : option.viewValue;
+            }
+          };
+        }
+      };
+    }
+
+
+    // Support: IE 9 only
+    // We can't just jqLite('<option>') since jqLite is not smart enough
+    // to create it in <select> and IE barfs otherwise.
+    var optionTemplate = window.document.createElement('option'),
+      optGroupTemplate = window.document.createElement('optgroup');
+
+    function ngOptionsPostLink(scope, selectElement, attr, ctrls) {
+
+      var selectCtrl = ctrls[0];
+      var ngModelCtrl = ctrls[1];
+      var multiple = attr.multiple;
+
+      // The emptyOption allows the application developer to provide their own custom "empty"
+      // option when the viewValue does not match any of the option values.
+      for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
+        if (children[i].value === '') {
+          selectCtrl.hasEmptyOption = true;
+          selectCtrl.emptyOption = children.eq(i);
+          break;
+        }
+      }
+
+      // The empty option will be compiled and rendered before we first generate the options
+      selectElement.empty();
+
+      var providedEmptyOption = !!selectCtrl.emptyOption;
+
+      var unknownOption = jqLite(optionTemplate.cloneNode(false));
+      unknownOption.val('?');
+
+      var options;
+      var ngOptions = parseOptionsExpression(attr.ngOptions, selectElement, scope);
+      // This stores the newly created options before they are appended to the select.
+      // Since the contents are removed from the fragment when it is appended,
+      // we only need to create it once.
+      var listFragment = $document[0].createDocumentFragment();
+
+      // Overwrite the implementation. ngOptions doesn't use hashes
+      selectCtrl.generateUnknownOptionValue = function(val) {
+        return '?';
+      };
+
+      // Update the controller methods for multiple selectable options
+      if (!multiple) {
+
+        selectCtrl.writeValue = function writeNgOptionsValue(value) {
+          // The options might not be defined yet when ngModel tries to render
+          if (!options) return;
+
+          var selectedOption = selectElement[0].options[selectElement[0].selectedIndex];
+          var option = options.getOptionFromViewValue(value);
+
+          // Make sure to remove the selected attribute from the previously selected option
+          // Otherwise, screen readers might get confused
+          if (selectedOption) selectedOption.removeAttribute('selected');
+
+          if (option) {
+            // Don't update the option when it is already selected.
+            // For example, the browser will select the first option by default. In that case,
+            // most properties are set automatically - except the `selected` attribute, which we
+            // set always
+
+            if (selectElement[0].value !== option.selectValue) {
+              selectCtrl.removeUnknownOption();
+
+              selectElement[0].value = option.selectValue;
+              option.element.selected = true;
+            }
+
+            option.element.setAttribute('selected', 'selected');
+          } else {
+            selectCtrl.selectUnknownOrEmptyOption(value);
+          }
+        };
+
+        selectCtrl.readValue = function readNgOptionsValue() {
+
+          var selectedOption = options.selectValueMap[selectElement.val()];
+
+          if (selectedOption && !selectedOption.disabled) {
+            selectCtrl.unselectEmptyOption();
+            selectCtrl.removeUnknownOption();
+            return options.getViewValueFromOption(selectedOption);
+          }
+          return null;
+        };
+
+        // If we are using `track by` then we must watch the tracked value on the model
+        // since ngModel only watches for object identity change
+        // FIXME: When a user selects an option, this watch will fire needlessly
+        if (ngOptions.trackBy) {
+          scope.$watch(
+            function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
+            function() { ngModelCtrl.$render(); }
+          );
+        }
+
+      } else {
+
+        selectCtrl.writeValue = function writeNgOptionsMultiple(values) {
+          // The options might not be defined yet when ngModel tries to render
+          if (!options) return;
+
+          // Only set `<option>.selected` if necessary, in order to prevent some browsers from
+          // scrolling to `<option>` elements that are outside the `<select>` element's viewport.
+          var selectedOptions = values && values.map(getAndUpdateSelectedOption) || [];
+
+          options.items.forEach(function(option) {
+            if (option.element.selected && !includes(selectedOptions, option)) {
+              option.element.selected = false;
+            }
+          });
+        };
+
+
+        selectCtrl.readValue = function readNgOptionsMultiple() {
+          var selectedValues = selectElement.val() || [],
+            selections = [];
+
+          forEach(selectedValues, function(value) {
+            var option = options.selectValueMap[value];
+            if (option && !option.disabled) selections.push(options.getViewValueFromOption(option));
+          });
+
+          return selections;
+        };
+
+        // If we are using `track by` then we must watch these tracked values on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+
+          scope.$watchCollection(function() {
+            if (isArray(ngModelCtrl.$viewValue)) {
+              return ngModelCtrl.$viewValue.map(function(value) {
+                return ngOptions.getTrackByValue(value);
+              });
+            }
+          }, function() {
+            ngModelCtrl.$render();
+          });
+
+        }
+      }
+
+      if (providedEmptyOption) {
+
+        // compile the element since there might be bindings in it
+        $compile(selectCtrl.emptyOption)(scope);
+
+        selectElement.prepend(selectCtrl.emptyOption);
+
+        if (selectCtrl.emptyOption[0].nodeType === NODE_TYPE_COMMENT) {
+          // This means the empty option has currently no actual DOM node, probably because
+          // it has been modified by a transclusion directive.
+          selectCtrl.hasEmptyOption = false;
+
+          // Redefine the registerOption function, which will catch
+          // options that are added by ngIf etc. (rendering of the node is async because of
+          // lazy transclusion)
+          selectCtrl.registerOption = function(optionScope, optionEl) {
+            if (optionEl.val() === '') {
+              selectCtrl.hasEmptyOption = true;
+              selectCtrl.emptyOption = optionEl;
+              selectCtrl.emptyOption.removeClass('ng-scope');
+              // This ensures the new empty option is selected if previously no option was selected
+              ngModelCtrl.$render();
+
+              optionEl.on('$destroy', function() {
+                var needsRerender = selectCtrl.$isEmptyOptionSelected();
+
+                selectCtrl.hasEmptyOption = false;
+                selectCtrl.emptyOption = undefined;
+
+                if (needsRerender) ngModelCtrl.$render();
+              });
+            }
+          };
+
+        } else {
+          // remove the class, which is added automatically because we recompile the element and it
+          // becomes the compilation root
+          selectCtrl.emptyOption.removeClass('ng-scope');
+        }
+
+      }
+
+      // We will re-render the option elements if the option values or labels change
+      scope.$watchCollection(ngOptions.getWatchables, updateOptions);
+
+      // ------------------------------------------------------------------ //
+
+      function addOptionElement(option, parent) {
+        var optionElement = optionTemplate.cloneNode(false);
+        parent.appendChild(optionElement);
+        updateOptionElement(option, optionElement);
+      }
+
+      function getAndUpdateSelectedOption(viewValue) {
+        var option = options.getOptionFromViewValue(viewValue);
+        var element = option && option.element;
+
+        if (element && !element.selected) element.selected = true;
+
+        return option;
+      }
+
+      function updateOptionElement(option, element) {
+        option.element = element;
+        element.disabled = option.disabled;
+        // Support: IE 11 only, Edge 12-13 only
+        // NOTE: The label must be set before the value, otherwise IE 11 & Edge create unresponsive
+        // selects in certain circumstances when multiple selects are next to each other and display
+        // the option list in listbox style, i.e. the select is [multiple], or specifies a [size].
+        // See https://github.com/angular/angular.js/issues/11314 for more info.
+        // This is unfortunately untestable with unit / e2e tests
+        if (option.label !== element.label) {
+          element.label = option.label;
+          element.textContent = option.label;
+        }
+        element.value = option.selectValue;
+      }
+
+      function updateOptions() {
+        var previousValue = options && selectCtrl.readValue();
+
+        // We must remove all current options, but cannot simply set innerHTML = null
+        // since the providedEmptyOption might have an ngIf on it that inserts comments which we
+        // must preserve.
+        // Instead, iterate over the current option elements and remove them or their optgroup
+        // parents
+        if (options) {
+
+          for (var i = options.items.length - 1; i >= 0; i--) {
+            var option = options.items[i];
+            if (isDefined(option.group)) {
+              jqLiteRemove(option.element.parentNode);
+            } else {
+              jqLiteRemove(option.element);
+            }
+          }
+        }
+
+        options = ngOptions.getOptions();
+
+        var groupElementMap = {};
+
+        options.items.forEach(function addOption(option) {
+          var groupElement;
+
+          if (isDefined(option.group)) {
+
+            // This option is to live in a group
+            // See if we have already created this group
+            groupElement = groupElementMap[option.group];
+
+            if (!groupElement) {
+
+              groupElement = optGroupTemplate.cloneNode(false);
+              listFragment.appendChild(groupElement);
+
+              // Update the label on the group element
+              // "null" is special cased because of Safari
+              groupElement.label = option.group === null ? 'null' : option.group;
+
+              // Store it for use later
+              groupElementMap[option.group] = groupElement;
+            }
+
+            addOptionElement(option, groupElement);
+
+          } else {
+
+            // This option is not in a group
+            addOptionElement(option, listFragment);
+          }
+        });
+
+        selectElement[0].appendChild(listFragment);
+
+        ngModelCtrl.$render();
+
+        // Check to see if the value has changed due to the update to the options
+        if (!ngModelCtrl.$isEmpty(previousValue)) {
+          var nextValue = selectCtrl.readValue();
+          var isNotPrimitive = ngOptions.trackBy || multiple;
+          if (isNotPrimitive ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
+            ngModelCtrl.$setViewValue(nextValue);
+            ngModelCtrl.$render();
+          }
+        }
+      }
+    }
+
+    return {
+      restrict: 'A',
+      terminal: true,
+      require: ['select', 'ngModel'],
+      link: {
+        pre: function ngOptionsPreLink(scope, selectElement, attr, ctrls) {
+          // Deactivate the SelectController.register method to prevent
+          // option directives from accidentally registering themselves
+          // (and unwanted $destroy handlers etc.)
+          ctrls[0].registerOption = noop;
+        },
+        post: ngOptionsPostLink
+      }
+    };
+  }];
+
+  /**
+   * @ngdoc directive
+   * @name ngPluralize
    * @restrict EA
    *
    * @description
-   * # Overview
    * `ngPluralize` is a directive that displays messages according to en-US localization rules.
    * These rules are bundled with angular.js, but can be overridden
    * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
    * by specifying the mappings between
-   * {@link http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-   * plural categories} and the strings to be displayed.
+   * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+   * and the strings to be displayed.
    *
    * # Plural categories and explicit number rules
    * There are two
-   * {@link http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-   * plural categories} in Angular's default en-US locale: "one" and "other".
+   * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+   * in Angular's default en-US locale: "one" and "other".
    *
    * While a plural category may match many numbers (for example, in en-US locale, "other" can match
    * any number that is not 1), an explicit number rule can only match one number. For example, the
@@ -18686,20 +30742,20 @@
    * You can also provide an optional attribute, `offset`.
    *
    * The value of the `count` attribute can be either a string or an {@link guide/expression
-   * Angular expression}; these are evaluated on the current scope for its bound value.
+ * Angular expression}; these are evaluated on the current scope for its bound value.
    *
    * The `when` attribute specifies the mappings between plural categories and the actual
    * string to be displayed. The value of the attribute should be a JSON object.
    *
    * The following example shows how to configure ngPluralize:
    *
-   * <pre>
+   * ```html
    * <ng-pluralize count="personCount"
    when="{'0': 'Nobody is viewing.',
  *                      'one': '1 person is viewing.',
  *                      'other': '{} people are viewing.'}">
    * </ng-pluralize>
-   *</pre>
+   *```
    *
    * In the example, `"0: Nobody is viewing."` is an explicit number rule. If you did not
    * specify this rule, 0 would be matched to the "other" category and "0 people are viewing"
@@ -18712,6 +30768,9 @@
    * <span ng-non-bindable>`{{personCount}}`</span>. The closed braces `{}` is a placeholder
    * for <span ng-non-bindable>{{numberExpression}}</span>.
    *
+   * If no rule is defined for a category, then an empty string is displayed and a warning is generated.
+   * Note that some locales define more categories than `one` and `other`. For example, fr-fr defines `few` and `many`.
+   *
    * # Configuring ngPluralize with offset
    * The `offset` attribute allows further customization of pluralized text, which can result in
    * a better user experience. For example, instead of the message "4 people are viewing this document",
@@ -18719,7 +30778,7 @@
    * The offset attribute allows you to offset a number by any desired value.
    * Let's take a look at an example:
    *
-   * <pre>
+   * ```html
    * <ng-pluralize count="personCount" offset=2
    *               when="{'0': 'Nobody is viewing.',
  *                      '1': '{{person1}} is viewing.',
@@ -18727,14 +30786,14 @@
  *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
  *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
    * </ng-pluralize>
-   * </pre>
+   * ```
    *
    * Notice that we are still using two plural categories(one, other), but we added
    * three explicit number rules 0, 1 and 2.
    * When one person, perhaps John, views the document, "John is viewing" will be shown.
    * When three people view the document, no explicit number rule is found, so
    * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
-   * In this case, plural category 'one' is matched and "John, Marry and one other person are viewing"
+   * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
    * is shown.
    *
    * Note that when you specify offsets, you must provide explicit number rules for
@@ -18742,24 +30801,25 @@
    * you must provide explicit number rules for 0, 1, 2 and 3. You must also provide plural strings for
    * plural categories "one" and "other".
    *
-   * @param {string|expression} count The variable to be bounded to.
+   * @param {string|expression} count The variable to be bound to.
    * @param {string} when The mapping between plural category to its corresponding strings.
    * @param {number=} offset Offset to deduct from the total number.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example module="pluralizeExample" name="ng-pluralize">
+   <file name="index.html">
    <script>
-   function Ctrl($scope) {
-            $scope.person1 = 'Igor';
-            $scope.person2 = 'Misko';
-            $scope.personCount = 1;
-          }
+   angular.module('pluralizeExample', [])
+   .controller('ExampleController', ['$scope', function($scope) {
+              $scope.person1 = 'Igor';
+              $scope.person2 = 'Misko';
+              $scope.personCount = 1;
+            }]);
    </script>
-   <div ng-controller="Ctrl">
-   Person 1:<input type="text" ng-model="person1" value="Igor" /><br/>
-   Person 2:<input type="text" ng-model="person2" value="Misko" /><br/>
-   Number of People:<input type="text" ng-model="personCount" value="1" /><br/>
+   <div ng-controller="ExampleController">
+   <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
+   <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
+   <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
 
    <!--- Example with simple pluralization rules for en locale --->
    Without Offset:
@@ -18779,99 +30839,127 @@
                                'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
    </ng-pluralize>
    </div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should show correct pluralized string', function() {
-          expect(element('.doc-example-live ng-pluralize:first').text()).
-                                             toBe('1 person is viewing.');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-                                                toBe('Igor is viewing.');
+          var withoutOffset = element.all(by.css('ng-pluralize')).get(0);
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var countInput = element(by.model('personCount'));
 
-          using('.doc-example-live').input('personCount').enter('0');
-          expect(element('.doc-example-live ng-pluralize:first').text()).
-                                               toBe('Nobody is viewing.');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-                                              toBe('Nobody is viewing.');
+          expect(withoutOffset.getText()).toEqual('1 person is viewing.');
+          expect(withOffset.getText()).toEqual('Igor is viewing.');
 
-          using('.doc-example-live').input('personCount').enter('2');
-          expect(element('.doc-example-live ng-pluralize:first').text()).
-                                            toBe('2 people are viewing.');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-                              toBe('Igor and Misko are viewing.');
+          countInput.clear();
+          countInput.sendKeys('0');
 
-          using('.doc-example-live').input('personCount').enter('3');
-          expect(element('.doc-example-live ng-pluralize:first').text()).
-                                            toBe('3 people are viewing.');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-                              toBe('Igor, Misko and one other person are viewing.');
+          expect(withoutOffset.getText()).toEqual('Nobody is viewing.');
+          expect(withOffset.getText()).toEqual('Nobody is viewing.');
 
-          using('.doc-example-live').input('personCount').enter('4');
-          expect(element('.doc-example-live ng-pluralize:first').text()).
-                                            toBe('4 people are viewing.');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-                              toBe('Igor, Misko and 2 other people are viewing.');
+          countInput.clear();
+          countInput.sendKeys('2');
+
+          expect(withoutOffset.getText()).toEqual('2 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor and Misko are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('3');
+
+          expect(withoutOffset.getText()).toEqual('3 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and one other person are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('4');
+
+          expect(withoutOffset.getText()).toEqual('4 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and 2 other people are viewing.');
         });
-
-   it('should show data-binded names', function() {
-          using('.doc-example-live').input('personCount').enter('4');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-              toBe('Igor, Misko and 2 other people are viewing.');
-
-          using('.doc-example-live').input('person1').enter('Di');
-          using('.doc-example-live').input('person2').enter('Vojta');
-          expect(element('.doc-example-live ng-pluralize:last').text()).
-              toBe('Di, Vojta and 2 other people are viewing.');
+   it('should show data-bound names', function() {
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var personCount = element(by.model('personCount'));
+          var person1 = element(by.model('person1'));
+          var person2 = element(by.model('person2'));
+          personCount.clear();
+          personCount.sendKeys('4');
+          person1.clear();
+          person1.sendKeys('Di');
+          person2.clear();
+          person2.sendKeys('Vojta');
+          expect(withOffset.getText()).toEqual('Di, Vojta and 2 other people are viewing.');
         });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
-  var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interpolate) {
-    var BRACE = /{}/g;
+  var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale, $interpolate, $log) {
+    var BRACE = /{}/g,
+      IS_WHEN = /^when(Minus)?(.+)$/;
+
     return {
-      restrict: 'EA',
       link: function(scope, element, attr) {
         var numberExp = attr.count,
-            whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
-            offset = attr.offset || 0,
-            whens = scope.$eval(whenExp) || {},
-            whensExpFns = {},
-            startSymbol = $interpolate.startSymbol(),
-            endSymbol = $interpolate.endSymbol(),
-            isWhen = /^when(Minus)?(.+)$/;
+          whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
+          offset = attr.offset || 0,
+          whens = scope.$eval(whenExp) || {},
+          whensExpFns = {},
+          startSymbol = $interpolate.startSymbol(),
+          endSymbol = $interpolate.endSymbol(),
+          braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
+          watchRemover = angular.noop,
+          lastCount;
 
         forEach(attr, function(expression, attributeName) {
-          if (isWhen.test(attributeName)) {
-            whens[lowercase(attributeName.replace('when', '').replace('Minus', '-'))] =
-                element.attr(attr.$attr[attributeName]);
+          var tmpMatch = IS_WHEN.exec(attributeName);
+          if (tmpMatch) {
+            var whenKey = (tmpMatch[1] ? '-' : '') + lowercase(tmpMatch[2]);
+            whens[whenKey] = element.attr(attr.$attr[attributeName]);
           }
         });
         forEach(whens, function(expression, key) {
-          whensExpFns[key] =
-              $interpolate(expression.replace(BRACE, startSymbol + numberExp + '-' +
-                  offset + endSymbol));
+          whensExpFns[key] = $interpolate(expression.replace(BRACE, braceReplacement));
+
         });
 
-        scope.$watch(function ngPluralizeWatch() {
-          var value = parseFloat(scope.$eval(numberExp));
+        scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
+          var count = parseFloat(newVal);
+          var countIsNaN = isNumberNaN(count);
 
-          if (!isNaN(value)) {
-            //if explicit number rule such as 1, 2, 3... is defined, just use it. Otherwise,
-            //check it against pluralization rules in $locale service
-            if (!(value in whens)) value = $locale.pluralCat(value - offset);
-            return whensExpFns[value](scope, element, true);
-          } else {
-            return '';
+          if (!countIsNaN && !(count in whens)) {
+            // If an explicit number rule such as 1, 2, 3... is defined, just use it.
+            // Otherwise, check it against pluralization rules in $locale service.
+            count = $locale.pluralCat(count - offset);
+          }
+
+          // If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
+          // In JS `NaN !== NaN`, so we have to explicitly check.
+          if ((count !== lastCount) && !(countIsNaN && isNumberNaN(lastCount))) {
+            watchRemover();
+            var whenExpFn = whensExpFns[count];
+            if (isUndefined(whenExpFn)) {
+              if (newVal != null) {
+                $log.debug('ngPluralize: no rule defined for \'' + count + '\' in ' + whenExp);
+              }
+              watchRemover = noop;
+              updateElementText();
+            } else {
+              watchRemover = scope.$watch(whenExpFn, updateElementText);
+            }
+            lastCount = count;
           }
-        }, function ngPluralizeWatchAction(newVal) {
-          element.text(newVal);
         });
+
+        function updateElementText(newText) {
+          element.text(newText || '');
+        }
       }
     };
   }];
 
+  /* exported ngRepeatDirective */
+
   /**
    * @ngdoc directive
-   * @name ng.directive:ngRepeat
+   * @name ngRepeat
+   * @multiElement
+   * @restrict A
    *
    * @description
    * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
@@ -18889,8 +30977,121 @@
    * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
    * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
    *
-   * Creating aliases for these properties is possible with {@link ../api/ng.directive:ngInit `ngInit`}.
-   * This may be useful when, for instance, nesting ngRepeats.
+   * <div class="alert alert-info">
+   *   Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
+   *   This may be useful when, for instance, nesting ngRepeats.
+   * </div>
+   *
+   *
+   * # Iterating over object properties
+   *
+   * It is possible to get `ngRepeat` to iterate over the properties of an object using the following
+   * syntax:
+   *
+   * ```js
+   * <div ng-repeat="(key, value) in myObj"> ... </div>
+   * ```
+   *
+   * However, there are a few limitations compared to array iteration:
+   *
+   * - The JavaScript specification does not define the order of keys
+   *   returned for an object, so Angular relies on the order returned by the browser
+   *   when running `for key in myObj`. Browsers generally follow the strategy of providing
+   *   keys in the order in which they were defined, although there are exceptions when keys are deleted
+   *   and reinstated. See the
+   *   [MDN page on `delete` for more info](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_notes).
+   *
+   * - `ngRepeat` will silently *ignore* object keys starting with `$`, because
+   *   it's a prefix used by Angular for public (`$`) and private (`$$`) properties.
+   *
+   * - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
+   *   objects, and will throw an error if used with one.
+   *
+   * If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
+   * that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
+   * do this with a filter such as [toArrayFilter](http://ngmodules.org/modules/angular-toArrayFilter)
+   * or implement a `$watch` on the object yourself.
+   *
+   *
+   * # Tracking and Duplicates
+   *
+   * `ngRepeat` uses {@link $rootScope.Scope#$watchCollection $watchCollection} to detect changes in
+   * the collection. When a change happens, `ngRepeat` then makes the corresponding changes to the DOM:
+   *
+   * * When an item is added, a new instance of the template is added to the DOM.
+   * * When an item is removed, its template instance is removed from the DOM.
+   * * When items are reordered, their respective templates are reordered in the DOM.
+   *
+   * To minimize creation of DOM elements, `ngRepeat` uses a function
+   * to "keep track" of all items in the collection and their corresponding DOM elements.
+   * For example, if an item is added to the collection, `ngRepeat` will know that all other items
+   * already have DOM elements, and will not re-render them.
+   *
+   * The default tracking function (which tracks items by their identity) does not allow
+   * duplicate items in arrays. This is because when there are duplicates, it is not possible
+   * to maintain a one-to-one mapping between collection items and DOM elements.
+   *
+   * If you do need to repeat duplicate items, you can substitute the default tracking behavior
+   * with your own using the `track by` expression.
+   *
+   * For example, you may track items by the index of each item in the collection, using the
+   * special scope property `$index`:
+   * ```html
+   *    <div ng-repeat="n in [42, 42, 43, 43] track by $index">
+   *      {{n}}
+   *    </div>
+   * ```
+   *
+   * You may also use arbitrary expressions in `track by`, including references to custom functions
+   * on the scope:
+   * ```html
+   *    <div ng-repeat="n in [42, 42, 43, 43] track by myTrackingFunction(n)">
+   *      {{n}}
+   *    </div>
+   * ```
+   *
+   * <div class="alert alert-success">
+   * If you are working with objects that have a unique identifier property, you should track
+   * by this identifier instead of the object instance. Should you reload your data later, `ngRepeat`
+   * will not have to rebuild the DOM elements for items it has already rendered, even if the
+   * JavaScript objects in the collection have been substituted for new ones. For large collections,
+   * this significantly improves rendering performance. If you don't have a unique identifier,
+   * `track by $index` can also provide a performance boost.
+   * </div>
+   *
+   * ```html
+   *    <div ng-repeat="model in collection track by model.id">
+   *      {{model.name}}
+   *    </div>
+   * ```
+   *
+   * <br />
+   * <div class="alert alert-warning">
+   * Avoid using `track by $index` when the repeated template contains
+   * {@link guide/expression#one-time-binding one-time bindings}. In such cases, the `nth` DOM
+   * element will always be matched with the `nth` item of the array, so the bindings on that element
+   * will not be updated even when the corresponding item changes, essentially causing the view to get
+   * out-of-sync with the underlying data.
+   * </div>
+   *
+   * When no `track by` expression is provided, it is equivalent to tracking by the built-in
+   * `$id` function, which tracks items by their identity:
+   * ```html
+   *    <div ng-repeat="obj in collection track by $id(obj)">
+   *      {{obj.prop}}
+   *    </div>
+   * ```
+   *
+   * <br />
+   * <div class="alert alert-warning">
+   * **Note:** `track by` must always be the last expression:
+   * </div>
+   * ```
+   *    <div ng-repeat="model in collection | orderBy: 'id' as filtered_result track by model.id">
+   *      {{model.name}}
+   *    </div>
+   * ```
+   *
    *
    * # Special repeat start and end points
    * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
@@ -18899,7 +31100,7 @@
    * up to and including the ending HTML tag where **ng-repeat-end** is placed.
    *
    * The example below makes use of this feature:
-   * <pre>
+   * ```html
    *   <header ng-repeat-start="item in items">
    *     Header {{ item }}
    *   </header>
@@ -18909,10 +31110,10 @@
    *   <footer ng-repeat-end>
    *     Footer {{ item }}
    *   </footer>
-   * </pre>
+   * ```
    *
    * And with an input of {@type ['A','B']} for the items variable in the example above, the output will evaluate to:
-   * <pre>
+   * ```html
    *   <header>
    *     Header A
    *   </header>
@@ -18931,15 +31132,19 @@
    *   <footer>
    *     Footer B
    *   </footer>
-   * </pre>
+   * ```
    *
    * The custom start and end points for ngRepeat also support all other HTML directive syntax flavors provided in AngularJS (such
    * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
    *
    * @animations
-   * enter - when a new item is added to the list or when an item is revealed after a filter
-   * leave - when an item is removed from the list or when an item is filtered out
-   * move - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
+   * | Animation                        | Occurs                              |
+   * |----------------------------------|-------------------------------------|
+   * | {@link ng.$animate#enter enter} | when a new item is added to the list or when an item is revealed after a filter |
+   * | {@link ng.$animate#leave leave} | when an item is removed from the list or when an item is filtered out |
+   * | {@link ng.$animate#move move } | when an adjacent item is filtered out causing a reorder or when the item contents are reordered |
+   *
+   * See the example below for defining CSS animations with ngRepeat.
    *
    * @element ANY
    * @scope
@@ -18957,14 +31162,17 @@
    *
    *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
    *
-   *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking function
-   *     which can be used to associate the objects in the collection with the DOM elements. If no tracking function
-   *     is specified the ng-repeat associates elements by identity in the collection. It is an error to have
-   *     more than one tracking function to resolve to the same key. (This would mean that two distinct objects are
-   *     mapped to the same DOM element, which is not possible.)  Filters should be applied to the expression,
-   *     before specifying a tracking expression.
+   *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
+   *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
+   *     is specified, ng-repeat associates elements by identity. It is an error to have
+   *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
+   *     mapped to the same DOM element, which is not possible.)
    *
-   *     For example: `item in items` is equivalent to `item in items track by $id(item)'. This implies that the DOM elements
+   *     <div class="alert alert-warning">
+   *       <strong>Note:</strong> the `track by` expression must come last - after any filters, and the alias expression.
+   *     </div>
+   *
+   *     For example: `item in items` is equivalent to `item in items track by $id(item)`. This implies that the DOM elements
    *     will be associated by item identity in the array.
    *
    *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
@@ -18979,32 +31187,52 @@
    *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
    *     to items in conjunction with a tracking expression.
    *
+   *   * `variable in expression as alias_expression` – You can also provide an optional alias expression which will then store the
+   *     intermediate results of the repeater after the filters have been applied. Typically this is used to render a special message
+   *     when a filter is active on the repeater, but the filtered result set is empty.
+   *
+   *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
+   *     the items have been processed through the filter.
+   *
+   *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat micro-syntax so it can be used only at the end
+   *     (and not as operator, inside an expression).
+   *
+   *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results` .
+   *
    * @example
-   * This example initializes the scope to a list of names and
-   * then uses `ngRepeat` to display every person:
-   <example animations="true">
+   * This example uses `ngRepeat` to display a list of people. A filter is used to restrict the displayed
+   * results by name or by age. New (entering) and removed (leaving) items are animated.
+   <example module="ngRepeat" name="ngRepeat" deps="angular-animate.js" animations="true" name="ng-repeat">
    <file name="index.html">
-   <div ng-init="friends = [
-   {name:'John', age:25, gender:'boy'},
-   {name:'Jessie', age:30, gender:'girl'},
-   {name:'Johanna', age:28, gender:'girl'},
-   {name:'Joy', age:15, gender:'girl'},
-   {name:'Mary', age:28, gender:'girl'},
-   {name:'Peter', age:95, gender:'boy'},
-   {name:'Sebastian', age:50, gender:'boy'},
-   {name:'Erika', age:27, gender:'girl'},
-   {name:'Patrick', age:40, gender:'boy'},
-   {name:'Samantha', age:60, gender:'girl'}
-   ]">
+   <div ng-controller="repeatController">
    I have {{friends.length}} friends. They are:
-   <input type="search" ng-model="q" placeholder="filter friends..." />
+   <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
    <ul class="example-animate-container">
-   <li class="animate-repeat" ng-repeat="friend in friends | filter:q">
+   <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results">
    [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
    </li>
+   <li class="animate-repeat" ng-if="results.length === 0">
+   <strong>No results found...</strong>
+   </li>
    </ul>
    </div>
    </file>
+   <file name="script.js">
+   angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
+        $scope.friends = [
+          {name:'John', age:25, gender:'boy'},
+          {name:'Jessie', age:30, gender:'girl'},
+          {name:'Johanna', age:28, gender:'girl'},
+          {name:'Joy', age:15, gender:'girl'},
+          {name:'Mary', age:28, gender:'girl'},
+          {name:'Peter', age:95, gender:'boy'},
+          {name:'Sebastian', age:50, gender:'boy'},
+          {name:'Erika', age:27, gender:'girl'},
+          {name:'Patrick', age:40, gender:'boy'},
+          {name:'Samantha', age:60, gender:'girl'}
+        ];
+      });
+   </file>
    <file name="animations.css">
    .example-animate-container {
         background:white;
@@ -19015,7 +31243,7 @@
       }
 
    .animate-repeat {
-        line-height:40px;
+        line-height:30px;
         list-style:none;
         box-sizing:border-box;
       }
@@ -19023,7 +31251,6 @@
    .animate-repeat.ng-move,
    .animate-repeat.ng-enter,
    .animate-repeat.ng-leave {
-        -webkit-transition:all linear 0.5s;
         transition:all linear 0.5s;
       }
 
@@ -19038,65 +31265,101 @@
    .animate-repeat.ng-move.ng-move-active,
    .animate-repeat.ng-enter.ng-enter-active {
         opacity:1;
-        max-height:40px;
+        max-height:30px;
       }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
+   var friends = element.all(by.repeater('friend in friends'));
+
    it('should render initial data set', function() {
-         var r = using('.doc-example-live').repeater('ul li');
-         expect(r.count()).toBe(10);
-         expect(r.row(0)).toEqual(["1","John","25"]);
-         expect(r.row(1)).toEqual(["2","Jessie","30"]);
-         expect(r.row(9)).toEqual(["10","Samantha","60"]);
-         expect(binding('friends.length')).toBe("10");
-       });
+        expect(friends.count()).toBe(10);
+        expect(friends.get(0).getText()).toEqual('[1] John who is 25 years old.');
+        expect(friends.get(1).getText()).toEqual('[2] Jessie who is 30 years old.');
+        expect(friends.last().getText()).toEqual('[10] Samantha who is 60 years old.');
+        expect(element(by.binding('friends.length')).getText())
+            .toMatch("I have 10 friends. They are:");
+      });
 
    it('should update repeater when filter predicate changes', function() {
-         var r = using('.doc-example-live').repeater('ul li');
-         expect(r.count()).toBe(10);
+         expect(friends.count()).toBe(10);
 
-         input('q').enter('ma');
+         element(by.model('q')).sendKeys('ma');
 
-         expect(r.count()).toBe(2);
-         expect(r.row(0)).toEqual(["1","Mary","28"]);
-         expect(r.row(1)).toEqual(["2","Samantha","60"]);
+         expect(friends.count()).toBe(2);
+         expect(friends.get(0).getText()).toEqual('[1] Mary who is 28 years old.');
+         expect(friends.last().getText()).toEqual('[2] Samantha who is 60 years old.');
        });
    </file>
    </example>
    */
-  var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
+  var ngRepeatDirective = ['$parse', '$animate', '$compile', function($parse, $animate, $compile) {
     var NG_REMOVED = '$$NG_REMOVED';
     var ngRepeatMinErr = minErr('ngRepeat');
+
+    var updateScope = function(scope, index, valueIdentifier, value, keyIdentifier, key, arrayLength) {
+      // TODO(perf): generate setters to shave off ~40ms or 1-1.5%
+      scope[valueIdentifier] = value;
+      if (keyIdentifier) scope[keyIdentifier] = key;
+      scope.$index = index;
+      scope.$first = (index === 0);
+      scope.$last = (index === (arrayLength - 1));
+      scope.$middle = !(scope.$first || scope.$last);
+      // eslint-disable-next-line no-bitwise
+      scope.$odd = !(scope.$even = (index & 1) === 0);
+    };
+
+    var getBlockStart = function(block) {
+      return block.clone[0];
+    };
+
+    var getBlockEnd = function(block) {
+      return block.clone[block.clone.length - 1];
+    };
+
+
     return {
+      restrict: 'A',
+      multiElement: true,
       transclude: 'element',
       priority: 1000,
       terminal: true,
       $$tlb: true,
-      link: function($scope, $element, $attr, ctrl, $transclude){
+      compile: function ngRepeatCompile($element, $attr) {
         var expression = $attr.ngRepeat;
-        var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),
-            trackByExp, trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn,
-            lhs, rhs, valueIdentifier, keyIdentifier,
-            hashFnLocals = {$id: hashKey};
+        var ngRepeatEndComment = $compile.$$createComment('end ngRepeat', expression);
+
+        var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
 
         if (!match) {
-          throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
-              expression);
+          throw ngRepeatMinErr('iexp', 'Expected expression in form of \'_item_ in _collection_[ track by _id_]\' but got \'{0}\'.',
+            expression);
         }
 
-        lhs = match[1];
-        rhs = match[2];
-        trackByExp = match[3];
+        var lhs = match[1];
+        var rhs = match[2];
+        var aliasAs = match[3];
+        var trackByExp = match[4];
+
+        match = lhs.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);
+
+        if (!match) {
+          throw ngRepeatMinErr('iidexp', '\'_item_\' in \'_item_ in _collection_\' should be an identifier or \'(_key_, _value_)\' expression, but got \'{0}\'.',
+            lhs);
+        }
+        var valueIdentifier = match[3] || match[1];
+        var keyIdentifier = match[2];
+
+        if (aliasAs && (!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(aliasAs) ||
+            /^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(aliasAs))) {
+          throw ngRepeatMinErr('badident', 'alias \'{0}\' is invalid --- must be a valid JS identifier which is not a reserved name.',
+            aliasAs);
+        }
+
+        var trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn;
+        var hashFnLocals = {$id: hashKey};
 
         if (trackByExp) {
           trackByExpGetter = $parse(trackByExp);
-          trackByIdExpFn = function(key, value, index) {
-            // assign key, value, and $index to the locals so that they can be used in hash functions
-            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
-            hashFnLocals[valueIdentifier] = value;
-            hashFnLocals.$index = index;
-            return trackByExpGetter($scope, hashFnLocals);
-          };
         } else {
           trackByIdArrayFn = function(key, value) {
             return hashKey(value);
@@ -19106,475 +31369,589 @@
           };
         }
 
-        match = lhs.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);
-        if (!match) {
-          throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
-              lhs);
-        }
-        valueIdentifier = match[3] || match[1];
-        keyIdentifier = match[2];
+        return function ngRepeatLink($scope, $element, $attr, ctrl, $transclude) {
 
-        // Store a list of elements from previous run. This is a hash where key is the item from the
-        // iterator, and the value is objects with following properties.
-        //   - scope: bound scope
-        //   - element: previous element.
-        //   - index: position
-        var lastBlockMap = {};
+          if (trackByExpGetter) {
+            trackByIdExpFn = function(key, value, index) {
+              // assign key, value, and $index to the locals so that they can be used in hash functions
+              if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
+              hashFnLocals[valueIdentifier] = value;
+              hashFnLocals.$index = index;
+              return trackByExpGetter($scope, hashFnLocals);
+            };
+          }
 
-        //watch props
-        $scope.$watchCollection(rhs, function ngRepeatAction(collection){
-          var index, length,
-              previousNode = $element[0],     // current position of the node
+          // Store a list of elements from previous run. This is a hash where key is the item from the
+          // iterator, and the value is objects with following properties.
+          //   - scope: bound scope
+          //   - clone: previous element.
+          //   - index: position
+          //
+          // We are using no-proto object so that we don't need to guard against inherited props via
+          // hasOwnProperty.
+          var lastBlockMap = createMap();
+
+          //watch props
+          $scope.$watchCollection(rhs, function ngRepeatAction(collection) {
+            var index, length,
+              previousNode = $element[0],     // node that cloned nodes should be inserted after
+                                              // initialized to the comment node anchor
               nextNode,
-          // Same as lastBlockMap but it has the current state. It will become the
-          // lastBlockMap on the next iteration.
-              nextBlockMap = {},
-              arrayLength,
-              childScope,
+              // Same as lastBlockMap but it has the current state. It will become the
+              // lastBlockMap on the next iteration.
+              nextBlockMap = createMap(),
+              collectionLength,
               key, value, // key/value of iteration
               trackById,
               trackByIdFn,
               collectionKeys,
               block,       // last object information {scope, element, id}
-              nextBlockOrder = [],
+              nextBlockOrder,
               elementsToRemove;
 
+            if (aliasAs) {
+              $scope[aliasAs] = collection;
+            }
 
-          if (isArrayLike(collection)) {
-            collectionKeys = collection;
-            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
-          } else {
-            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
-            // if object, extract keys, sort them and use to determine order of iteration over obj props
-            collectionKeys = [];
-            for (key in collection) {
-              if (collection.hasOwnProperty(key) && key.charAt(0) != '$') {
-                collectionKeys.push(key);
+            if (isArrayLike(collection)) {
+              collectionKeys = collection;
+              trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
+            } else {
+              trackByIdFn = trackByIdExpFn || trackByIdObjFn;
+              // if object, extract keys, in enumeration order, unsorted
+              collectionKeys = [];
+              for (var itemKey in collection) {
+                if (hasOwnProperty.call(collection, itemKey) && itemKey.charAt(0) !== '$') {
+                  collectionKeys.push(itemKey);
+                }
               }
             }
-            collectionKeys.sort();
-          }
 
-          arrayLength = collectionKeys.length;
+            collectionLength = collectionKeys.length;
+            nextBlockOrder = new Array(collectionLength);
 
-          // locate existing items
-          length = nextBlockOrder.length = collectionKeys.length;
-          for(index = 0; index < length; index++) {
-            key = (collection === collectionKeys) ? index : collectionKeys[index];
-            value = collection[key];
-            trackById = trackByIdFn(key, value, index);
-            assertNotHasOwnProperty(trackById, '`track by` id');
-            if(lastBlockMap.hasOwnProperty(trackById)) {
-              block = lastBlockMap[trackById];
-              delete lastBlockMap[trackById];
-              nextBlockMap[trackById] = block;
-              nextBlockOrder[index] = block;
-            } else if (nextBlockMap.hasOwnProperty(trackById)) {
-              // restore lastBlockMap
-              forEach(nextBlockOrder, function(block) {
-                if (block && block.scope) lastBlockMap[block.id] = block;
-              });
-              // This is a duplicate and we need to throw an error
-              throw ngRepeatMinErr('dupes', "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}",
-                  expression,       trackById);
-            } else {
-              // new never before seen block
-              nextBlockOrder[index] = { id: trackById };
-              nextBlockMap[trackById] = false;
+            // locate existing items
+            for (index = 0; index < collectionLength; index++) {
+              key = (collection === collectionKeys) ? index : collectionKeys[index];
+              value = collection[key];
+              trackById = trackByIdFn(key, value, index);
+              if (lastBlockMap[trackById]) {
+                // found previously seen block
+                block = lastBlockMap[trackById];
+                delete lastBlockMap[trackById];
+                nextBlockMap[trackById] = block;
+                nextBlockOrder[index] = block;
+              } else if (nextBlockMap[trackById]) {
+                // if collision detected. restore lastBlockMap and throw an error
+                forEach(nextBlockOrder, function(block) {
+                  if (block && block.scope) lastBlockMap[block.id] = block;
+                });
+                throw ngRepeatMinErr('dupes',
+                  'Duplicates in a repeater are not allowed. Use \'track by\' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}',
+                  expression, trackById, value);
+              } else {
+                // new never before seen block
+                nextBlockOrder[index] = {id: trackById, scope: undefined, clone: undefined};
+                nextBlockMap[trackById] = true;
+              }
             }
-          }
 
-          // remove existing items
-          for (key in lastBlockMap) {
-            // lastBlockMap is our own object so we don't need to use special hasOwnPropertyFn
-            if (lastBlockMap.hasOwnProperty(key)) {
-              block = lastBlockMap[key];
-              elementsToRemove = getBlockElements(block.clone);
+            // remove leftover items
+            for (var blockKey in lastBlockMap) {
+              block = lastBlockMap[blockKey];
+              elementsToRemove = getBlockNodes(block.clone);
               $animate.leave(elementsToRemove);
-              forEach(elementsToRemove, function(element) { element[NG_REMOVED] = true; });
+              if (elementsToRemove[0].parentNode) {
+                // if the element was not removed yet because of pending animation, mark it as deleted
+                // so that we can ignore it later
+                for (index = 0, length = elementsToRemove.length; index < length; index++) {
+                  elementsToRemove[index][NG_REMOVED] = true;
+                }
+              }
               block.scope.$destroy();
             }
-          }
 
-          // we are not using forEach for perf reasons (trying to avoid #call)
-          for (index = 0, length = collectionKeys.length; index < length; index++) {
-            key = (collection === collectionKeys) ? index : collectionKeys[index];
-            value = collection[key];
-            block = nextBlockOrder[index];
-            if (nextBlockOrder[index - 1]) previousNode = getBlockEnd(nextBlockOrder[index - 1]);
+            // we are not using forEach for perf reasons (trying to avoid #call)
+            for (index = 0; index < collectionLength; index++) {
+              key = (collection === collectionKeys) ? index : collectionKeys[index];
+              value = collection[key];
+              block = nextBlockOrder[index];
 
-            if (block.scope) {
-              // if we have already seen this object, then we need to reuse the
-              // associated scope/element
-              childScope = block.scope;
+              if (block.scope) {
+                // if we have already seen this object, then we need to reuse the
+                // associated scope/element
 
-              nextNode = previousNode;
-              do {
-                nextNode = nextNode.nextSibling;
-              } while(nextNode && nextNode[NG_REMOVED]);
+                nextNode = previousNode;
 
-              if (getBlockStart(block) != nextNode) {
-                // existing item which got moved
-                $animate.move(getBlockElements(block.clone), null, jqLite(previousNode));
+                // skip nodes that are already pending removal via leave animation
+                do {
+                  nextNode = nextNode.nextSibling;
+                } while (nextNode && nextNode[NG_REMOVED]);
+
+                if (getBlockStart(block) !== nextNode) {
+                  // existing item which got moved
+                  $animate.move(getBlockNodes(block.clone), null, previousNode);
+                }
+                previousNode = getBlockEnd(block);
+                updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+              } else {
+                // new item which we don't know about
+                $transclude(function ngRepeatTransclude(clone, scope) {
+                  block.scope = scope;
+                  // http://jsperf.com/clone-vs-createcomment
+                  var endNode = ngRepeatEndComment.cloneNode(false);
+                  clone[clone.length++] = endNode;
+
+                  $animate.enter(clone, null, previousNode);
+                  previousNode = endNode;
+                  // Note: We only need the first/last node of the cloned nodes.
+                  // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                  // by a directive with templateUrl when its template arrives.
+                  block.clone = clone;
+                  nextBlockMap[block.id] = block;
+                  updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+                });
               }
-              previousNode = getBlockEnd(block);
-            } else {
-              // new item which we don't know about
-              childScope = $scope.$new();
             }
-
-            childScope[valueIdentifier] = value;
-            if (keyIdentifier) childScope[keyIdentifier] = key;
-            childScope.$index = index;
-            childScope.$first = (index === 0);
-            childScope.$last = (index === (arrayLength - 1));
-            childScope.$middle = !(childScope.$first || childScope.$last);
-            // jshint bitwise: false
-            childScope.$odd = !(childScope.$even = (index&1) === 0);
-            // jshint bitwise: true
-
-            if (!block.scope) {
-              $transclude(childScope, function(clone) {
-                clone[clone.length++] = document.createComment(' end ngRepeat: ' + expression + ' ');
-                $animate.enter(clone, null, jqLite(previousNode));
-                previousNode = clone;
-                block.scope = childScope;
-                // Note: We only need the first/last node of the cloned nodes.
-                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-                // by a directive with templateUrl when it's template arrives.
-                block.clone = clone;
-                nextBlockMap[block.id] = block;
-              });
-            }
-          }
-          lastBlockMap = nextBlockMap;
-        });
+            lastBlockMap = nextBlockMap;
+          });
+        };
       }
     };
-
-    function getBlockStart(block) {
-      return block.clone[0];
-    }
-
-    function getBlockEnd(block) {
-      return block.clone[block.clone.length - 1];
-    }
   }];
 
+  var NG_HIDE_CLASS = 'ng-hide';
+  var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
   /**
    * @ngdoc directive
-   * @name ng.directive:ngShow
+   * @name ngShow
+   * @multiElement
    *
    * @description
-   * The `ngShow` directive shows or hides the given HTML element based on the expression
-   * provided to the ngShow attribute. The element is shown or hidden by removing or adding
-   * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
-   * in AngularJS and sets the display style to none (using an !important flag).
-   * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+   * The `ngShow` directive shows or hides the given HTML element based on the expression provided to
+   * the `ngShow` attribute.
    *
-   * <pre>
+   * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
+   * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
+   * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
+   * {@link ng.directive:ngCsp ngCsp}).
+   *
+   * ```html
    * <!-- when $scope.myValue is truthy (element is visible) -->
    * <div ng-show="myValue"></div>
    *
    * <!-- when $scope.myValue is falsy (element is hidden) -->
    * <div ng-show="myValue" class="ng-hide"></div>
-   * </pre>
+   * ```
    *
-   * When the ngShow expression evaluates to false then the ng-hide CSS class is added to the class attribute
-   * on the element causing it to become hidden. When true, the ng-hide CSS class is removed
-   * from the element causing the element not to appear hidden.
+   * When the `ngShow` expression evaluates to a falsy value then the `.ng-hide` CSS class is added
+   * to the class attribute on the element causing it to become hidden. When truthy, the `.ng-hide`
+   * CSS class is removed from the element causing the element not to appear hidden.
    *
-   * ## Why is !important used?
+   * ## Why is `!important` used?
    *
-   * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
-   * can be easily overridden by heavier selectors. For example, something as simple
-   * as changing the display style on a HTML list item would make hidden elements appear visible.
-   * This also becomes a bigger issue when dealing with CSS frameworks.
+   * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
+   * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
+   * simple as changing the display style on a HTML list item would make hidden elements appear
+   * visible. This also becomes a bigger issue when dealing with CSS frameworks.
    *
-   * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
-   * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
-   * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+   * By using `!important`, the show and hide behavior will work as expected despite any clash between
+   * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
+   * developer chooses to override the styling to change how to hide an element then it is just a
+   * matter of using `!important` in their own CSS code.
    *
-   * ### Overriding .ng-hide
+   * ### Overriding `.ng-hide`
    *
-   * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
-   * restating the styles for the .ng-hide class in CSS:
-   * <pre>
-   * .ng-hide {
- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
- *   display:block!important;
- *
- *   //this is just another form of hiding an element
- *   position:absolute;
- *   top:-9999px;
- *   left:-9999px;
+   * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
+   * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
+   * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
+   * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
+   *
+   * ```css
+   * .ng-hide:not(.ng-hide-animate) {
+ *   /&#42; These are just alternative ways of hiding an element &#42;/
+ *   display: block!important;
+ *   position: absolute;
+ *   top: -9999px;
+ *   left: -9999px;
  * }
-   * </pre>
+   * ```
    *
-   * Just remember to include the important flag so the CSS override will function.
+   * By default you don't need to override anything in CSS and the animations will work around the
+   * display style.
    *
-   * ## A note about animations with ngShow
+   * ## A note about animations with `ngShow`
    *
-   * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
-   * is true and false. This system works like the animation system present with ngClass except that
-   * you must also include the !important flag to override the display property
-   * so that you can perform an animation when the element is hidden during the time of the animation.
+   * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
+   * directive expression is true and false. This system works like the animation system present with
+   * `ngClass` except that you must also include the `!important` flag to override the display
+   * property so that the elements are not actually hidden during the animation.
    *
-   * <pre>
-   * //
-   * //a working example can be found at the bottom of this page
-   * //
+   * ```css
+   * /&#42; A working example can be found at the bottom of this page. &#42;/
    * .my-element.ng-hide-add, .my-element.ng-hide-remove {
- *   transition:0.5s linear all;
- *   display:block!important;
+ *   transition: all 0.5s linear;
  * }
    *
    * .my-element.ng-hide-add { ... }
    * .my-element.ng-hide-add.ng-hide-add-active { ... }
    * .my-element.ng-hide-remove { ... }
    * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
-   * </pre>
+   * ```
+   *
+   * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
+   * to block during animation states - ngAnimate will automatically handle the style toggling for you.
    *
    * @animations
-   * addClass: .ng-hide - happens after the ngShow expression evaluates to a truthy value and the just before contents are set to visible
-   * removeClass: .ng-hide - happens after the ngShow expression evaluates to a non truthy value and just before the contents are set to hidden
+   * | Animation                                           | Occurs                                                                                                        |
+   * |-----------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
+   * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden. |
+   * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngShow` expression evaluates to a truthy value and just before contents are set to visible.        |
    *
    * @element ANY
-   * @param {expression} ngShow If the {@link guide/expression expression} is truthy
-   *     then the element is shown or hidden respectively.
+   * @param {expression} ngShow If the {@link guide/expression expression} is truthy/falsy then the
+   *                            element is shown/hidden respectively.
    *
    * @example
-   <example animations="true">
+   * A simple example, animating the element's opacity:
+   *
+   <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-simple">
    <file name="index.html">
-   Click me: <input type="checkbox" ng-model="checked"><br/>
-   <div>
-   Show:
-   <div class="check-element animate-show" ng-show="checked">
-   <span class="icon-thumbs-up"></span> I show up when your checkbox is checked.
-   </div>
-   </div>
-   <div>
-   Hide:
-   <div class="check-element animate-show" ng-hide="checked">
-   <span class="icon-thumbs-down"></span> I hide when your checkbox is checked.
-   </div>
+   Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
+   <div class="check-element animate-show-hide" ng-show="checked">
+   I show up when your checkbox is checked.
    </div>
    </file>
    <file name="animations.css">
-   .animate-show {
-        -webkit-transition:all linear 0.5s;
-        transition:all linear 0.5s;
-        line-height:20px;
-        opacity:1;
-        padding:10px;
-        border:1px solid black;
-        background:white;
+   .animate-show-hide.ng-hide {
+        opacity: 0;
       }
 
-   .animate-show.ng-hide-add,
-   .animate-show.ng-hide-remove {
-        display:block!important;
-      }
-
-   .animate-show.ng-hide {
-        line-height:0;
-        opacity:0;
-        padding:0 10px;
+   .animate-show-hide.ng-hide-add,
+   .animate-show-hide.ng-hide-remove {
+        transition: all linear 0.5s;
       }
 
    .check-element {
-        padding:10px;
-        border:1px solid black;
-        background:white;
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
       }
    </file>
-   <file name="scenario.js">
-   it('should check ng-show / ng-hide', function() {
-         expect(element('.doc-example-live span:first:hidden').count()).toEqual(1);
-         expect(element('.doc-example-live span:last:visible').count()).toEqual(1);
+   <file name="protractor.js" type="protractor">
+   it('should check ngShow', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
 
-         input('checked').check();
+        expect(checkElem.isDisplayed()).toBe(false);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(true);
+      });
+   </file>
+   </example>
+   *
+   * <hr />
+   * @example
+   * A more complex example, featuring different show/hide animations:
+   *
+   <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-complex">
+   <file name="index.html">
+   Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
+   <div class="check-element funky-show-hide" ng-show="checked">
+   I show up when your checkbox is checked.
+   </div>
+   </file>
+   <file name="animations.css">
+   body {
+        overflow: hidden;
+        perspective: 1000px;
+      }
 
-         expect(element('.doc-example-live span:first:visible').count()).toEqual(1);
-         expect(element('.doc-example-live span:last:hidden').count()).toEqual(1);
-       });
+   .funky-show-hide.ng-hide-add {
+        transform: rotateZ(0);
+        transform-origin: right;
+        transition: all 0.5s ease-in-out;
+      }
+
+   .funky-show-hide.ng-hide-add.ng-hide-add-active {
+        transform: rotateZ(-135deg);
+      }
+
+   .funky-show-hide.ng-hide-remove {
+        transform: rotateY(90deg);
+        transform-origin: left;
+        transition: all 0.5s ease;
+      }
+
+   .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
+        transform: rotateY(0);
+      }
+
+   .check-element {
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
+      }
+   </file>
+   <file name="protractor.js" type="protractor">
+   it('should check ngShow', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
+
+        expect(checkElem.isDisplayed()).toBe(false);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(true);
+      });
    </file>
    </example>
    */
   var ngShowDirective = ['$animate', function($animate) {
-    return function(scope, element, attr) {
-      scope.$watch(attr.ngShow, function ngShowWatchAction(value){
-        $animate[toBoolean(value) ? 'removeClass' : 'addClass'](element, 'ng-hide');
-      });
+    return {
+      restrict: 'A',
+      multiElement: true,
+      link: function(scope, element, attr) {
+        scope.$watch(attr.ngShow, function ngShowWatchAction(value) {
+          // we're adding a temporary, animation-specific class for ng-hide since this way
+          // we can control when the element is actually displayed on screen without having
+          // to have a global/greedy CSS selector that breaks when other animations are run.
+          // Read: https://github.com/angular/angular.js/issues/9103#issuecomment-58335845
+          $animate[value ? 'removeClass' : 'addClass'](element, NG_HIDE_CLASS, {
+            tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+          });
+        });
+      }
     };
   }];
 
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngHide
+   * @name ngHide
+   * @multiElement
    *
    * @description
-   * The `ngHide` directive shows or hides the given HTML element based on the expression
-   * provided to the ngHide attribute. The element is shown or hidden by removing or adding
-   * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
-   * in AngularJS and sets the display style to none (using an !important flag).
-   * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+   * The `ngHide` directive shows or hides the given HTML element based on the expression provided to
+   * the `ngHide` attribute.
    *
-   * <pre>
+   * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
+   * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
+   * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
+   * {@link ng.directive:ngCsp ngCsp}).
+   *
+   * ```html
    * <!-- when $scope.myValue is truthy (element is hidden) -->
-   * <div ng-hide="myValue"></div>
+   * <div ng-hide="myValue" class="ng-hide"></div>
    *
    * <!-- when $scope.myValue is falsy (element is visible) -->
-   * <div ng-hide="myValue" class="ng-hide"></div>
-   * </pre>
+   * <div ng-hide="myValue"></div>
+   * ```
    *
-   * When the ngHide expression evaluates to true then the .ng-hide CSS class is added to the class attribute
-   * on the element causing it to become hidden. When false, the ng-hide CSS class is removed
-   * from the element causing the element not to appear hidden.
+   * When the `ngHide` expression evaluates to a truthy value then the `.ng-hide` CSS class is added
+   * to the class attribute on the element causing it to become hidden. When falsy, the `.ng-hide`
+   * CSS class is removed from the element causing the element not to appear hidden.
    *
-   * ## Why is !important used?
+   * ## Why is `!important` used?
    *
-   * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
-   * can be easily overridden by heavier selectors. For example, something as simple
-   * as changing the display style on a HTML list item would make hidden elements appear visible.
-   * This also becomes a bigger issue when dealing with CSS frameworks.
+   * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
+   * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
+   * simple as changing the display style on a HTML list item would make hidden elements appear
+   * visible. This also becomes a bigger issue when dealing with CSS frameworks.
    *
-   * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
-   * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
-   * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+   * By using `!important`, the show and hide behavior will work as expected despite any clash between
+   * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
+   * developer chooses to override the styling to change how to hide an element then it is just a
+   * matter of using `!important` in their own CSS code.
    *
-   * ### Overriding .ng-hide
+   * ### Overriding `.ng-hide`
    *
-   * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
-   * restating the styles for the .ng-hide class in CSS:
-   * <pre>
-   * .ng-hide {
- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
- *   display:block!important;
- *
- *   //this is just another form of hiding an element
- *   position:absolute;
- *   top:-9999px;
- *   left:-9999px;
+   * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
+   * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
+   * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
+   * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
+   *
+   * ```css
+   * .ng-hide:not(.ng-hide-animate) {
+ *   /&#42; These are just alternative ways of hiding an element &#42;/
+ *   display: block!important;
+ *   position: absolute;
+ *   top: -9999px;
+ *   left: -9999px;
  * }
-   * </pre>
+   * ```
    *
-   * Just remember to include the important flag so the CSS override will function.
+   * By default you don't need to override in CSS anything and the animations will work around the
+   * display style.
    *
-   * ## A note about animations with ngHide
+   * ## A note about animations with `ngHide`
    *
-   * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
-   * is true and false. This system works like the animation system present with ngClass, except that
-   * you must also include the !important flag to override the display property so
-   * that you can perform an animation when the element is hidden during the time of the animation.
+   * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
+   * directive expression is true and false. This system works like the animation system present with
+   * `ngClass` except that you must also include the `!important` flag to override the display
+   * property so that the elements are not actually hidden during the animation.
    *
-   * <pre>
-   * //
-   * //a working example can be found at the bottom of this page
-   * //
+   * ```css
+   * /&#42; A working example can be found at the bottom of this page. &#42;/
    * .my-element.ng-hide-add, .my-element.ng-hide-remove {
- *   transition:0.5s linear all;
- *   display:block!important;
+ *   transition: all 0.5s linear;
  * }
    *
    * .my-element.ng-hide-add { ... }
    * .my-element.ng-hide-add.ng-hide-add-active { ... }
    * .my-element.ng-hide-remove { ... }
    * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
-   * </pre>
+   * ```
+   *
+   * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
+   * to block during animation states - ngAnimate will automatically handle the style toggling for you.
    *
    * @animations
-   * removeClass: .ng-hide - happens after the ngHide expression evaluates to a truthy value and just before the contents are set to hidden
-   * addClass: .ng-hide - happens after the ngHide expression evaluates to a non truthy value and just before the contents are set to visible
+   * | Animation                                           | Occurs                                                                                                     |
+   * |-----------------------------------------------------|------------------------------------------------------------------------------------------------------------|
+   * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden.  |
+   * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngHide` expression evaluates to a non truthy value and just before contents are set to visible. |
+   *
    *
    * @element ANY
-   * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
-   *     the element is shown or hidden respectively.
+   * @param {expression} ngHide If the {@link guide/expression expression} is truthy/falsy then the
+   *                            element is hidden/shown respectively.
    *
    * @example
-   <example animations="true">
+   * A simple example, animating the element's opacity:
+   *
+   <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-simple">
    <file name="index.html">
-   Click me: <input type="checkbox" ng-model="checked"><br/>
-   <div>
-   Show:
-   <div class="check-element animate-hide" ng-show="checked">
-   <span class="icon-thumbs-up"></span> I show up when your checkbox is checked.
-   </div>
-   </div>
-   <div>
-   Hide:
-   <div class="check-element animate-hide" ng-hide="checked">
-   <span class="icon-thumbs-down"></span> I hide when your checkbox is checked.
-   </div>
+   Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
+   <div class="check-element animate-show-hide" ng-hide="checked">
+   I hide when your checkbox is checked.
    </div>
    </file>
    <file name="animations.css">
-   .animate-hide {
-        -webkit-transition:all linear 0.5s;
-        transition:all linear 0.5s;
-        line-height:20px;
-        opacity:1;
-        padding:10px;
-        border:1px solid black;
-        background:white;
+   .animate-show-hide.ng-hide {
+        opacity: 0;
       }
 
-   .animate-hide.ng-hide-add,
-   .animate-hide.ng-hide-remove {
-        display:block!important;
-      }
-
-   .animate-hide.ng-hide {
-        line-height:0;
-        opacity:0;
-        padding:0 10px;
+   .animate-show-hide.ng-hide-add,
+   .animate-show-hide.ng-hide-remove {
+        transition: all linear 0.5s;
       }
 
    .check-element {
-        padding:10px;
-        border:1px solid black;
-        background:white;
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
       }
    </file>
-   <file name="scenario.js">
-   it('should check ng-show / ng-hide', function() {
-         expect(element('.doc-example-live .check-element:first:hidden').count()).toEqual(1);
-         expect(element('.doc-example-live .check-element:last:visible').count()).toEqual(1);
+   <file name="protractor.js" type="protractor">
+   it('should check ngHide', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
 
-         input('checked').check();
+        expect(checkElem.isDisplayed()).toBe(true);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(false);
+      });
+   </file>
+   </example>
+   *
+   * <hr />
+   * @example
+   * A more complex example, featuring different show/hide animations:
+   *
+   <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-complex">
+   <file name="index.html">
+   Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
+   <div class="check-element funky-show-hide" ng-hide="checked">
+   I hide when your checkbox is checked.
+   </div>
+   </file>
+   <file name="animations.css">
+   body {
+        overflow: hidden;
+        perspective: 1000px;
+      }
 
-         expect(element('.doc-example-live .check-element:first:visible').count()).toEqual(1);
-         expect(element('.doc-example-live .check-element:last:hidden').count()).toEqual(1);
-       });
+   .funky-show-hide.ng-hide-add {
+        transform: rotateZ(0);
+        transform-origin: right;
+        transition: all 0.5s ease-in-out;
+      }
+
+   .funky-show-hide.ng-hide-add.ng-hide-add-active {
+        transform: rotateZ(-135deg);
+      }
+
+   .funky-show-hide.ng-hide-remove {
+        transform: rotateY(90deg);
+        transform-origin: left;
+        transition: all 0.5s ease;
+      }
+
+   .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
+        transform: rotateY(0);
+      }
+
+   .check-element {
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
+      }
+   </file>
+   <file name="protractor.js" type="protractor">
+   it('should check ngHide', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
+
+        expect(checkElem.isDisplayed()).toBe(true);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(false);
+      });
    </file>
    </example>
    */
   var ngHideDirective = ['$animate', function($animate) {
-    return function(scope, element, attr) {
-      scope.$watch(attr.ngHide, function ngHideWatchAction(value){
-        $animate[toBoolean(value) ? 'addClass' : 'removeClass'](element, 'ng-hide');
-      });
+    return {
+      restrict: 'A',
+      multiElement: true,
+      link: function(scope, element, attr) {
+        scope.$watch(attr.ngHide, function ngHideWatchAction(value) {
+          // The comment inside of the ngShowDirective explains why we add and
+          // remove a temporary class for the show/hide animation
+          $animate[value ? 'addClass' : 'removeClass'](element,NG_HIDE_CLASS, {
+            tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+          });
+        });
+      }
     };
   }];
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngStyle
+   * @name ngStyle
    * @restrict AC
    *
    * @description
    * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
    *
+   * @knownIssue
+   * You should not use {@link guide/interpolation interpolation} in the value of the `style`
+   * attribute, when using the `ngStyle` directive on the same element.
+   * See {@link guide/interpolation#known-issues here} for more info.
+   *
    * @element ANY
-   * @param {expression} ngStyle {@link guide/expression Expression} which evals to an
-   *      object whose keys are CSS style names and values are corresponding values for those CSS
-   *      keys.
+   * @param {expression} ngStyle
+   *
+   * {@link guide/expression Expression} which evals to an
+   * object whose keys are CSS style names and values are corresponding values for those CSS
+   * keys.
+   *
+   * Since some CSS style names are not valid keys for an object, they must be quoted.
+   * See the 'background-color' style in the example below.
    *
    * @example
-   <example>
+   <example name="ng-style">
    <file name="index.html">
-   <input type="button" value="set" ng-click="myStyle={color:'red'}">
+   <input type="button" value="set color" ng-click="myStyle={color:'red'}">
+   <input type="button" value="set background" ng-click="myStyle={'background-color':'blue'}">
    <input type="button" value="clear" ng-click="myStyle={}">
    <br/>
    <span ng-style="myStyle">Sample Text</span>
@@ -19585,13 +31962,15 @@
          color: black;
        }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
+   var colorSpan = element(by.css('span'));
+
    it('should check ng-style', function() {
-         expect(element('.doc-example-live span').css('color')).toBe('rgb(0, 0, 0)');
-         element('.doc-example-live :button[value=set]').click();
-         expect(element('.doc-example-live span').css('color')).toBe('rgb(255, 0, 0)');
-         element('.doc-example-live :button[value=clear]').click();
-         expect(element('.doc-example-live span').css('color')).toBe('rgb(0, 0, 0)');
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+         element(by.css('input[value=\'set color\']')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
+         element(by.css('input[value=clear]')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
        });
    </file>
    </example>
@@ -19607,7 +31986,7 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngSwitch
+   * @name ngSwitch
    * @restrict EA
    *
    * @description
@@ -19616,7 +31995,7 @@
    * as specified in the template.
    *
    * The directive itself works similar to ngInclude, however, instead of downloading template code (or loading it
-   * from the template cache), `ngSwitch` simply choses one of the nested elements and makes it visible based on which element
+   * from the template cache), `ngSwitch` simply chooses one of the nested elements and makes it visible based on which element
    * matches the value obtained from the evaluated expression. In other words, you define a container element
    * (where you place the directive), place an expression on the **`on="..."` attribute**
    * (or the **`ng-switch="..."` attribute**), define any inner elements inside of the directive and place
@@ -19632,52 +32011,61 @@
    * </div>
 
    * @animations
-   * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
-   * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
+   * | Animation                        | Occurs                              |
+   * |----------------------------------|-------------------------------------|
+   * | {@link ng.$animate#enter enter}  | after the ngSwitch contents change and the matched child element is placed inside the container |
+   * | {@link ng.$animate#leave leave}  | after the ngSwitch contents change and just before the former contents are removed from the DOM |
    *
    * @usage
+   *
+   * ```
    * <ANY ng-switch="expression">
    *   <ANY ng-switch-when="matchValue1">...</ANY>
    *   <ANY ng-switch-when="matchValue2">...</ANY>
    *   <ANY ng-switch-default>...</ANY>
    * </ANY>
+   * ```
    *
    *
    * @scope
-   * @priority 800
-   * @param {*} ngSwitch|on expression to match against <tt>ng-switch-when</tt>.
-   * @paramDescription
+   * @priority 1200
+   * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
    * On child elements add:
    *
    * * `ngSwitchWhen`: the case statement to match against. If match then this
    *   case will be displayed. If the same match appears multiple times, all the
-   *   elements will be displayed.
+   *   elements will be displayed. It is possible to associate multiple values to
+   *   the same `ngSwitchWhen` by defining the optional attribute
+   *   `ngSwitchWhenSeparator`. The separator will be used to split the value of
+   *   the `ngSwitchWhen` attribute into multiple tokens, and the element will show
+   *   if any of the `ngSwitch` evaluates to any of these tokens.
    * * `ngSwitchDefault`: the default case when no other case match. If there
    *   are multiple default cases, all of them will be displayed when no other
    *   case match.
    *
    *
    * @example
-   <example animations="true">
+   <example module="switchExample" deps="angular-animate.js" animations="true" name="ng-switch">
    <file name="index.html">
-   <div ng-controller="Ctrl">
+   <div ng-controller="ExampleController">
    <select ng-model="selection" ng-options="item for item in items">
    </select>
-   <tt>selection={{selection}}</tt>
+   <code>selection={{selection}}</code>
    <hr/>
    <div class="animate-switch-container"
    ng-switch on="selection">
-   <div class="animate-switch" ng-switch-when="settings">Settings Div</div>
+   <div class="animate-switch" ng-switch-when="settings|options" ng-switch-when-separator="|">Settings Div</div>
    <div class="animate-switch" ng-switch-when="home">Home Span</div>
    <div class="animate-switch" ng-switch-default>default</div>
    </div>
    </div>
    </file>
    <file name="script.js">
-   function Ctrl($scope) {
-        $scope.items = ['settings', 'home', 'other'];
-        $scope.selection = $scope.items[0];
-      }
+   angular.module('switchExample', ['ngAnimate'])
+   .controller('ExampleController', ['$scope', function($scope) {
+          $scope.items = ['settings', 'home', 'options', 'other'];
+          $scope.selection = $scope.items[0];
+        }]);
    </file>
    <file name="animations.css">
    .animate-switch-container {
@@ -19693,7 +32081,6 @@
       }
 
    .animate-switch.ng-animate {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
 
         position:absolute;
@@ -19712,54 +32099,76 @@
         top:0;
       }
    </file>
-   <file name="scenario.js">
+   <file name="protractor.js" type="protractor">
+   var switchElem = element(by.css('[ng-switch]'));
+   var select = element(by.model('selection'));
+
    it('should start in settings', function() {
-        expect(element('.doc-example-live [ng-switch]').text()).toMatch(/Settings Div/);
+        expect(switchElem.getText()).toMatch(/Settings Div/);
       });
    it('should change to home', function() {
-        select('selection').option('home');
-        expect(element('.doc-example-live [ng-switch]').text()).toMatch(/Home Span/);
+        select.all(by.css('option')).get(1).click();
+        expect(switchElem.getText()).toMatch(/Home Span/);
+      });
+   it('should change to settings via "options"', function() {
+        select.all(by.css('option')).get(2).click();
+        expect(switchElem.getText()).toMatch(/Settings Div/);
       });
    it('should select default', function() {
-        select('selection').option('other');
-        expect(element('.doc-example-live [ng-switch]').text()).toMatch(/default/);
+        select.all(by.css('option')).get(3).click();
+        expect(switchElem.getText()).toMatch(/default/);
       });
    </file>
    </example>
    */
-  var ngSwitchDirective = ['$animate', function($animate) {
+  var ngSwitchDirective = ['$animate', '$compile', function($animate, $compile) {
     return {
-      restrict: 'EA',
       require: 'ngSwitch',
 
       // asks for $scope to fool the BC controller module
-      controller: ['$scope', function ngSwitchController() {
+      controller: ['$scope', function NgSwitchController() {
         this.cases = {};
       }],
       link: function(scope, element, attr, ngSwitchController) {
         var watchExpr = attr.ngSwitch || attr.on,
-            selectedTranscludes,
-            selectedElements,
-            selectedScopes = [];
-
-        scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
-          for (var i= 0, ii=selectedScopes.length; i<ii; i++) {
-            selectedScopes[i].$destroy();
-            $animate.leave(selectedElements[i]);
-          }
-
-          selectedElements = [];
+          selectedTranscludes = [],
+          selectedElements = [],
+          previousLeaveAnimations = [],
           selectedScopes = [];
 
-          if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
-            scope.$eval(attr.change);
-            forEach(selectedTranscludes, function(selectedTransclude) {
-              var selectedScope = scope.$new();
-              selectedScopes.push(selectedScope);
-              selectedTransclude.transclude(selectedScope, function(caseElement) {
-                var anchor = selectedTransclude.element;
+        var spliceFactory = function(array, index) {
+          return function(response) {
+            if (response !== false) array.splice(index, 1);
+          };
+        };
 
-                selectedElements.push(caseElement);
+        scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
+          var i, ii;
+
+          // Start with the last, in case the array is modified during the loop
+          while (previousLeaveAnimations.length) {
+            $animate.cancel(previousLeaveAnimations.pop());
+          }
+
+          for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
+            var selected = getBlockNodes(selectedElements[i].clone);
+            selectedScopes[i].$destroy();
+            var runner = previousLeaveAnimations[i] = $animate.leave(selected);
+            runner.done(spliceFactory(previousLeaveAnimations, i));
+          }
+
+          selectedElements.length = 0;
+          selectedScopes.length = 0;
+
+          if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
+            forEach(selectedTranscludes, function(selectedTransclude) {
+              selectedTransclude.transclude(function(caseElement, selectedScope) {
+                selectedScopes.push(selectedScope);
+                var anchor = selectedTransclude.element;
+                caseElement[caseElement.length++] = $compile.$$createComment('end ngSwitchWhen');
+                var block = { clone: caseElement };
+
+                selectedElements.push(block);
                 $animate.enter(caseElement, anchor.parent(), anchor);
               });
             });
@@ -19771,18 +32180,28 @@
 
   var ngSwitchWhenDirective = ngDirective({
     transclude: 'element',
-    priority: 800,
+    priority: 1200,
     require: '^ngSwitch',
+    multiElement: true,
     link: function(scope, element, attrs, ctrl, $transclude) {
-      ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
-      ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
+
+      var cases = attrs.ngSwitchWhen.split(attrs.ngSwitchWhenSeparator).sort().filter(
+        // Filter duplicate cases
+        function(element, index, array) { return array[index - 1] !== element; }
+      );
+
+      forEach(cases, function(whenCase) {
+        ctrl.cases['!' + whenCase] = (ctrl.cases['!' + whenCase] || []);
+        ctrl.cases['!' + whenCase].push({ transclude: $transclude, element: element });
+      });
     }
   });
 
   var ngSwitchDefaultDirective = ngDirective({
     transclude: 'element',
-    priority: 800,
+    priority: 1200,
     require: '^ngSwitch',
+    multiElement: true,
     link: function(scope, element, attr, ctrl, $transclude) {
       ctrl.cases['?'] = (ctrl.cases['?'] || []);
       ctrl.cases['?'].push({ transclude: $transclude, element: element });
@@ -19791,121 +32210,271 @@
 
   /**
    * @ngdoc directive
-   * @name ng.directive:ngTransclude
-   * @restrict AC
+   * @name ngTransclude
+   * @restrict EAC
    *
    * @description
    * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
    *
-   * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
+   * You can specify that you want to insert a named transclusion slot, instead of the default slot, by providing the slot name
+   * as the value of the `ng-transclude` or `ng-transclude-slot` attribute.
+   *
+   * If the transcluded content is not empty (i.e. contains one or more DOM nodes, including whitespace text nodes), any existing
+   * content of this element will be removed before the transcluded content is inserted.
+   * If the transcluded content is empty (or only whitespace), the existing content is left intact. This lets you provide fallback
+   * content in the case that no transcluded content is provided.
    *
    * @element ANY
    *
-   * @example
-   <doc:example module="transclude">
-   <doc:source>
-   <script>
-   function Ctrl($scope) {
-           $scope.title = 'Lorem Ipsum';
-           $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
-         }
-
-   angular.module('transclude', [])
-   .directive('pane', function(){
-             return {
-               restrict: 'E',
-               transclude: true,
-               scope: { title:'@' },
-   template: '<div style="border: 1px solid black;">' +
-   '<div style="background-color: gray">{{title}}</div>' +
-   '<div ng-transclude></div>' +
-   '</div>'
-   };
-   });
-   </script>
-   <div ng-controller="Ctrl">
-   <input ng-model="title"><br>
-   <textarea ng-model="text"></textarea> <br/>
-   <pane title="{{title}}">{{text}}</pane>
-   </div>
-   </doc:source>
-   <doc:scenario>
-   it('should have transcluded', function() {
-          input('title').enter('TITLE');
-          input('text').enter('TEXT');
-          expect(binding('title')).toEqual('TITLE');
-          expect(binding('text')).toEqual('TEXT');
-        });
-   </doc:scenario>
-   </doc:example>
+   * @param {string} ngTransclude|ngTranscludeSlot the name of the slot to insert at this point. If this is not provided, is empty
+   *                                               or its value is the same as the name of the attribute then the default slot is used.
    *
+   * @example
+   * ### Basic transclusion
+   * This example demonstrates basic transclusion of content into a component directive.
+   * <example name="simpleTranscludeExample" module="transcludeExample">
+   *   <file name="index.html">
+   *     <script>
+   *       angular.module('transcludeExample', [])
+   *        .directive('pane', function(){
+ *           return {
+ *             restrict: 'E',
+ *             transclude: true,
+ *             scope: { title:'@' },
+ *             template: '<div style="border: 1px solid black;">' +
+ *                         '<div style="background-color: gray">{{title}}</div>' +
+ *                         '<ng-transclude></ng-transclude>' +
+ *                       '</div>'
+ *           };
+ *       })
+   *       .controller('ExampleController', ['$scope', function($scope) {
+ *         $scope.title = 'Lorem Ipsum';
+ *         $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+ *       }]);
+   *     </script>
+   *     <div ng-controller="ExampleController">
+   *       <input ng-model="title" aria-label="title"> <br/>
+   *       <textarea ng-model="text" aria-label="text"></textarea> <br/>
+   *       <pane title="{{title}}"><span>{{text}}</span></pane>
+   *     </div>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *      it('should have transcluded', function() {
+ *        var titleElement = element(by.model('title'));
+ *        titleElement.clear();
+ *        titleElement.sendKeys('TITLE');
+ *        var textElement = element(by.model('text'));
+ *        textElement.clear();
+ *        textElement.sendKeys('TEXT');
+ *        expect(element(by.binding('title')).getText()).toEqual('TITLE');
+ *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
+ *      });
+   *   </file>
+   * </example>
+   *
+   * @example
+   * ### Transclude fallback content
+   * This example shows how to use `NgTransclude` with fallback content, that
+   * is displayed if no transcluded content is provided.
+   *
+   * <example module="transcludeFallbackContentExample" name="ng-transclude">
+   * <file name="index.html">
+   * <script>
+   * angular.module('transcludeFallbackContentExample', [])
+   * .directive('myButton', function(){
+ *             return {
+ *               restrict: 'E',
+ *               transclude: true,
+ *               scope: true,
+ *               template: '<button style="cursor: pointer;">' +
+ *                           '<ng-transclude>' +
+ *                             '<b style="color: red;">Button1</b>' +
+ *                           '</ng-transclude>' +
+ *                         '</button>'
+ *             };
+ *         });
+   * </script>
+   * <!-- fallback button content -->
+   * <my-button id="fallback"></my-button>
+   * <!-- modified button content -->
+   * <my-button id="modified">
+   *   <i style="color: green;">Button2</i>
+   * </my-button>
+   * </file>
+   * <file name="protractor.js" type="protractor">
+   * it('should have different transclude element content', function() {
+ *          expect(element(by.id('fallback')).getText()).toBe('Button1');
+ *          expect(element(by.id('modified')).getText()).toBe('Button2');
+ *        });
+   * </file>
+   * </example>
+   *
+   * @example
+   * ### Multi-slot transclusion
+   * This example demonstrates using multi-slot transclusion in a component directive.
+   * <example name="multiSlotTranscludeExample" module="multiSlotTranscludeExample">
+   *   <file name="index.html">
+   *    <style>
+   *      .title, .footer {
+ *        background-color: gray
+ *      }
+   *    </style>
+   *    <div ng-controller="ExampleController">
+   *      <input ng-model="title" aria-label="title"> <br/>
+   *      <textarea ng-model="text" aria-label="text"></textarea> <br/>
+   *      <pane>
+   *        <pane-title><a ng-href="{{link}}">{{title}}</a></pane-title>
+   *        <pane-body><p>{{text}}</p></pane-body>
+   *      </pane>
+   *    </div>
+   *   </file>
+   *   <file name="app.js">
+   *    angular.module('multiSlotTranscludeExample', [])
+   *     .directive('pane', function() {
+ *        return {
+ *          restrict: 'E',
+ *          transclude: {
+ *            'title': '?paneTitle',
+ *            'body': 'paneBody',
+ *            'footer': '?paneFooter'
+ *          },
+ *          template: '<div style="border: 1px solid black;">' +
+ *                      '<div class="title" ng-transclude="title">Fallback Title</div>' +
+ *                      '<div ng-transclude="body"></div>' +
+ *                      '<div class="footer" ng-transclude="footer">Fallback Footer</div>' +
+ *                    '</div>'
+ *        };
+ *    })
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.title = 'Lorem Ipsum';
+ *      $scope.link = 'https://google.com';
+ *      $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+ *    }]);
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *      it('should have transcluded the title and the body', function() {
+ *        var titleElement = element(by.model('title'));
+ *        titleElement.clear();
+ *        titleElement.sendKeys('TITLE');
+ *        var textElement = element(by.model('text'));
+ *        textElement.clear();
+ *        textElement.sendKeys('TEXT');
+ *        expect(element(by.css('.title')).getText()).toEqual('TITLE');
+ *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
+ *        expect(element(by.css('.footer')).getText()).toEqual('Fallback Footer');
+ *      });
+   *   </file>
+   * </example>
    */
-  var ngTranscludeDirective = ngDirective({
-    controller: ['$element', '$transclude', function($element, $transclude) {
-      if (!$transclude) {
-        throw minErr('ngTransclude')('orphan',
-            'Illegal use of ngTransclude directive in the template! ' +
-                'No parent directive that requires a transclusion found. ' +
-                'Element: {0}',
-            startingTag($element));
+  var ngTranscludeMinErr = minErr('ngTransclude');
+  var ngTranscludeDirective = ['$compile', function($compile) {
+    return {
+      restrict: 'EAC',
+      terminal: true,
+      compile: function ngTranscludeCompile(tElement) {
+
+        // Remove and cache any original content to act as a fallback
+        var fallbackLinkFn = $compile(tElement.contents());
+        tElement.empty();
+
+        return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
+
+          if (!$transclude) {
+            throw ngTranscludeMinErr('orphan',
+              'Illegal use of ngTransclude directive in the template! ' +
+              'No parent directive that requires a transclusion found. ' +
+              'Element: {0}',
+              startingTag($element));
+          }
+
+
+          // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
+          if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+            $attrs.ngTransclude = '';
+          }
+          var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+
+          // If the slot is required and no transclusion content is provided then this call will throw an error
+          $transclude(ngTranscludeCloneAttachFn, null, slotName);
+
+          // If the slot is optional and no transclusion content is provided then use the fallback content
+          if (slotName && !$transclude.isSlotFilled(slotName)) {
+            useFallbackContent();
+          }
+
+          function ngTranscludeCloneAttachFn(clone, transcludedScope) {
+            if (clone.length && notWhitespace(clone)) {
+              $element.append(clone);
+            } else {
+              useFallbackContent();
+              // There is nothing linked against the transcluded scope since no content was available,
+              // so it should be safe to clean up the generated scope.
+              transcludedScope.$destroy();
+            }
+          }
+
+          function useFallbackContent() {
+            // Since this is the fallback content rather than the transcluded content,
+            // we link against the scope of this directive rather than the transcluded scope
+            fallbackLinkFn($scope, function(clone) {
+              $element.append(clone);
+            });
+          }
+
+          function notWhitespace(nodes) {
+            for (var i = 0, ii = nodes.length; i < ii; i++) {
+              var node = nodes[i];
+              if (node.nodeType !== NODE_TYPE_TEXT || node.nodeValue.trim()) {
+                return true;
+              }
+            }
+          }
+        };
       }
-
-      // remember the transclusion fn but call it during linking so that we don't process transclusion before directives on
-      // the parent element even when the transclusion replaces the current element. (we can't use priority here because
-      // that applies only to compile fns and not controllers
-      this.$transclude = $transclude;
-    }],
-
-    link: function($scope, $element, $attrs, controller) {
-      controller.$transclude(function(clone) {
-        $element.empty();
-        $element.append(clone);
-      });
-    }
-  });
+    };
+  }];
 
   /**
    * @ngdoc directive
-   * @name ng.directive:script
+   * @name script
    * @restrict E
    *
    * @description
-   * Load the content of a `<script>` element into {@link ../api/ng.$templateCache `$templateCache`}, so that the
-   * template can be used by {@link ../api/ng.directive:ngInclude `ngInclude`},
-   * {@link ../api/ngRoute.directive:ngView `ngView`}, or {@link guide/directive directives}. The type of the
+   * Load the content of a `<script>` element into {@link ng.$templateCache `$templateCache`}, so that the
+   * template can be used by {@link ng.directive:ngInclude `ngInclude`},
+   * {@link ngRoute.directive:ngView `ngView`}, or {@link guide/directive directives}. The type of the
    * `<script>` element must be specified as `text/ng-template`, and a cache name for the template must be
    * assigned through the element's `id`, which can then be used as a directive's `templateUrl`.
    *
-   * @param {'text/ng-template'} type Must be set to `'text/ng-template'`.
+   * @param {string} type Must be set to `'text/ng-template'`.
    * @param {string} id Cache name of the template.
    *
    * @example
-   <doc:example>
-   <doc:source>
+   <example  name="script-tag">
+   <file name="index.html">
    <script type="text/ng-template" id="/tpl.html">
    Content of the template.
    </script>
 
    <a ng-click="currentTpl='/tpl.html'" id="tpl-link">Load inlined template</a>
    <div id="tpl-content" ng-include src="currentTpl"></div>
-   </doc:source>
-   <doc:scenario>
+   </file>
+   <file name="protractor.js" type="protractor">
    it('should load template defined inside script tag', function() {
-        element('#tpl-link').click();
-        expect(element('#tpl-content').text()).toMatch(/Content of the template/);
+        element(by.css('#tpl-link')).click();
+        expect(element(by.css('#tpl-content')).getText()).toMatch(/Content of the template/);
       });
-   </doc:scenario>
-   </doc:example>
+   </file>
+   </example>
    */
   var scriptDirective = ['$templateCache', function($templateCache) {
     return {
       restrict: 'E',
       terminal: true,
       compile: function(element, attr) {
-        if (attr.type == 'text/ng-template') {
+        if (attr.type === 'text/ng-template') {
           var templateUrl = attr.id,
-          // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent
-              text = element[0].text;
+            text = element[0].text;
 
           $templateCache.put(templateUrl, text);
         }
@@ -19913,642 +32482,1408 @@
     };
   }];
 
-  var ngOptionsMinErr = minErr('ngOptions');
+  /* exported selectDirective, optionDirective */
+
+  var noopNgModelController = { $setViewValue: noop, $render: noop };
+
+  function setOptionSelectedStatus(optionEl, value) {
+    optionEl.prop('selected', value);
+    /**
+     * When unselecting an option, setting the property to null / false should be enough
+     * However, screenreaders might react to the selected attribute instead, see
+     * https://github.com/angular/angular.js/issues/14419
+     * Note: "selected" is a boolean attr and will be removed when the "value" arg in attr() is false
+     * or null
+     */
+    optionEl.attr('selected', value);
+  }
+
+  /**
+   * @ngdoc type
+   * @name  select.SelectController
+   *
+   * @description
+   * The controller for the {@link ng.select select} directive. The controller exposes
+   * a few utility methods that can be used to augment the behavior of a regular or an
+   * {@link ng.ngOptions ngOptions} select element.
+   *
+   * @example
+   * ### Set a custom error when the unknown option is selected
+   *
+   * This example sets a custom error "unknownValue" on the ngModelController
+   * when the select element's unknown option is selected, i.e. when the model is set to a value
+   * that is not matched by any option.
+   *
+   * <example name="select-unknown-value-error" module="staticSelect">
+   * <file name="index.html">
+   * <div ng-controller="ExampleController">
+   *   <form name="myForm">
+   *     <label for="testSelect"> Single select: </label><br>
+   *     <select name="testSelect" ng-model="selected" unknown-value-error>
+   *       <option value="option-1">Option 1</option>
+   *       <option value="option-2">Option 2</option>
+   *     </select><br>
+   *     <span ng-if="myForm.testSelect.$error.unknownValue">Error: The current model doesn't match any option</span>
+   *
+   *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+   *   </form>
+   * </div>
+   * </file>
+   * <file name="app.js">
+   *  angular.module('staticSelect', [])
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.selected = null;
+ *
+ *      $scope.forceUnknownOption = function() {
+ *        $scope.selected = 'nonsense';
+ *      };
+ *   }])
+   *   .directive('unknownValueError', function() {
+ *     return {
+ *       require: ['ngModel', 'select'],
+ *       link: function(scope, element, attrs, ctrls) {
+ *         var ngModelCtrl = ctrls[0];
+ *         var selectCtrl = ctrls[1];
+ *
+ *         ngModelCtrl.$validators.unknownValue = function(modelValue, viewValue) {
+ *           if (selectCtrl.$isUnknownOptionSelected()) {
+ *             return false;
+ *           }
+ *
+ *           return true;
+ *         };
+ *       }
+ *
+ *     };
+ *   });
+   * </file>
+   *</example>
+   *
+   *
+   * @example
+   * ### Set the "required" error when the unknown option is selected.
+   *
+   * By default, the "required" error on the ngModelController is only set on a required select
+   * when the empty option is selected. This example adds a custom directive that also sets the
+   * error when the unknown option is selected.
+   *
+   * <example name="select-unknown-value-required" module="staticSelect">
+   * <file name="index.html">
+   * <div ng-controller="ExampleController">
+   *   <form name="myForm">
+   *     <label for="testSelect"> Select: </label><br>
+   *     <select name="testSelect" ng-model="selected" unknown-value-required>
+   *       <option value="option-1">Option 1</option>
+   *       <option value="option-2">Option 2</option>
+   *     </select><br>
+   *     <span ng-if="myForm.testSelect.$error.required">Error: Please select a value</span><br>
+   *
+   *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+   *   </form>
+   * </div>
+   * </file>
+   * <file name="app.js">
+   *  angular.module('staticSelect', [])
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.selected = null;
+ *
+ *      $scope.forceUnknownOption = function() {
+ *        $scope.selected = 'nonsense';
+ *      };
+ *   }])
+   *   .directive('unknownValueRequired', function() {
+ *     return {
+ *       priority: 1, // This directive must run after the required directive has added its validator
+ *       require: ['ngModel', 'select'],
+ *       link: function(scope, element, attrs, ctrls) {
+ *         var ngModelCtrl = ctrls[0];
+ *         var selectCtrl = ctrls[1];
+ *
+ *         var originalRequiredValidator = ngModelCtrl.$validators.required;
+ *
+ *         ngModelCtrl.$validators.required = function() {
+ *           if (attrs.required && selectCtrl.$isUnknownOptionSelected()) {
+ *             return false;
+ *           }
+ *
+ *           return originalRequiredValidator.apply(this, arguments);
+ *         };
+ *       }
+ *     };
+ *   });
+   * </file>
+   *</example>
+   *
+   *
+   */
+  var SelectController =
+    ['$element', '$scope', /** @this */ function($element, $scope) {
+
+      var self = this,
+        optionsMap = new NgMap();
+
+      self.selectValueMap = {}; // Keys are the hashed values, values the original values
+
+      // If the ngModel doesn't get provided then provide a dummy noop version to prevent errors
+      self.ngModelCtrl = noopNgModelController;
+      self.multiple = false;
+
+      // The "unknown" option is one that is prepended to the list if the viewValue
+      // does not match any of the options. When it is rendered the value of the unknown
+      // option is '? XXX ?' where XXX is the hashKey of the value that is not known.
+      //
+      // Support: IE 9 only
+      // We can't just jqLite('<option>') since jqLite is not smart enough
+      // to create it in <select> and IE barfs otherwise.
+      self.unknownOption = jqLite(window.document.createElement('option'));
+
+      // The empty option is an option with the value '' that the application developer can
+      // provide inside the select. It is always selectable and indicates that a "null" selection has
+      // been made by the user.
+      // If the select has an empty option, and the model of the select is set to "undefined" or "null",
+      // the empty option is selected.
+      // If the model is set to a different unmatched value, the unknown option is rendered and
+      // selected, i.e both are present, because a "null" selection and an unknown value are different.
+      self.hasEmptyOption = false;
+      self.emptyOption = undefined;
+
+      self.renderUnknownOption = function(val) {
+        var unknownVal = self.generateUnknownOptionValue(val);
+        self.unknownOption.val(unknownVal);
+        $element.prepend(self.unknownOption);
+        setOptionSelectedStatus(self.unknownOption, true);
+        $element.val(unknownVal);
+      };
+
+      self.updateUnknownOption = function(val) {
+        var unknownVal = self.generateUnknownOptionValue(val);
+        self.unknownOption.val(unknownVal);
+        setOptionSelectedStatus(self.unknownOption, true);
+        $element.val(unknownVal);
+      };
+
+      self.generateUnknownOptionValue = function(val) {
+        return '? ' + hashKey(val) + ' ?';
+      };
+
+      self.removeUnknownOption = function() {
+        if (self.unknownOption.parent()) self.unknownOption.remove();
+      };
+
+      self.selectEmptyOption = function() {
+        if (self.emptyOption) {
+          $element.val('');
+          setOptionSelectedStatus(self.emptyOption, true);
+        }
+      };
+
+      self.unselectEmptyOption = function() {
+        if (self.hasEmptyOption) {
+          setOptionSelectedStatus(self.emptyOption, false);
+        }
+      };
+
+      $scope.$on('$destroy', function() {
+        // disable unknown option so that we don't do work when the whole select is being destroyed
+        self.renderUnknownOption = noop;
+      });
+
+      // Read the value of the select control, the implementation of this changes depending
+      // upon whether the select can have multiple values and whether ngOptions is at work.
+      self.readValue = function readSingleValue() {
+        var val = $element.val();
+        // ngValue added option values are stored in the selectValueMap, normal interpolations are not
+        var realVal = val in self.selectValueMap ? self.selectValueMap[val] : val;
+
+        if (self.hasOption(realVal)) {
+          return realVal;
+        }
+
+        return null;
+      };
+
+
+      // Write the value to the select control, the implementation of this changes depending
+      // upon whether the select can have multiple values and whether ngOptions is at work.
+      self.writeValue = function writeSingleValue(value) {
+        // Make sure to remove the selected attribute from the previously selected option
+        // Otherwise, screen readers might get confused
+        var currentlySelectedOption = $element[0].options[$element[0].selectedIndex];
+        if (currentlySelectedOption) setOptionSelectedStatus(jqLite(currentlySelectedOption), false);
+
+        if (self.hasOption(value)) {
+          self.removeUnknownOption();
+
+          var hashedVal = hashKey(value);
+          $element.val(hashedVal in self.selectValueMap ? hashedVal : value);
+
+          // Set selected attribute and property on selected option for screen readers
+          var selectedOption = $element[0].options[$element[0].selectedIndex];
+          setOptionSelectedStatus(jqLite(selectedOption), true);
+        } else {
+          self.selectUnknownOrEmptyOption(value);
+        }
+      };
+
+
+      // Tell the select control that an option, with the given value, has been added
+      self.addOption = function(value, element) {
+        // Skip comment nodes, as they only pollute the `optionsMap`
+        if (element[0].nodeType === NODE_TYPE_COMMENT) return;
+
+        assertNotHasOwnProperty(value, '"option value"');
+        if (value === '') {
+          self.hasEmptyOption = true;
+          self.emptyOption = element;
+        }
+        var count = optionsMap.get(value) || 0;
+        optionsMap.set(value, count + 1);
+        // Only render at the end of a digest. This improves render performance when many options
+        // are added during a digest and ensures all relevant options are correctly marked as selected
+        scheduleRender();
+      };
+
+      // Tell the select control that an option, with the given value, has been removed
+      self.removeOption = function(value) {
+        var count = optionsMap.get(value);
+        if (count) {
+          if (count === 1) {
+            optionsMap.delete(value);
+            if (value === '') {
+              self.hasEmptyOption = false;
+              self.emptyOption = undefined;
+            }
+          } else {
+            optionsMap.set(value, count - 1);
+          }
+        }
+      };
+
+      // Check whether the select control has an option matching the given value
+      self.hasOption = function(value) {
+        return !!optionsMap.get(value);
+      };
+
+      /**
+       * @ngdoc method
+       * @name select.SelectController#$hasEmptyOption
+       *
+       * @description
+       *
+       * Returns `true` if the select element currently has an empty option
+       * element, i.e. an option that signifies that the select is empty / the selection is null.
+       *
+       */
+      self.$hasEmptyOption = function() {
+        return self.hasEmptyOption;
+      };
+
+      /**
+       * @ngdoc method
+       * @name select.SelectController#$isUnknownOptionSelected
+       *
+       * @description
+       *
+       * Returns `true` if the select element's unknown option is selected. The unknown option is added
+       * and automatically selected whenever the select model doesn't match any option.
+       *
+       */
+      self.$isUnknownOptionSelected = function() {
+        // Presence of the unknown option means it is selected
+        return $element[0].options[0] === self.unknownOption[0];
+      };
+
+      /**
+       * @ngdoc method
+       * @name select.SelectController#$isEmptyOptionSelected
+       *
+       * @description
+       *
+       * Returns `true` if the select element has an empty option and this empty option is currently
+       * selected. Returns `false` if the select element has no empty option or it is not selected.
+       *
+       */
+      self.$isEmptyOptionSelected = function() {
+        return self.hasEmptyOption && $element[0].options[$element[0].selectedIndex] === self.emptyOption[0];
+      };
+
+      self.selectUnknownOrEmptyOption = function(value) {
+        if (value == null && self.emptyOption) {
+          self.removeUnknownOption();
+          self.selectEmptyOption();
+        } else if (self.unknownOption.parent().length) {
+          self.updateUnknownOption(value);
+        } else {
+          self.renderUnknownOption(value);
+        }
+      };
+
+      var renderScheduled = false;
+      function scheduleRender() {
+        if (renderScheduled) return;
+        renderScheduled = true;
+        $scope.$$postDigest(function() {
+          renderScheduled = false;
+          self.ngModelCtrl.$render();
+        });
+      }
+
+      var updateScheduled = false;
+      function scheduleViewValueUpdate(renderAfter) {
+        if (updateScheduled) return;
+
+        updateScheduled = true;
+
+        $scope.$$postDigest(function() {
+          if ($scope.$$destroyed) return;
+
+          updateScheduled = false;
+          self.ngModelCtrl.$setViewValue(self.readValue());
+          if (renderAfter) self.ngModelCtrl.$render();
+        });
+      }
+
+
+      self.registerOption = function(optionScope, optionElement, optionAttrs, interpolateValueFn, interpolateTextFn) {
+
+        if (optionAttrs.$attr.ngValue) {
+          // The value attribute is set by ngValue
+          var oldVal, hashedVal = NaN;
+          optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
+
+            var removal;
+            var previouslySelected = optionElement.prop('selected');
+
+            if (isDefined(hashedVal)) {
+              self.removeOption(oldVal);
+              delete self.selectValueMap[hashedVal];
+              removal = true;
+            }
+
+            hashedVal = hashKey(newVal);
+            oldVal = newVal;
+            self.selectValueMap[hashedVal] = newVal;
+            self.addOption(newVal, optionElement);
+            // Set the attribute directly instead of using optionAttrs.$set - this stops the observer
+            // from firing a second time. Other $observers on value will also get the result of the
+            // ngValue expression, not the hashed value
+            optionElement.attr('value', hashedVal);
+
+            if (removal && previouslySelected) {
+              scheduleViewValueUpdate();
+            }
+
+          });
+        } else if (interpolateValueFn) {
+          // The value attribute is interpolated
+          optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
+            // This method is overwritten in ngOptions and has side-effects!
+            self.readValue();
+
+            var removal;
+            var previouslySelected = optionElement.prop('selected');
+
+            if (isDefined(oldVal)) {
+              self.removeOption(oldVal);
+              removal = true;
+            }
+            oldVal = newVal;
+            self.addOption(newVal, optionElement);
+
+            if (removal && previouslySelected) {
+              scheduleViewValueUpdate();
+            }
+          });
+        } else if (interpolateTextFn) {
+          // The text content is interpolated
+          optionScope.$watch(interpolateTextFn, function interpolateWatchAction(newVal, oldVal) {
+            optionAttrs.$set('value', newVal);
+            var previouslySelected = optionElement.prop('selected');
+            if (oldVal !== newVal) {
+              self.removeOption(oldVal);
+            }
+            self.addOption(newVal, optionElement);
+
+            if (oldVal && previouslySelected) {
+              scheduleViewValueUpdate();
+            }
+          });
+        } else {
+          // The value attribute is static
+          self.addOption(optionAttrs.value, optionElement);
+        }
+
+
+        optionAttrs.$observe('disabled', function(newVal) {
+
+          // Since model updates will also select disabled options (like ngOptions),
+          // we only have to handle options becoming disabled, not enabled
+
+          if (newVal === 'true' || newVal && optionElement.prop('selected')) {
+            if (self.multiple) {
+              scheduleViewValueUpdate(true);
+            } else {
+              self.ngModelCtrl.$setViewValue(null);
+              self.ngModelCtrl.$render();
+            }
+          }
+        });
+
+        optionElement.on('$destroy', function() {
+          var currentValue = self.readValue();
+          var removeValue = optionAttrs.value;
+
+          self.removeOption(removeValue);
+          scheduleRender();
+
+          if (self.multiple && currentValue && currentValue.indexOf(removeValue) !== -1 ||
+            currentValue === removeValue
+          ) {
+            // When multiple (selected) options are destroyed at the same time, we don't want
+            // to run a model update for each of them. Instead, run a single update in the $$postDigest
+            scheduleViewValueUpdate(true);
+          }
+        });
+      };
+    }];
+
   /**
    * @ngdoc directive
-   * @name ng.directive:select
+   * @name select
    * @restrict E
    *
    * @description
-   * HTML `SELECT` element with angular data-binding.
+   * HTML `select` element with angular data-binding.
    *
-   * # `ngOptions`
+   * The `select` directive is used together with {@link ngModel `ngModel`} to provide data-binding
+   * between the scope and the `<select>` control (including setting default values).
+   * It also handles dynamic `<option>` elements, which can be added using the {@link ngRepeat `ngRepeat}` or
+   * {@link ngOptions `ngOptions`} directives.
    *
-   * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
-   * elements for the `<select>` element using the array or object obtained by evaluating the
-   * `ngOptions` comprehension_expression.
+   * When an item in the `<select>` menu is selected, the value of the selected option will be bound
+   * to the model identified by the `ngModel` directive. With static or repeated options, this is
+   * the content of the `value` attribute or the textContent of the `<option>`, if the value attribute is missing.
+   * Value and textContent can be interpolated.
    *
-   * When an item in the `<select>` menu is selected, the array element or object property
-   * represented by the selected option will be bound to the model identified by the `ngModel`
-   * directive.
+   * The {@link select.SelectController select controller} exposes utility functions that can be used
+   * to manipulate the select's behavior.
+   *
+   * ## Matching model and option values
+   *
+   * In general, the match between the model and an option is evaluated by strictly comparing the model
+   * value against the value of the available options.
+   *
+   * If you are setting the option value with the option's `value` attribute, or textContent, the
+   * value will always be a `string` which means that the model value must also be a string.
+   * Otherwise the `select` directive cannot match them correctly.
+   *
+   * To bind the model to a non-string value, you can use one of the following strategies:
+   * - the {@link ng.ngOptions `ngOptions`} directive
+   *   ({@link ng.select#using-select-with-ngoptions-and-setting-a-default-value})
+   * - the {@link ng.ngValue `ngValue`} directive, which allows arbitrary expressions to be
+   *   option values ({@link ng.select#using-ngvalue-to-bind-the-model-to-an-array-of-objects Example})
+   * - model $parsers / $formatters to convert the string value
+   *   ({@link ng.select#binding-select-to-a-non-string-value-via-ngmodel-parsing-formatting Example})
+   *
+   * If the viewValue of `ngModel` does not match any of the options, then the control
+   * will automatically add an "unknown" option, which it then removes when the mismatch is resolved.
    *
    * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
    * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
    * option. See example below for demonstration.
    *
-   * Note: `ngOptions` provides iterator facility for `<option>` element which should be used instead
-   * of {@link ng.directive:ngRepeat ngRepeat} when you want the
-   * `select` model to be bound to a non-string value. This is because an option element can only
-   * be bound to string values at present.
+   * ## Choosing between `ngRepeat` and `ngOptions`
+   *
+   * In many cases, `ngRepeat` can be used on `<option>` elements instead of {@link ng.directive:ngOptions
+ * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits:
+   * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+   * comprehension expression
+   * - reduced memory consumption by not creating a new scope for each repeated instance
+   * - increased render speed by creating the options in a documentFragment instead of individually
+   *
+   * Specifically, select with repeated options slows down significantly starting at 2000 options in
+   * Chrome and Internet Explorer / Edge.
+   *
    *
    * @param {string} ngModel Assignable angular expression to data-bind to.
    * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} required The control is considered valid only if value is entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {comprehension_expression=} ngOptions in one of the following forms:
+   * @param {string=} multiple Allows multiple options to be selected. The selected values will be
+   *     bound to the model as an array.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds required attribute and required validation constraint to
+   * the element when the ngRequired expression evaluates to true. Use ngRequired instead of required
+   * when you want to data-bind to the required attribute.
+   * @param {string=} ngChange Angular expression to be executed when selected option(s) changes due to user
+   *    interaction with the select element.
+   * @param {string=} ngOptions sets the options that the select is populated with and defines what is
+   * set on the model on selection. See {@link ngOptions `ngOptions`}.
+   * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
+   * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
    *
-   *   * for array data sources:
-   *     * `label` **`for`** `value` **`in`** `array`
-   *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
-   *     * `label`  **`group by`** `group` **`for`** `value` **`in`** `array`
-   *     * `select` **`as`** `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
-   *   * for object data sources:
-   *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-   *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-   *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
-   *     * `select` **`as`** `label` **`group by`** `group`
-   *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
    *
-   * Where:
+   * @knownIssue
    *
-   *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
-   *   * `value`: local variable which will refer to each item in the `array` or each property value
-   *      of `object` during iteration.
-   *   * `key`: local variable which will refer to a property name in `object` during iteration.
-   *   * `label`: The result of this expression will be the label for `<option>` element. The
-   *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
-   *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
-   *      element. If not specified, `select` expression will default to `value`.
-   *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
-   *      DOM element.
-   *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
-   *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
-   *     `value` variable (e.g. `value.propertyName`).
+   * In Firefox, the select model is only updated when the select element is blurred. For example,
+   * when switching between options with the keyboard, the select model is only set to the
+   * currently selected option when the select is blurred, e.g via tab key or clicking the mouse
+   * outside the select.
+   *
+   * This is due to an ambiguity in the select element specification. See the
+   * [issue on the Firefox bug tracker](https://bugzilla.mozilla.org/show_bug.cgi?id=126379)
+   * for more information, and this
+   * [Github comment for a workaround](https://github.com/angular/angular.js/issues/9134#issuecomment-130800488)
    *
    * @example
-   <doc:example>
-   <doc:source>
-   <script>
-   function MyCntrl($scope) {
-          $scope.colors = [
-            {name:'black', shade:'dark'},
-            {name:'white', shade:'light'},
-            {name:'red', shade:'dark'},
-            {name:'blue', shade:'dark'},
-            {name:'yellow', shade:'light'}
-          ];
-          $scope.color = $scope.colors[2]; // red
-        }
-   </script>
-   <div ng-controller="MyCntrl">
-   <ul>
-   <li ng-repeat="color in colors">
-   Name: <input ng-model="color.name">
-   [<a href ng-click="colors.splice($index, 1)">X</a>]
-   </li>
-   <li>
-   [<a href ng-click="colors.push({})">add</a>]
-   </li>
-   </ul>
-   <hr/>
-   Color (null not allowed):
-   <select ng-model="color" ng-options="c.name for c in colors"></select><br>
-
-   Color (null allowed):
-   <span  class="nullable">
-   <select ng-model="color" ng-options="c.name for c in colors">
-   <option value="">-- choose color --</option>
-   </select>
-   </span><br/>
-
-   Color grouped by shade:
-   <select ng-model="color" ng-options="c.name group by c.shade for c in colors">
-   </select><br/>
-
-
-   Select <a href ng-click="color={name:'not in list'}">bogus</a>.<br>
-   <hr/>
-   Currently selected: {{ {selected_color:color}  }}
-   <div style="border:solid 1px black; height:20px"
-   ng-style="{'background-color':color.name}">
-   </div>
-   </div>
-   </doc:source>
-   <doc:scenario>
-   it('should check ng-options', function() {
-           expect(binding('{selected_color:color}')).toMatch('red');
-           select('color').option('0');
-           expect(binding('{selected_color:color}')).toMatch('black');
-           using('.nullable').select('color').option('');
-           expect(binding('{selected_color:color}')).toMatch('null');
-         });
-   </doc:scenario>
-   </doc:example>
+   * ### Simple `select` elements with static options
+   *
+   * <example name="static-select" module="staticSelect">
+   * <file name="index.html">
+   * <div ng-controller="ExampleController">
+   *   <form name="myForm">
+   *     <label for="singleSelect"> Single select: </label><br>
+   *     <select name="singleSelect" ng-model="data.singleSelect">
+   *       <option value="option-1">Option 1</option>
+   *       <option value="option-2">Option 2</option>
+   *     </select><br>
+   *
+   *     <label for="singleSelect"> Single select with "not selected" option and dynamic option values: </label><br>
+   *     <select name="singleSelect" id="singleSelect" ng-model="data.singleSelect">
+   *       <option value="">---Please select---</option> <!-- not selected / blank option -->
+   *       <option value="{{data.option1}}">Option 1</option> <!-- interpolation -->
+   *       <option value="option-2">Option 2</option>
+   *     </select><br>
+   *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+   *     <tt>singleSelect = {{data.singleSelect}}</tt>
+   *
+   *     <hr>
+   *     <label for="multipleSelect"> Multiple select: </label><br>
+   *     <select name="multipleSelect" id="multipleSelect" ng-model="data.multipleSelect" multiple>
+   *       <option value="option-1">Option 1</option>
+   *       <option value="option-2">Option 2</option>
+   *       <option value="option-3">Option 3</option>
+   *     </select><br>
+   *     <tt>multipleSelect = {{data.multipleSelect}}</tt><br/>
+   *   </form>
+   * </div>
+   * </file>
+   * <file name="app.js">
+   *  angular.module('staticSelect', [])
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       singleSelect: null,
+ *       multipleSelect: [],
+ *       option1: 'option-1'
+ *      };
+ *
+ *      $scope.forceUnknownOption = function() {
+ *        $scope.data.singleSelect = 'nonsense';
+ *      };
+ *   }]);
+   * </file>
+   *</example>
+   *
+   * ### Using `ngRepeat` to generate `select` options
+   * <example name="select-ngrepeat" module="ngrepeatSelect">
+   * <file name="index.html">
+   * <div ng-controller="ExampleController">
+   *   <form name="myForm">
+   *     <label for="repeatSelect"> Repeat select: </label>
+   *     <select name="repeatSelect" id="repeatSelect" ng-model="data.model">
+   *       <option ng-repeat="option in data.availableOptions" value="{{option.id}}">{{option.name}}</option>
+   *     </select>
+   *   </form>
+   *   <hr>
+   *   <tt>model = {{data.model}}</tt><br/>
+   * </div>
+   * </file>
+   * <file name="app.js">
+   *  angular.module('ngrepeatSelect', [])
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       model: null,
+ *       availableOptions: [
+ *         {id: '1', name: 'Option A'},
+ *         {id: '2', name: 'Option B'},
+ *         {id: '3', name: 'Option C'}
+ *       ]
+ *      };
+ *   }]);
+   * </file>
+   *</example>
+   *
+   * ### Using `ngValue` to bind the model to an array of objects
+   * <example name="select-ngvalue" module="ngvalueSelect">
+   * <file name="index.html">
+   * <div ng-controller="ExampleController">
+   *   <form name="myForm">
+   *     <label for="ngvalueselect"> ngvalue select: </label>
+   *     <select size="6" name="ngvalueselect" ng-model="data.model" multiple>
+   *       <option ng-repeat="option in data.availableOptions" ng-value="option.value">{{option.name}}</option>
+   *     </select>
+   *   </form>
+   *   <hr>
+   *   <pre>model = {{data.model | json}}</pre><br/>
+   * </div>
+   * </file>
+   * <file name="app.js">
+   *  angular.module('ngvalueSelect', [])
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       model: null,
+ *       availableOptions: [
+           {value: 'myString', name: 'string'},
+           {value: 1, name: 'integer'},
+           {value: true, name: 'boolean'},
+           {value: null, name: 'null'},
+           {value: {prop: 'value'}, name: 'object'},
+           {value: ['a'], name: 'array'}
+ *       ]
+ *      };
+ *   }]);
+   * </file>
+   *</example>
+   *
+   * ### Using `select` with `ngOptions` and setting a default value
+   * See the {@link ngOptions ngOptions documentation} for more `ngOptions` usage examples.
+   *
+   * <example name="select-with-default-values" module="defaultValueSelect">
+   * <file name="index.html">
+   * <div ng-controller="ExampleController">
+   *   <form name="myForm">
+   *     <label for="mySelect">Make a choice:</label>
+   *     <select name="mySelect" id="mySelect"
+   *       ng-options="option.name for option in data.availableOptions track by option.id"
+   *       ng-model="data.selectedOption"></select>
+   *   </form>
+   *   <hr>
+   *   <tt>option = {{data.selectedOption}}</tt><br/>
+   * </div>
+   * </file>
+   * <file name="app.js">
+   *  angular.module('defaultValueSelect', [])
+   *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       availableOptions: [
+ *         {id: '1', name: 'Option A'},
+ *         {id: '2', name: 'Option B'},
+ *         {id: '3', name: 'Option C'}
+ *       ],
+ *       selectedOption: {id: '3', name: 'Option C'} //This sets the default value of the select in the ui
+ *       };
+ *   }]);
+   * </file>
+   *</example>
+   *
+   *
+   * ### Binding `select` to a non-string value via `ngModel` parsing / formatting
+   *
+   * <example name="select-with-non-string-options" module="nonStringSelect">
+   *   <file name="index.html">
+   *     <select ng-model="model.id" convert-to-number>
+   *       <option value="0">Zero</option>
+   *       <option value="1">One</option>
+   *       <option value="2">Two</option>
+   *     </select>
+   *     {{ model }}
+   *   </file>
+   *   <file name="app.js">
+   *     angular.module('nonStringSelect', [])
+   *       .run(function($rootScope) {
+ *         $rootScope.model = { id: 2 };
+ *       })
+   *       .directive('convertToNumber', function() {
+ *         return {
+ *           require: 'ngModel',
+ *           link: function(scope, element, attrs, ngModel) {
+ *             ngModel.$parsers.push(function(val) {
+ *               return parseInt(val, 10);
+ *             });
+ *             ngModel.$formatters.push(function(val) {
+ *               return '' + val;
+ *             });
+ *           }
+ *         };
+ *       });
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   *     it('should initialize to model', function() {
+ *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
+ *     });
+   *   </file>
+   * </example>
+   *
    */
-
-  var ngOptionsDirective = valueFn({ terminal: true });
-// jshint maxlen: false
-  var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
-    //000011111111110000000000022222222220000000000000000000003333333333000000000000004444444444444440000000005555555555555550000000666666666666666000000000000000777777777700000000000000000008888888888
-    var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
-        nullModelCtrl = {$setViewValue: noop};
-// jshint maxlen: 100
+  var selectDirective = function() {
 
     return {
       restrict: 'E',
       require: ['select', '?ngModel'],
-      controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
-        var self = this,
-            optionsMap = {},
-            ngModelCtrl = nullModelCtrl,
-            nullOption,
-            unknownOption;
-
-
-        self.databound = $attrs.ngModel;
-
-
-        self.init = function(ngModelCtrl_, nullOption_, unknownOption_) {
-          ngModelCtrl = ngModelCtrl_;
-          nullOption = nullOption_;
-          unknownOption = unknownOption_;
-        };
-
-
-        self.addOption = function(value) {
-          assertNotHasOwnProperty(value, '"option value"');
-          optionsMap[value] = true;
-
-          if (ngModelCtrl.$viewValue == value) {
-            $element.val(value);
-            if (unknownOption.parent()) unknownOption.remove();
-          }
-        };
-
-
-        self.removeOption = function(value) {
-          if (this.hasOption(value)) {
-            delete optionsMap[value];
-            if (ngModelCtrl.$viewValue == value) {
-              this.renderUnknownOption(value);
-            }
-          }
-        };
-
-
-        self.renderUnknownOption = function(val) {
-          var unknownVal = '? ' + hashKey(val) + ' ?';
-          unknownOption.val(unknownVal);
-          $element.prepend(unknownOption);
-          $element.val(unknownVal);
-          unknownOption.prop('selected', true); // needed for IE
-        };
-
-
-        self.hasOption = function(value) {
-          return optionsMap.hasOwnProperty(value);
-        };
-
-        $scope.$on('$destroy', function() {
-          // disable unknown option so that we don't do work when the whole select is being destroyed
-          self.renderUnknownOption = noop;
-        });
-      }],
-
-      link: function(scope, element, attr, ctrls) {
-        // if ngModel is not defined, we don't need to do anything
-        if (!ctrls[1]) return;
-
-        var selectCtrl = ctrls[0],
-            ngModelCtrl = ctrls[1],
-            multiple = attr.multiple,
-            optionsExp = attr.ngOptions,
-            nullOption = false, // if false, user will not be able to select it (used by ngOptions)
-            emptyOption,
-        // we can't just jqLite('<option>') since jqLite is not smart enough
-        // to create it in <select> and IE barfs otherwise.
-            optionTemplate = jqLite(document.createElement('option')),
-            optGroupTemplate =jqLite(document.createElement('optgroup')),
-            unknownOption = optionTemplate.clone();
-
-        // find "null" option
-        for(var i = 0, children = element.children(), ii = children.length; i < ii; i++) {
-          if (children[i].value === '') {
-            emptyOption = nullOption = children.eq(i);
-            break;
-          }
-        }
-
-        selectCtrl.init(ngModelCtrl, nullOption, unknownOption);
-
-        // required validator
-        if (multiple) {
-          ngModelCtrl.$isEmpty = function(value) {
-            return !value || value.length === 0;
-          };
-        }
-
-        if (optionsExp) setupAsOptions(scope, element, ngModelCtrl);
-        else if (multiple) setupAsMultiple(scope, element, ngModelCtrl);
-        else setupAsSingle(scope, element, ngModelCtrl, selectCtrl);
-
-
-        ////////////////////////////
-
-
-
-        function setupAsSingle(scope, selectElement, ngModelCtrl, selectCtrl) {
-          ngModelCtrl.$render = function() {
-            var viewValue = ngModelCtrl.$viewValue;
-
-            if (selectCtrl.hasOption(viewValue)) {
-              if (unknownOption.parent()) unknownOption.remove();
-              selectElement.val(viewValue);
-              if (viewValue === '') emptyOption.prop('selected', true); // to make IE9 happy
-            } else {
-              if (isUndefined(viewValue) && emptyOption) {
-                selectElement.val('');
-              } else {
-                selectCtrl.renderUnknownOption(viewValue);
-              }
-            }
-          };
-
-          selectElement.on('change', function() {
-            scope.$apply(function() {
-              if (unknownOption.parent()) unknownOption.remove();
-              ngModelCtrl.$setViewValue(selectElement.val());
-            });
-          });
-        }
-
-        function setupAsMultiple(scope, selectElement, ctrl) {
-          var lastView;
-          ctrl.$render = function() {
-            var items = new HashMap(ctrl.$viewValue);
-            forEach(selectElement.find('option'), function(option) {
-              option.selected = isDefined(items.get(option.value));
-            });
-          };
-
-          // we have to do it on each watch since ngModel watches reference, but
-          // we need to work of an array, so we need to see if anything was inserted/removed
-          scope.$watch(function selectMultipleWatch() {
-            if (!equals(lastView, ctrl.$viewValue)) {
-              lastView = copy(ctrl.$viewValue);
-              ctrl.$render();
-            }
-          });
-
-          selectElement.on('change', function() {
-            scope.$apply(function() {
-              var array = [];
-              forEach(selectElement.find('option'), function(option) {
-                if (option.selected) {
-                  array.push(option.value);
-                }
-              });
-              ctrl.$setViewValue(array);
-            });
-          });
-        }
-
-        function setupAsOptions(scope, selectElement, ctrl) {
-          var match;
-
-          if (! (match = optionsExp.match(NG_OPTIONS_REGEXP))) {
-            throw ngOptionsMinErr('iexp',
-                "Expected expression in form of " +
-                    "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
-                    " but got '{0}'. Element: {1}",
-                optionsExp, startingTag(selectElement));
-          }
-
-          var displayFn = $parse(match[2] || match[1]),
-              valueName = match[4] || match[6],
-              keyName = match[5],
-              groupByFn = $parse(match[3] || ''),
-              valueFn = $parse(match[2] ? match[1] : valueName),
-              valuesFn = $parse(match[7]),
-              track = match[8],
-              trackFn = track ? $parse(match[8]) : null,
-          // This is an array of array of existing option groups in DOM.
-          // We try to reuse these if possible
-          // - optionGroupsCache[0] is the options with no option group
-          // - optionGroupsCache[?][0] is the parent: either the SELECT or OPTGROUP element
-              optionGroupsCache = [[{element: selectElement, label:''}]];
-
-          if (nullOption) {
-            // compile the element since there might be bindings in it
-            $compile(nullOption)(scope);
-
-            // remove the class, which is added automatically because we recompile the element and it
-            // becomes the compilation root
-            nullOption.removeClass('ng-scope');
-
-            // we need to remove it before calling selectElement.empty() because otherwise IE will
-            // remove the label from the element. wtf?
-            nullOption.remove();
-          }
-
-          // clear contents, we'll add what's needed based on the model
-          selectElement.empty();
-
-          selectElement.on('change', function() {
-            scope.$apply(function() {
-              var optionGroup,
-                  collection = valuesFn(scope) || [],
-                  locals = {},
-                  key, value, optionElement, index, groupIndex, length, groupLength, trackIndex;
-
-              if (multiple) {
-                value = [];
-                for (groupIndex = 0, groupLength = optionGroupsCache.length;
-                     groupIndex < groupLength;
-                     groupIndex++) {
-                  // list of options for that group. (first item has the parent)
-                  optionGroup = optionGroupsCache[groupIndex];
-
-                  for(index = 1, length = optionGroup.length; index < length; index++) {
-                    if ((optionElement = optionGroup[index].element)[0].selected) {
-                      key = optionElement.val();
-                      if (keyName) locals[keyName] = key;
-                      if (trackFn) {
-                        for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                          locals[valueName] = collection[trackIndex];
-                          if (trackFn(scope, locals) == key) break;
-                        }
-                      } else {
-                        locals[valueName] = collection[key];
-                      }
-                      value.push(valueFn(scope, locals));
-                    }
-                  }
-                }
-              } else {
-                key = selectElement.val();
-                if (key == '?') {
-                  value = undefined;
-                } else if (key === ''){
-                  value = null;
-                } else {
-                  if (trackFn) {
-                    for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                      locals[valueName] = collection[trackIndex];
-                      if (trackFn(scope, locals) == key) {
-                        value = valueFn(scope, locals);
-                        break;
-                      }
-                    }
-                  } else {
-                    locals[valueName] = collection[key];
-                    if (keyName) locals[keyName] = key;
-                    value = valueFn(scope, locals);
-                  }
-                }
-              }
-              ctrl.$setViewValue(value);
-            });
-          });
-
-          ctrl.$render = render;
-
-          // TODO(vojta): can't we optimize this ?
-          scope.$watch(render);
-
-          function render() {
-            // Temporary location for the option groups before we render them
-            var optionGroups = {'':[]},
-                optionGroupNames = [''],
-                optionGroupName,
-                optionGroup,
-                option,
-                existingParent, existingOptions, existingOption,
-                modelValue = ctrl.$modelValue,
-                values = valuesFn(scope) || [],
-                keys = keyName ? sortedKeys(values) : values,
-                key,
-                groupLength, length,
-                groupIndex, index,
-                locals = {},
-                selected,
-                selectedSet = false, // nothing is selected yet
-                lastElement,
-                element,
-                label;
-
-            if (multiple) {
-              if (trackFn && isArray(modelValue)) {
-                selectedSet = new HashMap([]);
-                for (var trackIndex = 0; trackIndex < modelValue.length; trackIndex++) {
-                  locals[valueName] = modelValue[trackIndex];
-                  selectedSet.put(trackFn(scope, locals), modelValue[trackIndex]);
-                }
-              } else {
-                selectedSet = new HashMap(modelValue);
-              }
-            }
-
-            // We now build up the list of options we need (we merge later)
-            for (index = 0; length = keys.length, index < length; index++) {
-
-              key = index;
-              if (keyName) {
-                key = keys[index];
-                if ( key.charAt(0) === '$' ) continue;
-                locals[keyName] = key;
-              }
-
-              locals[valueName] = values[key];
-
-              optionGroupName = groupByFn(scope, locals) || '';
-              if (!(optionGroup = optionGroups[optionGroupName])) {
-                optionGroup = optionGroups[optionGroupName] = [];
-                optionGroupNames.push(optionGroupName);
-              }
-              if (multiple) {
-                selected = isDefined(
-                    selectedSet.remove(trackFn ? trackFn(scope, locals) : valueFn(scope, locals))
-                );
-              } else {
-                if (trackFn) {
-                  var modelCast = {};
-                  modelCast[valueName] = modelValue;
-                  selected = trackFn(scope, modelCast) === trackFn(scope, locals);
-                } else {
-                  selected = modelValue === valueFn(scope, locals);
-                }
-                selectedSet = selectedSet || selected; // see if at least one item is selected
-              }
-              label = displayFn(scope, locals); // what will be seen by the user
-
-              // doing displayFn(scope, locals) || '' overwrites zero values
-              label = isDefined(label) ? label : '';
-              optionGroup.push({
-                // either the index into array or key from object
-                id: trackFn ? trackFn(scope, locals) : (keyName ? keys[index] : index),
-                label: label,
-                selected: selected                   // determine if we should be selected
-              });
-            }
-            if (!multiple) {
-              if (nullOption || modelValue === null) {
-                // insert null option if we have a placeholder, or the model is null
-                optionGroups[''].unshift({id:'', label:'', selected:!selectedSet});
-              } else if (!selectedSet) {
-                // option could not be found, we have to insert the undefined item
-                optionGroups[''].unshift({id:'?', label:'', selected:true});
-              }
-            }
-
-            // Now we need to update the list of DOM nodes to match the optionGroups we computed above
-            for (groupIndex = 0, groupLength = optionGroupNames.length;
-                 groupIndex < groupLength;
-                 groupIndex++) {
-              // current option group name or '' if no group
-              optionGroupName = optionGroupNames[groupIndex];
-
-              // list of options for that group. (first item has the parent)
-              optionGroup = optionGroups[optionGroupName];
-
-              if (optionGroupsCache.length <= groupIndex) {
-                // we need to grow the optionGroups
-                existingParent = {
-                  element: optGroupTemplate.clone().attr('label', optionGroupName),
-                  label: optionGroup.label
-                };
-                existingOptions = [existingParent];
-                optionGroupsCache.push(existingOptions);
-                selectElement.append(existingParent.element);
-              } else {
-                existingOptions = optionGroupsCache[groupIndex];
-                existingParent = existingOptions[0];  // either SELECT (no group) or OPTGROUP element
-
-                // update the OPTGROUP label if not the same.
-                if (existingParent.label != optionGroupName) {
-                  existingParent.element.attr('label', existingParent.label = optionGroupName);
-                }
-              }
-
-              lastElement = null;  // start at the beginning
-              for(index = 0, length = optionGroup.length; index < length; index++) {
-                option = optionGroup[index];
-                if ((existingOption = existingOptions[index+1])) {
-                  // reuse elements
-                  lastElement = existingOption.element;
-                  if (existingOption.label !== option.label) {
-                    lastElement.text(existingOption.label = option.label);
-                  }
-                  if (existingOption.id !== option.id) {
-                    lastElement.val(existingOption.id = option.id);
-                  }
-                  // lastElement.prop('selected') provided by jQuery has side-effects
-                  if (lastElement[0].selected !== option.selected) {
-                    lastElement.prop('selected', (existingOption.selected = option.selected));
-                  }
-                } else {
-                  // grow elements
-
-                  // if it's a null option
-                  if (option.id === '' && nullOption) {
-                    // put back the pre-compiled element
-                    element = nullOption;
-                  } else {
-                    // jQuery(v1.4.2) Bug: We should be able to chain the method calls, but
-                    // in this version of jQuery on some browser the .text() returns a string
-                    // rather then the element.
-                    (element = optionTemplate.clone())
-                        .val(option.id)
-                        .attr('selected', option.selected)
-                        .text(option.label);
-                  }
-
-                  existingOptions.push(existingOption = {
-                    element: element,
-                    label: option.label,
-                    id: option.id,
-                    selected: option.selected
-                  });
-                  if (lastElement) {
-                    lastElement.after(element);
-                  } else {
-                    existingParent.element.append(element);
-                  }
-                  lastElement = element;
-                }
-              }
-              // remove any excessive OPTIONs in a group
-              index++; // increment since the existingOptions[0] is parent element not OPTION
-              while(existingOptions.length > index) {
-                existingOptions.pop().element.remove();
-              }
-            }
-            // remove any excessive OPTGROUPs from select
-            while(optionGroupsCache.length > groupIndex) {
-              optionGroupsCache.pop()[0].element.remove();
-            }
-          }
-        }
+      controller: SelectController,
+      priority: 1,
+      link: {
+        pre: selectPreLink,
+        post: selectPostLink
       }
     };
-  }];
 
+    function selectPreLink(scope, element, attr, ctrls) {
+
+      var selectCtrl = ctrls[0];
+      var ngModelCtrl = ctrls[1];
+
+      // if ngModel is not defined, we don't need to do anything but set the registerOption
+      // function to noop, so options don't get added internally
+      if (!ngModelCtrl) {
+        selectCtrl.registerOption = noop;
+        return;
+      }
+
+
+      selectCtrl.ngModelCtrl = ngModelCtrl;
+
+      // When the selected item(s) changes we delegate getting the value of the select control
+      // to the `readValue` method, which can be changed if the select can have multiple
+      // selected values or if the options are being generated by `ngOptions`
+      element.on('change', function() {
+        selectCtrl.removeUnknownOption();
+        scope.$apply(function() {
+          ngModelCtrl.$setViewValue(selectCtrl.readValue());
+        });
+      });
+
+      // If the select allows multiple values then we need to modify how we read and write
+      // values from and to the control; also what it means for the value to be empty and
+      // we have to add an extra watch since ngModel doesn't work well with arrays - it
+      // doesn't trigger rendering if only an item in the array changes.
+      if (attr.multiple) {
+        selectCtrl.multiple = true;
+
+        // Read value now needs to check each option to see if it is selected
+        selectCtrl.readValue = function readMultipleValue() {
+          var array = [];
+          forEach(element.find('option'), function(option) {
+            if (option.selected && !option.disabled) {
+              var val = option.value;
+              array.push(val in selectCtrl.selectValueMap ? selectCtrl.selectValueMap[val] : val);
+            }
+          });
+          return array;
+        };
+
+        // Write value now needs to set the selected property of each matching option
+        selectCtrl.writeValue = function writeMultipleValue(value) {
+          forEach(element.find('option'), function(option) {
+            var shouldBeSelected = !!value && (includes(value, option.value) ||
+              includes(value, selectCtrl.selectValueMap[option.value]));
+            var currentlySelected = option.selected;
+
+            // Support: IE 9-11 only, Edge 12-15+
+            // In IE and Edge adding options to the selection via shift+click/UP/DOWN
+            // will de-select already selected options if "selected" on those options was set
+            // more than once (i.e. when the options were already selected)
+            // So we only modify the selected property if necessary.
+            // Note: this behavior cannot be replicated via unit tests because it only shows in the
+            // actual user interface.
+            if (shouldBeSelected !== currentlySelected) {
+              setOptionSelectedStatus(jqLite(option), shouldBeSelected);
+            }
+
+          });
+        };
+
+        // we have to do it on each watch since ngModel watches reference, but
+        // we need to work of an array, so we need to see if anything was inserted/removed
+        var lastView, lastViewRef = NaN;
+        scope.$watch(function selectMultipleWatch() {
+          if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
+            lastView = shallowCopy(ngModelCtrl.$viewValue);
+            ngModelCtrl.$render();
+          }
+          lastViewRef = ngModelCtrl.$viewValue;
+        });
+
+        // If we are a multiple select then value is now a collection
+        // so the meaning of $isEmpty changes
+        ngModelCtrl.$isEmpty = function(value) {
+          return !value || value.length === 0;
+        };
+
+      }
+    }
+
+    function selectPostLink(scope, element, attrs, ctrls) {
+      // if ngModel is not defined, we don't need to do anything
+      var ngModelCtrl = ctrls[1];
+      if (!ngModelCtrl) return;
+
+      var selectCtrl = ctrls[0];
+
+      // We delegate rendering to the `writeValue` method, which can be changed
+      // if the select can have multiple selected values or if the options are being
+      // generated by `ngOptions`.
+      // This must be done in the postLink fn to prevent $render to be called before
+      // all nodes have been linked correctly.
+      ngModelCtrl.$render = function() {
+        selectCtrl.writeValue(ngModelCtrl.$viewValue);
+      };
+    }
+  };
+
+
+// The option directive is purely designed to communicate the existence (or lack of)
+// of dynamically created (and destroyed) option elements to their containing select
+// directive via its controller.
   var optionDirective = ['$interpolate', function($interpolate) {
-    var nullSelectCtrl = {
-      addOption: noop,
-      removeOption: noop
-    };
-
     return {
       restrict: 'E',
       priority: 100,
       compile: function(element, attr) {
-        if (isUndefined(attr.value)) {
-          var interpolateFn = $interpolate(element.text(), true);
-          if (!interpolateFn) {
+        var interpolateValueFn, interpolateTextFn;
+
+        if (isDefined(attr.ngValue)) {
+          // Will be handled by registerOption
+        } else if (isDefined(attr.value)) {
+          // If the value attribute is defined, check if it contains an interpolation
+          interpolateValueFn = $interpolate(attr.value, true);
+        } else {
+          // If the value attribute is not defined then we fall back to the
+          // text content of the option element, which may be interpolated
+          interpolateTextFn = $interpolate(element.text(), true);
+          if (!interpolateTextFn) {
             attr.$set('value', element.text());
           }
         }
 
-        return function (scope, element, attr) {
+        return function(scope, element, attr) {
+          // This is an optimization over using ^^ since we don't want to have to search
+          // all the way to the root of the DOM for every single option element
           var selectCtrlName = '$selectController',
-              parent = element.parent(),
-              selectCtrl = parent.data(selectCtrlName) ||
-                  parent.parent().data(selectCtrlName); // in case we are in optgroup
+            parent = element.parent(),
+            selectCtrl = parent.data(selectCtrlName) ||
+              parent.parent().data(selectCtrlName); // in case we are in optgroup
 
-          if (selectCtrl && selectCtrl.databound) {
-            // For some reason Opera defaults to true and if not overridden this messes up the repeater.
-            // We don't want the view to drive the initialization of the model anyway.
-            element.prop('selected', false);
-          } else {
-            selectCtrl = nullSelectCtrl;
+          if (selectCtrl) {
+            selectCtrl.registerOption(scope, element, attr, interpolateValueFn, interpolateTextFn);
           }
-
-          if (interpolateFn) {
-            scope.$watch(interpolateFn, function interpolateWatchAction(newVal, oldVal) {
-              attr.$set('value', newVal);
-              if (newVal !== oldVal) selectCtrl.removeOption(oldVal);
-              selectCtrl.addOption(newVal);
-            });
-          } else {
-            selectCtrl.addOption(attr.value);
-          }
-
-          element.on('$destroy', function() {
-            selectCtrl.removeOption(attr.value);
-          });
         };
       }
     };
   }];
 
-  var styleDirective = valueFn({
-    restrict: 'E',
-    terminal: true
-  });
+  /**
+   * @ngdoc directive
+   * @name ngRequired
+   * @restrict A
+   *
+   * @description
+   *
+   * ngRequired adds the required {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+   * It is most often used for {@link input `input`} and {@link select `select`} controls, but can also be
+   * applied to custom controls.
+   *
+   * The directive sets the `required` attribute on the element if the Angular expression inside
+   * `ngRequired` evaluates to true. A special directive for setting `required` is necessary because we
+   * cannot use interpolation inside `required`. See the {@link guide/interpolation interpolation guide}
+   * for more info.
+   *
+   * The validator will set the `required` error key to true if the `required` attribute is set and
+   * calling {@link ngModel.NgModelController#$isEmpty `NgModelController.$isEmpty`} with the
+   * {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`} returns `true`. For example, the
+   * `$isEmpty()` implementation for `input[text]` checks the length of the `$viewValue`. When developing
+   * custom controls, `$isEmpty()` can be overwritten to account for a $viewValue that is not string-based.
+   *
+   * @example
+   * <example name="ngRequiredDirective" module="ngRequiredExample">
+   *   <file name="index.html">
+   *     <script>
+   *       angular.module('ngRequiredExample', [])
+   *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.required = true;
+ *         }]);
+   *     </script>
+   *     <div ng-controller="ExampleController">
+   *       <form name="form">
+   *         <label for="required">Toggle required: </label>
+   *         <input type="checkbox" ng-model="required" id="required" />
+   *         <br>
+   *         <label for="input">This input must be filled if `required` is true: </label>
+   *         <input type="text" ng-model="model" id="input" name="input" ng-required="required" /><br>
+   *         <hr>
+   *         required error set? = <code>{{form.input.$error.required}}</code><br>
+   *         model = <code>{{model}}</code>
+   *       </form>
+   *     </div>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   var required = element(by.binding('form.input.$error.required'));
+   var model = element(by.binding('model'));
+   var input = element(by.id('input'));
 
-  //try to bind to jquery now so that one can write angular.element().read()
-  //but we will rebind on bootstrap again.
+   it('should set the required error', function() {
+         expect(required.getText()).toContain('true');
+
+         input.sendKeys('123');
+         expect(required.getText()).not.toContain('true');
+         expect(model.getText()).toContain('123');
+       });
+   *   </file>
+   * </example>
+   */
+  var requiredDirective = function() {
+    return {
+      restrict: 'A',
+      require: '?ngModel',
+      link: function(scope, elm, attr, ctrl) {
+        if (!ctrl) return;
+        attr.required = true; // force truthy in case we are on non input element
+
+        ctrl.$validators.required = function(modelValue, viewValue) {
+          return !attr.required || !ctrl.$isEmpty(viewValue);
+        };
+
+        attr.$observe('required', function() {
+          ctrl.$validate();
+        });
+      }
+    };
+  };
+
+  /**
+   * @ngdoc directive
+   * @name ngPattern
+   *
+   * @description
+   *
+   * ngPattern adds the pattern {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+   * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+   *
+   * The validator sets the `pattern` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+   * does not match a RegExp which is obtained by evaluating the Angular expression given in the
+   * `ngPattern` attribute value:
+   * * If the expression evaluates to a RegExp object, then this is used directly.
+   * * If the expression evaluates to a string, then it will be converted to a RegExp after wrapping it
+   * in `^` and `$` characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+   *
+   * <div class="alert alert-info">
+   * **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   * start at the index of the last search's match, thus not taking the whole input value into
+   * account.
+   * </div>
+   *
+   * <div class="alert alert-info">
+   * **Note:** This directive is also added when the plain `pattern` attribute is used, with two
+   * differences:
+   * <ol>
+   *   <li>
+   *     `ngPattern` does not set the `pattern` attribute and therefore HTML5 constraint validation is
+   *     not available.
+   *   </li>
+   *   <li>
+   *     The `ngPattern` attribute must be an expression, while the `pattern` value must be
+   *     interpolated.
+   *   </li>
+   * </ol>
+   * </div>
+   *
+   * @example
+   * <example name="ngPatternDirective" module="ngPatternExample">
+   *   <file name="index.html">
+   *     <script>
+   *       angular.module('ngPatternExample', [])
+   *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.regex = '\\d+';
+ *         }]);
+   *     </script>
+   *     <div ng-controller="ExampleController">
+   *       <form name="form">
+   *         <label for="regex">Set a pattern (regex string): </label>
+   *         <input type="text" ng-model="regex" id="regex" />
+   *         <br>
+   *         <label for="input">This input is restricted by the current pattern: </label>
+   *         <input type="text" ng-model="model" id="input" name="input" ng-pattern="regex" /><br>
+   *         <hr>
+   *         input valid? = <code>{{form.input.$valid}}</code><br>
+   *         model = <code>{{model}}</code>
+   *       </form>
+   *     </div>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   var model = element(by.binding('model'));
+   var input = element(by.id('input'));
+
+   it('should validate the input with the default pattern', function() {
+         input.sendKeys('aaa');
+         expect(model.getText()).not.toContain('aaa');
+
+         input.clear().then(function() {
+           input.sendKeys('123');
+           expect(model.getText()).toContain('123');
+         });
+       });
+   *   </file>
+   * </example>
+   */
+  var patternDirective = function() {
+    return {
+      restrict: 'A',
+      require: '?ngModel',
+      link: function(scope, elm, attr, ctrl) {
+        if (!ctrl) return;
+
+        var regexp, patternExp = attr.ngPattern || attr.pattern;
+        attr.$observe('pattern', function(regex) {
+          if (isString(regex) && regex.length > 0) {
+            regex = new RegExp('^' + regex + '$');
+          }
+
+          if (regex && !regex.test) {
+            throw minErr('ngPattern')('noregexp',
+              'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
+              regex, startingTag(elm));
+          }
+
+          regexp = regex || undefined;
+          ctrl.$validate();
+        });
+
+        ctrl.$validators.pattern = function(modelValue, viewValue) {
+          // HTML5 pattern constraint validates the input value, so we validate the viewValue
+          return ctrl.$isEmpty(viewValue) || isUndefined(regexp) || regexp.test(viewValue);
+        };
+      }
+    };
+  };
+
+  /**
+   * @ngdoc directive
+   * @name ngMaxlength
+   *
+   * @description
+   *
+   * ngMaxlength adds the maxlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+   * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+   *
+   * The validator sets the `maxlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+   * is longer than the integer obtained by evaluating the Angular expression given in the
+   * `ngMaxlength` attribute value.
+   *
+   * <div class="alert alert-info">
+   * **Note:** This directive is also added when the plain `maxlength` attribute is used, with two
+   * differences:
+   * <ol>
+   *   <li>
+   *     `ngMaxlength` does not set the `maxlength` attribute and therefore HTML5 constraint
+   *     validation is not available.
+   *   </li>
+   *   <li>
+   *     The `ngMaxlength` attribute must be an expression, while the `maxlength` value must be
+   *     interpolated.
+   *   </li>
+   * </ol>
+   * </div>
+   *
+   * @example
+   * <example name="ngMaxlengthDirective" module="ngMaxlengthExample">
+   *   <file name="index.html">
+   *     <script>
+   *       angular.module('ngMaxlengthExample', [])
+   *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.maxlength = 5;
+ *         }]);
+   *     </script>
+   *     <div ng-controller="ExampleController">
+   *       <form name="form">
+   *         <label for="maxlength">Set a maxlength: </label>
+   *         <input type="number" ng-model="maxlength" id="maxlength" />
+   *         <br>
+   *         <label for="input">This input is restricted by the current maxlength: </label>
+   *         <input type="text" ng-model="model" id="input" name="input" ng-maxlength="maxlength" /><br>
+   *         <hr>
+   *         input valid? = <code>{{form.input.$valid}}</code><br>
+   *         model = <code>{{model}}</code>
+   *       </form>
+   *     </div>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   var model = element(by.binding('model'));
+   var input = element(by.id('input'));
+
+   it('should validate the input with the default maxlength', function() {
+         input.sendKeys('abcdef');
+         expect(model.getText()).not.toContain('abcdef');
+
+         input.clear().then(function() {
+           input.sendKeys('abcde');
+           expect(model.getText()).toContain('abcde');
+         });
+       });
+   *   </file>
+   * </example>
+   */
+  var maxlengthDirective = function() {
+    return {
+      restrict: 'A',
+      require: '?ngModel',
+      link: function(scope, elm, attr, ctrl) {
+        if (!ctrl) return;
+
+        var maxlength = -1;
+        attr.$observe('maxlength', function(value) {
+          var intVal = toInt(value);
+          maxlength = isNumberNaN(intVal) ? -1 : intVal;
+          ctrl.$validate();
+        });
+        ctrl.$validators.maxlength = function(modelValue, viewValue) {
+          return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
+        };
+      }
+    };
+  };
+
+  /**
+   * @ngdoc directive
+   * @name ngMinlength
+   *
+   * @description
+   *
+   * ngMinlength adds the minlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+   * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+   *
+   * The validator sets the `minlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+   * is shorter than the integer obtained by evaluating the Angular expression given in the
+   * `ngMinlength` attribute value.
+   *
+   * <div class="alert alert-info">
+   * **Note:** This directive is also added when the plain `minlength` attribute is used, with two
+   * differences:
+   * <ol>
+   *   <li>
+   *     `ngMinlength` does not set the `minlength` attribute and therefore HTML5 constraint
+   *     validation is not available.
+   *   </li>
+   *   <li>
+   *     The `ngMinlength` value must be an expression, while the `minlength` value must be
+   *     interpolated.
+   *   </li>
+   * </ol>
+   * </div>
+   *
+   * @example
+   * <example name="ngMinlengthDirective" module="ngMinlengthExample">
+   *   <file name="index.html">
+   *     <script>
+   *       angular.module('ngMinlengthExample', [])
+   *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.minlength = 3;
+ *         }]);
+   *     </script>
+   *     <div ng-controller="ExampleController">
+   *       <form name="form">
+   *         <label for="minlength">Set a minlength: </label>
+   *         <input type="number" ng-model="minlength" id="minlength" />
+   *         <br>
+   *         <label for="input">This input is restricted by the current minlength: </label>
+   *         <input type="text" ng-model="model" id="input" name="input" ng-minlength="minlength" /><br>
+   *         <hr>
+   *         input valid? = <code>{{form.input.$valid}}</code><br>
+   *         model = <code>{{model}}</code>
+   *       </form>
+   *     </div>
+   *   </file>
+   *   <file name="protractor.js" type="protractor">
+   var model = element(by.binding('model'));
+   var input = element(by.id('input'));
+
+   it('should validate the input with the default minlength', function() {
+         input.sendKeys('ab');
+         expect(model.getText()).not.toContain('ab');
+
+         input.sendKeys('abc');
+         expect(model.getText()).toContain('abc');
+       });
+   *   </file>
+   * </example>
+   */
+  var minlengthDirective = function() {
+    return {
+      restrict: 'A',
+      require: '?ngModel',
+      link: function(scope, elm, attr, ctrl) {
+        if (!ctrl) return;
+
+        var minlength = 0;
+        attr.$observe('minlength', function(value) {
+          minlength = toInt(value) || 0;
+          ctrl.$validate();
+        });
+        ctrl.$validators.minlength = function(modelValue, viewValue) {
+          return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength;
+        };
+      }
+    };
+  };
+
+  if (window.angular.bootstrap) {
+    // AngularJS is already loaded, so we can return here...
+    if (window.console) {
+      console.log('WARNING: Tried to load angular more than once.');
+    }
+    return;
+  }
+
+// try to bind to jquery now so that one can write jqLite(fn)
+// but we will rebind on bootstrap again.
   bindJQuery();
 
   publishExternalAPI(angular);
 
-  jqLite(document).ready(function() {
-    angularInit(document, bootstrap);
+  angular.module("ngLocale", [], ["$provide", function($provide) {
+    var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+    function getDecimals(n) {
+      n = n + '';
+      var i = n.indexOf('.');
+      return (i == -1) ? 0 : n.length - i - 1;
+    }
+
+    function getVF(n, opt_precision) {
+      var v = opt_precision;
+
+      if (undefined === v) {
+        v = Math.min(getDecimals(n), 3);
+      }
+
+      var base = Math.pow(10, v);
+      var f = ((n * base) | 0) % base;
+      return {v: v, f: f};
+    }
+
+    $provide.value("$locale", {
+      "DATETIME_FORMATS": {
+        "AMPMS": [
+          "AM",
+          "PM"
+        ],
+        "DAY": [
+          "Sunday",
+          "Monday",
+          "Tuesday",
+          "Wednesday",
+          "Thursday",
+          "Friday",
+          "Saturday"
+        ],
+        "ERANAMES": [
+          "Before Christ",
+          "Anno Domini"
+        ],
+        "ERAS": [
+          "BC",
+          "AD"
+        ],
+        "FIRSTDAYOFWEEK": 6,
+        "MONTH": [
+          "January",
+          "February",
+          "March",
+          "April",
+          "May",
+          "June",
+          "July",
+          "August",
+          "September",
+          "October",
+          "November",
+          "December"
+        ],
+        "SHORTDAY": [
+          "Sun",
+          "Mon",
+          "Tue",
+          "Wed",
+          "Thu",
+          "Fri",
+          "Sat"
+        ],
+        "SHORTMONTH": [
+          "Jan",
+          "Feb",
+          "Mar",
+          "Apr",
+          "May",
+          "Jun",
+          "Jul",
+          "Aug",
+          "Sep",
+          "Oct",
+          "Nov",
+          "Dec"
+        ],
+        "STANDALONEMONTH": [
+          "January",
+          "February",
+          "March",
+          "April",
+          "May",
+          "June",
+          "July",
+          "August",
+          "September",
+          "October",
+          "November",
+          "December"
+        ],
+        "WEEKENDRANGE": [
+          5,
+          6
+        ],
+        "fullDate": "EEEE, MMMM d, y",
+        "longDate": "MMMM d, y",
+        "medium": "MMM d, y h:mm:ss a",
+        "mediumDate": "MMM d, y",
+        "mediumTime": "h:mm:ss a",
+        "short": "M/d/yy h:mm a",
+        "shortDate": "M/d/yy",
+        "shortTime": "h:mm a"
+      },
+      "NUMBER_FORMATS": {
+        "CURRENCY_SYM": "$",
+        "DECIMAL_SEP": ".",
+        "GROUP_SEP": ",",
+        "PATTERNS": [
+          {
+            "gSize": 3,
+            "lgSize": 3,
+            "maxFrac": 3,
+            "minFrac": 0,
+            "minInt": 1,
+            "negPre": "-",
+            "negSuf": "",
+            "posPre": "",
+            "posSuf": ""
+          },
+          {
+            "gSize": 3,
+            "lgSize": 3,
+            "maxFrac": 2,
+            "minFrac": 2,
+            "minInt": 1,
+            "negPre": "-\u00a4",
+            "negSuf": "",
+            "posPre": "\u00a4",
+            "posSuf": ""
+          }
+        ]
+      },
+      "id": "en-us",
+      "localeID": "en_US",
+      "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+    });
+  }]);
+
+  jqLite(function() {
+    angularInit(window.document, bootstrap);
   });
 
-})(window, document);
+})(window);
 
-!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}</style>');
\ No newline at end of file
+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.restangular.js b/docs-web/src/main/webapp/src/lib/angular.restangular.js
index 5cb35d97..dac240da 100644
--- a/docs-web/src/main/webapp/src/lib/angular.restangular.js
+++ b/docs-web/src/main/webapp/src/lib/angular.restangular.js
@@ -1,8 +1,1452 @@
 /**
  * Restful Resources service for AngularJS apps
- * @version v1.2.2 - 2013-12-20
- * @link https://github.com/mgonto/restangular
- * @author Martin Gontovnikas <martin@gonto.com.ar>
+ * @version v1.6.1 - 2017-01-06 * @link https://github.com/mgonto/restangular
+ * @author Martin Gontovnikas <martin@gon.to>
  * @license MIT License, http://www.opensource.org/licenses/MIT
- */
-!function(){var a=angular.module("restangular",[]);a.provider("Restangular",function(){var a={};a.init=function(a,b){function c(a,b,c,d){var e={};return _.each(_.keys(d),function(f){var g=d[f];g.params=_.extend({},g.params,a.defaultRequestParams[g.method.toLowerCase()]),_.isEmpty(g.params)&&delete g.params,e[f]=a.isSafe(g.method)?function(){return b(_.extend(g,{url:c}))}:function(a){return b(_.extend(g,{url:c,data:a}))}}),e}a.configuration=b;var d=["get","head","options","trace","getlist"];b.isSafe=function(a){return _.contains(d,a.toLowerCase())};var e=/^https?:\/\//i;b.isAbsoluteUrl=function(a){return _.isUndefined(b.absoluteUrl)||_.isNull(b.absoluteUrl)?a&&e.test(a):b.absoluteUrl},b.absoluteUrl=_.isUndefined(b.absoluteUrl)?!1:!0,a.setSelfLinkAbsoluteUrl=function(a){b.absoluteUrl=a},b.baseUrl=_.isUndefined(b.baseUrl)?"":b.baseUrl,a.setBaseUrl=function(a){return b.baseUrl=/\/$/.test(a)?a.substring(0,a.length-1):a,this},b.extraFields=b.extraFields||[],a.setExtraFields=function(a){return b.extraFields=a,this},b.defaultHttpFields=b.defaultHttpFields||{},a.setDefaultHttpFields=function(a){return b.defaultHttpFields=a,this},b.withHttpValues=function(a,c){return _.defaults(c,a,b.defaultHttpFields)},b.encodeIds=_.isUndefined(b.encodeIds)?!0:b.encodeIds,a.setEncodeIds=function(a){b.encodeIds=a},b.defaultRequestParams=b.defaultRequestParams||{get:{},post:{},put:{},remove:{},common:{}},a.setDefaultRequestParams=function(a,c){var d=[],e=c||a;return _.isUndefined(c)?d.push("common"):_.isArray(a)?d=a:d.push(a),_.each(d,function(a){b.defaultRequestParams[a]=e}),this},a.requestParams=b.defaultRequestParams,b.defaultHeaders=b.defaultHeaders||{},a.setDefaultHeaders=function(c){return b.defaultHeaders=c,a.defaultHeaders=b.defaultHeaders,this},a.defaultHeaders=b.defaultHeaders,b.methodOverriders=b.methodOverriders||[],a.setMethodOverriders=function(a){var c=_.extend([],a);return b.isOverridenMethod("delete",c)&&c.push("remove"),b.methodOverriders=c,this},b.isOverridenMethod=function(a,c){var d=c||b.methodOverriders;return!_.isUndefined(_.find(d,function(b){return b.toLowerCase()===a.toLowerCase()}))},b.urlCreator=b.urlCreator||"path",a.setUrlCreator=function(a){if(!_.has(b.urlCreatorFactory,a))throw new Error("URL Path selected isn't valid");return b.urlCreator=a,this},b.restangularFields=b.restangularFields||{id:"id",route:"route",parentResource:"parentResource",restangularCollection:"restangularCollection",cannonicalId:"__cannonicalId",etag:"restangularEtag",selfLink:"href",get:"get",getList:"getList",put:"put",post:"post",remove:"remove",head:"head",trace:"trace",options:"options",patch:"patch",getRestangularUrl:"getRestangularUrl",getRequestedUrl:"getRequestedUrl",putElement:"putElement",addRestangularMethod:"addRestangularMethod",getParentList:"getParentList",clone:"clone",ids:"ids",httpConfig:"_$httpConfig",reqParams:"reqParams",one:"one",all:"all",several:"several",oneUrl:"oneUrl",allUrl:"allUrl",customPUT:"customPUT",customPOST:"customPOST",customDELETE:"customDELETE",customGET:"customGET",doPUT:"doPUT",doPOST:"doPOST",doDELETE:"doDELETE",doGET:"doGET"},a.setRestangularFields=function(a){return b.restangularFields=_.extend(b.restangularFields,a),this},b.isRestangularized=function(a){return!!a[b.restangularFields.one]||!!a[b.restangularFields.all]},b.setFieldToElem=function(a,b,c){var d=a.split("."),e=b;return _.each(_.initial(d),function(a){e[a]={},e=e[a]}),e[_.last(d)]=c,this},b.getFieldFromElem=function(a,b){var c=a.split("."),d=angular.copy(b);return _.each(c,function(a){d&&(d=d[a])}),d},b.setIdToElem=function(a,c){return b.setFieldToElem(b.restangularFields.id,a,c),this},b.getIdFromElem=function(a){return b.getFieldFromElem(b.restangularFields.id,a)},b.isValidId=function(a){return""!==a&&!_.isUndefined(a)&&!_.isNull(a)},b.setUrlToElem=function(a,c){return b.setFieldToElem(b.restangularFields.selfLink,a,c),this},b.getUrlFromElem=function(a){return b.getFieldFromElem(b.restangularFields.selfLink,a)},b.useCannonicalId=_.isUndefined(b.useCannonicalId)?!1:b.useCannonicalId,a.setUseCannonicalId=function(a){return b.useCannonicalId=a,this},b.getCannonicalIdFromElem=function(a){var c=a[b.restangularFields.cannonicalId],d=b.isValidId(c)?c:b.getIdFromElem(a);return d},b.responseExtractor=b.responseExtractor||function(a){return a},a.setResponseExtractor=function(a){return b.responseExtractor=a,this},a.setResponseInterceptor=a.setResponseExtractor,b.fullRequestInterceptor=b.fullRequestInterceptor||function(a,b,c,d,e,f,g){return{element:a,headers:e,params:f,httpConfig:g}},a.setRequestInterceptor=function(a){return b.fullRequestInterceptor=function(b,c,d,e,f,g,h){return{headers:f,params:g,element:a(b,c,d,e),httpConfig:h}},this},a.setFullRequestInterceptor=function(a){return b.fullRequestInterceptor=a,this},b.errorInterceptor=b.errorInterceptor||function(){},a.setErrorInterceptor=function(a){return b.errorInterceptor=a,this},b.onBeforeElemRestangularized=b.onBeforeElemRestangularized||function(a){return a},a.setOnBeforeElemRestangularized=function(a){return b.onBeforeElemRestangularized=a,this},b.onElemRestangularized=b.onElemRestangularized||function(a){return a},a.setOnElemRestangularized=function(a){return b.onElemRestangularized=a,this},a.setListTypeIsArray=function(){},b.shouldSaveParent=b.shouldSaveParent||function(){return!0},a.setParentless=function(a){return _.isArray(a)?b.shouldSaveParent=function(b){return!_.contains(a,b)}:_.isBoolean(a)&&(b.shouldSaveParent=function(){return!a}),this},b.suffix=_.isUndefined(b.suffix)?null:b.suffix,a.setRequestSuffix=function(a){return b.suffix=a,this},b.transformers=b.transformers||{},a.addElementTransformer=function(a,c,d){var e=null,f=null;2===arguments.length?f=c:(f=d,e=c);var g=b.transformers[a];g||(g=b.transformers[a]=[]),g.push(function(a,b){return _.isNull(e)||a==e?f(b):b})},a.extendCollection=function(b,c){return a.addElementTransformer(b,!0,c)},a.extendModel=function(b,c){return a.addElementTransformer(b,!1,c)},b.transformElem=function(a,c,d,e){var f=b.transformers[d],g=a;return f&&_.each(f,function(a){g=a(c,g)}),b.onElemRestangularized(g,c,d,e)},b.fullResponse=_.isUndefined(b.fullResponse)?!1:b.fullResponse,a.setFullResponse=function(a){return b.fullResponse=a,this},b.urlCreatorFactory={};var f=function(){};f.prototype.setConfig=function(a){return this.config=a,this},f.prototype.parentsArray=function(a){for(var b=[];a;)b.push(a),a=a[this.config.restangularFields.parentResource];return b.reverse()},f.prototype.resource=function(a,d,e,f,g,h,i,j){var k=_.defaults(g||{},this.config.defaultRequestParams.common),l=_.defaults(f||{},this.config.defaultHeaders);i&&(b.isSafe(j)?l["If-None-Match"]=i:l["If-Match"]=i);var m=this.base(a);if(h){var n="";/\/$/.test(m)||(n+="/"),n+=h,m+=n}return this.config.suffix&&-1===m.indexOf(this.config.suffix,m.length-this.config.suffix.length)&&!this.config.getUrlFromElem(a)&&(m+=this.config.suffix),a[this.config.restangularFields.httpConfig]=void 0,c(this.config,d,m,{getList:this.config.withHttpValues(e,{method:"GET",params:k,headers:l}),get:this.config.withHttpValues(e,{method:"GET",params:k,headers:l}),put:this.config.withHttpValues(e,{method:"PUT",params:k,headers:l}),post:this.config.withHttpValues(e,{method:"POST",params:k,headers:l}),remove:this.config.withHttpValues(e,{method:"DELETE",params:k,headers:l}),head:this.config.withHttpValues(e,{method:"HEAD",params:k,headers:l}),trace:this.config.withHttpValues(e,{method:"TRACE",params:k,headers:l}),options:this.config.withHttpValues(e,{method:"OPTIONS",params:k,headers:l}),patch:this.config.withHttpValues(e,{method:"PATCH",params:k,headers:l})})};var g=function(){};g.prototype=new f,g.prototype.base=function(a){var c=this;return _.reduce(this.parentsArray(a),function(a,d){var e,f=c.config.getUrlFromElem(d);if(f){if(c.config.isAbsoluteUrl(f))return f;e=f}else if(e=d[c.config.restangularFields.route],d[c.config.restangularFields.restangularCollection]){var g=d[c.config.restangularFields.ids];g&&(e+="/"+g.join(","))}else{var h;h=c.config.useCannonicalId?c.config.getCannonicalIdFromElem(d):c.config.getIdFromElem(d),b.isValidId(h)&&(e+="/"+(c.config.encodeIds?encodeURIComponent(h):h))}return a.replace(/\/$/,"")+"/"+e},this.config.baseUrl)},g.prototype.fetchUrl=function(a,b){var c=this.base(a);return b&&(c+="/"+b),c},g.prototype.fetchRequestedUrl=function(a,c){function d(a){var b=[];for(var c in a)a.hasOwnProperty(c)&&b.push(c);return b.sort()}function e(a,b,c){for(var e=d(a),f=0;f<e.length;f++)b.call(c,a[e[f]],e[f]);return e}function f(a,b){return encodeURIComponent(a).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,b?"%20":"+")}var g=this.fetchUrl(a,c),h=a[b.restangularFields.reqParams];if(!h)return g;var i=[];return e(h,function(a,b){null!=a&&void 0!=a&&(angular.isArray(a)||(a=[a]),angular.forEach(a,function(a){angular.isObject(a)&&(a=angular.toJson(a)),i.push(f(b)+"="+f(a))}))}),g+(-1===g.indexOf("?")?"?":"&")+i.join("&")},b.urlCreatorFactory.path=g};var b={};a.init(this,b),this.$get=["$http","$q",function(c,d){function e(b){function f(a,c,d,e){if(c[b.restangularFields.route]=d,c[b.restangularFields.getRestangularUrl]=_.bind(N.fetchUrl,N,c),c[b.restangularFields.getRequestedUrl]=_.bind(N.fetchRequestedUrl,N,c),c[b.restangularFields.addRestangularMethod]=_.bind(K,c),c[b.restangularFields.clone]=_.bind(r,c,c),c[b.restangularFields.reqParams]=_.isEmpty(e)?null:e,c.withHttpConfig=_.bind(z,c),c[b.restangularFields.one]=_.bind(g,c,c),c[b.restangularFields.all]=_.bind(h,c,c),c[b.restangularFields.several]=_.bind(i,c,c),c[b.restangularFields.oneUrl]=_.bind(j,c,c),c[b.restangularFields.allUrl]=_.bind(k,c,c),a&&b.shouldSaveParent(d)){var f=b.getIdFromElem(a),l=b.getUrlFromElem(a),m=_.union(_.values(_.pick(b.restangularFields,["route","parentResource"])),b.extraFields),n=_.pick(a,m);b.isValidId(f)&&b.setIdToElem(n,f),b.isValidId(l)&&b.setUrlToElem(n,l),c[b.restangularFields.parentResource]=n}else c[b.restangularFields.parentResource]=null;return c}function g(a,c,d){var e={};return b.setIdToElem(e,d),s(a,e,c)}function h(a,b){return t(a,[],b,!0)}function i(a,c){var d=[];return d[b.restangularFields.ids]=Array.prototype.splice.call(arguments,2),t(a,d,c,!0)}function j(a,c,d){var e={};return b.setUrlToElem(e,d),s(a,e,c)}function k(a,c,d){var e={};return b.setUrlToElem(e,d),t(a,e,c,!0)}function l(a,c,d){return a.call=_.bind(m,a),a.get=_.bind(n,a),a[b.restangularFields.restangularCollection]=c,c&&(a.push=_.bind(m,a,"push")),a.$object=d,a}function m(a){var c=d.defer(),e=arguments,f={};return this.then(function(b){var d=Array.prototype.slice.call(e,1),g=b[a];g.apply(b,d),f=b,c.resolve(b)}),l(c.promise,this[b.restangularFields.restangularCollection],f)}function n(a){var c=d.defer(),e={};return this.then(function(b){e=b[a],c.resolve(e)}),l(c.promise,this[b.restangularFields.restangularCollection],e)}function o(a,c,d,e){return _.extend(e,d),b.fullResponse?a.resolve(_.extend(c,{data:d})):(a.resolve(d),void 0)}function p(a){if(_.isArray(a)){var c=[];return _.each(a,function(a){c.push(p(a))}),c}return _.omit(a,_.values(_.omit(b.restangularFields,"id")))}function q(a){a.customOperation=_.bind(J,a),_.each(["put","post","get","delete"],function(b){_.each(["do","custom"],function(c){var d,e="delete"===b?"remove":b,f=c+b.toUpperCase();d="put"!==e&&"post"!==e?J:function(a,b,c,d,e){return _.bind(J,this)(a,c,d,e,b)},a[f]=_.bind(d,a,e)})}),a.customGETLIST=_.bind(y,a),a.doGETLIST=a.customGETLIST}function r(a){var c=angular.copy(a);return s(c[b.restangularFields.parentResource],c,c[b.restangularFields.route])}function s(a,c,d,e,g){var h=b.onBeforeElemRestangularized(c,!1,d),i=f(a,h,d,g);return b.useCannonicalId&&(i[b.restangularFields.cannonicalId]=b.getIdFromElem(i)),e&&(i[b.restangularFields.getParentList]=function(){return e}),i[b.restangularFields.restangularCollection]=!1,i[b.restangularFields.get]=_.bind(B,i),i[b.restangularFields.getList]=_.bind(y,i),i[b.restangularFields.put]=_.bind(D,i),i[b.restangularFields.post]=_.bind(E,i),i[b.restangularFields.remove]=_.bind(C,i),i[b.restangularFields.head]=_.bind(F,i),i[b.restangularFields.trace]=_.bind(G,i),i[b.restangularFields.options]=_.bind(H,i),i[b.restangularFields.patch]=_.bind(I,i),q(i),b.transformElem(i,!1,d,M)}function t(a,c,d,e){var g=b.onBeforeElemRestangularized(c,!0,d),h=f(a,g,d,e);return h[b.restangularFields.restangularCollection]=!0,h[b.restangularFields.post]=_.bind(E,h,null),h[b.restangularFields.remove]=_.bind(C,h),h[b.restangularFields.head]=_.bind(F,h),h[b.restangularFields.trace]=_.bind(G,h),h[b.restangularFields.putElement]=_.bind(w,h),h[b.restangularFields.options]=_.bind(H,h),h[b.restangularFields.patch]=_.bind(I,h),h[b.restangularFields.get]=_.bind(v,h),h[b.restangularFields.getList]=_.bind(y,h,null),q(h),b.transformElem(h,!0,d,M)}function u(a,b,c){var d=t(a,b,c);return _.each(d,function(b){s(a,b,c)}),d}function v(a,b,c){return this.customGET(a.toString(),b,c)}function w(a,b,c){var e=this,f=this[a],g=d.defer(),h=[];return f.put(b,c).then(function(b){var c=r(e);c[a]=b,h=c,g.resolve(c)},function(a){g.reject(a)}),l(g.promise,!0,h)}function x(a,c,d,e,f,g){var h=b.responseExtractor(a,c,d,e,f,g),i=f.headers("ETag");return h&&i&&(h[b.restangularFields.etag]=i),h}function y(a,e,f){var g=this,h=d.defer(),i="getList",j=N.fetchUrl(this,a),k=a||g[b.restangularFields.route],m=b.fullRequestInterceptor(null,i,k,j,f||{},e||{},this[b.restangularFields.httpConfig]||{}),n=[];return N.resource(this,c,m.httpConfig,m.headers,m.params,a,this[b.restangularFields.etag],i).getList().then(function(c){var d=c.data,e=c.config.params,f=x(d,i,k,j,c,h),l=_.map(f,function(c){return g[b.restangularFields.restangularCollection]?s(g[b.restangularFields.parentResource],c,g[b.restangularFields.route],f):s(g,c,a,f)});l=_.extend(f,l),g[b.restangularFields.restangularCollection]?o(h,c,t(g[b.restangularFields.parentResource],l,g[b.restangularFields.route],e),n):o(h,c,t(g,l,a,e),n)},function(a){b.errorInterceptor(a)!==!1&&h.reject(a)}),l(h.promise,!0,n)}function z(a){return this[b.restangularFields.httpConfig]=a,this}function A(a,e,f,g,h){var i=this,j=d.defer(),k=f||{},m=e||this[b.restangularFields.route],n=N.fetchUrl(this,e),q=g||this,r=q[b.restangularFields.etag];_.isObject(q)&&b.isRestangularized(q)&&(q=p(q));var t=b.fullRequestInterceptor(q,a,m,n,h||{},k||{},this[b.restangularFields.httpConfig]||{}),u={},v=function(c){var d=c.data,f=c.config.params,g=x(d,a,m,n,c,j);g?"post"!==a||i[b.restangularFields.restangularCollection]?o(j,c,s(i[b.restangularFields.parentResource],g,i[b.restangularFields.route],f),u):o(j,c,s(i,g,e,f),u):o(j,c,void 0,u)},w=function(a){b.errorInterceptor(a)!==!1&&j.reject(a)},y=a,z=_.extend({},t.headers),A=b.isOverridenMethod(a);return A&&(y="post",z=_.extend(z,{"X-HTTP-Method-Override":"remove"===a?"DELETE":a})),b.isSafe(a)?A?N.resource(this,c,t.httpConfig,z,t.params,e,r,y)[y]({}).then(v,w):N.resource(this,c,t.httpConfig,z,t.params,e,r,y)[y]().then(v,w):N.resource(this,c,t.httpConfig,z,t.params,e,r,y)[y](t.element).then(v,w),l(j.promise,!1,u)}function B(a,b){return _.bind(A,this)("get",void 0,a,void 0,b)}function C(a,b){return _.bind(A,this)("remove",void 0,a,void 0,b)}function D(a,b){return _.bind(A,this)("put",void 0,a,void 0,b)}function E(a,b,c,d){return _.bind(A,this)("post",a,c,b,d)}function F(a,b){return _.bind(A,this)("head",void 0,a,void 0,b)}function G(a,b){return _.bind(A,this)("trace",void 0,a,void 0,b)}function H(a,b){return _.bind(A,this)("options",void 0,a,void 0,b)}function I(a,b,c){return _.bind(A,this)("patch",void 0,b,a,c)}function J(a,b,c,d,e){return _.bind(A,this)(a,b,c,e,d)}function K(a,c,d,e,f,g){var h;h="getList"===c?_.bind(y,this,d):_.bind(J,this,c,d);var i=function(a,b,c){var d=_.defaults({params:a,headers:b,elem:c},{params:e,headers:f,elem:g});return h(d.params,d.headers,d.elem)};this[a]=b.isSafe(c)?i:function(a,b,c){return i(b,c,a)}}function L(c){var d=angular.copy(_.omit(b,"configuration"));return a.init(d,d),c(d),e(d)}var M={},N=new b.urlCreatorFactory[b.urlCreator];return N.setConfig(b),a.init(M,b),M.copy=_.bind(r,M),M.withConfig=_.bind(L,M),M.one=_.bind(g,M,null),M.all=_.bind(h,M,null),M.several=_.bind(i,M,null),M.oneUrl=_.bind(j,M,null),M.allUrl=_.bind(k,M,null),M.stripRestangular=_.bind(p,M),M.restangularizeElement=_.bind(s,M),M.restangularizeCollection=_.bind(u,M),M}return e(b)}]})}();
\ No newline at end of file
+ */(function(root, factory) {
+  /* global define, require */
+  // https://github.com/umdjs/umd/blob/master/templates/returnExports.js
+  if (typeof define === 'function' && define.amd) {
+    define(['lodash', 'angular'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = factory(require('lodash'), require('angular'));
+  } else {
+    // No global export, Restangular will register itself as Angular.js module
+    factory(root._, root.angular);
+  }
+}(this, function(_, angular) {
+
+  var restangular = angular.module('restangular', []);
+
+  restangular.provider('Restangular', function() {
+    // Configuration
+    var Configurer = {};
+    Configurer.init = function(object, config) {
+      object.configuration = config;
+
+      /**
+       * Those are HTTP safe methods for which there is no need to pass any data with the request.
+       */
+      var safeMethods = ['get', 'head', 'options', 'trace', 'getlist'];
+      config.isSafe = function(operation) {
+        return _.includes(safeMethods, operation.toLowerCase());
+      };
+
+      var absolutePattern = /^https?:\/\//i;
+      config.isAbsoluteUrl = function(string) {
+        return _.isUndefined(config.absoluteUrl) || _.isNull(config.absoluteUrl) ?
+          string && absolutePattern.test(string) :
+          config.absoluteUrl;
+      };
+
+      config.absoluteUrl = _.isUndefined(config.absoluteUrl) ? true : config.absoluteUrl;
+      object.setSelfLinkAbsoluteUrl = function(value) {
+        config.absoluteUrl = value;
+      };
+      /**
+       * This is the BaseURL to be used with Restangular
+       */
+      config.baseUrl = _.isUndefined(config.baseUrl) ? '' : config.baseUrl;
+      object.setBaseUrl = function(newBaseUrl) {
+        config.baseUrl = /\/$/.test(newBaseUrl) ?
+          newBaseUrl.substring(0, newBaseUrl.length - 1) :
+          newBaseUrl;
+        return this;
+      };
+
+      /**
+       * Sets the extra fields to keep from the parents
+       */
+      config.extraFields = config.extraFields || [];
+      object.setExtraFields = function(newExtraFields) {
+        config.extraFields = newExtraFields;
+        return this;
+      };
+
+      /**
+       * Some default $http parameter to be used in EVERY call
+       **/
+      config.defaultHttpFields = config.defaultHttpFields || {};
+      object.setDefaultHttpFields = function(values) {
+        config.defaultHttpFields = values;
+        return this;
+      };
+
+      /**
+       * Always return plain data, no restangularized object
+       **/
+      config.plainByDefault = config.plainByDefault || false;
+      object.setPlainByDefault = function(value) {
+        config.plainByDefault = value === true ? true : false;
+        return this;
+      };
+
+      config.withHttpValues = function(httpLocalConfig, obj) {
+        return _.defaults(obj, httpLocalConfig, config.defaultHttpFields);
+      };
+
+      config.encodeIds = _.isUndefined(config.encodeIds) ? true : config.encodeIds;
+      object.setEncodeIds = function(encode) {
+        config.encodeIds = encode;
+      };
+
+      config.defaultRequestParams = config.defaultRequestParams || {
+        get: {},
+        post: {},
+        put: {},
+        remove: {},
+        common: {}
+      };
+
+      object.setDefaultRequestParams = function(param1, param2) {
+        var methods = [],
+          params = param2 || param1;
+        if (!_.isUndefined(param2)) {
+          if (_.isArray(param1)) {
+            methods = param1;
+          } else {
+            methods.push(param1);
+          }
+        } else {
+          methods.push('common');
+        }
+
+        _.each(methods, function(method) {
+          config.defaultRequestParams[method] = params;
+        });
+        return this;
+      };
+
+      object.requestParams = config.defaultRequestParams;
+
+      config.defaultHeaders = config.defaultHeaders || {};
+      object.setDefaultHeaders = function(headers) {
+        config.defaultHeaders = headers;
+        object.defaultHeaders = config.defaultHeaders;
+        return this;
+      };
+
+      object.defaultHeaders = config.defaultHeaders;
+
+      /**
+       * Method overriders will set which methods are sent via POST with an X-HTTP-Method-Override
+       **/
+      config.methodOverriders = config.methodOverriders || [];
+      object.setMethodOverriders = function(values) {
+        var overriders = _.extend([], values);
+        if (config.isOverridenMethod('delete', overriders)) {
+          overriders.push('remove');
+        }
+        config.methodOverriders = overriders;
+        return this;
+      };
+
+      config.jsonp = _.isUndefined(config.jsonp) ? false : config.jsonp;
+      object.setJsonp = function(active) {
+        config.jsonp = active;
+      };
+
+      config.isOverridenMethod = function(method, values) {
+        var search = values || config.methodOverriders;
+        return !_.isUndefined(_.find(search, function(one) {
+          return one.toLowerCase() === method.toLowerCase();
+        }));
+      };
+
+      /**
+       * Sets the URL creator type. For now, only Path is created. In the future we'll have queryParams
+       **/
+      config.urlCreator = config.urlCreator || 'path';
+      object.setUrlCreator = function(name) {
+        if (!_.has(config.urlCreatorFactory, name)) {
+          throw new Error('URL Path selected isn\'t valid');
+        }
+
+        config.urlCreator = name;
+        return this;
+      };
+
+      /**
+       * You can set the restangular fields here. The 3 required fields for Restangular are:
+       *
+       * id: Id of the element
+       * route: name of the route of this element
+       * parentResource: the reference to the parent resource
+       *
+       *  All of this fields except for id, are handled (and created) by Restangular. By default,
+       *  the field values will be id, route and parentResource respectively
+       */
+      config.restangularFields = config.restangularFields || {
+        id: 'id',
+        route: 'route',
+        parentResource: 'parentResource',
+        restangularCollection: 'restangularCollection',
+        cannonicalId: '__cannonicalId',
+        etag: 'restangularEtag',
+        selfLink: 'href',
+        get: 'get',
+        getList: 'getList',
+        put: 'put',
+        post: 'post',
+        remove: 'remove',
+        head: 'head',
+        trace: 'trace',
+        options: 'options',
+        patch: 'patch',
+        getRestangularUrl: 'getRestangularUrl',
+        getRequestedUrl: 'getRequestedUrl',
+        putElement: 'putElement',
+        addRestangularMethod: 'addRestangularMethod',
+        getParentList: 'getParentList',
+        clone: 'clone',
+        ids: 'ids',
+        httpConfig: '_$httpConfig',
+        reqParams: 'reqParams',
+        one: 'one',
+        all: 'all',
+        several: 'several',
+        oneUrl: 'oneUrl',
+        allUrl: 'allUrl',
+        customPUT: 'customPUT',
+        customPATCH: 'customPATCH',
+        customPOST: 'customPOST',
+        customDELETE: 'customDELETE',
+        customGET: 'customGET',
+        customGETLIST: 'customGETLIST',
+        customOperation: 'customOperation',
+        doPUT: 'doPUT',
+        doPATCH: 'doPATCH',
+        doPOST: 'doPOST',
+        doDELETE: 'doDELETE',
+        doGET: 'doGET',
+        doGETLIST: 'doGETLIST',
+        fromServer: 'fromServer',
+        withConfig: 'withConfig',
+        withHttpConfig: 'withHttpConfig',
+        singleOne: 'singleOne',
+        plain: 'plain',
+        save: 'save',
+        restangularized: 'restangularized'
+      };
+      object.setRestangularFields = function(resFields) {
+        config.restangularFields =
+          _.extend(config.restangularFields, resFields);
+        return this;
+      };
+
+      config.isRestangularized = function(obj) {
+        return !!obj[config.restangularFields.restangularized];
+      };
+
+      config.setFieldToElem = function(field, elem, value) {
+        var properties = field.split('.');
+        var idValue = elem;
+        _.each(_.initial(properties), function(prop) {
+          idValue[prop] = {};
+          idValue = idValue[prop];
+        });
+        idValue[_.last(properties)] = value;
+        return this;
+      };
+
+      config.getFieldFromElem = function(field, elem) {
+        var properties = field.split('.');
+        var idValue = elem;
+        _.each(properties, function(prop) {
+          if (idValue) {
+            idValue = idValue[prop];
+          }
+        });
+        return angular.copy(idValue);
+      };
+
+      config.setIdToElem = function(elem, id /*, route */ ) {
+        config.setFieldToElem(config.restangularFields.id, elem, id);
+        return this;
+      };
+
+      config.getIdFromElem = function(elem) {
+        return config.getFieldFromElem(config.restangularFields.id, elem);
+      };
+
+      config.isValidId = function(elemId) {
+        return '' !== elemId && !_.isUndefined(elemId) && !_.isNull(elemId);
+      };
+
+      config.setUrlToElem = function(elem, url /*, route */ ) {
+        config.setFieldToElem(config.restangularFields.selfLink, elem, url);
+        return this;
+      };
+
+      config.getUrlFromElem = function(elem) {
+        return config.getFieldFromElem(config.restangularFields.selfLink, elem);
+      };
+
+      config.useCannonicalId = _.isUndefined(config.useCannonicalId) ? false : config.useCannonicalId;
+      object.setUseCannonicalId = function(value) {
+        config.useCannonicalId = value;
+        return this;
+      };
+
+      config.getCannonicalIdFromElem = function(elem) {
+        var cannonicalId = elem[config.restangularFields.cannonicalId];
+        var actualId = config.isValidId(cannonicalId) ? cannonicalId : config.getIdFromElem(elem);
+        return actualId;
+      };
+
+      /**
+       * Sets the Response parser. This is used in case your response isn't directly the data.
+       * For example if you have a response like {meta: {'meta'}, data: {name: 'Gonto'}}
+       * you can extract this data which is the one that needs wrapping
+       *
+       * The ResponseExtractor is a function that receives the response and the method executed.
+       */
+
+      config.responseInterceptors = config.responseInterceptors || [];
+
+      config.defaultResponseInterceptor = function(data /*, operation, what, url, response, deferred */ ) {
+        return data;
+      };
+
+      config.responseExtractor = function(data, operation, what, url, response, deferred) {
+        var interceptors = angular.copy(config.responseInterceptors);
+        interceptors.push(config.defaultResponseInterceptor);
+        var theData = data;
+        _.each(interceptors, function(interceptor) {
+          theData = interceptor(theData, operation,
+            what, url, response, deferred);
+        });
+        return theData;
+      };
+
+      object.addResponseInterceptor = function(extractor) {
+        config.responseInterceptors.push(extractor);
+        return this;
+      };
+
+      config.errorInterceptors = config.errorInterceptors || [];
+      object.addErrorInterceptor = function(interceptor) {
+        config.errorInterceptors.push(interceptor);
+        return this;
+      };
+
+      object.setResponseInterceptor = object.addResponseInterceptor;
+      object.setResponseExtractor = object.addResponseInterceptor;
+      object.setErrorInterceptor = object.addErrorInterceptor;
+
+      /**
+       * Response interceptor is called just before resolving promises.
+       */
+
+
+      /**
+       * Request interceptor is called before sending an object to the server.
+       */
+      config.requestInterceptors = config.requestInterceptors || [];
+
+      config.defaultInterceptor = function(element, operation, path, url, headers, params, httpConfig) {
+        return {
+          element: element,
+          headers: headers,
+          params: params,
+          httpConfig: httpConfig
+        };
+      };
+
+      config.fullRequestInterceptor = function(element, operation, path, url, headers, params, httpConfig) {
+        var interceptors = angular.copy(config.requestInterceptors);
+        var defaultRequest = config.defaultInterceptor(element, operation, path, url, headers, params, httpConfig);
+        return _.reduce(interceptors, function(request, interceptor) {
+          return _.extend(request, interceptor(request.element, operation,
+            path, url, request.headers, request.params, request.httpConfig));
+        }, defaultRequest);
+      };
+
+      object.addRequestInterceptor = function(interceptor) {
+        config.requestInterceptors.push(function(elem, operation, path, url, headers, params, httpConfig) {
+          return {
+            headers: headers,
+            params: params,
+            element: interceptor(elem, operation, path, url),
+            httpConfig: httpConfig
+          };
+        });
+        return this;
+      };
+
+      object.setRequestInterceptor = object.addRequestInterceptor;
+
+      object.addFullRequestInterceptor = function(interceptor) {
+        config.requestInterceptors.push(interceptor);
+        return this;
+      };
+
+      object.setFullRequestInterceptor = object.addFullRequestInterceptor;
+
+      config.onBeforeElemRestangularized = config.onBeforeElemRestangularized || function(elem) {
+        return elem;
+      };
+      object.setOnBeforeElemRestangularized = function(post) {
+        config.onBeforeElemRestangularized = post;
+        return this;
+      };
+
+      object.setRestangularizePromiseInterceptor = function(interceptor) {
+        config.restangularizePromiseInterceptor = interceptor;
+        return this;
+      };
+
+      /**
+       * This method is called after an element has been "Restangularized".
+       *
+       * It receives the element, a boolean indicating if it's an element or a collection
+       * and the name of the model
+       *
+       */
+      config.onElemRestangularized = config.onElemRestangularized || function(elem) {
+        return elem;
+      };
+      object.setOnElemRestangularized = function(post) {
+        config.onElemRestangularized = post;
+        return this;
+      };
+
+      config.shouldSaveParent = config.shouldSaveParent || function() {
+        return true;
+      };
+      object.setParentless = function(values) {
+        if (_.isArray(values)) {
+          config.shouldSaveParent = function(route) {
+            return !_.includes(values, route);
+          };
+        } else if (_.isBoolean(values)) {
+          config.shouldSaveParent = function() {
+            return !values;
+          };
+        }
+        return this;
+      };
+
+      /**
+       * This lets you set a suffix to every request.
+       *
+       * For example, if your api requires that for JSon requests you do /users/123.json, you can set that
+       * in here.
+       *
+       *
+       * By default, the suffix is null
+       */
+      config.suffix = _.isUndefined(config.suffix) ? null : config.suffix;
+      object.setRequestSuffix = function(newSuffix) {
+        config.suffix = newSuffix;
+        return this;
+      };
+
+      /**
+       * Add element transformers for certain routes.
+       */
+      config.transformers = config.transformers || {};
+      config.matchTransformers = config.matchTransformers || [];
+      object.addElementTransformer = function(type, secondArg, thirdArg) {
+        var isCollection = null;
+        var transformer = null;
+        if (arguments.length === 2) {
+          transformer = secondArg;
+        } else {
+          transformer = thirdArg;
+          isCollection = secondArg;
+        }
+
+        var transformerFn = function(coll, elem) {
+          if (_.isNull(isCollection) || (coll === isCollection)) {
+            return transformer(elem);
+          }
+          return elem;
+        };
+
+        if (_.isRegExp(type)) {
+          config.matchTransformers.push({
+            regexp: type,
+            transformer: transformerFn
+          });
+        } else {
+          if (!config.transformers[type]) {
+            config.transformers[type] = [];
+          }
+          config.transformers[type].push(transformerFn);
+        }
+
+        return object;
+      };
+
+      object.extendCollection = function(route, fn) {
+        return object.addElementTransformer(route, true, fn);
+      };
+
+      object.extendModel = function(route, fn) {
+        return object.addElementTransformer(route, false, fn);
+      };
+
+      config.transformElem = function(elem, isCollection, route, Restangular, force) {
+        if (!force && !config.transformLocalElements && !elem[config.restangularFields.fromServer]) {
+          return elem;
+        }
+
+        var changedElem = elem;
+
+        var matchTransformers = config.matchTransformers;
+        if (matchTransformers) {
+          _.each(matchTransformers, function(transformer) {
+            if (transformer.regexp.test(route)) {
+              changedElem = transformer.transformer(isCollection, changedElem);
+            }
+          });
+        }
+
+        var typeTransformers = config.transformers[route];
+        if (typeTransformers) {
+          _.each(typeTransformers, function(transformer) {
+            changedElem = transformer(isCollection, changedElem);
+          });
+        }
+        return config.onElemRestangularized(changedElem, isCollection, route, Restangular);
+      };
+
+      config.transformLocalElements = _.isUndefined(config.transformLocalElements) ?
+        false :
+        config.transformLocalElements;
+
+      object.setTransformOnlyServerElements = function(active) {
+        config.transformLocalElements = !active;
+      };
+
+      config.fullResponse = _.isUndefined(config.fullResponse) ? false : config.fullResponse;
+      object.setFullResponse = function(full) {
+        config.fullResponse = full;
+        return this;
+      };
+
+
+      //Internal values and functions
+      config.urlCreatorFactory = {};
+
+      /**
+       * Base URL Creator. Base prototype for everything related to it
+       **/
+
+      var BaseCreator = function() {};
+
+      BaseCreator.prototype.setConfig = function(config) {
+        this.config = config;
+        return this;
+      };
+
+      BaseCreator.prototype.parentsArray = function(current) {
+        var parents = [];
+        while (current) {
+          parents.push(current);
+          current = current[this.config.restangularFields.parentResource];
+        }
+        return parents.reverse();
+      };
+
+      function RestangularResource(config, $http, url, configurer) {
+        var resource = {};
+        _.each(_.keys(configurer), function(key) {
+          var value = configurer[key];
+
+          // Add default parameters
+          value.params = _.extend({}, value.params, config.defaultRequestParams[value.method.toLowerCase()]);
+          // We don't want the ? if no params are there
+          if (_.isEmpty(value.params)) {
+            delete value.params;
+          }
+
+          if (config.isSafe(value.method)) {
+
+            resource[key] = function() {
+              return $http(_.extend(value, {
+                url: url
+              }));
+            };
+
+          } else {
+
+            resource[key] = function(data) {
+              return $http(_.extend(value, {
+                url: url,
+                data: data
+              }));
+            };
+
+          }
+        });
+
+        return resource;
+      }
+
+      BaseCreator.prototype.resource = function(current, $http, localHttpConfig, callHeaders, callParams, what, etag, operation) {
+
+        var params = _.defaults(callParams || {}, this.config.defaultRequestParams.common);
+        var headers = _.defaults(callHeaders || {}, this.config.defaultHeaders);
+
+        if (etag) {
+          if (!config.isSafe(operation)) {
+            headers['If-Match'] = etag;
+          } else {
+            headers['If-None-Match'] = etag;
+          }
+        }
+
+        var url = this.base(current);
+
+        if (what || what === 0) {
+          var add = '';
+          if (!/\/$/.test(url)) {
+            add += '/';
+          }
+          add += what;
+          url += add;
+        }
+
+        if (this.config.suffix &&
+          url.indexOf(this.config.suffix, url.length - this.config.suffix.length) === -1 &&
+          !this.config.getUrlFromElem(current)) {
+          url += this.config.suffix;
+        }
+
+        current[this.config.restangularFields.httpConfig] = undefined;
+
+        return RestangularResource(this.config, $http, url, {
+          getList: this.config.withHttpValues(localHttpConfig, {
+            method: 'GET',
+            params: params,
+            headers: headers
+          }),
+
+          get: this.config.withHttpValues(localHttpConfig, {
+            method: 'GET',
+            params: params,
+            headers: headers
+          }),
+
+          jsonp: this.config.withHttpValues(localHttpConfig, {
+            method: 'jsonp',
+            params: params,
+            headers: headers
+          }),
+
+          put: this.config.withHttpValues(localHttpConfig, {
+            method: 'PUT',
+            params: params,
+            headers: headers
+          }),
+
+          post: this.config.withHttpValues(localHttpConfig, {
+            method: 'POST',
+            params: params,
+            headers: headers
+          }),
+
+          remove: this.config.withHttpValues(localHttpConfig, {
+            method: 'DELETE',
+            params: params,
+            headers: headers
+          }),
+
+          head: this.config.withHttpValues(localHttpConfig, {
+            method: 'HEAD',
+            params: params,
+            headers: headers
+          }),
+
+          trace: this.config.withHttpValues(localHttpConfig, {
+            method: 'TRACE',
+            params: params,
+            headers: headers
+          }),
+
+          options: this.config.withHttpValues(localHttpConfig, {
+            method: 'OPTIONS',
+            params: params,
+            headers: headers
+          }),
+
+          patch: this.config.withHttpValues(localHttpConfig, {
+            method: 'PATCH',
+            params: params,
+            headers: headers
+          })
+        });
+      };
+
+      /**
+       * This is the Path URL creator. It uses Path to show Hierarchy in the Rest API.
+       * This means that if you have an Account that then has a set of Buildings, a URL to a building
+       * would be /accounts/123/buildings/456
+       **/
+      var Path = function() {};
+
+      Path.prototype = new BaseCreator();
+
+      Path.prototype.normalizeUrl = function(url) {
+        var parts = /((?:http[s]?:)?\/\/)?(.*)?/.exec(url);
+        parts[2] = parts[2].replace(/[\\\/]+/g, '/');
+        return (typeof parts[1] !== 'undefined') ? parts[1] + parts[2] : parts[2];
+      };
+
+      Path.prototype.base = function(current) {
+        var __this = this;
+        return _.reduce(this.parentsArray(current), function(acum, elem) {
+          var elemUrl;
+          var elemSelfLink = __this.config.getUrlFromElem(elem);
+          if (elemSelfLink) {
+            if (__this.config.isAbsoluteUrl(elemSelfLink)) {
+              return elemSelfLink;
+            } else {
+              elemUrl = elemSelfLink;
+            }
+          } else {
+            elemUrl = elem[__this.config.restangularFields.route];
+
+            if (elem[__this.config.restangularFields.restangularCollection]) {
+              var ids = elem[__this.config.restangularFields.ids];
+              if (ids) {
+                elemUrl += '/' + ids.join(',');
+              }
+            } else {
+              var elemId;
+              if (__this.config.useCannonicalId) {
+                elemId = __this.config.getCannonicalIdFromElem(elem);
+              } else {
+                elemId = __this.config.getIdFromElem(elem);
+              }
+
+              if (config.isValidId(elemId) && !elem.singleOne) {
+                elemUrl += '/' + (__this.config.encodeIds ? encodeURIComponent(elemId) : elemId);
+              }
+            }
+          }
+          acum = acum.replace(/\/$/, '') + '/' + elemUrl;
+          return __this.normalizeUrl(acum);
+
+        }, this.config.baseUrl);
+      };
+
+
+
+      Path.prototype.fetchUrl = function(current, what) {
+        var baseUrl = this.base(current);
+        if (what) {
+          baseUrl += '/' + what;
+        }
+        return baseUrl;
+      };
+
+      Path.prototype.fetchRequestedUrl = function(current, what) {
+        var url = this.fetchUrl(current, what);
+        var params = current[config.restangularFields.reqParams];
+
+        // From here on and until the end of fetchRequestedUrl,
+        // the code has been kindly borrowed from angular.js
+        // The reason for such code bloating is coherence:
+        //   If the user were to use this for cache management, the
+        //   serialization of parameters would need to be identical
+        //   to the one done by angular for cache keys to match.
+        function sortedKeys(obj) {
+          var keys = [];
+          for (var key in obj) {
+            if (obj.hasOwnProperty(key)) {
+              keys.push(key);
+            }
+          }
+          return keys.sort();
+        }
+
+        function forEachSorted(obj, iterator, context) {
+          var keys = sortedKeys(obj);
+          for (var i = 0; i < keys.length; i++) {
+            iterator.call(context, obj[keys[i]], keys[i]);
+          }
+          return keys;
+        }
+
+        function encodeUriQuery(val, pctEncodeSpaces) {
+          return encodeURIComponent(val).
+          replace(/%40/gi, '@').
+          replace(/%3A/gi, ':').
+          replace(/%24/g, '$').
+          replace(/%2C/gi, ',').
+          replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+        }
+
+        if (!params) {
+          return url + (this.config.suffix || '');
+        }
+
+        var parts = [];
+        forEachSorted(params, function(value, key) {
+          if (value === null || value === undefined) {
+            return;
+          }
+          if (!angular.isArray(value)) {
+            value = [value];
+          }
+
+          angular.forEach(value, function(v) {
+            if (angular.isObject(v)) {
+              v = angular.toJson(v);
+            }
+            parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(v));
+          });
+        });
+
+        return url + (this.config.suffix || '') + ((url.indexOf('?') === -1) ? '?' : '&') + parts.join('&');
+      };
+
+      config.urlCreatorFactory.path = Path;
+    };
+
+    var globalConfiguration = {};
+
+    Configurer.init(this, globalConfiguration);
+
+
+
+    this.$get = ['$http', '$q', function($http, $q) {
+
+      function createServiceForConfiguration(config) {
+        var service = {};
+
+        var urlHandler = new config.urlCreatorFactory[config.urlCreator]();
+        urlHandler.setConfig(config);
+
+        function restangularizeBase(parent, elem, route, reqParams, fromServer) {
+          elem[config.restangularFields.route] = route;
+          elem[config.restangularFields.getRestangularUrl] = _.bind(urlHandler.fetchUrl, urlHandler, elem);
+          elem[config.restangularFields.getRequestedUrl] = _.bind(urlHandler.fetchRequestedUrl, urlHandler, elem);
+          elem[config.restangularFields.addRestangularMethod] = _.bind(addRestangularMethodFunction, elem);
+          elem[config.restangularFields.clone] = _.bind(copyRestangularizedElement, elem, elem);
+          elem[config.restangularFields.reqParams] = _.isEmpty(reqParams) ? null : reqParams;
+          elem[config.restangularFields.withHttpConfig] = _.bind(withHttpConfig, elem);
+          elem[config.restangularFields.plain] = _.bind(stripRestangular, elem, elem);
+
+          // Tag element as restangularized
+          elem[config.restangularFields.restangularized] = true;
+
+          // RequestLess connection
+          elem[config.restangularFields.one] = _.bind(one, elem, elem);
+          elem[config.restangularFields.all] = _.bind(all, elem, elem);
+          elem[config.restangularFields.several] = _.bind(several, elem, elem);
+          elem[config.restangularFields.oneUrl] = _.bind(oneUrl, elem, elem);
+          elem[config.restangularFields.allUrl] = _.bind(allUrl, elem, elem);
+
+          elem[config.restangularFields.fromServer] = !!fromServer;
+
+          if (parent && config.shouldSaveParent(route)) {
+            var parentId = config.getIdFromElem(parent);
+            var parentUrl = config.getUrlFromElem(parent);
+
+            var restangularFieldsForParent = _.union(
+              _.values(_.pick(config.restangularFields, ['route', 'singleOne', 'parentResource'])),
+              config.extraFields
+            );
+            var parentResource = _.pick(parent, restangularFieldsForParent);
+
+            if (config.isValidId(parentId)) {
+              config.setIdToElem(parentResource, parentId, route);
+            }
+            if (config.isValidId(parentUrl)) {
+              config.setUrlToElem(parentResource, parentUrl, route);
+            }
+
+            elem[config.restangularFields.parentResource] = parentResource;
+          } else {
+            elem[config.restangularFields.parentResource] = null;
+          }
+          return elem;
+        }
+
+        function one(parent, route, id, singleOne) {
+          var error;
+          if (_.isNumber(route) || _.isNumber(parent)) {
+            error = 'You\'re creating a Restangular entity with the number ';
+            error += 'instead of the route or the parent. For example, you can\'t call .one(12).';
+            throw new Error(error);
+          }
+          if (_.isUndefined(route)) {
+            error = 'You\'re creating a Restangular entity either without the path. ';
+            error += 'For example you can\'t call .one(). Please check if your arguments are valid.';
+            throw new Error(error);
+          }
+          var elem = {};
+          config.setIdToElem(elem, id, route);
+          config.setFieldToElem(config.restangularFields.singleOne, elem, singleOne);
+          return restangularizeElem(parent, elem, route, false);
+        }
+
+
+        function all(parent, route) {
+          return restangularizeCollection(parent, [], route, false);
+        }
+
+        function several(parent, route /*, ids */ ) {
+          var collection = [];
+          collection[config.restangularFields.ids] = Array.prototype.splice.call(arguments, 2);
+          return restangularizeCollection(parent, collection, route, false);
+        }
+
+        function oneUrl(parent, route, url) {
+          if (!route) {
+            throw new Error('Route is mandatory when creating new Restangular objects.');
+          }
+          var elem = {};
+          config.setUrlToElem(elem, url, route);
+          return restangularizeElem(parent, elem, route, false);
+        }
+
+
+        function allUrl(parent, route, url) {
+          if (!route) {
+            throw new Error('Route is mandatory when creating new Restangular objects.');
+          }
+          var elem = {};
+          config.setUrlToElem(elem, url, route);
+          return restangularizeCollection(parent, elem, route, false);
+        }
+        // Promises
+        function restangularizePromise(promise, isCollection, valueToFill) {
+          promise.call = _.bind(promiseCall, promise);
+          promise.get = _.bind(promiseGet, promise);
+          promise[config.restangularFields.restangularCollection] = isCollection;
+          if (isCollection) {
+            promise.push = _.bind(promiseCall, promise, 'push');
+          }
+          promise.$object = valueToFill;
+          if (config.restangularizePromiseInterceptor) {
+            config.restangularizePromiseInterceptor(promise);
+          }
+          return promise;
+        }
+
+        function promiseCall(method) {
+          var deferred = $q.defer();
+          var callArgs = arguments;
+          var filledValue = {};
+          this.then(function(val) {
+            var params = Array.prototype.slice.call(callArgs, 1);
+            var func = val[method];
+            func.apply(val, params);
+            filledValue = val;
+            deferred.resolve(val);
+          });
+          return restangularizePromise(deferred.promise, this[config.restangularFields.restangularCollection], filledValue);
+        }
+
+        function promiseGet(what) {
+          var deferred = $q.defer();
+          var filledValue = {};
+          this.then(function(val) {
+            filledValue = val[what];
+            deferred.resolve(filledValue);
+          });
+          return restangularizePromise(deferred.promise, this[config.restangularFields.restangularCollection], filledValue);
+        }
+
+        function resolvePromise(deferred, response, data, filledValue) {
+          _.extend(filledValue, data);
+
+          // Trigger the full response interceptor.
+          if (config.fullResponse) {
+            return deferred.resolve(_.extend(response, {
+              data: data
+            }));
+          } else {
+            deferred.resolve(data);
+          }
+        }
+
+
+        // Elements
+        function stripRestangular(elem) {
+          if (_.isArray(elem)) {
+            var array = [];
+            _.each(elem, function(value) {
+              array.push(config.isRestangularized(value) ? stripRestangular(value) : value);
+            });
+            return array;
+          } else {
+            return _.omit(elem, _.values(_.omit(config.restangularFields, 'id')));
+          }
+        }
+
+        function addCustomOperation(elem) {
+          elem[config.restangularFields.customOperation] = _.bind(customFunction, elem);
+          var requestMethods = {
+            get: customFunction,
+            delete: customFunction
+          };
+          _.each(['put', 'patch', 'post'], function(name) {
+            requestMethods[name] = function(operation, elem, path, params, headers) {
+              return _.bind(customFunction, this)(operation, path, params, headers, elem);
+            };
+          });
+          _.each(requestMethods, function(requestFunc, name) {
+            var callOperation = name === 'delete' ? 'remove' : name;
+            _.each(['do', 'custom'], function(alias) {
+              elem[alias + name.toUpperCase()] = _.bind(requestFunc, elem, callOperation);
+            });
+          });
+          elem[config.restangularFields.customGETLIST] = _.bind(fetchFunction, elem);
+          elem[config.restangularFields.doGETLIST] = elem[config.restangularFields.customGETLIST];
+        }
+
+        function copyRestangularizedElement(element) {
+          var copiedElement = angular.copy(element);
+
+          // check if we're dealing with a collection (i.e. an array)
+          // and restangularize the element using the proper restangularizer,
+          // element / collection
+          if (_.isArray(element)) {
+            return restangularizeCollection(
+              element[config.restangularFields.parentResource],
+              copiedElement,
+              element[config.restangularFields.route],
+              element[config.restangularFields.fromServer],
+              element[config.restangularFields.reqParams]
+            );
+          }
+
+          // not a collection, restangularize it as an element
+          return restangularizeElem(
+            element[config.restangularFields.parentResource],
+            copiedElement,
+            element[config.restangularFields.route],
+            element[config.restangularFields.fromServer],
+            element[config.restangularFields.restangularCollection],
+            element[config.restangularFields.reqParams]
+          );
+        }
+
+        function restangularizeElem(parent, element, route, fromServer, collection, reqParams) {
+          var elem = config.onBeforeElemRestangularized(element, false, route);
+
+          var localElem = restangularizeBase(parent, elem, route, reqParams, fromServer);
+
+          if (config.useCannonicalId) {
+            localElem[config.restangularFields.cannonicalId] = config.getIdFromElem(localElem);
+          }
+
+          if (collection) {
+            localElem[config.restangularFields.getParentList] = function() {
+              return collection;
+            };
+          }
+
+          localElem[config.restangularFields.restangularCollection] = false;
+          localElem[config.restangularFields.get] = _.bind(getFunction, localElem);
+          localElem[config.restangularFields.getList] = _.bind(fetchFunction, localElem);
+          localElem[config.restangularFields.put] = _.bind(putFunction, localElem);
+          localElem[config.restangularFields.post] = _.bind(postFunction, localElem);
+          localElem[config.restangularFields.remove] = _.bind(deleteFunction, localElem);
+          localElem[config.restangularFields.head] = _.bind(headFunction, localElem);
+          localElem[config.restangularFields.trace] = _.bind(traceFunction, localElem);
+          localElem[config.restangularFields.options] = _.bind(optionsFunction, localElem);
+          localElem[config.restangularFields.patch] = _.bind(patchFunction, localElem);
+          localElem[config.restangularFields.save] = _.bind(save, localElem);
+
+          addCustomOperation(localElem);
+          return config.transformElem(localElem, false, route, service, true);
+        }
+
+        function restangularizeCollection(parent, element, route, fromServer, reqParams) {
+          var elem = config.onBeforeElemRestangularized(element, true, route);
+
+          var localElem = restangularizeBase(parent, elem, route, reqParams, fromServer);
+          localElem[config.restangularFields.restangularCollection] = true;
+          localElem[config.restangularFields.post] = _.bind(postFunction, localElem, null);
+          localElem[config.restangularFields.remove] = _.bind(deleteFunction, localElem);
+          localElem[config.restangularFields.head] = _.bind(headFunction, localElem);
+          localElem[config.restangularFields.trace] = _.bind(traceFunction, localElem);
+          localElem[config.restangularFields.putElement] = _.bind(putElementFunction, localElem);
+          localElem[config.restangularFields.options] = _.bind(optionsFunction, localElem);
+          localElem[config.restangularFields.patch] = _.bind(patchFunction, localElem);
+          localElem[config.restangularFields.get] = _.bind(getById, localElem);
+          localElem[config.restangularFields.getList] = _.bind(fetchFunction, localElem, null);
+
+          addCustomOperation(localElem);
+          return config.transformElem(localElem, true, route, service, true);
+        }
+
+        function restangularizeCollectionAndElements(parent, element, route, fromServer) {
+          var collection = restangularizeCollection(parent, element, route, fromServer);
+          _.each(collection, function(elem) {
+            if (elem) {
+              restangularizeElem(parent, elem, route, fromServer);
+            }
+          });
+          return collection;
+        }
+
+        function getById(id, reqParams, headers) {
+          return this.customGET(id.toString(), reqParams, headers);
+        }
+
+        function putElementFunction(idx, params, headers) {
+          var __this = this;
+          var elemToPut = this[idx];
+          var deferred = $q.defer();
+          var filledArray = [];
+          filledArray = config.transformElem(filledArray, true, elemToPut[config.restangularFields.route], service);
+          elemToPut.put(params, headers).then(function(serverElem) {
+            var newArray = copyRestangularizedElement(__this);
+            newArray[idx] = serverElem;
+            filledArray = newArray;
+            deferred.resolve(newArray);
+          }, function(response) {
+            deferred.reject(response);
+          });
+
+          return restangularizePromise(deferred.promise, true, filledArray);
+        }
+
+        function parseResponse(resData, operation, route, fetchUrl, response, deferred) {
+          var data = config.responseExtractor(resData, operation, route, fetchUrl, response, deferred);
+          var etag = response.headers('ETag');
+          if (data && etag) {
+            data[config.restangularFields.etag] = etag;
+          }
+          return data;
+        }
+
+
+        function fetchFunction(what, reqParams, headers) {
+          var __this = this;
+          var deferred = $q.defer();
+          var operation = 'getList';
+          var url = urlHandler.fetchUrl(this, what);
+          var whatFetched = what || __this[config.restangularFields.route];
+
+          var request = config.fullRequestInterceptor(null, operation,
+            whatFetched, url, headers || {}, reqParams || {}, this[config.restangularFields.httpConfig] || {});
+
+          var filledArray = [];
+          filledArray = config.transformElem(filledArray, true, whatFetched, service);
+
+          var method = 'getList';
+
+          if (config.jsonp) {
+            method = 'jsonp';
+          }
+
+          var okCallback = function(response) {
+            var resData = response.data;
+            var fullParams = response.config.params;
+            var data = parseResponse(resData, operation, whatFetched, url, response, deferred);
+
+            // support empty response for getList() calls (some APIs respond with 204 and empty body)
+            if (_.isUndefined(data) || '' === data) {
+              data = [];
+            }
+            if (!_.isArray(data)) {
+              throw new Error('Response for getList SHOULD be an array and not an object or something else');
+            }
+
+            if (true === config.plainByDefault) {
+              return resolvePromise(deferred, response, data, filledArray);
+            }
+
+            var processedData = _.map(data, function(elem) {
+              if (!__this[config.restangularFields.restangularCollection]) {
+                return restangularizeElem(__this, elem, what, true, data);
+              } else {
+                return restangularizeElem(__this[config.restangularFields.parentResource],
+                  elem, __this[config.restangularFields.route], true, data);
+              }
+            });
+
+            processedData = _.extend(data, processedData);
+
+            if (!__this[config.restangularFields.restangularCollection]) {
+              resolvePromise(
+                deferred,
+                response,
+                restangularizeCollection(
+                  __this,
+                  processedData,
+                  what,
+                  true,
+                  fullParams
+                ),
+                filledArray
+              );
+            } else {
+              resolvePromise(
+                deferred,
+                response,
+                restangularizeCollection(
+                  __this[config.restangularFields.parentResource],
+                  processedData,
+                  __this[config.restangularFields.route],
+                  true,
+                  fullParams
+                ),
+                filledArray
+              );
+            }
+          };
+
+          urlHandler.resource(this, $http, request.httpConfig, request.headers, request.params, what,
+            this[config.restangularFields.etag], operation)[method]().then(okCallback, function error(response) {
+            if (response.status === 304 && __this[config.restangularFields.restangularCollection]) {
+              resolvePromise(deferred, response, __this, filledArray);
+            } else if (_.every(config.errorInterceptors, function(cb) {
+                return cb(response, deferred, okCallback) !== false;
+              })) {
+              // triggered if no callback returns false
+              deferred.reject(response);
+            }
+          });
+
+          return restangularizePromise(deferred.promise, true, filledArray);
+        }
+
+        function withHttpConfig(httpConfig) {
+          this[config.restangularFields.httpConfig] = httpConfig;
+          return this;
+        }
+
+        function save(params, headers) {
+          if (this[config.restangularFields.fromServer]) {
+            return this[config.restangularFields.put](params, headers);
+          } else {
+            return _.bind(elemFunction, this)('post', undefined, params, undefined, headers);
+          }
+        }
+
+        function elemFunction(operation, what, params, obj, headers) {
+          var __this = this;
+          var deferred = $q.defer();
+          var resParams = params || {};
+          var route = what || this[config.restangularFields.route];
+          var fetchUrl = urlHandler.fetchUrl(this, what);
+
+          var callObj = obj || this;
+          // fallback to etag on restangular object (since for custom methods we probably don't explicitly specify the etag field)
+          var etag = callObj[config.restangularFields.etag] || (operation !== 'post' ? this[config.restangularFields.etag] : null);
+
+          if (_.isObject(callObj) && config.isRestangularized(callObj)) {
+            callObj = stripRestangular(callObj);
+          }
+          var request = config.fullRequestInterceptor(callObj, operation, route, fetchUrl,
+            headers || {}, resParams || {}, this[config.restangularFields.httpConfig] || {});
+
+          var filledObject = {};
+          filledObject = config.transformElem(filledObject, false, route, service);
+
+          var okCallback = function(response) {
+            var resData = response.data;
+            var fullParams = response.config.params;
+            var elem = parseResponse(resData, operation, route, fetchUrl, response, deferred);
+
+            // accept 0 as response
+            if (elem !== null && elem !== undefined && elem !== '') {
+              var data;
+
+              if (true === config.plainByDefault) {
+                return resolvePromise(deferred, response, elem, filledObject);
+              }
+
+              if (operation === 'post' && !__this[config.restangularFields.restangularCollection]) {
+                data = restangularizeElem(
+                  __this[config.restangularFields.parentResource],
+                  elem,
+                  route,
+                  true,
+                  null,
+                  fullParams
+                );
+                resolvePromise(deferred, response, data, filledObject);
+              } else {
+                data = restangularizeElem(
+                  __this[config.restangularFields.parentResource],
+                  elem,
+                  __this[config.restangularFields.route],
+                  true,
+                  null,
+                  fullParams
+                );
+
+                data[config.restangularFields.singleOne] = __this[config.restangularFields.singleOne];
+                resolvePromise(deferred, response, data, filledObject);
+              }
+
+            } else {
+              resolvePromise(deferred, response, undefined, filledObject);
+            }
+          };
+
+          var errorCallback = function(response) {
+            if (response.status === 304 && config.isSafe(operation)) {
+              resolvePromise(deferred, response, __this, filledObject);
+            } else if (_.every(config.errorInterceptors, function(cb) {
+                return cb(response, deferred, okCallback) !== false;
+              })) {
+              // triggered if no callback returns false
+              deferred.reject(response);
+            }
+          };
+          // Overriding HTTP Method
+          var callOperation = operation;
+          var callHeaders = _.extend({}, request.headers);
+          var isOverrideOperation = config.isOverridenMethod(operation);
+          if (isOverrideOperation) {
+            callOperation = 'post';
+            callHeaders = _.extend(callHeaders, {
+              'X-HTTP-Method-Override': operation === 'remove' ? 'DELETE' : operation.toUpperCase()
+            });
+          } else if (config.jsonp && callOperation === 'get') {
+            callOperation = 'jsonp';
+          }
+
+          if (config.isSafe(operation)) {
+            if (isOverrideOperation) {
+              urlHandler.resource(this, $http, request.httpConfig, callHeaders, request.params,
+                what, etag, callOperation)[callOperation]({}).then(okCallback, errorCallback);
+            } else {
+              urlHandler.resource(this, $http, request.httpConfig, callHeaders, request.params,
+                what, etag, callOperation)[callOperation]().then(okCallback, errorCallback);
+            }
+          } else {
+            urlHandler.resource(this, $http, request.httpConfig, callHeaders, request.params,
+              what, etag, callOperation)[callOperation](request.element).then(okCallback, errorCallback);
+          }
+
+          return restangularizePromise(deferred.promise, false, filledObject);
+        }
+
+        function getFunction(params, headers) {
+          return _.bind(elemFunction, this)('get', undefined, params, undefined, headers);
+        }
+
+        function deleteFunction(params, headers) {
+          return _.bind(elemFunction, this)('remove', undefined, params, undefined, headers);
+        }
+
+        function putFunction(params, headers) {
+          return _.bind(elemFunction, this)('put', undefined, params, undefined, headers);
+        }
+
+        function postFunction(what, elem, params, headers) {
+          return _.bind(elemFunction, this)('post', what, params, elem, headers);
+        }
+
+        function headFunction(params, headers) {
+          return _.bind(elemFunction, this)('head', undefined, params, undefined, headers);
+        }
+
+        function traceFunction(params, headers) {
+          return _.bind(elemFunction, this)('trace', undefined, params, undefined, headers);
+        }
+
+        function optionsFunction(params, headers) {
+          return _.bind(elemFunction, this)('options', undefined, params, undefined, headers);
+        }
+
+        function patchFunction(elem, params, headers) {
+          return _.bind(elemFunction, this)('patch', undefined, params, elem, headers);
+        }
+
+        function customFunction(operation, path, params, headers, elem) {
+          return _.bind(elemFunction, this)(operation, path, params, elem, headers);
+        }
+
+        function addRestangularMethodFunction(name, operation, path, defaultParams, defaultHeaders, defaultElem) {
+          var bindedFunction;
+          if (operation === 'getList') {
+            bindedFunction = _.bind(fetchFunction, this, path);
+          } else {
+            bindedFunction = _.bind(customFunction, this, operation, path);
+          }
+
+          var createdFunction = function(params, headers, elem) {
+            var callParams = _.defaults({
+              params: params,
+              headers: headers,
+              elem: elem
+            }, {
+              params: defaultParams,
+              headers: defaultHeaders,
+              elem: defaultElem
+            });
+            return bindedFunction(callParams.params, callParams.headers, callParams.elem);
+          };
+
+          if (config.isSafe(operation)) {
+            this[name] = createdFunction;
+          } else {
+            this[name] = function(elem, params, headers) {
+              return createdFunction(params, headers, elem);
+            };
+          }
+        }
+
+        function withConfigurationFunction(configurer) {
+          var newConfig = angular.copy(_.omit(config, 'configuration'));
+          Configurer.init(newConfig, newConfig);
+          configurer(newConfig);
+          return createServiceForConfiguration(newConfig);
+        }
+
+        function toService(route, parent) {
+          var knownCollectionMethods = _.values(config.restangularFields);
+          var serv = {};
+          var collection = (parent || service).all(route);
+          serv.one = _.bind(one, (parent || service), parent, route);
+          serv.post = _.bind(collection.post, collection);
+          serv.getList = _.bind(collection.getList, collection);
+          serv.withHttpConfig = _.bind(collection.withHttpConfig, collection);
+          serv.get = _.bind(collection.get, collection);
+
+          for (var prop in collection) {
+            if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.includes(knownCollectionMethods, prop)) {
+              serv[prop] = _.bind(collection[prop], collection);
+            }
+          }
+
+          return serv;
+        }
+
+
+        Configurer.init(service, config);
+
+        service.copy = _.bind(copyRestangularizedElement, service);
+
+        service.service = _.bind(toService, service);
+
+        service.withConfig = _.bind(withConfigurationFunction, service);
+
+        service.one = _.bind(one, service, null);
+
+        service.all = _.bind(all, service, null);
+
+        service.several = _.bind(several, service, null);
+
+        service.oneUrl = _.bind(oneUrl, service, null);
+
+        service.allUrl = _.bind(allUrl, service, null);
+
+        service.stripRestangular = _.bind(stripRestangular, service);
+
+        service.restangularizeElement = _.bind(restangularizeElem, service);
+
+        service.restangularizeCollection = _.bind(restangularizeCollectionAndElements, service);
+
+        return service;
+      }
+
+      return createServiceForConfiguration(globalConfiguration);
+    }];
+  });
+  return restangular.name;
+}));
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.sanitize.js b/docs-web/src/main/webapp/src/lib/angular.sanitize.js
index 9da534d6..7692d8f0 100644
--- a/docs-web/src/main/webapp/src/lib/angular.sanitize.js
+++ b/docs-web/src/main/webapp/src/lib/angular.sanitize.js
@@ -1,13 +1,806 @@
-/*
- AngularJS v1.2.8
- (c) 2010-2014 Google, Inc. http://angularjs.org
- License: MIT
+/**
+ * @license AngularJS v1.6.6
+ * (c) 2010-2017 Google, Inc. http://angularjs.org
+ * License: MIT
  */
-(function(p,h,q){'use strict';function E(a){var e=[];s(e,h.noop).chars(a);return e.join("")}function k(a){var e={};a=a.split(",");var d;for(d=0;d<a.length;d++)e[a[d]]=!0;return e}function F(a,e){function d(a,b,d,g){b=h.lowercase(b);if(t[b])for(;f.last()&&u[f.last()];)c("",f.last());v[b]&&f.last()==b&&c("",b);(g=w[b]||!!g)||f.push(b);var l={};d.replace(G,function(a,b,e,c,d){l[b]=r(e||c||d||"")});e.start&&e.start(b,l,g)}function c(a,b){var c=0,d;if(b=h.lowercase(b))for(c=f.length-1;0<=c&&f[c]!=b;c--);
-  if(0<=c){for(d=f.length-1;d>=c;d--)e.end&&e.end(f[d]);f.length=c}}var b,g,f=[],l=a;for(f.last=function(){return f[f.length-1]};a;){g=!0;if(f.last()&&x[f.last()])a=a.replace(RegExp("(.*)<\\s*\\/\\s*"+f.last()+"[^>]*>","i"),function(b,a){a=a.replace(H,"$1").replace(I,"$1");e.chars&&e.chars(r(a));return""}),c("",f.last());else{if(0===a.indexOf("\x3c!--"))b=a.indexOf("--",4),0<=b&&a.lastIndexOf("--\x3e",b)===b&&(e.comment&&e.comment(a.substring(4,b)),a=a.substring(b+3),g=!1);else if(y.test(a)){if(b=a.match(y))a=
-    a.replace(b[0],""),g=!1}else if(J.test(a)){if(b=a.match(z))a=a.substring(b[0].length),b[0].replace(z,c),g=!1}else K.test(a)&&(b=a.match(A))&&(a=a.substring(b[0].length),b[0].replace(A,d),g=!1);g&&(b=a.indexOf("<"),g=0>b?a:a.substring(0,b),a=0>b?"":a.substring(b),e.chars&&e.chars(r(g)))}if(a==l)throw L("badparse",a);l=a}c()}function r(a){if(!a)return"";var e=M.exec(a);a=e[1];var d=e[3];if(e=e[2])n.innerHTML=e.replace(/</g,"&lt;"),e="textContent"in n?n.textContent:n.innerText;return a+e+d}function B(a){return a.replace(/&/g,
-    "&amp;").replace(N,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function s(a,e){var d=!1,c=h.bind(a,a.push);return{start:function(a,g,f){a=h.lowercase(a);!d&&x[a]&&(d=a);d||!0!==C[a]||(c("<"),c(a),h.forEach(g,function(d,f){var g=h.lowercase(f),k="img"===a&&"src"===g||"background"===g;!0!==O[g]||!0===D[g]&&!e(d,k)||(c(" "),c(f),c('="'),c(B(d)),c('"'))}),c(f?"/>":">"))},end:function(a){a=h.lowercase(a);d||!0!==C[a]||(c("</"),c(a),c(">"));a==d&&(d=!1)},chars:function(a){d||
-c(B(a))}}}var L=h.$$minErr("$sanitize"),A=/^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,z=/^<\s*\/\s*([\w:-]+)[^>]*>/,G=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,K=/^</,J=/^<\s*\//,H=/\x3c!--(.*?)--\x3e/g,y=/<!DOCTYPE([^>]*?)>/i,I=/<!\[CDATA\[(.*?)]]\x3e/g,N=/([^\#-~| |!])/g,w=k("area,br,col,hr,img,wbr");p=k("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");q=k("rp,rt");var v=h.extend({},q,p),t=h.extend({},p,k("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),
-    u=h.extend({},q,k("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),x=k("script,style"),C=h.extend({},w,t,u,v),D=k("background,cite,href,longdesc,src,usemap"),O=h.extend({},D,k("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width")),
-    n=document.createElement("pre"),M=/^(\s*)([\s\S]*?)(\s*)$/;h.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(a){return function(e){var d=[];F(e,s(d,function(c,b){return!/^unsafe/.test(a(c,b))}));return d.join("")}}]});h.module("ngSanitize").filter("linky",["$sanitize",function(a){var e=/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,d=/^mailto:/;return function(c,b){function g(a){a&&m.push(E(a))}function f(a,c){m.push("<a ");h.isDefined(b)&&
-(m.push('target="'),m.push(b),m.push('" '));m.push('href="');m.push(a);m.push('">');g(c);m.push("</a>")}if(!c)return c;for(var l,k=c,m=[],n,p;l=k.match(e);)n=l[0],l[2]==l[3]&&(n="mailto:"+n),p=l.index,g(k.substr(0,p)),f(n,l[0].replace(d,"")),k=k.substring(p+l[0].length);g(k);return a(m.join(""))}}])})(window,window.angular);
\ No newline at end of file
+(function(window, angular) {'use strict';
+
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+   *     Any commits to this file should be reviewed with security in mind.  *
+   *   Changes to this file can potentially create security vulnerabilities. *
+   *          An approval from 2 Core members with history of modifying      *
+   *                         this file is required.                          *
+   *                                                                         *
+   *  Does the change somehow allow for arbitrary javascript to be executed? *
+   *    Or allows for someone to change the prototype of built-in objects?   *
+   *     Or gives undesired access to variables likes document or window?    *
+   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+  var $sanitizeMinErr = angular.$$minErr('$sanitize');
+  var bind;
+  var extend;
+  var forEach;
+  var isDefined;
+  var lowercase;
+  var noop;
+  var nodeContains;
+  var htmlParser;
+  var htmlSanitizeWriter;
+
+  /**
+   * @ngdoc module
+   * @name ngSanitize
+   * @description
+   *
+   * # ngSanitize
+   *
+   * The `ngSanitize` module provides functionality to sanitize HTML.
+   *
+   *
+   * <div doc-module-components="ngSanitize"></div>
+   *
+   * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
+   */
+
+  /**
+   * @ngdoc service
+   * @name $sanitize
+   * @kind function
+   *
+   * @description
+   *   Sanitizes an html string by stripping all potentially dangerous tokens.
+   *
+   *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a whitelist) are
+   *   then serialized back to properly escaped html string. This means that no unsafe input can make
+   *   it into the returned string.
+   *
+   *   The whitelist for URL sanitization of attribute values is configured using the functions
+   *   `aHrefSanitizationWhitelist` and `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider
+ *   `$compileProvider`}.
+   *
+   *   The input may also contain SVG markup if this is enabled via {@link $sanitizeProvider}.
+   *
+   * @param {string} html HTML input.
+   * @returns {string} Sanitized HTML.
+   *
+   * @example
+   <example module="sanitizeExample" deps="angular-sanitize.js" name="sanitize-service">
+   <file name="index.html">
+   <script>
+   angular.module('sanitizeExample', ['ngSanitize'])
+   .controller('ExampleController', ['$scope', '$sce', function($scope, $sce) {
+             $scope.snippet =
+               '<p style="color:blue">an html\n' +
+               '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
+               'snippet</p>';
+             $scope.deliberatelyTrustDangerousSnippet = function() {
+               return $sce.trustAsHtml($scope.snippet);
+             };
+           }]);
+   </script>
+   <div ng-controller="ExampleController">
+   Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
+   <table>
+   <tr>
+   <td>Directive</td>
+   <td>How</td>
+   <td>Source</td>
+   <td>Rendered</td>
+   </tr>
+   <tr id="bind-html-with-sanitize">
+   <td>ng-bind-html</td>
+   <td>Automatically uses $sanitize</td>
+   <td><pre>&lt;div ng-bind-html="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+   <td><div ng-bind-html="snippet"></div></td>
+   </tr>
+   <tr id="bind-html-with-trust">
+   <td>ng-bind-html</td>
+   <td>Bypass $sanitize by explicitly trusting the dangerous value</td>
+   <td>
+   <pre>&lt;div ng-bind-html="deliberatelyTrustDangerousSnippet()"&gt;
+   &lt;/div&gt;</pre>
+   </td>
+   <td><div ng-bind-html="deliberatelyTrustDangerousSnippet()"></div></td>
+   </tr>
+   <tr id="bind-default">
+   <td>ng-bind</td>
+   <td>Automatically escapes</td>
+   <td><pre>&lt;div ng-bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+   <td><div ng-bind="snippet"></div></td>
+   </tr>
+   </table>
+   </div>
+   </file>
+   <file name="protractor.js" type="protractor">
+   it('should sanitize the html snippet by default', function() {
+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
+         toBe('<p>an html\n<em>click here</em>\nsnippet</p>');
+     });
+
+   it('should inline raw snippet if bound to a trusted value', function() {
+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).
+         toBe("<p style=\"color:blue\">an html\n" +
+              "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" +
+              "snippet</p>");
+     });
+
+   it('should escape snippet without any filter', function() {
+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).
+         toBe("&lt;p style=\"color:blue\"&gt;an html\n" +
+              "&lt;em onmouseover=\"this.textContent='PWN3D!'\"&gt;click here&lt;/em&gt;\n" +
+              "snippet&lt;/p&gt;");
+     });
+
+   it('should update', function() {
+       element(by.model('snippet')).clear();
+       element(by.model('snippet')).sendKeys('new <b onclick="alert(1)">text</b>');
+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
+         toBe('new <b>text</b>');
+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).toBe(
+         'new <b onclick="alert(1)">text</b>');
+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).toBe(
+         "new &lt;b onclick=\"alert(1)\"&gt;text&lt;/b&gt;");
+     });
+   </file>
+   </example>
+   */
+
+
+  /**
+   * @ngdoc provider
+   * @name $sanitizeProvider
+   * @this
+   *
+   * @description
+   * Creates and configures {@link $sanitize} instance.
+   */
+  function $SanitizeProvider() {
+    var svgEnabled = false;
+
+    this.$get = ['$$sanitizeUri', function($$sanitizeUri) {
+      if (svgEnabled) {
+        extend(validElements, svgElements);
+      }
+      return function(html) {
+        var buf = [];
+        htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) {
+          return !/^unsafe:/.test($$sanitizeUri(uri, isImage));
+        }));
+        return buf.join('');
+      };
+    }];
+
+
+    /**
+     * @ngdoc method
+     * @name $sanitizeProvider#enableSvg
+     * @kind function
+     *
+     * @description
+     * Enables a subset of svg to be supported by the sanitizer.
+     *
+     * <div class="alert alert-warning">
+     *   <p>By enabling this setting without taking other precautions, you might expose your
+     *   application to click-hijacking attacks. In these attacks, sanitized svg elements could be positioned
+     *   outside of the containing element and be rendered over other elements on the page (e.g. a login
+     *   link). Such behavior can then result in phishing incidents.</p>
+     *
+     *   <p>To protect against these, explicitly setup `overflow: hidden` css rule for all potential svg
+     *   tags within the sanitized content:</p>
+     *
+     *   <br>
+     *
+     *   <pre><code>
+     *   .rootOfTheIncludedContent svg {
+   *     overflow: hidden !important;
+   *   }
+     *   </code></pre>
+     * </div>
+     *
+     * @param {boolean=} flag Enable or disable SVG support in the sanitizer.
+     * @returns {boolean|ng.$sanitizeProvider} Returns the currently configured value if called
+     *    without an argument or self for chaining otherwise.
+     */
+    this.enableSvg = function(enableSvg) {
+      if (isDefined(enableSvg)) {
+        svgEnabled = enableSvg;
+        return this;
+      } else {
+        return svgEnabled;
+      }
+    };
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // Private stuff
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    bind = angular.bind;
+    extend = angular.extend;
+    forEach = angular.forEach;
+    isDefined = angular.isDefined;
+    lowercase = angular.lowercase;
+    noop = angular.noop;
+
+    htmlParser = htmlParserImpl;
+    htmlSanitizeWriter = htmlSanitizeWriterImpl;
+
+    nodeContains = window.Node.prototype.contains || /** @this */ function(arg) {
+      // eslint-disable-next-line no-bitwise
+      return !!(this.compareDocumentPosition(arg) & 16);
+    };
+
+    // Regular Expressions for parsing tags and attributes
+    var SURROGATE_PAIR_REGEXP = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+      // Match everything outside of normal chars and " (quote character)
+      NON_ALPHANUMERIC_REGEXP = /([^#-~ |!])/g;
+
+
+    // Good source of info about elements and attributes
+    // http://dev.w3.org/html5/spec/Overview.html#semantics
+    // http://simon.html5.org/html-elements
+
+    // Safe Void Elements - HTML5
+    // http://dev.w3.org/html5/spec/Overview.html#void-elements
+    var voidElements = toMap('area,br,col,hr,img,wbr');
+
+    // Elements that you can, intentionally, leave open (and which close themselves)
+    // http://dev.w3.org/html5/spec/Overview.html#optional-tags
+    var optionalEndTagBlockElements = toMap('colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr'),
+      optionalEndTagInlineElements = toMap('rp,rt'),
+      optionalEndTagElements = extend({},
+        optionalEndTagInlineElements,
+        optionalEndTagBlockElements);
+
+    // Safe Block Elements - HTML5
+    var blockElements = extend({}, optionalEndTagBlockElements, toMap('address,article,' +
+      'aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,' +
+      'h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul'));
+
+    // Inline Elements - HTML5
+    var inlineElements = extend({}, optionalEndTagInlineElements, toMap('a,abbr,acronym,b,' +
+      'bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,' +
+      'samp,small,span,strike,strong,sub,sup,time,tt,u,var'));
+
+    // SVG Elements
+    // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Elements
+    // Note: the elements animate,animateColor,animateMotion,animateTransform,set are intentionally omitted.
+    // They can potentially allow for arbitrary javascript to be executed. See #11290
+    var svgElements = toMap('circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,' +
+      'hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,' +
+      'radialGradient,rect,stop,svg,switch,text,title,tspan');
+
+    // Blocked Elements (will be stripped)
+    var blockedElements = toMap('script,style');
+
+    var validElements = extend({},
+      voidElements,
+      blockElements,
+      inlineElements,
+      optionalEndTagElements);
+
+    //Attributes that have href and hence need to be sanitized
+    var uriAttrs = toMap('background,cite,href,longdesc,src,xlink:href');
+
+    var htmlAttrs = toMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
+      'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
+      'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
+      'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
+      'valign,value,vspace,width');
+
+    // SVG attributes (without "id" and "name" attributes)
+    // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Attributes
+    var svgAttrs = toMap('accent-height,accumulate,additive,alphabetic,arabic-form,ascent,' +
+      'baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,' +
+      'cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,' +
+      'font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,' +
+      'height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,' +
+      'marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,' +
+      'max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,' +
+      'path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,' +
+      'requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,' +
+      'stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,' +
+      'stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,' +
+      'stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,' +
+      'underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,' +
+      'width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,' +
+      'xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan', true);
+
+    var validAttrs = extend({},
+      uriAttrs,
+      svgAttrs,
+      htmlAttrs);
+
+    function toMap(str, lowercaseKeys) {
+      var obj = {}, items = str.split(','), i;
+      for (i = 0; i < items.length; i++) {
+        obj[lowercaseKeys ? lowercase(items[i]) : items[i]] = true;
+      }
+      return obj;
+    }
+
+    /**
+     * Create an inert document that contains the dirty HTML that needs sanitizing
+     * Depending upon browser support we use one of three strategies for doing this.
+     * Support: Safari 10.x -> XHR strategy
+     * Support: Firefox -> DomParser strategy
+     */
+    var getInertBodyElement /* function(html: string): HTMLBodyElement */ = (function(window, document) {
+      var inertDocument;
+      if (document && document.implementation) {
+        inertDocument = document.implementation.createHTMLDocument('inert');
+      } else {
+        throw $sanitizeMinErr('noinert', 'Can\'t create an inert html document');
+      }
+      var inertBodyElement = (inertDocument.documentElement || inertDocument.getDocumentElement()).querySelector('body');
+
+      // Check for the Safari 10.1 bug - which allows JS to run inside the SVG G element
+      inertBodyElement.innerHTML = '<svg><g onload="this.parentNode.remove()"></g></svg>';
+      if (!inertBodyElement.querySelector('svg')) {
+        return getInertBodyElement_XHR;
+      } else {
+        // Check for the Firefox bug - which prevents the inner img JS from being sanitized
+        inertBodyElement.innerHTML = '<svg><p><style><img src="</style><img src=x onerror=alert(1)//">';
+        if (inertBodyElement.querySelector('svg img')) {
+          return getInertBodyElement_DOMParser;
+        } else {
+          return getInertBodyElement_InertDocument;
+        }
+      }
+
+      function getInertBodyElement_XHR(html) {
+        // We add this dummy element to ensure that the rest of the content is parsed as expected
+        // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
+        html = '<remove></remove>' + html;
+        try {
+          html = encodeURI(html);
+        } catch (e) {
+          return undefined;
+        }
+        var xhr = new window.XMLHttpRequest();
+        xhr.responseType = 'document';
+        xhr.open('GET', 'data:text/html;charset=utf-8,' + html, false);
+        xhr.send(null);
+        var body = xhr.response.body;
+        body.firstChild.remove();
+        return body;
+      }
+
+      function getInertBodyElement_DOMParser(html) {
+        // We add this dummy element to ensure that the rest of the content is parsed as expected
+        // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
+        html = '<remove></remove>' + html;
+        try {
+          var body = new window.DOMParser().parseFromString(html, 'text/html').body;
+          body.firstChild.remove();
+          return body;
+        } catch (e) {
+          return undefined;
+        }
+      }
+
+      function getInertBodyElement_InertDocument(html) {
+        inertBodyElement.innerHTML = html;
+
+        // Support: IE 9-11 only
+        // strip custom-namespaced attributes on IE<=11
+        if (document.documentMode) {
+          stripCustomNsAttrs(inertBodyElement);
+        }
+
+        return inertBodyElement;
+      }
+    })(window, window.document);
+
+    /**
+     * @example
+     * htmlParser(htmlString, {
+   *     start: function(tag, attrs) {},
+   *     end: function(tag) {},
+   *     chars: function(text) {},
+   *     comment: function(text) {}
+   * });
+     *
+     * @param {string} html string
+     * @param {object} handler
+     */
+    function htmlParserImpl(html, handler) {
+      if (html === null || html === undefined) {
+        html = '';
+      } else if (typeof html !== 'string') {
+        html = '' + html;
+      }
+
+      var inertBodyElement = getInertBodyElement(html);
+      if (!inertBodyElement) return '';
+
+      //mXSS protection
+      var mXSSAttempts = 5;
+      do {
+        if (mXSSAttempts === 0) {
+          throw $sanitizeMinErr('uinput', 'Failed to sanitize html because the input is unstable');
+        }
+        mXSSAttempts--;
+
+        // trigger mXSS if it is going to happen by reading and writing the innerHTML
+        html = inertBodyElement.innerHTML;
+        inertBodyElement = getInertBodyElement(html);
+      } while (html !== inertBodyElement.innerHTML);
+
+      var node = inertBodyElement.firstChild;
+      while (node) {
+        switch (node.nodeType) {
+          case 1: // ELEMENT_NODE
+            handler.start(node.nodeName.toLowerCase(), attrToMap(node.attributes));
+            break;
+          case 3: // TEXT NODE
+            handler.chars(node.textContent);
+            break;
+        }
+
+        var nextNode;
+        if (!(nextNode = node.firstChild)) {
+          if (node.nodeType === 1) {
+            handler.end(node.nodeName.toLowerCase());
+          }
+          nextNode = getNonDescendant('nextSibling', node);
+          if (!nextNode) {
+            while (nextNode == null) {
+              node = getNonDescendant('parentNode', node);
+              if (node === inertBodyElement) break;
+              nextNode = getNonDescendant('nextSibling', node);
+              if (node.nodeType === 1) {
+                handler.end(node.nodeName.toLowerCase());
+              }
+            }
+          }
+        }
+        node = nextNode;
+      }
+
+      while ((node = inertBodyElement.firstChild)) {
+        inertBodyElement.removeChild(node);
+      }
+    }
+
+    function attrToMap(attrs) {
+      var map = {};
+      for (var i = 0, ii = attrs.length; i < ii; i++) {
+        var attr = attrs[i];
+        map[attr.name] = attr.value;
+      }
+      return map;
+    }
+
+
+    /**
+     * Escapes all potentially dangerous characters, so that the
+     * resulting string can be safely inserted into attribute or
+     * element text.
+     * @param value
+     * @returns {string} escaped text
+     */
+    function encodeEntities(value) {
+      return value.
+      replace(/&/g, '&amp;').
+      replace(SURROGATE_PAIR_REGEXP, function(value) {
+        var hi = value.charCodeAt(0);
+        var low = value.charCodeAt(1);
+        return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';';
+      }).
+      replace(NON_ALPHANUMERIC_REGEXP, function(value) {
+        return '&#' + value.charCodeAt(0) + ';';
+      }).
+      replace(/</g, '&lt;').
+      replace(/>/g, '&gt;');
+    }
+
+    /**
+     * create an HTML/XML writer which writes to buffer
+     * @param {Array} buf use buf.join('') to get out sanitized html string
+     * @returns {object} in the form of {
+   *     start: function(tag, attrs) {},
+   *     end: function(tag) {},
+   *     chars: function(text) {},
+   *     comment: function(text) {}
+   * }
+     */
+    function htmlSanitizeWriterImpl(buf, uriValidator) {
+      var ignoreCurrentElement = false;
+      var out = bind(buf, buf.push);
+      return {
+        start: function(tag, attrs) {
+          tag = lowercase(tag);
+          if (!ignoreCurrentElement && blockedElements[tag]) {
+            ignoreCurrentElement = tag;
+          }
+          if (!ignoreCurrentElement && validElements[tag] === true) {
+            out('<');
+            out(tag);
+            forEach(attrs, function(value, key) {
+              var lkey = lowercase(key);
+              var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
+              if (validAttrs[lkey] === true &&
+                (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
+                out(' ');
+                out(key);
+                out('="');
+                out(encodeEntities(value));
+                out('"');
+              }
+            });
+            out('>');
+          }
+        },
+        end: function(tag) {
+          tag = lowercase(tag);
+          if (!ignoreCurrentElement && validElements[tag] === true && voidElements[tag] !== true) {
+            out('</');
+            out(tag);
+            out('>');
+          }
+          // eslint-disable-next-line eqeqeq
+          if (tag == ignoreCurrentElement) {
+            ignoreCurrentElement = false;
+          }
+        },
+        chars: function(chars) {
+          if (!ignoreCurrentElement) {
+            out(encodeEntities(chars));
+          }
+        }
+      };
+    }
+
+
+    /**
+     * When IE9-11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1' attribute to declare
+     * ns1 namespace and prefixes the attribute with 'ns1' (e.g. 'ns1:xlink:foo'). This is undesirable since we don't want
+     * to allow any of these custom attributes. This method strips them all.
+     *
+     * @param node Root element to process
+     */
+    function stripCustomNsAttrs(node) {
+      while (node) {
+        if (node.nodeType === window.Node.ELEMENT_NODE) {
+          var attrs = node.attributes;
+          for (var i = 0, l = attrs.length; i < l; i++) {
+            var attrNode = attrs[i];
+            var attrName = attrNode.name.toLowerCase();
+            if (attrName === 'xmlns:ns1' || attrName.lastIndexOf('ns1:', 0) === 0) {
+              node.removeAttributeNode(attrNode);
+              i--;
+              l--;
+            }
+          }
+        }
+
+        var nextNode = node.firstChild;
+        if (nextNode) {
+          stripCustomNsAttrs(nextNode);
+        }
+
+        node = getNonDescendant('nextSibling', node);
+      }
+    }
+
+    function getNonDescendant(propName, node) {
+      // An element is clobbered if its `propName` property points to one of its descendants
+      var nextNode = node[propName];
+      if (nextNode && nodeContains.call(node, nextNode)) {
+        throw $sanitizeMinErr('elclob', 'Failed to sanitize html because the element is clobbered: {0}', node.outerHTML || node.outerText);
+      }
+      return nextNode;
+    }
+  }
+
+  function sanitizeText(chars) {
+    var buf = [];
+    var writer = htmlSanitizeWriter(buf, noop);
+    writer.chars(chars);
+    return buf.join('');
+  }
+
+
+// define ngSanitize module and register $sanitize service
+  angular.module('ngSanitize', [])
+    .provider('$sanitize', $SanitizeProvider)
+    .info({ angularVersion: '1.6.6' });
+
+  /**
+   * @ngdoc filter
+   * @name linky
+   * @kind function
+   *
+   * @description
+   * Finds links in text input and turns them into html links. Supports `http/https/ftp/mailto` and
+   * plain email address links.
+   *
+   * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
+   *
+   * @param {string} text Input text.
+   * @param {string} target Window (`_blank|_self|_parent|_top`) or named frame to open links in.
+   * @param {object|function(url)} [attributes] Add custom attributes to the link element.
+   *
+   *    Can be one of:
+   *
+   *    - `object`: A map of attributes
+   *    - `function`: Takes the url as a parameter and returns a map of attributes
+   *
+   *    If the map of attributes contains a value for `target`, it overrides the value of
+   *    the target parameter.
+   *
+   *
+   * @returns {string} Html-linkified and {@link $sanitize sanitized} text.
+   *
+   * @usage
+   <span ng-bind-html="linky_expression | linky"></span>
+   *
+   * @example
+   <example module="linkyExample" deps="angular-sanitize.js" name="linky-filter">
+   <file name="index.html">
+   <div ng-controller="ExampleController">
+   Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
+   <table>
+   <tr>
+   <th>Filter</th>
+   <th>Source</th>
+   <th>Rendered</th>
+   </tr>
+   <tr id="linky-filter">
+   <td>linky filter</td>
+   <td>
+   <pre>&lt;div ng-bind-html="snippet | linky"&gt;<br>&lt;/div&gt;</pre>
+   </td>
+   <td>
+   <div ng-bind-html="snippet | linky"></div>
+   </td>
+   </tr>
+   <tr id="linky-target">
+   <td>linky target</td>
+   <td>
+   <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
+   </td>
+   <td>
+   <div ng-bind-html="snippetWithSingleURL | linky:'_blank'"></div>
+   </td>
+   </tr>
+   <tr id="linky-custom-attributes">
+   <td>linky custom attributes</td>
+   <td>
+   <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"&gt;<br>&lt;/div&gt;</pre>
+   </td>
+   <td>
+   <div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"></div>
+   </td>
+   </tr>
+   <tr id="escaped-html">
+   <td>no filter</td>
+   <td><pre>&lt;div ng-bind="snippet"&gt;<br>&lt;/div&gt;</pre></td>
+   <td><div ng-bind="snippet"></div></td>
+   </tr>
+   </table>
+   </file>
+   <file name="script.js">
+   angular.module('linkyExample', ['ngSanitize'])
+   .controller('ExampleController', ['$scope', function($scope) {
+           $scope.snippet =
+             'Pretty text with some links:\n' +
+             'http://angularjs.org/,\n' +
+             'mailto:us@somewhere.org,\n' +
+             'another@somewhere.org,\n' +
+             'and one more: ftp://127.0.0.1/.';
+           $scope.snippetWithSingleURL = 'http://angularjs.org/';
+         }]);
+   </file>
+   <file name="protractor.js" type="protractor">
+   it('should linkify the snippet with urls', function() {
+         expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
+             toBe('Pretty text with some links: http://angularjs.org/, us@somewhere.org, ' +
+                  'another@somewhere.org, and one more: ftp://127.0.0.1/.');
+         expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
+       });
+
+   it('should not linkify snippet without the linky filter', function() {
+         expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
+             toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
+                  'another@somewhere.org, and one more: ftp://127.0.0.1/.');
+         expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
+       });
+
+   it('should update', function() {
+         element(by.model('snippet')).clear();
+         element(by.model('snippet')).sendKeys('new http://link.');
+         expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
+             toBe('new http://link.');
+         expect(element.all(by.css('#linky-filter a')).count()).toEqual(1);
+         expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText())
+             .toBe('new http://link.');
+       });
+
+   it('should work with the target property', function() {
+        expect(element(by.id('linky-target')).
+            element(by.binding("snippetWithSingleURL | linky:'_blank'")).getText()).
+            toBe('http://angularjs.org/');
+        expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
+       });
+
+   it('should optionally add custom attributes', function() {
+        expect(element(by.id('linky-custom-attributes')).
+            element(by.binding("snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}")).getText()).
+            toBe('http://angularjs.org/');
+        expect(element(by.css('#linky-custom-attributes a')).getAttribute('rel')).toEqual('nofollow');
+       });
+   </file>
+   </example>
+   */
+  angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
+    var LINKY_URL_REGEXP =
+        /((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+      MAILTO_REGEXP = /^mailto:/i;
+
+    var linkyMinErr = angular.$$minErr('linky');
+    var isDefined = angular.isDefined;
+    var isFunction = angular.isFunction;
+    var isObject = angular.isObject;
+    var isString = angular.isString;
+
+    return function(text, target, attributes) {
+      if (text == null || text === '') return text;
+      if (!isString(text)) throw linkyMinErr('notstring', 'Expected string but received: {0}', text);
+
+      var attributesFn =
+        isFunction(attributes) ? attributes :
+          isObject(attributes) ? function getAttributesObject() {return attributes;} :
+            function getEmptyAttributesObject() {return {};};
+
+      var match;
+      var raw = text;
+      var html = [];
+      var url;
+      var i;
+      while ((match = raw.match(LINKY_URL_REGEXP))) {
+        // We can not end in these as they are sometimes found at the end of the sentence
+        url = match[0];
+        // if we did not match ftp/http/www/mailto then assume mailto
+        if (!match[2] && !match[4]) {
+          url = (match[3] ? 'http://' : 'mailto:') + url;
+        }
+        i = match.index;
+        addText(raw.substr(0, i));
+        addLink(url, match[0].replace(MAILTO_REGEXP, ''));
+        raw = raw.substring(i + match[0].length);
+      }
+      addText(raw);
+      return $sanitize(html.join(''));
+
+      function addText(text) {
+        if (!text) {
+          return;
+        }
+        html.push(sanitizeText(text));
+      }
+
+      function addLink(url, text) {
+        var key, linkAttributes = attributesFn(url);
+        html.push('<a ');
+
+        for (key in linkAttributes) {
+          html.push(key + '="' + linkAttributes[key] + '" ');
+        }
+
+        if (isDefined(target) && !('target' in linkAttributes)) {
+          html.push('target="',
+            target,
+            '" ');
+        }
+        html.push('href="',
+          url.replace(/"/g, '&quot;'),
+          '">');
+        addText(text);
+        html.push('</a>');
+      }
+    };
+  }]);
+
+
+})(window, window.angular);
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.touch.js b/docs-web/src/main/webapp/src/lib/angular.touch.js
index d54dbfd7..9b4ca8ec 100644
--- a/docs-web/src/main/webapp/src/lib/angular.touch.js
+++ b/docs-web/src/main/webapp/src/lib/angular.touch.js
@@ -1,12 +1,749 @@
-/*
- AngularJS v1.2.8
- (c) 2010-2014 Google, Inc. http://angularjs.org
- License: MIT
+/**
+ * @license AngularJS v1.6.6
+ * (c) 2010-2017 Google, Inc. http://angularjs.org
+ * License: MIT
  */
-(function(y,v,z){'use strict';function t(g,a,b){q.directive(g,["$parse","$swipe",function(l,n){var r=75,h=0.3,d=30;return function(p,m,k){function e(e){if(!u)return!1;var c=Math.abs(e.y-u.y);e=(e.x-u.x)*a;return f&&c<r&&0<e&&e>d&&c/e<h}var c=l(k[g]),u,f;n.bind(m,{start:function(e,c){u=e;f=!0},cancel:function(e){f=!1},end:function(a,f){e(a)&&p.$apply(function(){m.triggerHandler(b);c(p,{$event:f})})}})}}])}var q=v.module("ngTouch",[]);q.factory("$swipe",[function(){function g(a){var b=a.touches&&a.touches.length?
-    a.touches:[a];a=a.changedTouches&&a.changedTouches[0]||a.originalEvent&&a.originalEvent.changedTouches&&a.originalEvent.changedTouches[0]||b[0].originalEvent||b[0];return{x:a.clientX,y:a.clientY}}return{bind:function(a,b){var l,n,r,h,d=!1;a.on("touchstart mousedown",function(a){r=g(a);d=!0;n=l=0;h=r;b.start&&b.start(r,a)});a.on("touchcancel",function(a){d=!1;b.cancel&&b.cancel(a)});a.on("touchmove mousemove",function(a){if(d&&r){var m=g(a);l+=Math.abs(m.x-h.x);n+=Math.abs(m.y-h.y);h=m;10>l&&10>n||
-(n>l?(d=!1,b.cancel&&b.cancel(a)):(a.preventDefault(),b.move&&b.move(m,a)))}});a.on("touchend mouseup",function(a){d&&(d=!1,b.end&&b.end(g(a),a))})}}}]);q.config(["$provide",function(g){g.decorator("ngClickDirective",["$delegate",function(a){a.shift();return a}])}]);q.directive("ngClick",["$parse","$timeout","$rootElement",function(g,a,b){function l(a,c,b){for(var f=0;f<a.length;f+=2)if(Math.abs(a[f]-c)<d&&Math.abs(a[f+1]-b)<d)return a.splice(f,f+2),!0;return!1}function n(a){if(!(Date.now()-m>h)){var c=
-    a.touches&&a.touches.length?a.touches:[a],b=c[0].clientX,c=c[0].clientY;1>b&&1>c||l(k,b,c)||(a.stopPropagation(),a.preventDefault(),a.target&&a.target.blur())}}function r(b){b=b.touches&&b.touches.length?b.touches:[b];var c=b[0].clientX,d=b[0].clientY;k.push(c,d);a(function(){for(var a=0;a<k.length;a+=2)if(k[a]==c&&k[a+1]==d){k.splice(a,a+2);break}},h,!1)}var h=2500,d=25,p="ng-click-active",m,k;return function(a,c,d){function f(){q=!1;c.removeClass(p)}var h=g(d.ngClick),q=!1,s,t,w,x;c.on("touchstart",
-    function(a){q=!0;s=a.target?a.target:a.srcElement;3==s.nodeType&&(s=s.parentNode);c.addClass(p);t=Date.now();a=a.touches&&a.touches.length?a.touches:[a];a=a[0].originalEvent||a[0];w=a.clientX;x=a.clientY});c.on("touchmove",function(a){f()});c.on("touchcancel",function(a){f()});c.on("touchend",function(a){var h=Date.now()-t,e=a.changedTouches&&a.changedTouches.length?a.changedTouches:a.touches&&a.touches.length?a.touches:[a],g=e[0].originalEvent||e[0],e=g.clientX,g=g.clientY,p=Math.sqrt(Math.pow(e-
-    w,2)+Math.pow(g-x,2));q&&(750>h&&12>p)&&(k||(b[0].addEventListener("click",n,!0),b[0].addEventListener("touchstart",r,!0),k=[]),m=Date.now(),l(k,e,g),s&&s.blur(),v.isDefined(d.disabled)&&!1!==d.disabled||c.triggerHandler("click",[a]));f()});c.onclick=function(a){};c.on("click",function(b,c){a.$apply(function(){h(a,{$event:c||b})})});c.on("mousedown",function(a){c.addClass(p)});c.on("mousemove mouseup",function(a){c.removeClass(p)})}}]);t("ngSwipeLeft",-1,"swipeleft");t("ngSwipeRight",1,"swiperight")})(window,
-        window.angular);
\ No newline at end of file
+(function(window, angular) {'use strict';
+
+  /* global ngTouchClickDirectiveFactory: false */
+
+  /**
+   * @ngdoc module
+   * @name ngTouch
+   * @description
+   *
+   * # ngTouch
+   *
+   * The `ngTouch` module provides touch events and other helpers for touch-enabled devices.
+   * The implementation is based on jQuery Mobile touch event handling
+   * ([jquerymobile.com](http://jquerymobile.com/)).
+   *
+   *
+   * See {@link ngTouch.$swipe `$swipe`} for usage.
+   *
+   * <div doc-module-components="ngTouch"></div>
+   *
+   */
+
+// define ngTouch module
+  /* global -ngTouch */
+  var ngTouch = angular.module('ngTouch', []);
+
+  ngTouch.info({ angularVersion: '1.6.6' });
+
+  ngTouch.provider('$touch', $TouchProvider);
+
+  function nodeName_(element) {
+    return angular.lowercase(element.nodeName || (element[0] && element[0].nodeName));
+  }
+
+  /**
+   * @ngdoc provider
+   * @name $touchProvider
+   *
+   * @description
+   * The `$touchProvider` allows enabling / disabling {@link ngTouch.ngClick ngTouch's ngClick directive}.
+   */
+  $TouchProvider.$inject = ['$provide', '$compileProvider'];
+  function $TouchProvider($provide, $compileProvider) {
+
+    /**
+     * @ngdoc method
+     * @name  $touchProvider#ngClickOverrideEnabled
+     *
+     * @param {boolean=} enabled update the ngClickOverrideEnabled state if provided, otherwise just return the
+     * current ngClickOverrideEnabled state
+     * @returns {*} current value if used as getter or itself (chaining) if used as setter
+     *
+     * @kind function
+     *
+     * @description
+     * Call this method to enable/disable {@link ngTouch.ngClick ngTouch's ngClick directive}. If enabled,
+     * the default ngClick directive will be replaced by a version that eliminates the 300ms delay for
+     * click events on browser for touch-devices.
+     *
+     * The default is `false`.
+     *
+     */
+    var ngClickOverrideEnabled = false;
+    var ngClickDirectiveAdded = false;
+    // eslint-disable-next-line no-invalid-this
+    this.ngClickOverrideEnabled = function(enabled) {
+      if (angular.isDefined(enabled)) {
+
+        if (enabled && !ngClickDirectiveAdded) {
+          ngClickDirectiveAdded = true;
+
+          // Use this to identify the correct directive in the delegate
+          ngTouchClickDirectiveFactory.$$moduleName = 'ngTouch';
+          $compileProvider.directive('ngClick', ngTouchClickDirectiveFactory);
+
+          $provide.decorator('ngClickDirective', ['$delegate', function($delegate) {
+            if (ngClickOverrideEnabled) {
+              // drop the default ngClick directive
+              $delegate.shift();
+            } else {
+              // drop the ngTouch ngClick directive if the override has been re-disabled (because
+              // we cannot de-register added directives)
+              var i = $delegate.length - 1;
+              while (i >= 0) {
+                if ($delegate[i].$$moduleName === 'ngTouch') {
+                  $delegate.splice(i, 1);
+                  break;
+                }
+                i--;
+              }
+            }
+
+            return $delegate;
+          }]);
+        }
+
+        ngClickOverrideEnabled = enabled;
+        return this;
+      }
+
+      return ngClickOverrideEnabled;
+    };
+
+    /**
+     * @ngdoc service
+     * @name $touch
+     * @kind object
+     *
+     * @description
+     * Provides the {@link ngTouch.$touch#ngClickOverrideEnabled `ngClickOverrideEnabled`} method.
+     *
+     */
+    // eslint-disable-next-line no-invalid-this
+    this.$get = function() {
+      return {
+        /**
+         * @ngdoc method
+         * @name  $touch#ngClickOverrideEnabled
+         *
+         * @returns {*} current value of `ngClickOverrideEnabled` set in the {@link ngTouch.$touchProvider $touchProvider},
+         * i.e. if {@link ngTouch.ngClick ngTouch's ngClick} directive is enabled.
+         *
+         * @kind function
+         */
+        ngClickOverrideEnabled: function() {
+          return ngClickOverrideEnabled;
+        }
+      };
+    };
+
+  }
+
+  /* global ngTouch: false */
+
+  /**
+   * @ngdoc service
+   * @name $swipe
+   *
+   * @description
+   * The `$swipe` service is a service that abstracts the messier details of hold-and-drag swipe
+   * behavior, to make implementing swipe-related directives more convenient.
+   *
+   * Requires the {@link ngTouch `ngTouch`} module to be installed.
+   *
+   * `$swipe` is used by the `ngSwipeLeft` and `ngSwipeRight` directives in `ngTouch`.
+   *
+   * # Usage
+   * The `$swipe` service is an object with a single method: `bind`. `bind` takes an element
+   * which is to be watched for swipes, and an object with four handler functions. See the
+   * documentation for `bind` below.
+   */
+
+  ngTouch.factory('$swipe', [function() {
+    // The total distance in any direction before we make the call on swipe vs. scroll.
+    var MOVE_BUFFER_RADIUS = 10;
+
+    var POINTER_EVENTS = {
+      'mouse': {
+        start: 'mousedown',
+        move: 'mousemove',
+        end: 'mouseup'
+      },
+      'touch': {
+        start: 'touchstart',
+        move: 'touchmove',
+        end: 'touchend',
+        cancel: 'touchcancel'
+      },
+      'pointer': {
+        start: 'pointerdown',
+        move: 'pointermove',
+        end: 'pointerup',
+        cancel: 'pointercancel'
+      }
+    };
+
+    function getCoordinates(event) {
+      var originalEvent = event.originalEvent || event;
+      var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
+      var e = (originalEvent.changedTouches && originalEvent.changedTouches[0]) || touches[0];
+
+      return {
+        x: e.clientX,
+        y: e.clientY
+      };
+    }
+
+    function getEvents(pointerTypes, eventType) {
+      var res = [];
+      angular.forEach(pointerTypes, function(pointerType) {
+        var eventName = POINTER_EVENTS[pointerType][eventType];
+        if (eventName) {
+          res.push(eventName);
+        }
+      });
+      return res.join(' ');
+    }
+
+    return {
+      /**
+       * @ngdoc method
+       * @name $swipe#bind
+       *
+       * @description
+       * The main method of `$swipe`. It takes an element to be watched for swipe motions, and an
+       * object containing event handlers.
+       * The pointer types that should be used can be specified via the optional
+       * third argument, which is an array of strings `'mouse'`, `'touch'` and `'pointer'`. By default,
+       * `$swipe` will listen for `mouse`, `touch` and `pointer` events.
+       *
+       * The four events are `start`, `move`, `end`, and `cancel`. `start`, `move`, and `end`
+       * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }` and the raw
+       * `event`. `cancel` receives the raw `event` as its single parameter.
+       *
+       * `start` is called on either `mousedown`, `touchstart` or `pointerdown`. After this event, `$swipe` is
+       * watching for `touchmove`, `mousemove` or `pointermove` events. These events are ignored until the total
+       * distance moved in either dimension exceeds a small threshold.
+       *
+       * Once this threshold is exceeded, either the horizontal or vertical delta is greater.
+       * - If the horizontal distance is greater, this is a swipe and `move` and `end` events follow.
+       * - If the vertical distance is greater, this is a scroll, and we let the browser take over.
+       *   A `cancel` event is sent.
+       *
+       * `move` is called on `mousemove`, `touchmove` and `pointermove` after the above logic has determined that
+       * a swipe is in progress.
+       *
+       * `end` is called when a swipe is successfully completed with a `touchend`, `mouseup` or `pointerup`.
+       *
+       * `cancel` is called either on a `touchcancel` or `pointercancel`  from the browser, or when we begin scrolling
+       * as described above.
+       *
+       */
+      bind: function(element, eventHandlers, pointerTypes) {
+        // Absolute total movement, used to control swipe vs. scroll.
+        var totalX, totalY;
+        // Coordinates of the start position.
+        var startCoords;
+        // Last event's position.
+        var lastPos;
+        // Whether a swipe is active.
+        var active = false;
+
+        pointerTypes = pointerTypes || ['mouse', 'touch', 'pointer'];
+        element.on(getEvents(pointerTypes, 'start'), function(event) {
+          startCoords = getCoordinates(event);
+          active = true;
+          totalX = 0;
+          totalY = 0;
+          lastPos = startCoords;
+          if (eventHandlers['start']) {
+            eventHandlers['start'](startCoords, event);
+          }
+        });
+        var events = getEvents(pointerTypes, 'cancel');
+        if (events) {
+          element.on(events, function(event) {
+            active = false;
+            if (eventHandlers['cancel']) {
+              eventHandlers['cancel'](event);
+            }
+          });
+        }
+
+        element.on(getEvents(pointerTypes, 'move'), function(event) {
+          if (!active) return;
+
+          // Android will send a touchcancel if it thinks we're starting to scroll.
+          // So when the total distance (+ or - or both) exceeds 10px in either direction,
+          // we either:
+          // - On totalX > totalY, we send preventDefault() and treat this as a swipe.
+          // - On totalY > totalX, we let the browser handle it as a scroll.
+
+          if (!startCoords) return;
+          var coords = getCoordinates(event);
+
+          totalX += Math.abs(coords.x - lastPos.x);
+          totalY += Math.abs(coords.y - lastPos.y);
+
+          lastPos = coords;
+
+          if (totalX < MOVE_BUFFER_RADIUS && totalY < MOVE_BUFFER_RADIUS) {
+            return;
+          }
+
+          // One of totalX or totalY has exceeded the buffer, so decide on swipe vs. scroll.
+          if (totalY > totalX) {
+            // Allow native scrolling to take over.
+            active = false;
+            if (eventHandlers['cancel']) {
+              eventHandlers['cancel'](event);
+            }
+            return;
+          } else {
+            // Prevent the browser from scrolling.
+            event.preventDefault();
+            if (eventHandlers['move']) {
+              eventHandlers['move'](coords, event);
+            }
+          }
+        });
+
+        element.on(getEvents(pointerTypes, 'end'), function(event) {
+          if (!active) return;
+          active = false;
+          if (eventHandlers['end']) {
+            eventHandlers['end'](getCoordinates(event), event);
+          }
+        });
+      }
+    };
+  }]);
+
+  /* global ngTouch: false,
+    nodeName_: false
+  */
+
+  /**
+   * @ngdoc directive
+   * @name ngClick
+   * @deprecated
+   * sinceVersion="v1.5.0"
+   * This directive is deprecated and **disabled** by default.
+   * The directive will receive no further support and might be removed from future releases.
+   * If you need the directive, you can enable it with the {@link ngTouch.$touchProvider $touchProvider#ngClickOverrideEnabled}
+   * function. We also recommend that you migrate to [FastClick](https://github.com/ftlabs/fastclick).
+   * To learn more about the 300ms delay, this [Telerik article](http://developer.telerik.com/featured/300-ms-click-delay-ios-8/)
+   * gives a good overview.
+   *
+   * @description
+   * A more powerful replacement for the default ngClick designed to be used on touchscreen
+   * devices. Most mobile browsers wait about 300ms after a tap-and-release before sending
+   * the click event. This version handles them immediately, and then prevents the
+   * following click event from propagating.
+   *
+   * Requires the {@link ngTouch `ngTouch`} module to be installed.
+   *
+   * This directive can fall back to using an ordinary click event, and so works on desktop
+   * browsers as well as mobile.
+   *
+   * This directive also sets the CSS class `ng-click-active` while the element is being held
+   * down (by a mouse click or touch) so you can restyle the depressed element if you wish.
+   *
+   * @element ANY
+   * @param {expression} ngClick {@link guide/expression Expression} to evaluate
+   * upon tap. (Event object is available as `$event`)
+   *
+   * @example
+   <example module="ngClickExample" deps="angular-touch.js" name="ng-touch-ng-click">
+   <file name="index.html">
+   <button ng-click="count = count + 1" ng-init="count=0">
+   Increment
+   </button>
+   count: {{ count }}
+   </file>
+   <file name="script.js">
+   angular.module('ngClickExample', ['ngTouch']);
+   </file>
+   </example>
+   */
+
+  var ngTouchClickDirectiveFactory = ['$parse', '$timeout', '$rootElement',
+    function($parse, $timeout, $rootElement) {
+      var TAP_DURATION = 750; // Shorter than 750ms is a tap, longer is a taphold or drag.
+      var MOVE_TOLERANCE = 12; // 12px seems to work in most mobile browsers.
+      var PREVENT_DURATION = 2500; // 2.5 seconds maximum from preventGhostClick call to click
+      var CLICKBUSTER_THRESHOLD = 25; // 25 pixels in any dimension is the limit for busting clicks.
+
+      var ACTIVE_CLASS_NAME = 'ng-click-active';
+      var lastPreventedTime;
+      var touchCoordinates;
+      var lastLabelClickCoordinates;
+
+
+      // TAP EVENTS AND GHOST CLICKS
+      //
+      // Why tap events?
+      // Mobile browsers detect a tap, then wait a moment (usually ~300ms) to see if you're
+      // double-tapping, and then fire a click event.
+      //
+      // This delay sucks and makes mobile apps feel unresponsive.
+      // So we detect touchstart, touchcancel and touchend ourselves and determine when
+      // the user has tapped on something.
+      //
+      // What happens when the browser then generates a click event?
+      // The browser, of course, also detects the tap and fires a click after a delay. This results in
+      // tapping/clicking twice. We do "clickbusting" to prevent it.
+      //
+      // How does it work?
+      // We attach global touchstart and click handlers, that run during the capture (early) phase.
+      // So the sequence for a tap is:
+      // - global touchstart: Sets an "allowable region" at the point touched.
+      // - element's touchstart: Starts a touch
+      // (- touchcancel ends the touch, no click follows)
+      // - element's touchend: Determines if the tap is valid (didn't move too far away, didn't hold
+      //   too long) and fires the user's tap handler. The touchend also calls preventGhostClick().
+      // - preventGhostClick() removes the allowable region the global touchstart created.
+      // - The browser generates a click event.
+      // - The global click handler catches the click, and checks whether it was in an allowable region.
+      //     - If preventGhostClick was called, the region will have been removed, the click is busted.
+      //     - If the region is still there, the click proceeds normally. Therefore clicks on links and
+      //       other elements without ngTap on them work normally.
+      //
+      // This is an ugly, terrible hack!
+      // Yeah, tell me about it. The alternatives are using the slow click events, or making our users
+      // deal with the ghost clicks, so I consider this the least of evils. Fortunately Angular
+      // encapsulates this ugly logic away from the user.
+      //
+      // Why not just put click handlers on the element?
+      // We do that too, just to be sure. If the tap event caused the DOM to change,
+      // it is possible another element is now in that position. To take account for these possibly
+      // distinct elements, the handlers are global and care only about coordinates.
+
+      // Checks if the coordinates are close enough to be within the region.
+      function hit(x1, y1, x2, y2) {
+        return Math.abs(x1 - x2) < CLICKBUSTER_THRESHOLD && Math.abs(y1 - y2) < CLICKBUSTER_THRESHOLD;
+      }
+
+      // Checks a list of allowable regions against a click location.
+      // Returns true if the click should be allowed.
+      // Splices out the allowable region from the list after it has been used.
+      function checkAllowableRegions(touchCoordinates, x, y) {
+        for (var i = 0; i < touchCoordinates.length; i += 2) {
+          if (hit(touchCoordinates[i], touchCoordinates[i + 1], x, y)) {
+            touchCoordinates.splice(i, i + 2);
+            return true; // allowable region
+          }
+        }
+        return false; // No allowable region; bust it.
+      }
+
+      // Global click handler that prevents the click if it's in a bustable zone and preventGhostClick
+      // was called recently.
+      function onClick(event) {
+        if (Date.now() - lastPreventedTime > PREVENT_DURATION) {
+          return; // Too old.
+        }
+
+        var touches = event.touches && event.touches.length ? event.touches : [event];
+        var x = touches[0].clientX;
+        var y = touches[0].clientY;
+        // Work around desktop Webkit quirk where clicking a label will fire two clicks (on the label
+        // and on the input element). Depending on the exact browser, this second click we don't want
+        // to bust has either (0,0), negative coordinates, or coordinates equal to triggering label
+        // click event
+        if (x < 1 && y < 1) {
+          return; // offscreen
+        }
+        if (lastLabelClickCoordinates &&
+          lastLabelClickCoordinates[0] === x && lastLabelClickCoordinates[1] === y) {
+          return; // input click triggered by label click
+        }
+        // reset label click coordinates on first subsequent click
+        if (lastLabelClickCoordinates) {
+          lastLabelClickCoordinates = null;
+        }
+        // remember label click coordinates to prevent click busting of trigger click event on input
+        if (nodeName_(event.target) === 'label') {
+          lastLabelClickCoordinates = [x, y];
+        }
+
+        // Look for an allowable region containing this click.
+        // If we find one, that means it was created by touchstart and not removed by
+        // preventGhostClick, so we don't bust it.
+        if (checkAllowableRegions(touchCoordinates, x, y)) {
+          return;
+        }
+
+        // If we didn't find an allowable region, bust the click.
+        event.stopPropagation();
+        event.preventDefault();
+
+        // Blur focused form elements
+        if (event.target && event.target.blur) {
+          event.target.blur();
+        }
+      }
+
+
+      // Global touchstart handler that creates an allowable region for a click event.
+      // This allowable region can be removed by preventGhostClick if we want to bust it.
+      function onTouchStart(event) {
+        var touches = event.touches && event.touches.length ? event.touches : [event];
+        var x = touches[0].clientX;
+        var y = touches[0].clientY;
+        touchCoordinates.push(x, y);
+
+        $timeout(function() {
+          // Remove the allowable region.
+          for (var i = 0; i < touchCoordinates.length; i += 2) {
+            if (touchCoordinates[i] === x && touchCoordinates[i + 1] === y) {
+              touchCoordinates.splice(i, i + 2);
+              return;
+            }
+          }
+        }, PREVENT_DURATION, false);
+      }
+
+      // On the first call, attaches some event handlers. Then whenever it gets called, it creates a
+      // zone around the touchstart where clicks will get busted.
+      function preventGhostClick(x, y) {
+        if (!touchCoordinates) {
+          $rootElement[0].addEventListener('click', onClick, true);
+          $rootElement[0].addEventListener('touchstart', onTouchStart, true);
+          touchCoordinates = [];
+        }
+
+        lastPreventedTime = Date.now();
+
+        checkAllowableRegions(touchCoordinates, x, y);
+      }
+
+      // Actual linking function.
+      return function(scope, element, attr) {
+        var clickHandler = $parse(attr.ngClick),
+          tapping = false,
+          tapElement,  // Used to blur the element after a tap.
+          startTime,   // Used to check if the tap was held too long.
+          touchStartX,
+          touchStartY;
+
+        function resetState() {
+          tapping = false;
+          element.removeClass(ACTIVE_CLASS_NAME);
+        }
+
+        element.on('touchstart', function(event) {
+          tapping = true;
+          tapElement = event.target ? event.target : event.srcElement; // IE uses srcElement.
+          // Hack for Safari, which can target text nodes instead of containers.
+          if (tapElement.nodeType === 3) {
+            tapElement = tapElement.parentNode;
+          }
+
+          element.addClass(ACTIVE_CLASS_NAME);
+
+          startTime = Date.now();
+
+          // Use jQuery originalEvent
+          var originalEvent = event.originalEvent || event;
+          var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
+          var e = touches[0];
+          touchStartX = e.clientX;
+          touchStartY = e.clientY;
+        });
+
+        element.on('touchcancel', function(event) {
+          resetState();
+        });
+
+        element.on('touchend', function(event) {
+          var diff = Date.now() - startTime;
+
+          // Use jQuery originalEvent
+          var originalEvent = event.originalEvent || event;
+          var touches = (originalEvent.changedTouches && originalEvent.changedTouches.length) ?
+            originalEvent.changedTouches :
+            ((originalEvent.touches && originalEvent.touches.length) ? originalEvent.touches : [originalEvent]);
+          var e = touches[0];
+          var x = e.clientX;
+          var y = e.clientY;
+          var dist = Math.sqrt(Math.pow(x - touchStartX, 2) + Math.pow(y - touchStartY, 2));
+
+          if (tapping && diff < TAP_DURATION && dist < MOVE_TOLERANCE) {
+            // Call preventGhostClick so the clickbuster will catch the corresponding click.
+            preventGhostClick(x, y);
+
+            // Blur the focused element (the button, probably) before firing the callback.
+            // This doesn't work perfectly on Android Chrome, but seems to work elsewhere.
+            // I couldn't get anything to work reliably on Android Chrome.
+            if (tapElement) {
+              tapElement.blur();
+            }
+
+            if (!angular.isDefined(attr.disabled) || attr.disabled === false) {
+              element.triggerHandler('click', [event]);
+            }
+          }
+
+          resetState();
+        });
+
+        // Hack for iOS Safari's benefit. It goes searching for onclick handlers and is liable to click
+        // something else nearby.
+        element.onclick = function(event) { };
+
+        // Actual click handler.
+        // There are three different kinds of clicks, only two of which reach this point.
+        // - On desktop browsers without touch events, their clicks will always come here.
+        // - On mobile browsers, the simulated "fast" click will call this.
+        // - But the browser's follow-up slow click will be "busted" before it reaches this handler.
+        // Therefore it's safe to use this directive on both mobile and desktop.
+        element.on('click', function(event, touchend) {
+          scope.$apply(function() {
+            clickHandler(scope, {$event: (touchend || event)});
+          });
+        });
+
+        element.on('mousedown', function(event) {
+          element.addClass(ACTIVE_CLASS_NAME);
+        });
+
+        element.on('mousemove mouseup', function(event) {
+          element.removeClass(ACTIVE_CLASS_NAME);
+        });
+
+      };
+    }];
+
+  /* global ngTouch: false */
+
+  /**
+   * @ngdoc directive
+   * @name ngSwipeLeft
+   *
+   * @description
+   * Specify custom behavior when an element is swiped to the left on a touchscreen device.
+   * A leftward swipe is a quick, right-to-left slide of the finger.
+   * Though ngSwipeLeft is designed for touch-based devices, it will work with a mouse click and drag
+   * too.
+   *
+   * To disable the mouse click and drag functionality, add `ng-swipe-disable-mouse` to
+   * the `ng-swipe-left` or `ng-swipe-right` DOM Element.
+   *
+   * Requires the {@link ngTouch `ngTouch`} module to be installed.
+   *
+   * @element ANY
+   * @param {expression} ngSwipeLeft {@link guide/expression Expression} to evaluate
+   * upon left swipe. (Event object is available as `$event`)
+   *
+   * @example
+   <example module="ngSwipeLeftExample" deps="angular-touch.js" name="ng-swipe-left">
+   <file name="index.html">
+   <div ng-show="!showActions" ng-swipe-left="showActions = true">
+   Some list content, like an email in the inbox
+   </div>
+   <div ng-show="showActions" ng-swipe-right="showActions = false">
+   <button ng-click="reply()">Reply</button>
+   <button ng-click="delete()">Delete</button>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngSwipeLeftExample', ['ngTouch']);
+   </file>
+   </example>
+   */
+
+  /**
+   * @ngdoc directive
+   * @name ngSwipeRight
+   *
+   * @description
+   * Specify custom behavior when an element is swiped to the right on a touchscreen device.
+   * A rightward swipe is a quick, left-to-right slide of the finger.
+   * Though ngSwipeRight is designed for touch-based devices, it will work with a mouse click and drag
+   * too.
+   *
+   * Requires the {@link ngTouch `ngTouch`} module to be installed.
+   *
+   * @element ANY
+   * @param {expression} ngSwipeRight {@link guide/expression Expression} to evaluate
+   * upon right swipe. (Event object is available as `$event`)
+   *
+   * @example
+   <example module="ngSwipeRightExample" deps="angular-touch.js" name="ng-swipe-right">
+   <file name="index.html">
+   <div ng-show="!showActions" ng-swipe-left="showActions = true">
+   Some list content, like an email in the inbox
+   </div>
+   <div ng-show="showActions" ng-swipe-right="showActions = false">
+   <button ng-click="reply()">Reply</button>
+   <button ng-click="delete()">Delete</button>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngSwipeRightExample', ['ngTouch']);
+   </file>
+   </example>
+   */
+
+  function makeSwipeDirective(directiveName, direction, eventName) {
+    ngTouch.directive(directiveName, ['$parse', '$swipe', function($parse, $swipe) {
+      // The maximum vertical delta for a swipe should be less than 75px.
+      var MAX_VERTICAL_DISTANCE = 75;
+      // Vertical distance should not be more than a fraction of the horizontal distance.
+      var MAX_VERTICAL_RATIO = 0.3;
+      // At least a 30px lateral motion is necessary for a swipe.
+      var MIN_HORIZONTAL_DISTANCE = 30;
+
+      return function(scope, element, attr) {
+        var swipeHandler = $parse(attr[directiveName]);
+
+        var startCoords, valid;
+
+        function validSwipe(coords) {
+          // Check that it's within the coordinates.
+          // Absolute vertical distance must be within tolerances.
+          // Horizontal distance, we take the current X - the starting X.
+          // This is negative for leftward swipes and positive for rightward swipes.
+          // After multiplying by the direction (-1 for left, +1 for right), legal swipes
+          // (ie. same direction as the directive wants) will have a positive delta and
+          // illegal ones a negative delta.
+          // Therefore this delta must be positive, and larger than the minimum.
+          if (!startCoords) return false;
+          var deltaY = Math.abs(coords.y - startCoords.y);
+          var deltaX = (coords.x - startCoords.x) * direction;
+          return valid && // Short circuit for already-invalidated swipes.
+            deltaY < MAX_VERTICAL_DISTANCE &&
+            deltaX > 0 &&
+            deltaX > MIN_HORIZONTAL_DISTANCE &&
+            deltaY / deltaX < MAX_VERTICAL_RATIO;
+        }
+
+        var pointerTypes = ['touch'];
+        if (!angular.isDefined(attr['ngSwipeDisableMouse'])) {
+          pointerTypes.push('mouse');
+        }
+        $swipe.bind(element, {
+          'start': function(coords, event) {
+            startCoords = coords;
+            valid = true;
+          },
+          'cancel': function(event) {
+            valid = false;
+          },
+          'end': function(coords, event) {
+            if (validSwipe(coords)) {
+              scope.$apply(function() {
+                element.triggerHandler(eventName);
+                swipeHandler(scope, {$event: event});
+              });
+            }
+          }
+        }, pointerTypes);
+      };
+    }]);
+  }
+
+// Left is negative X-coordinate, right is positive.
+  makeSwipeDirective('ngSwipeLeft', -1, 'swipeleft');
+  makeSwipeDirective('ngSwipeRight', 1, 'swiperight');
+
+
+
+})(window, window.angular);
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.ui-bootstrap.js b/docs-web/src/main/webapp/src/lib/angular.ui-bootstrap.js
index 474e2d3a..8dc8fc45 100644
--- a/docs-web/src/main/webapp/src/lib/angular.ui-bootstrap.js
+++ b/docs-web/src/main/webapp/src/lib/angular.ui-bootstrap.js
@@ -1,2116 +1,5109 @@
-angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.transition","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdownToggle","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
-angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/popup.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]);
-angular.module('ui.bootstrap.transition', [])
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
 
-/**
- * $transition service provides a consistent interface to trigger CSS 3 transitions and to be informed when they complete.
- * @param  {DOMElement} element  The DOMElement that will be animated.
- * @param  {string|object|function} trigger  The thing that will cause the transition to start:
- *   - As a string, it represents the css class to be added to the element.
- *   - As an object, it represents a hash of style attributes to be applied to the element.
- *   - As a function, it represents a function to be called that will cause the transition to occur.
- * @return {Promise}  A promise that is resolved when the transition finishes.
- */
-    .factory('$transition', ['$q', '$timeout', '$rootScope', function($q, $timeout, $rootScope) {
+ * Version: 2.5.0 - 2017-01-28
+ * License: MIT
+ */angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.tabindex","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.datepicker","ui.bootstrap.position","ui.bootstrap.datepickerPopup","ui.bootstrap.debounce","ui.bootstrap.multiMap","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
+angular.module("ui.bootstrap.tpls", ["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/year.html","uib/template/datepickerPopup/popup.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]);
+angular.module('ui.bootstrap.collapse', [])
 
-      var $transition = function(element, trigger, options) {
-        options = options || {};
-        var deferred = $q.defer();
-        var endEventName = $transition[options.animation ? "animationEndEventName" : "transitionEndEventName"];
+  .directive('uibCollapse', ['$animate', '$q', '$parse', '$injector', function($animate, $q, $parse, $injector) {
+    var $animateCss = $injector.has('$animateCss') ? $injector.get('$animateCss') : null;
+    return {
+      link: function(scope, element, attrs) {
+        var expandingExpr = $parse(attrs.expanding),
+          expandedExpr = $parse(attrs.expanded),
+          collapsingExpr = $parse(attrs.collapsing),
+          collapsedExpr = $parse(attrs.collapsed),
+          horizontal = false,
+          css = {},
+          cssTo = {};
 
-        var transitionEndHandler = function(event) {
-          $rootScope.$apply(function() {
-            element.unbind(endEventName, transitionEndHandler);
-            deferred.resolve(element);
-          });
-        };
+        init();
 
-        if (endEventName) {
-          element.bind(endEventName, transitionEndHandler);
-        }
-
-        // Wrap in a timeout to allow the browser time to update the DOM before the transition is to occur
-        $timeout(function() {
-          if ( angular.isString(trigger) ) {
-            element.addClass(trigger);
-          } else if ( angular.isFunction(trigger) ) {
-            trigger(element);
-          } else if ( angular.isObject(trigger) ) {
-            element.css(trigger);
+        function init() {
+          horizontal = !!('horizontal' in attrs);
+          if (horizontal) {
+            css = {
+              width: ''
+            };
+            cssTo = {width: '0'};
+          } else {
+            css = {
+              height: ''
+            };
+            cssTo = {height: '0'};
           }
-          //If browser does not support transitions, instantly resolve
-          if ( !endEventName ) {
-            deferred.resolve(element);
-          }
-        });
-
-        // Add our custom cancel function to the promise that is returned
-        // We can call this if we are about to run a new transition, which we know will prevent this transition from ending,
-        // i.e. it will therefore never raise a transitionEnd event for that transition
-        deferred.promise.cancel = function() {
-          if ( endEventName ) {
-            element.unbind(endEventName, transitionEndHandler);
-          }
-          deferred.reject('Transition cancelled');
-        };
-
-        return deferred.promise;
-      };
-
-      // Work out the name of the transitionEnd event
-      var transElement = document.createElement('trans');
-      var transitionEndEventNames = {
-        'WebkitTransition': 'webkitTransitionEnd',
-        'MozTransition': 'transitionend',
-        'OTransition': 'oTransitionEnd',
-        'transition': 'transitionend'
-      };
-      var animationEndEventNames = {
-        'WebkitTransition': 'webkitAnimationEnd',
-        'MozTransition': 'animationend',
-        'OTransition': 'oAnimationEnd',
-        'transition': 'animationend'
-      };
-      function findEndEventName(endEventNames) {
-        for (var name in endEventNames){
-          if (transElement.style[name] !== undefined) {
-            return endEventNames[name];
+          if (!scope.$eval(attrs.uibCollapse)) {
+            element.addClass('in')
+              .addClass('collapse')
+              .attr('aria-expanded', true)
+              .attr('aria-hidden', false)
+              .css(css);
           }
         }
-      }
-      $transition.transitionEndEventName = findEndEventName(transitionEndEventNames);
-      $transition.animationEndEventName = findEndEventName(animationEndEventNames);
-      return $transition;
-    }]);
 
-angular.module('ui.bootstrap.collapse', ['ui.bootstrap.transition'])
+        function getScrollFromElement(element) {
+          if (horizontal) {
+            return {width: element.scrollWidth + 'px'};
+          }
+          return {height: element.scrollHeight + 'px'};
+        }
 
-    .directive('collapse', ['$transition', function ($transition, $timeout) {
+        function expand() {
+          if (element.hasClass('collapse') && element.hasClass('in')) {
+            return;
+          }
 
-      return {
-        link: function (scope, element, attrs) {
+          $q.resolve(expandingExpr(scope))
+            .then(function() {
+              element.removeClass('collapse')
+                .addClass('collapsing')
+                .attr('aria-expanded', true)
+                .attr('aria-hidden', false);
 
-          var initialAnimSkip = true;
-          var currentTransition;
-
-          function doTransition(change) {
-            var newTransition = $transition(element, change);
-            if (currentTransition) {
-              currentTransition.cancel();
-            }
-            currentTransition = newTransition;
-            newTransition.then(newTransitionDone, newTransitionDone);
-            return newTransition;
-
-            function newTransitionDone() {
-              // Make sure it's this transition, otherwise, leave it alone.
-              if (currentTransition === newTransition) {
-                currentTransition = undefined;
+              if ($animateCss) {
+                $animateCss(element, {
+                  addClass: 'in',
+                  easing: 'ease',
+                  css: {
+                    overflow: 'hidden'
+                  },
+                  to: getScrollFromElement(element[0])
+                }).start()['finally'](expandDone);
+              } else {
+                $animate.addClass(element, 'in', {
+                  css: {
+                    overflow: 'hidden'
+                  },
+                  to: getScrollFromElement(element[0])
+                }).then(expandDone);
               }
-            }
-          }
-
-          function expand() {
-            if (initialAnimSkip) {
-              initialAnimSkip = false;
-              expandDone();
-            } else {
-              element.removeClass('collapse').addClass('collapsing');
-              doTransition({ height: element[0].scrollHeight + 'px' }).then(expandDone);
-            }
-          }
-
-          function expandDone() {
-            element.removeClass('collapsing');
-            element.addClass('collapse in');
-            element.css({height: 'auto'});
-          }
-
-          function collapse() {
-            if (initialAnimSkip) {
-              initialAnimSkip = false;
-              collapseDone();
-              element.css({height: 0});
-            } else {
-              // CSS transitions don't work with height: auto, so we have to manually change the height to a specific value
-              element.css({ height: element[0].scrollHeight + 'px' });
-              //trigger reflow so a browser relaizes that height was updated from auto to a specific value
-              var x = element[0].offsetWidth;
-
-              element.removeClass('collapse in').addClass('collapsing');
-
-              doTransition({ height: 0 }).then(collapseDone);
-            }
-          }
-
-          function collapseDone() {
-            element.removeClass('collapsing');
-            element.addClass('collapse');
-          }
-
-          scope.$watch(attrs.collapse, function (shouldCollapse) {
-            if (shouldCollapse) {
-              collapse();
-            } else {
-              expand();
-            }
-          });
+            }, angular.noop);
         }
-      };
-    }]);
 
-angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
-
-    .constant('accordionConfig', {
-      closeOthers: true
-    })
-
-    .controller('AccordionController', ['$scope', '$attrs', 'accordionConfig', function ($scope, $attrs, accordionConfig) {
-
-      // This array keeps track of the accordion groups
-      this.groups = [];
-
-      // Ensure that all the groups in this accordion are closed, unless close-others explicitly says not to
-      this.closeOthers = function(openGroup) {
-        var closeOthers = angular.isDefined($attrs.closeOthers) ? $scope.$eval($attrs.closeOthers) : accordionConfig.closeOthers;
-        if ( closeOthers ) {
-          angular.forEach(this.groups, function (group) {
-            if ( group !== openGroup ) {
-              group.isOpen = false;
-            }
-          });
+        function expandDone() {
+          element.removeClass('collapsing')
+            .addClass('collapse')
+            .css(css);
+          expandedExpr(scope);
         }
-      };
 
-      // This is called from the accordion-group directive to add itself to the accordion
-      this.addGroup = function(groupScope) {
-        var that = this;
-        this.groups.push(groupScope);
+        function collapse() {
+          if (!element.hasClass('collapse') && !element.hasClass('in')) {
+            return collapseDone();
+          }
 
-        groupScope.$on('$destroy', function (event) {
-          that.removeGroup(groupScope);
+          $q.resolve(collapsingExpr(scope))
+            .then(function() {
+              element
+              // IMPORTANT: The width must be set before adding "collapsing" class.
+              // Otherwise, the browser attempts to animate from width 0 (in
+              // collapsing class) to the given width here.
+                .css(getScrollFromElement(element[0]))
+                // initially all panel collapse have the collapse class, this removal
+                // prevents the animation from jumping to collapsed state
+                .removeClass('collapse')
+                .addClass('collapsing')
+                .attr('aria-expanded', false)
+                .attr('aria-hidden', true);
+
+              if ($animateCss) {
+                $animateCss(element, {
+                  removeClass: 'in',
+                  to: cssTo
+                }).start()['finally'](collapseDone);
+              } else {
+                $animate.removeClass(element, 'in', {
+                  to: cssTo
+                }).then(collapseDone);
+              }
+            }, angular.noop);
+        }
+
+        function collapseDone() {
+          element.css(cssTo); // Required so that collapse works when animation is disabled
+          element.removeClass('collapsing')
+            .addClass('collapse');
+          collapsedExpr(scope);
+        }
+
+        scope.$watch(attrs.uibCollapse, function(shouldCollapse) {
+          if (shouldCollapse) {
+            collapse();
+          } else {
+            expand();
+          }
         });
-      };
+      }
+    };
+  }]);
 
-      // This is called from the accordion-group directive when to remove itself
-      this.removeGroup = function(group) {
-        var index = this.groups.indexOf(group);
-        if ( index !== -1 ) {
-          this.groups.splice(this.groups.indexOf(group), 1);
-        }
-      };
+angular.module('ui.bootstrap.tabindex', [])
 
-    }])
-
-// The accordion directive simply sets up the directive controller
-// and adds an accordion CSS class to itself element.
-    .directive('accordion', function () {
-      return {
-        restrict:'EA',
-        controller:'AccordionController',
-        transclude: true,
-        replace: false,
-        templateUrl: 'template/accordion/accordion.html'
-      };
-    })
-
-// The accordion-group directive indicates a block of html that will expand and collapse in an accordion
-    .directive('accordionGroup', ['$parse', function($parse) {
-      return {
-        require:'^accordion',         // We need this directive to be inside an accordion
-        restrict:'EA',
-        transclude:true,              // It transcludes the contents of the directive into the template
-        replace: true,                // The element containing the directive will be replaced with the template
-        templateUrl:'template/accordion/accordion-group.html',
-        scope:{ heading:'@' },        // Create an isolated scope and interpolate the heading attribute onto this scope
-        controller: function() {
-          this.setHeading = function(element) {
-            this.heading = element;
-          };
-        },
-        link: function(scope, element, attrs, accordionCtrl) {
-          var getIsOpen, setIsOpen;
-
-          accordionCtrl.addGroup(scope);
-
-          scope.isOpen = false;
-
-          if ( attrs.isOpen ) {
-            getIsOpen = $parse(attrs.isOpen);
-            setIsOpen = getIsOpen.assign;
-
-            scope.$parent.$watch(getIsOpen, function(value) {
-              scope.isOpen = !!value;
-            });
-          }
-
-          scope.$watch('isOpen', function(value) {
-            if ( value ) {
-              accordionCtrl.closeOthers(scope);
-            }
-            if ( setIsOpen ) {
-              setIsOpen(scope.$parent, value);
-            }
-          });
-        }
-      };
-    }])
-
-// Use accordion-heading below an accordion-group to provide a heading containing HTML
-// <accordion-group>
-//   <accordion-heading>Heading containing HTML - <img src="..."></accordion-heading>
-// </accordion-group>
-    .directive('accordionHeading', function() {
-      return {
-        restrict: 'EA',
-        transclude: true,   // Grab the contents to be used as the heading
-        template: '',       // In effect remove this element!
-        replace: true,
-        require: '^accordionGroup',
-        compile: function(element, attr, transclude) {
-          return function link(scope, element, attr, accordionGroupCtrl) {
-            // Pass the heading to the accordion-group controller
-            // so that it can be transcluded into the right place in the template
-            // [The second parameter to transclude causes the elements to be cloned so that they work in ng-repeat]
-            accordionGroupCtrl.setHeading(transclude(scope, function() {}));
-          };
-        }
-      };
-    })
-
-// Use in the accordion-group template to indicate where you want the heading to be transcluded
-// You must provide the property on the accordion-group controller that will hold the transcluded element
-// <div class="accordion-group">
-//   <div class="accordion-heading" ><a ... accordion-transclude="heading">...</a></div>
-//   ...
-// </div>
-    .directive('accordionTransclude', function() {
-      return {
-        require: '^accordionGroup',
-        link: function(scope, element, attr, controller) {
-          scope.$watch(function() { return controller[attr.accordionTransclude]; }, function(heading) {
-            if ( heading ) {
-              element.html('');
-              element.append(heading);
-            }
-          });
-        }
-      };
-    });
-
-angular.module("ui.bootstrap.alert", [])
-
-    .controller('AlertController', ['$scope', '$attrs', function ($scope, $attrs) {
-      $scope.closeable = 'close' in $attrs;
-    }])
-
-    .directive('alert', function () {
-      return {
-        restrict:'EA',
-        controller:'AlertController',
-        templateUrl:'template/alert/alert.html',
-        transclude:true,
-        replace:true,
-        scope: {
-          type: '=',
-          close: '&'
-        }
-      };
-    });
-
-angular.module('ui.bootstrap.bindHtml', [])
-
-    .directive('bindHtmlUnsafe', function () {
-      return function (scope, element, attr) {
-        element.addClass('ng-binding').data('$binding', attr.bindHtmlUnsafe);
-        scope.$watch(attr.bindHtmlUnsafe, function bindHtmlUnsafeWatchAction(value) {
-          element.html(value || '');
+  .directive('uibTabindexToggle', function() {
+    return {
+      restrict: 'A',
+      link: function(scope, elem, attrs) {
+        attrs.$observe('disabled', function(disabled) {
+          attrs.$set('tabindex', disabled ? -1 : null);
         });
-      };
-    });
+      }
+    };
+  });
+
+angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse', 'ui.bootstrap.tabindex'])
+
+  .constant('uibAccordionConfig', {
+    closeOthers: true
+  })
+
+  .controller('UibAccordionController', ['$scope', '$attrs', 'uibAccordionConfig', function($scope, $attrs, accordionConfig) {
+    // This array keeps track of the accordion groups
+    this.groups = [];
+
+    // Ensure that all the groups in this accordion are closed, unless close-others explicitly says not to
+    this.closeOthers = function(openGroup) {
+      var closeOthers = angular.isDefined($attrs.closeOthers) ?
+        $scope.$eval($attrs.closeOthers) : accordionConfig.closeOthers;
+      if (closeOthers) {
+        angular.forEach(this.groups, function(group) {
+          if (group !== openGroup) {
+            group.isOpen = false;
+          }
+        });
+      }
+    };
+
+    // This is called from the accordion-group directive to add itself to the accordion
+    this.addGroup = function(groupScope) {
+      var that = this;
+      this.groups.push(groupScope);
+
+      groupScope.$on('$destroy', function(event) {
+        that.removeGroup(groupScope);
+      });
+    };
+
+    // This is called from the accordion-group directive when to remove itself
+    this.removeGroup = function(group) {
+      var index = this.groups.indexOf(group);
+      if (index !== -1) {
+        this.groups.splice(index, 1);
+      }
+    };
+  }])
+
+  // The accordion directive simply sets up the directive controller
+  // and adds an accordion CSS class to itself element.
+  .directive('uibAccordion', function() {
+    return {
+      controller: 'UibAccordionController',
+      controllerAs: 'accordion',
+      transclude: true,
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/accordion/accordion.html';
+      }
+    };
+  })
+
+  // The accordion-group directive indicates a block of html that will expand and collapse in an accordion
+  .directive('uibAccordionGroup', function() {
+    return {
+      require: '^uibAccordion',         // We need this directive to be inside an accordion
+      transclude: true,              // It transcludes the contents of the directive into the template
+      restrict: 'A',
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/accordion/accordion-group.html';
+      },
+      scope: {
+        heading: '@',               // Interpolate the heading attribute onto this scope
+        panelClass: '@?',           // Ditto with panelClass
+        isOpen: '=?',
+        isDisabled: '=?'
+      },
+      controller: function() {
+        this.setHeading = function(element) {
+          this.heading = element;
+        };
+      },
+      link: function(scope, element, attrs, accordionCtrl) {
+        element.addClass('panel');
+        accordionCtrl.addGroup(scope);
+
+        scope.openClass = attrs.openClass || 'panel-open';
+        scope.panelClass = attrs.panelClass || 'panel-default';
+        scope.$watch('isOpen', function(value) {
+          element.toggleClass(scope.openClass, !!value);
+          if (value) {
+            accordionCtrl.closeOthers(scope);
+          }
+        });
+
+        scope.toggleOpen = function($event) {
+          if (!scope.isDisabled) {
+            if (!$event || $event.which === 32) {
+              scope.isOpen = !scope.isOpen;
+            }
+          }
+        };
+
+        var id = 'accordiongroup-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+        scope.headingId = id + '-tab';
+        scope.panelId = id + '-panel';
+      }
+    };
+  })
+
+  // Use accordion-heading below an accordion-group to provide a heading containing HTML
+  .directive('uibAccordionHeading', function() {
+    return {
+      transclude: true,   // Grab the contents to be used as the heading
+      template: '',       // In effect remove this element!
+      replace: true,
+      require: '^uibAccordionGroup',
+      link: function(scope, element, attrs, accordionGroupCtrl, transclude) {
+        // Pass the heading to the accordion-group controller
+        // so that it can be transcluded into the right place in the template
+        // [The second parameter to transclude causes the elements to be cloned so that they work in ng-repeat]
+        accordionGroupCtrl.setHeading(transclude(scope, angular.noop));
+      }
+    };
+  })
+
+  // Use in the accordion-group template to indicate where you want the heading to be transcluded
+  // You must provide the property on the accordion-group controller that will hold the transcluded element
+  .directive('uibAccordionTransclude', function() {
+    return {
+      require: '^uibAccordionGroup',
+      link: function(scope, element, attrs, controller) {
+        scope.$watch(function() { return controller[attrs.uibAccordionTransclude]; }, function(heading) {
+          if (heading) {
+            var elem = angular.element(element[0].querySelector(getHeaderSelectors()));
+            elem.html('');
+            elem.append(heading);
+          }
+        });
+      }
+    };
+
+    function getHeaderSelectors() {
+      return 'uib-accordion-header,' +
+        'data-uib-accordion-header,' +
+        'x-uib-accordion-header,' +
+        'uib\\:accordion-header,' +
+        '[uib-accordion-header],' +
+        '[data-uib-accordion-header],' +
+        '[x-uib-accordion-header]';
+    }
+  });
+
+angular.module('ui.bootstrap.alert', [])
+
+  .controller('UibAlertController', ['$scope', '$element', '$attrs', '$interpolate', '$timeout', function($scope, $element, $attrs, $interpolate, $timeout) {
+    $scope.closeable = !!$attrs.close;
+    $element.addClass('alert');
+    $attrs.$set('role', 'alert');
+    if ($scope.closeable) {
+      $element.addClass('alert-dismissible');
+    }
+
+    var dismissOnTimeout = angular.isDefined($attrs.dismissOnTimeout) ?
+      $interpolate($attrs.dismissOnTimeout)($scope.$parent) : null;
+
+    if (dismissOnTimeout) {
+      $timeout(function() {
+        $scope.close();
+      }, parseInt(dismissOnTimeout, 10));
+    }
+  }])
+
+  .directive('uibAlert', function() {
+    return {
+      controller: 'UibAlertController',
+      controllerAs: 'alert',
+      restrict: 'A',
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/alert/alert.html';
+      },
+      transclude: true,
+      scope: {
+        close: '&'
+      }
+    };
+  });
+
 angular.module('ui.bootstrap.buttons', [])
 
-    .constant('buttonConfig', {
-      activeClass: 'active',
-      toggleEvent: 'click'
-    })
+  .constant('uibButtonConfig', {
+    activeClass: 'active',
+    toggleEvent: 'click'
+  })
 
-    .controller('ButtonsController', ['buttonConfig', function(buttonConfig) {
-      this.activeClass = buttonConfig.activeClass || 'active';
-      this.toggleEvent = buttonConfig.toggleEvent || 'click';
-    }])
+  .controller('UibButtonsController', ['uibButtonConfig', function(buttonConfig) {
+    this.activeClass = buttonConfig.activeClass || 'active';
+    this.toggleEvent = buttonConfig.toggleEvent || 'click';
+  }])
 
-    .directive('btnRadio', function () {
-      return {
-        require: ['btnRadio', 'ngModel'],
-        controller: 'ButtonsController',
-        link: function (scope, element, attrs, ctrls) {
-          var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+  .directive('uibBtnRadio', ['$parse', function($parse) {
+    return {
+      require: ['uibBtnRadio', 'ngModel'],
+      controller: 'UibButtonsController',
+      controllerAs: 'buttons',
+      link: function(scope, element, attrs, ctrls) {
+        var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+        var uncheckableExpr = $parse(attrs.uibUncheckable);
 
-          //model -> UI
-          ngModelCtrl.$render = function () {
-            element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, scope.$eval(attrs.btnRadio)));
-          };
+        element.find('input').css({display: 'none'});
 
-          //ui->model
-          element.bind(buttonsCtrl.toggleEvent, function () {
-            if (!element.hasClass(buttonsCtrl.activeClass)) {
-              scope.$apply(function () {
-                ngModelCtrl.$setViewValue(scope.$eval(attrs.btnRadio));
-                ngModelCtrl.$render();
-              });
-            }
-          });
-        }
-      };
-    })
+        //model -> UI
+        ngModelCtrl.$render = function() {
+          element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, scope.$eval(attrs.uibBtnRadio)));
+        };
 
-    .directive('btnCheckbox', function () {
-      return {
-        require: ['btnCheckbox', 'ngModel'],
-        controller: 'ButtonsController',
-        link: function (scope, element, attrs, ctrls) {
-          var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
-
-          function getTrueValue() {
-            return getCheckboxValue(attrs.btnCheckboxTrue, true);
+        //ui->model
+        element.on(buttonsCtrl.toggleEvent, function() {
+          if (attrs.disabled) {
+            return;
           }
 
-          function getFalseValue() {
-            return getCheckboxValue(attrs.btnCheckboxFalse, false);
-          }
+          var isActive = element.hasClass(buttonsCtrl.activeClass);
 
-          function getCheckboxValue(attributeValue, defaultValue) {
-            var val = scope.$eval(attributeValue);
-            return angular.isDefined(val) ? val : defaultValue;
-          }
-
-          //model -> UI
-          ngModelCtrl.$render = function () {
-            element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, getTrueValue()));
-          };
-
-          //ui->model
-          element.bind(buttonsCtrl.toggleEvent, function () {
-            scope.$apply(function () {
-              ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue());
+          if (!isActive || angular.isDefined(attrs.uncheckable)) {
+            scope.$apply(function() {
+              ngModelCtrl.$setViewValue(isActive ? null : scope.$eval(attrs.uibBtnRadio));
               ngModelCtrl.$render();
             });
+          }
+        });
+
+        if (attrs.uibUncheckable) {
+          scope.$watch(uncheckableExpr, function(uncheckable) {
+            attrs.$set('uncheckable', uncheckable ? '' : undefined);
           });
         }
-      };
-    });
+      }
+    };
+  }])
 
-/**
- * @ngdoc overview
- * @name ui.bootstrap.carousel
- *
- * @description
- * AngularJS version of an image carousel.
- *
- */
-angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
-    .controller('CarouselController', ['$scope', '$timeout', '$transition', '$q', function ($scope, $timeout, $transition, $q) {
-      var self = this,
-          slides = self.slides = [],
-          currentIndex = -1,
-          currentTimeout, isPlaying;
-      self.currentSlide = null;
+  .directive('uibBtnCheckbox', function() {
+    return {
+      require: ['uibBtnCheckbox', 'ngModel'],
+      controller: 'UibButtonsController',
+      controllerAs: 'button',
+      link: function(scope, element, attrs, ctrls) {
+        var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
 
-      var destroyed = false;
-      /* direction: "prev" or "next" */
-      self.select = function(nextSlide, direction) {
-        var nextIndex = slides.indexOf(nextSlide);
-        //Decide direction if it's not given
-        if (direction === undefined) {
-          direction = nextIndex > currentIndex ? "next" : "prev";
+        element.find('input').css({display: 'none'});
+
+        function getTrueValue() {
+          return getCheckboxValue(attrs.btnCheckboxTrue, true);
         }
-        if (nextSlide && nextSlide !== self.currentSlide) {
-          if ($scope.$currentTransition) {
-            $scope.$currentTransition.cancel();
-            //Timeout so ng-class in template has time to fix classes for finished slide
-            $timeout(goNext);
-          } else {
-            goNext();
+
+        function getFalseValue() {
+          return getCheckboxValue(attrs.btnCheckboxFalse, false);
+        }
+
+        function getCheckboxValue(attribute, defaultValue) {
+          return angular.isDefined(attribute) ? scope.$eval(attribute) : defaultValue;
+        }
+
+        //model -> UI
+        ngModelCtrl.$render = function() {
+          element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, getTrueValue()));
+        };
+
+        //ui->model
+        element.on(buttonsCtrl.toggleEvent, function() {
+          if (attrs.disabled) {
+            return;
           }
-        }
-        function goNext() {
-          // Scope has been destroyed, stop here.
-          if (destroyed) { return; }
-          //If we have a slide to transition from and we have a transition type and we're allowed, go
-          if (self.currentSlide && angular.isString(direction) && !$scope.noTransition && nextSlide.$element) {
-            //We shouldn't do class manip in here, but it's the same weird thing bootstrap does. need to fix sometime
-            nextSlide.$element.addClass(direction);
-            var reflow = nextSlide.$element[0].offsetWidth; //force reflow
 
-            //Set all other slides to stop doing their stuff for the new transition
-            angular.forEach(slides, function(slide) {
-              angular.extend(slide, {direction: '', entering: false, leaving: false, active: false});
-            });
-            angular.extend(nextSlide, {direction: direction, active: true, entering: true});
-            angular.extend(self.currentSlide||{}, {direction: direction, leaving: true});
+          scope.$apply(function() {
+            ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue());
+            ngModelCtrl.$render();
+          });
+        });
+      }
+    };
+  });
 
-            $scope.$currentTransition = $transition(nextSlide.$element, {});
-            //We have to create new pointers inside a closure since next & current will change
-            (function(next,current) {
-              $scope.$currentTransition.then(
-                  function(){ transitionDone(next, current); },
-                  function(){ transitionDone(next, current); }
-              );
-            }(nextSlide, self.currentSlide));
-          } else {
-            transitionDone(nextSlide, self.currentSlide);
-          }
-          self.currentSlide = nextSlide;
-          currentIndex = nextIndex;
-          //every time you change slides, reset the timer
-          restartTimer();
-        }
-        function transitionDone(next, current) {
-          angular.extend(next, {direction: '', active: true, leaving: false, entering: false});
-          angular.extend(current||{}, {direction: '', active: false, leaving: false, entering: false});
+angular.module('ui.bootstrap.carousel', [])
+
+  .controller('UibCarouselController', ['$scope', '$element', '$interval', '$timeout', '$animate', function($scope, $element, $interval, $timeout, $animate) {
+    var self = this,
+      slides = self.slides = $scope.slides = [],
+      SLIDE_DIRECTION = 'uib-slideDirection',
+      currentIndex = $scope.active,
+      currentInterval, isPlaying;
+
+    var destroyed = false;
+    $element.addClass('carousel');
+
+    self.addSlide = function(slide, element) {
+      slides.push({
+        slide: slide,
+        element: element
+      });
+      slides.sort(function(a, b) {
+        return +a.slide.index - +b.slide.index;
+      });
+      //if this is the first slide or the slide is set to active, select it
+      if (slide.index === $scope.active || slides.length === 1 && !angular.isNumber($scope.active)) {
+        if ($scope.$currentTransition) {
           $scope.$currentTransition = null;
         }
-      };
-      $scope.$on('$destroy', function () {
-        destroyed = true;
-      });
 
-      /* Allow outside people to call indexOf on slides array */
-      self.indexOfSlide = function(slide) {
-        return slides.indexOf(slide);
-      };
-
-      $scope.next = function() {
-        var newIndex = (currentIndex + 1) % slides.length;
-
-        //Prevent this user-triggered transition from occurring if there is already one in progress
-        if (!$scope.$currentTransition) {
-          return self.select(slides[newIndex], 'next');
+        currentIndex = slide.index;
+        $scope.active = slide.index;
+        setActive(currentIndex);
+        self.select(slides[findSlideIndex(slide)]);
+        if (slides.length === 1) {
+          $scope.play();
         }
-      };
+      }
+    };
 
-      $scope.prev = function() {
-        var newIndex = currentIndex - 1 < 0 ? slides.length - 1 : currentIndex - 1;
-
-        //Prevent this user-triggered transition from occurring if there is already one in progress
-        if (!$scope.$currentTransition) {
-          return self.select(slides[newIndex], 'prev');
+    self.getCurrentIndex = function() {
+      for (var i = 0; i < slides.length; i++) {
+        if (slides[i].slide.index === currentIndex) {
+          return i;
         }
-      };
+      }
+    };
 
-      $scope.select = function(slide) {
-        self.select(slide);
-      };
+    self.next = $scope.next = function() {
+      var newIndex = (self.getCurrentIndex() + 1) % slides.length;
 
-      $scope.isActive = function(slide) {
-        return self.currentSlide === slide;
-      };
+      if (newIndex === 0 && $scope.noWrap()) {
+        $scope.pause();
+        return;
+      }
 
-      $scope.slides = function() {
-        return slides;
-      };
+      return self.select(slides[newIndex], 'next');
+    };
 
-      $scope.$watch('interval', restartTimer);
-      $scope.$on('$destroy', resetTimer);
+    self.prev = $scope.prev = function() {
+      var newIndex = self.getCurrentIndex() - 1 < 0 ? slides.length - 1 : self.getCurrentIndex() - 1;
 
-      function restartTimer() {
+      if ($scope.noWrap() && newIndex === slides.length - 1) {
+        $scope.pause();
+        return;
+      }
+
+      return self.select(slides[newIndex], 'prev');
+    };
+
+    self.removeSlide = function(slide) {
+      var index = findSlideIndex(slide);
+
+      //get the index of the slide inside the carousel
+      slides.splice(index, 1);
+      if (slides.length > 0 && currentIndex === index) {
+        if (index >= slides.length) {
+          currentIndex = slides.length - 1;
+          $scope.active = currentIndex;
+          setActive(currentIndex);
+          self.select(slides[slides.length - 1]);
+        } else {
+          currentIndex = index;
+          $scope.active = currentIndex;
+          setActive(currentIndex);
+          self.select(slides[index]);
+        }
+      } else if (currentIndex > index) {
+        currentIndex--;
+        $scope.active = currentIndex;
+      }
+
+      //clean the active value when no more slide
+      if (slides.length === 0) {
+        currentIndex = null;
+        $scope.active = null;
+      }
+    };
+
+    /* direction: "prev" or "next" */
+    self.select = $scope.select = function(nextSlide, direction) {
+      var nextIndex = findSlideIndex(nextSlide.slide);
+      //Decide direction if it's not given
+      if (direction === undefined) {
+        direction = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+      }
+      //Prevent this user-triggered transition from occurring if there is already one in progress
+      if (nextSlide.slide.index !== currentIndex &&
+        !$scope.$currentTransition) {
+        goNext(nextSlide.slide, nextIndex, direction);
+      }
+    };
+
+    /* Allow outside people to call indexOf on slides array */
+    $scope.indexOfSlide = function(slide) {
+      return +slide.slide.index;
+    };
+
+    $scope.isActive = function(slide) {
+      return $scope.active === slide.slide.index;
+    };
+
+    $scope.isPrevDisabled = function() {
+      return $scope.active === 0 && $scope.noWrap();
+    };
+
+    $scope.isNextDisabled = function() {
+      return $scope.active === slides.length - 1 && $scope.noWrap();
+    };
+
+    $scope.pause = function() {
+      if (!$scope.noPause) {
+        isPlaying = false;
         resetTimer();
-        var interval = +$scope.interval;
-        if (!isNaN(interval) && interval>=0) {
-          currentTimeout = $timeout(timerFn, interval);
-        }
       }
+    };
 
-      function resetTimer() {
-        if (currentTimeout) {
-          $timeout.cancel(currentTimeout);
-          currentTimeout = null;
-        }
+    $scope.play = function() {
+      if (!isPlaying) {
+        isPlaying = true;
+        restartTimer();
       }
+    };
 
-      function timerFn() {
-        if (isPlaying) {
-          $scope.next();
-          restartTimer();
-        } else {
-          $scope.pause();
-        }
-      }
+    $element.on('mouseenter', $scope.pause);
+    $element.on('mouseleave', $scope.play);
 
-      $scope.play = function() {
-        if (!isPlaying) {
-          isPlaying = true;
-          restartTimer();
-        }
-      };
-      $scope.pause = function() {
-        if (!$scope.noPause) {
-          isPlaying = false;
-          resetTimer();
-        }
-      };
-
-      self.addSlide = function(slide, element) {
-        slide.$element = element;
-        slides.push(slide);
-        //if this is the first slide or the slide is set to active, select it
-        if(slides.length === 1 || slide.active) {
-          self.select(slides[slides.length-1]);
-          if (slides.length == 1) {
-            $scope.play();
-          }
-        } else {
-          slide.active = false;
-        }
-      };
-
-      self.removeSlide = function(slide) {
-        //get the index of the slide inside the carousel
-        var index = slides.indexOf(slide);
-        slides.splice(index, 1);
-        if (slides.length > 0 && slide.active) {
-          if (index >= slides.length) {
-            self.select(slides[index-1]);
-          } else {
-            self.select(slides[index]);
-          }
-        } else if (currentIndex > index) {
-          currentIndex--;
-        }
-      };
-
-    }])
-
-/**
- * @ngdoc directive
- * @name ui.bootstrap.carousel.directive:carousel
- * @restrict EA
- *
- * @description
- * Carousel is the outer container for a set of image 'slides' to showcase.
- *
- * @param {number=} interval The time, in milliseconds, that it will take the carousel to go to the next slide.
- * @param {boolean=} noTransition Whether to disable transitions on the carousel.
- * @param {boolean=} noPause Whether to disable pausing on the carousel (by default, the carousel interval pauses on hover).
- *
- * @example
- <example module="ui.bootstrap">
- <file name="index.html">
- <carousel>
- <slide>
- <img src="http://placekitten.com/150/150" style="margin:auto;">
- <div class="carousel-caption">
- <p>Beautiful!</p>
- </div>
- </slide>
- <slide>
- <img src="http://placekitten.com/100/150" style="margin:auto;">
- <div class="carousel-caption">
- <p>D'aww!</p>
- </div>
- </slide>
- </carousel>
- </file>
- <file name="demo.css">
- .carousel-indicators {
-      top: auto;
-      bottom: 15px;
-    }
- </file>
- </example>
- */
-    .directive('carousel', [function() {
-      return {
-        restrict: 'EA',
-        transclude: true,
-        replace: true,
-        controller: 'CarouselController',
-        require: 'carousel',
-        templateUrl: 'template/carousel/carousel.html',
-        scope: {
-          interval: '=',
-          noTransition: '=',
-          noPause: '='
-        }
-      };
-    }])
-
-/**
- * @ngdoc directive
- * @name ui.bootstrap.carousel.directive:slide
- * @restrict EA
- *
- * @description
- * Creates a slide inside a {@link ui.bootstrap.carousel.directive:carousel carousel}.  Must be placed as a child of a carousel element.
- *
- * @param {boolean=} active Model binding, whether or not this slide is currently active.
- *
- * @example
- <example module="ui.bootstrap">
- <file name="index.html">
- <div ng-controller="CarouselDemoCtrl">
- <carousel>
- <slide ng-repeat="slide in slides" active="slide.active">
- <img ng-src="{{slide.image}}" style="margin:auto;">
- <div class="carousel-caption">
- <h4>Slide {{$index}}</h4>
- <p>{{slide.text}}</p>
- </div>
- </slide>
- </carousel>
- <div class="row-fluid">
- <div class="span6">
- <ul>
- <li ng-repeat="slide in slides">
- <button class="btn btn-mini" ng-class="{'btn-info': !slide.active, 'btn-success': slide.active}" ng-disabled="slide.active" ng-click="slide.active = true">select</button>
- {{$index}}: {{slide.text}}
- </li>
- </ul>
- <a class="btn" ng-click="addSlide()">Add Slide</a>
- </div>
- <div class="span6">
- Interval, in milliseconds: <input type="number" ng-model="myInterval">
- <br />Enter a negative number to stop the interval.
- </div>
- </div>
- </div>
- </file>
- <file name="script.js">
- function CarouselDemoCtrl($scope) {
-  $scope.myInterval = 5000;
-  var slides = $scope.slides = [];
-  $scope.addSlide = function() {
-    var newWidth = 200 + ((slides.length + (25 * slides.length)) % 150);
-    slides.push({
-      image: 'http://placekitten.com/' + newWidth + '/200',
-      text: ['More','Extra','Lots of','Surplus'][slides.length % 4] + ' '
-        ['Cats', 'Kittys', 'Felines', 'Cutes'][slides.length % 4]
+    $scope.$on('$destroy', function() {
+      destroyed = true;
+      resetTimer();
     });
-  };
-  for (var i=0; i<4; i++) $scope.addSlide();
-}
- </file>
- <file name="demo.css">
- .carousel-indicators {
-      top: auto;
-      bottom: 15px;
-    }
- </file>
- </example>
- */
 
-    .directive('slide', ['$parse', function($parse) {
-      return {
-        require: '^carousel',
-        restrict: 'EA',
-        transclude: true,
-        replace: true,
-        templateUrl: 'template/carousel/slide.html',
-        scope: {
-        },
-        link: function (scope, element, attrs, carouselCtrl) {
-          //Set up optional 'active' = binding
-          if (attrs.active) {
-            var getActive = $parse(attrs.active);
-            var setActive = getActive.assign;
-            var lastValue = scope.active = getActive(scope.$parent);
-            scope.$watch(function parentActiveWatch() {
-              var parentActive = getActive(scope.$parent);
+    $scope.$watch('noTransition', function(noTransition) {
+      $animate.enabled($element, !noTransition);
+    });
 
-              if (parentActive !== scope.active) {
-                // we are out of sync and need to copy
-                if (parentActive !== lastValue) {
-                  // parent changed and it has precedence
-                  lastValue = scope.active = parentActive;
-                } else {
-                  // if the parent can be assigned then do so
-                  setActive(scope.$parent, parentActive = lastValue = scope.active);
-                }
-              }
-              return parentActive;
-            });
+    $scope.$watch('interval', restartTimer);
+
+    $scope.$watchCollection('slides', resetTransition);
+
+    $scope.$watch('active', function(index) {
+      if (angular.isNumber(index) && currentIndex !== index) {
+        for (var i = 0; i < slides.length; i++) {
+          if (slides[i].slide.index === index) {
+            index = i;
+            break;
           }
+        }
 
-          carouselCtrl.addSlide(scope, element);
-          //when the scope is destroyed then remove the slide from the current slides array
-          scope.$on('$destroy', function() {
-            carouselCtrl.removeSlide(scope);
-          });
+        var slide = slides[index];
+        if (slide) {
+          setActive(index);
+          self.select(slides[index]);
+          currentIndex = index;
+        }
+      }
+    });
 
-          scope.$watch('active', function(active) {
-            if (active) {
-              carouselCtrl.select(scope);
-            }
-          });
+    function getSlideByIndex(index) {
+      for (var i = 0, l = slides.length; i < l; ++i) {
+        if (slides[i].index === index) {
+          return slides[i];
+        }
+      }
+    }
+
+    function setActive(index) {
+      for (var i = 0; i < slides.length; i++) {
+        slides[i].slide.active = i === index;
+      }
+    }
+
+    function goNext(slide, index, direction) {
+      if (destroyed) {
+        return;
+      }
+
+      angular.extend(slide, {direction: direction});
+      angular.extend(slides[currentIndex].slide || {}, {direction: direction});
+      if ($animate.enabled($element) && !$scope.$currentTransition &&
+        slides[index].element && self.slides.length > 1) {
+        slides[index].element.data(SLIDE_DIRECTION, slide.direction);
+        var currentIdx = self.getCurrentIndex();
+
+        if (angular.isNumber(currentIdx) && slides[currentIdx].element) {
+          slides[currentIdx].element.data(SLIDE_DIRECTION, slide.direction);
+        }
+
+        $scope.$currentTransition = true;
+        $animate.on('addClass', slides[index].element, function(element, phase) {
+          if (phase === 'close') {
+            $scope.$currentTransition = null;
+            $animate.off('addClass', element);
+          }
+        });
+      }
+
+      $scope.active = slide.index;
+      currentIndex = slide.index;
+      setActive(index);
+
+      //every time you change slides, reset the timer
+      restartTimer();
+    }
+
+    function findSlideIndex(slide) {
+      for (var i = 0; i < slides.length; i++) {
+        if (slides[i].slide === slide) {
+          return i;
+        }
+      }
+    }
+
+    function resetTimer() {
+      if (currentInterval) {
+        $interval.cancel(currentInterval);
+        currentInterval = null;
+      }
+    }
+
+    function resetTransition(slides) {
+      if (!slides.length) {
+        $scope.$currentTransition = null;
+      }
+    }
+
+    function restartTimer() {
+      resetTimer();
+      var interval = +$scope.interval;
+      if (!isNaN(interval) && interval > 0) {
+        currentInterval = $interval(timerFn, interval);
+      }
+    }
+
+    function timerFn() {
+      var interval = +$scope.interval;
+      if (isPlaying && !isNaN(interval) && interval > 0 && slides.length) {
+        $scope.next();
+      } else {
+        $scope.pause();
+      }
+    }
+  }])
+
+  .directive('uibCarousel', function() {
+    return {
+      transclude: true,
+      controller: 'UibCarouselController',
+      controllerAs: 'carousel',
+      restrict: 'A',
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/carousel/carousel.html';
+      },
+      scope: {
+        active: '=',
+        interval: '=',
+        noTransition: '=',
+        noPause: '=',
+        noWrap: '&'
+      }
+    };
+  })
+
+  .directive('uibSlide', ['$animate', function($animate) {
+    return {
+      require: '^uibCarousel',
+      restrict: 'A',
+      transclude: true,
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/carousel/slide.html';
+      },
+      scope: {
+        actual: '=?',
+        index: '=?'
+      },
+      link: function (scope, element, attrs, carouselCtrl) {
+        element.addClass('item');
+        carouselCtrl.addSlide(scope, element);
+        //when the scope is destroyed then remove the slide from the current slides array
+        scope.$on('$destroy', function() {
+          carouselCtrl.removeSlide(scope);
+        });
+
+        scope.$watch('active', function(active) {
+          $animate[active ? 'addClass' : 'removeClass'](element, 'active');
+        });
+      }
+    };
+  }])
+
+  .animation('.item', ['$animateCss',
+    function($animateCss) {
+      var SLIDE_DIRECTION = 'uib-slideDirection';
+
+      function removeClass(element, className, callback) {
+        element.removeClass(className);
+        if (callback) {
+          callback();
+        }
+      }
+
+      return {
+        beforeAddClass: function(element, className, done) {
+          if (className === 'active') {
+            var stopped = false;
+            var direction = element.data(SLIDE_DIRECTION);
+            var directionClass = direction === 'next' ? 'left' : 'right';
+            var removeClassFn = removeClass.bind(this, element,
+              directionClass + ' ' + direction, done);
+            element.addClass(direction);
+
+            $animateCss(element, {addClass: directionClass})
+              .start()
+              .done(removeClassFn);
+
+            return function() {
+              stopped = true;
+            };
+          }
+          done();
+        },
+        beforeRemoveClass: function (element, className, done) {
+          if (className === 'active') {
+            var stopped = false;
+            var direction = element.data(SLIDE_DIRECTION);
+            var directionClass = direction === 'next' ? 'left' : 'right';
+            var removeClassFn = removeClass.bind(this, element, directionClass, done);
+
+            $animateCss(element, {addClass: directionClass})
+              .start()
+              .done(removeClassFn);
+
+            return function() {
+              stopped = true;
+            };
+          }
+          done();
         }
       };
     }]);
 
+angular.module('ui.bootstrap.dateparser', [])
+
+  .service('uibDateParser', ['$log', '$locale', 'dateFilter', 'orderByFilter', 'filterFilter', function($log, $locale, dateFilter, orderByFilter, filterFilter) {
+    // Pulled from https://github.com/mbostock/d3/blob/master/src/format/requote.js
+    var SPECIAL_CHARACTERS_REGEXP = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
+
+    var localeId;
+    var formatCodeToRegex;
+
+    this.init = function() {
+      localeId = $locale.id;
+
+      this.parsers = {};
+      this.formatters = {};
+
+      formatCodeToRegex = [
+        {
+          key: 'yyyy',
+          regex: '\\d{4}',
+          apply: function(value) { this.year = +value; },
+          formatter: function(date) {
+            var _date = new Date();
+            _date.setFullYear(Math.abs(date.getFullYear()));
+            return dateFilter(_date, 'yyyy');
+          }
+        },
+        {
+          key: 'yy',
+          regex: '\\d{2}',
+          apply: function(value) { value = +value; this.year = value < 69 ? value + 2000 : value + 1900; },
+          formatter: function(date) {
+            var _date = new Date();
+            _date.setFullYear(Math.abs(date.getFullYear()));
+            return dateFilter(_date, 'yy');
+          }
+        },
+        {
+          key: 'y',
+          regex: '\\d{1,4}',
+          apply: function(value) { this.year = +value; },
+          formatter: function(date) {
+            var _date = new Date();
+            _date.setFullYear(Math.abs(date.getFullYear()));
+            return dateFilter(_date, 'y');
+          }
+        },
+        {
+          key: 'M!',
+          regex: '0?[1-9]|1[0-2]',
+          apply: function(value) { this.month = value - 1; },
+          formatter: function(date) {
+            var value = date.getMonth();
+            if (/^[0-9]$/.test(value)) {
+              return dateFilter(date, 'MM');
+            }
+
+            return dateFilter(date, 'M');
+          }
+        },
+        {
+          key: 'MMMM',
+          regex: $locale.DATETIME_FORMATS.MONTH.join('|'),
+          apply: function(value) { this.month = $locale.DATETIME_FORMATS.MONTH.indexOf(value); },
+          formatter: function(date) { return dateFilter(date, 'MMMM'); }
+        },
+        {
+          key: 'MMM',
+          regex: $locale.DATETIME_FORMATS.SHORTMONTH.join('|'),
+          apply: function(value) { this.month = $locale.DATETIME_FORMATS.SHORTMONTH.indexOf(value); },
+          formatter: function(date) { return dateFilter(date, 'MMM'); }
+        },
+        {
+          key: 'MM',
+          regex: '0[1-9]|1[0-2]',
+          apply: function(value) { this.month = value - 1; },
+          formatter: function(date) { return dateFilter(date, 'MM'); }
+        },
+        {
+          key: 'M',
+          regex: '[1-9]|1[0-2]',
+          apply: function(value) { this.month = value - 1; },
+          formatter: function(date) { return dateFilter(date, 'M'); }
+        },
+        {
+          key: 'd!',
+          regex: '[0-2]?[0-9]{1}|3[0-1]{1}',
+          apply: function(value) { this.date = +value; },
+          formatter: function(date) {
+            var value = date.getDate();
+            if (/^[1-9]$/.test(value)) {
+              return dateFilter(date, 'dd');
+            }
+
+            return dateFilter(date, 'd');
+          }
+        },
+        {
+          key: 'dd',
+          regex: '[0-2][0-9]{1}|3[0-1]{1}',
+          apply: function(value) { this.date = +value; },
+          formatter: function(date) { return dateFilter(date, 'dd'); }
+        },
+        {
+          key: 'd',
+          regex: '[1-2]?[0-9]{1}|3[0-1]{1}',
+          apply: function(value) { this.date = +value; },
+          formatter: function(date) { return dateFilter(date, 'd'); }
+        },
+        {
+          key: 'EEEE',
+          regex: $locale.DATETIME_FORMATS.DAY.join('|'),
+          formatter: function(date) { return dateFilter(date, 'EEEE'); }
+        },
+        {
+          key: 'EEE',
+          regex: $locale.DATETIME_FORMATS.SHORTDAY.join('|'),
+          formatter: function(date) { return dateFilter(date, 'EEE'); }
+        },
+        {
+          key: 'HH',
+          regex: '(?:0|1)[0-9]|2[0-3]',
+          apply: function(value) { this.hours = +value; },
+          formatter: function(date) { return dateFilter(date, 'HH'); }
+        },
+        {
+          key: 'hh',
+          regex: '0[0-9]|1[0-2]',
+          apply: function(value) { this.hours = +value; },
+          formatter: function(date) { return dateFilter(date, 'hh'); }
+        },
+        {
+          key: 'H',
+          regex: '1?[0-9]|2[0-3]',
+          apply: function(value) { this.hours = +value; },
+          formatter: function(date) { return dateFilter(date, 'H'); }
+        },
+        {
+          key: 'h',
+          regex: '[0-9]|1[0-2]',
+          apply: function(value) { this.hours = +value; },
+          formatter: function(date) { return dateFilter(date, 'h'); }
+        },
+        {
+          key: 'mm',
+          regex: '[0-5][0-9]',
+          apply: function(value) { this.minutes = +value; },
+          formatter: function(date) { return dateFilter(date, 'mm'); }
+        },
+        {
+          key: 'm',
+          regex: '[0-9]|[1-5][0-9]',
+          apply: function(value) { this.minutes = +value; },
+          formatter: function(date) { return dateFilter(date, 'm'); }
+        },
+        {
+          key: 'sss',
+          regex: '[0-9][0-9][0-9]',
+          apply: function(value) { this.milliseconds = +value; },
+          formatter: function(date) { return dateFilter(date, 'sss'); }
+        },
+        {
+          key: 'ss',
+          regex: '[0-5][0-9]',
+          apply: function(value) { this.seconds = +value; },
+          formatter: function(date) { return dateFilter(date, 'ss'); }
+        },
+        {
+          key: 's',
+          regex: '[0-9]|[1-5][0-9]',
+          apply: function(value) { this.seconds = +value; },
+          formatter: function(date) { return dateFilter(date, 's'); }
+        },
+        {
+          key: 'a',
+          regex: $locale.DATETIME_FORMATS.AMPMS.join('|'),
+          apply: function(value) {
+            if (this.hours === 12) {
+              this.hours = 0;
+            }
+
+            if (value === 'PM') {
+              this.hours += 12;
+            }
+          },
+          formatter: function(date) { return dateFilter(date, 'a'); }
+        },
+        {
+          key: 'Z',
+          regex: '[+-]\\d{4}',
+          apply: function(value) {
+            var matches = value.match(/([+-])(\d{2})(\d{2})/),
+              sign = matches[1],
+              hours = matches[2],
+              minutes = matches[3];
+            this.hours += toInt(sign + hours);
+            this.minutes += toInt(sign + minutes);
+          },
+          formatter: function(date) {
+            return dateFilter(date, 'Z');
+          }
+        },
+        {
+          key: 'ww',
+          regex: '[0-4][0-9]|5[0-3]',
+          formatter: function(date) { return dateFilter(date, 'ww'); }
+        },
+        {
+          key: 'w',
+          regex: '[0-9]|[1-4][0-9]|5[0-3]',
+          formatter: function(date) { return dateFilter(date, 'w'); }
+        },
+        {
+          key: 'GGGG',
+          regex: $locale.DATETIME_FORMATS.ERANAMES.join('|').replace(/\s/g, '\\s'),
+          formatter: function(date) { return dateFilter(date, 'GGGG'); }
+        },
+        {
+          key: 'GGG',
+          regex: $locale.DATETIME_FORMATS.ERAS.join('|'),
+          formatter: function(date) { return dateFilter(date, 'GGG'); }
+        },
+        {
+          key: 'GG',
+          regex: $locale.DATETIME_FORMATS.ERAS.join('|'),
+          formatter: function(date) { return dateFilter(date, 'GG'); }
+        },
+        {
+          key: 'G',
+          regex: $locale.DATETIME_FORMATS.ERAS.join('|'),
+          formatter: function(date) { return dateFilter(date, 'G'); }
+        }
+      ];
+
+      if (angular.version.major >= 1 && angular.version.minor > 4) {
+        formatCodeToRegex.push({
+          key: 'LLLL',
+          regex: $locale.DATETIME_FORMATS.STANDALONEMONTH.join('|'),
+          apply: function(value) { this.month = $locale.DATETIME_FORMATS.STANDALONEMONTH.indexOf(value); },
+          formatter: function(date) { return dateFilter(date, 'LLLL'); }
+        });
+      }
+    };
+
+    this.init();
+
+    function getFormatCodeToRegex(key) {
+      return filterFilter(formatCodeToRegex, {key: key}, true)[0];
+    }
+
+    this.getParser = function (key) {
+      var f = getFormatCodeToRegex(key);
+      return f && f.apply || null;
+    };
+
+    this.overrideParser = function (key, parser) {
+      var f = getFormatCodeToRegex(key);
+      if (f && angular.isFunction(parser)) {
+        this.parsers = {};
+        f.apply = parser;
+      }
+    }.bind(this);
+
+    function createParser(format) {
+      var map = [], regex = format.split('');
+
+      // check for literal values
+      var quoteIndex = format.indexOf('\'');
+      if (quoteIndex > -1) {
+        var inLiteral = false;
+        format = format.split('');
+        for (var i = quoteIndex; i < format.length; i++) {
+          if (inLiteral) {
+            if (format[i] === '\'') {
+              if (i + 1 < format.length && format[i+1] === '\'') { // escaped single quote
+                format[i+1] = '$';
+                regex[i+1] = '';
+              } else { // end of literal
+                regex[i] = '';
+                inLiteral = false;
+              }
+            }
+            format[i] = '$';
+          } else {
+            if (format[i] === '\'') { // start of literal
+              format[i] = '$';
+              regex[i] = '';
+              inLiteral = true;
+            }
+          }
+        }
+
+        format = format.join('');
+      }
+
+      angular.forEach(formatCodeToRegex, function(data) {
+        var index = format.indexOf(data.key);
+
+        if (index > -1) {
+          format = format.split('');
+
+          regex[index] = '(' + data.regex + ')';
+          format[index] = '$'; // Custom symbol to define consumed part of format
+          for (var i = index + 1, n = index + data.key.length; i < n; i++) {
+            regex[i] = '';
+            format[i] = '$';
+          }
+          format = format.join('');
+
+          map.push({
+            index: index,
+            key: data.key,
+            apply: data.apply,
+            matcher: data.regex
+          });
+        }
+      });
+
+      return {
+        regex: new RegExp('^' + regex.join('') + '$'),
+        map: orderByFilter(map, 'index')
+      };
+    }
+
+    function createFormatter(format) {
+      var formatters = [];
+      var i = 0;
+      var formatter, literalIdx;
+      while (i < format.length) {
+        if (angular.isNumber(literalIdx)) {
+          if (format.charAt(i) === '\'') {
+            if (i + 1 >= format.length || format.charAt(i + 1) !== '\'') {
+              formatters.push(constructLiteralFormatter(format, literalIdx, i));
+              literalIdx = null;
+            }
+          } else if (i === format.length) {
+            while (literalIdx < format.length) {
+              formatter = constructFormatterFromIdx(format, literalIdx);
+              formatters.push(formatter);
+              literalIdx = formatter.endIdx;
+            }
+          }
+
+          i++;
+          continue;
+        }
+
+        if (format.charAt(i) === '\'') {
+          literalIdx = i;
+          i++;
+          continue;
+        }
+
+        formatter = constructFormatterFromIdx(format, i);
+
+        formatters.push(formatter.parser);
+        i = formatter.endIdx;
+      }
+
+      return formatters;
+    }
+
+    function constructLiteralFormatter(format, literalIdx, endIdx) {
+      return function() {
+        return format.substr(literalIdx + 1, endIdx - literalIdx - 1);
+      };
+    }
+
+    function constructFormatterFromIdx(format, i) {
+      var currentPosStr = format.substr(i);
+      for (var j = 0; j < formatCodeToRegex.length; j++) {
+        if (new RegExp('^' + formatCodeToRegex[j].key).test(currentPosStr)) {
+          var data = formatCodeToRegex[j];
+          return {
+            endIdx: i + data.key.length,
+            parser: data.formatter
+          };
+        }
+      }
+
+      return {
+        endIdx: i + 1,
+        parser: function() {
+          return currentPosStr.charAt(0);
+        }
+      };
+    }
+
+    this.filter = function(date, format) {
+      if (!angular.isDate(date) || isNaN(date) || !format) {
+        return '';
+      }
+
+      format = $locale.DATETIME_FORMATS[format] || format;
+
+      if ($locale.id !== localeId) {
+        this.init();
+      }
+
+      if (!this.formatters[format]) {
+        this.formatters[format] = createFormatter(format);
+      }
+
+      var formatters = this.formatters[format];
+
+      return formatters.reduce(function(str, formatter) {
+        return str + formatter(date);
+      }, '');
+    };
+
+    this.parse = function(input, format, baseDate) {
+      if (!angular.isString(input) || !format) {
+        return input;
+      }
+
+      format = $locale.DATETIME_FORMATS[format] || format;
+      format = format.replace(SPECIAL_CHARACTERS_REGEXP, '\\$&');
+
+      if ($locale.id !== localeId) {
+        this.init();
+      }
+
+      if (!this.parsers[format]) {
+        this.parsers[format] = createParser(format, 'apply');
+      }
+
+      var parser = this.parsers[format],
+        regex = parser.regex,
+        map = parser.map,
+        results = input.match(regex),
+        tzOffset = false;
+      if (results && results.length) {
+        var fields, dt;
+        if (angular.isDate(baseDate) && !isNaN(baseDate.getTime())) {
+          fields = {
+            year: baseDate.getFullYear(),
+            month: baseDate.getMonth(),
+            date: baseDate.getDate(),
+            hours: baseDate.getHours(),
+            minutes: baseDate.getMinutes(),
+            seconds: baseDate.getSeconds(),
+            milliseconds: baseDate.getMilliseconds()
+          };
+        } else {
+          if (baseDate) {
+            $log.warn('dateparser:', 'baseDate is not a valid date');
+          }
+          fields = { year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0 };
+        }
+
+        for (var i = 1, n = results.length; i < n; i++) {
+          var mapper = map[i - 1];
+          if (mapper.matcher === 'Z') {
+            tzOffset = true;
+          }
+
+          if (mapper.apply) {
+            mapper.apply.call(fields, results[i]);
+          }
+        }
+
+        var datesetter = tzOffset ? Date.prototype.setUTCFullYear :
+          Date.prototype.setFullYear;
+        var timesetter = tzOffset ? Date.prototype.setUTCHours :
+          Date.prototype.setHours;
+
+        if (isValid(fields.year, fields.month, fields.date)) {
+          if (angular.isDate(baseDate) && !isNaN(baseDate.getTime()) && !tzOffset) {
+            dt = new Date(baseDate);
+            datesetter.call(dt, fields.year, fields.month, fields.date);
+            timesetter.call(dt, fields.hours, fields.minutes,
+              fields.seconds, fields.milliseconds);
+          } else {
+            dt = new Date(0);
+            datesetter.call(dt, fields.year, fields.month, fields.date);
+            timesetter.call(dt, fields.hours || 0, fields.minutes || 0,
+              fields.seconds || 0, fields.milliseconds || 0);
+          }
+        }
+
+        return dt;
+      }
+    };
+
+    // Check if date is valid for specific month (and year for February).
+    // Month: 0 = Jan, 1 = Feb, etc
+    function isValid(year, month, date) {
+      if (date < 1) {
+        return false;
+      }
+
+      if (month === 1 && date > 28) {
+        return date === 29 && (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0);
+      }
+
+      if (month === 3 || month === 5 || month === 8 || month === 10) {
+        return date < 31;
+      }
+
+      return true;
+    }
+
+    function toInt(str) {
+      return parseInt(str, 10);
+    }
+
+    this.toTimezone = toTimezone;
+    this.fromTimezone = fromTimezone;
+    this.timezoneToOffset = timezoneToOffset;
+    this.addDateMinutes = addDateMinutes;
+    this.convertTimezoneToLocal = convertTimezoneToLocal;
+
+    function toTimezone(date, timezone) {
+      return date && timezone ? convertTimezoneToLocal(date, timezone) : date;
+    }
+
+    function fromTimezone(date, timezone) {
+      return date && timezone ? convertTimezoneToLocal(date, timezone, true) : date;
+    }
+
+    //https://github.com/angular/angular.js/blob/622c42169699ec07fc6daaa19fe6d224e5d2f70e/src/Angular.js#L1207
+    function timezoneToOffset(timezone, fallback) {
+      timezone = timezone.replace(/:/g, '');
+      var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+      return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+    }
+
+    function addDateMinutes(date, minutes) {
+      date = new Date(date.getTime());
+      date.setMinutes(date.getMinutes() + minutes);
+      return date;
+    }
+
+    function convertTimezoneToLocal(date, timezone, reverse) {
+      reverse = reverse ? -1 : 1;
+      var dateTimezoneOffset = date.getTimezoneOffset();
+      var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+      return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset));
+    }
+  }]);
+
+// Avoiding use of ng-class as it creates a lot of watchers when a class is to be applied to
+// at most one element.
+angular.module('ui.bootstrap.isClass', [])
+  .directive('uibIsClass', [
+    '$animate',
+    function ($animate) {
+      //                    11111111          22222222
+      var ON_REGEXP = /^\s*([\s\S]+?)\s+on\s+([\s\S]+?)\s*$/;
+      //                    11111111           22222222
+      var IS_REGEXP = /^\s*([\s\S]+?)\s+for\s+([\s\S]+?)\s*$/;
+
+      var dataPerTracked = {};
+
+      return {
+        restrict: 'A',
+        compile: function(tElement, tAttrs) {
+          var linkedScopes = [];
+          var instances = [];
+          var expToData = {};
+          var lastActivated = null;
+          var onExpMatches = tAttrs.uibIsClass.match(ON_REGEXP);
+          var onExp = onExpMatches[2];
+          var expsStr = onExpMatches[1];
+          var exps = expsStr.split(',');
+
+          return linkFn;
+
+          function linkFn(scope, element, attrs) {
+            linkedScopes.push(scope);
+            instances.push({
+              scope: scope,
+              element: element
+            });
+
+            exps.forEach(function(exp, k) {
+              addForExp(exp, scope);
+            });
+
+            scope.$on('$destroy', removeScope);
+          }
+
+          function addForExp(exp, scope) {
+            var matches = exp.match(IS_REGEXP);
+            var clazz = scope.$eval(matches[1]);
+            var compareWithExp = matches[2];
+            var data = expToData[exp];
+            if (!data) {
+              var watchFn = function(compareWithVal) {
+                var newActivated = null;
+                instances.some(function(instance) {
+                  var thisVal = instance.scope.$eval(onExp);
+                  if (thisVal === compareWithVal) {
+                    newActivated = instance;
+                    return true;
+                  }
+                });
+                if (data.lastActivated !== newActivated) {
+                  if (data.lastActivated) {
+                    $animate.removeClass(data.lastActivated.element, clazz);
+                  }
+                  if (newActivated) {
+                    $animate.addClass(newActivated.element, clazz);
+                  }
+                  data.lastActivated = newActivated;
+                }
+              };
+              expToData[exp] = data = {
+                lastActivated: null,
+                scope: scope,
+                watchFn: watchFn,
+                compareWithExp: compareWithExp,
+                watcher: scope.$watch(compareWithExp, watchFn)
+              };
+            }
+            data.watchFn(scope.$eval(compareWithExp));
+          }
+
+          function removeScope(e) {
+            var removedScope = e.targetScope;
+            var index = linkedScopes.indexOf(removedScope);
+            linkedScopes.splice(index, 1);
+            instances.splice(index, 1);
+            if (linkedScopes.length) {
+              var newWatchScope = linkedScopes[0];
+              angular.forEach(expToData, function(data) {
+                if (data.scope === removedScope) {
+                  data.watcher = newWatchScope.$watch(data.compareWithExp, data.watchFn);
+                  data.scope = newWatchScope;
+                }
+              });
+            } else {
+              expToData = {};
+            }
+          }
+        }
+      };
+    }]);
+angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.isClass'])
+
+  .value('$datepickerSuppressError', false)
+
+  .value('$datepickerLiteralWarning', true)
+
+  .constant('uibDatepickerConfig', {
+    datepickerMode: 'day',
+    formatDay: 'dd',
+    formatMonth: 'MMMM',
+    formatYear: 'yyyy',
+    formatDayHeader: 'EEE',
+    formatDayTitle: 'MMMM yyyy',
+    formatMonthTitle: 'yyyy',
+    maxDate: null,
+    maxMode: 'year',
+    minDate: null,
+    minMode: 'day',
+    monthColumns: 3,
+    ngModelOptions: {},
+    shortcutPropagation: false,
+    showWeeks: true,
+    yearColumns: 5,
+    yearRows: 4
+  })
+
+  .controller('UibDatepickerController', ['$scope', '$element', '$attrs', '$parse', '$interpolate', '$locale', '$log', 'dateFilter', 'uibDatepickerConfig', '$datepickerLiteralWarning', '$datepickerSuppressError', 'uibDateParser',
+    function($scope, $element, $attrs, $parse, $interpolate, $locale, $log, dateFilter, datepickerConfig, $datepickerLiteralWarning, $datepickerSuppressError, dateParser) {
+      var self = this,
+        ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl;
+        ngModelOptions = {},
+        watchListeners = [];
+
+      $element.addClass('uib-datepicker');
+      $attrs.$set('role', 'application');
+
+      if (!$scope.datepickerOptions) {
+        $scope.datepickerOptions = {};
+      }
+
+      // Modes chain
+      this.modes = ['day', 'month', 'year'];
+
+      [
+        'customClass',
+        'dateDisabled',
+        'datepickerMode',
+        'formatDay',
+        'formatDayHeader',
+        'formatDayTitle',
+        'formatMonth',
+        'formatMonthTitle',
+        'formatYear',
+        'maxDate',
+        'maxMode',
+        'minDate',
+        'minMode',
+        'monthColumns',
+        'showWeeks',
+        'shortcutPropagation',
+        'startingDay',
+        'yearColumns',
+        'yearRows'
+      ].forEach(function(key) {
+        switch (key) {
+          case 'customClass':
+          case 'dateDisabled':
+            $scope[key] = $scope.datepickerOptions[key] || angular.noop;
+            break;
+          case 'datepickerMode':
+            $scope.datepickerMode = angular.isDefined($scope.datepickerOptions.datepickerMode) ?
+              $scope.datepickerOptions.datepickerMode : datepickerConfig.datepickerMode;
+            break;
+          case 'formatDay':
+          case 'formatDayHeader':
+          case 'formatDayTitle':
+          case 'formatMonth':
+          case 'formatMonthTitle':
+          case 'formatYear':
+            self[key] = angular.isDefined($scope.datepickerOptions[key]) ?
+              $interpolate($scope.datepickerOptions[key])($scope.$parent) :
+              datepickerConfig[key];
+            break;
+          case 'monthColumns':
+          case 'showWeeks':
+          case 'shortcutPropagation':
+          case 'yearColumns':
+          case 'yearRows':
+            self[key] = angular.isDefined($scope.datepickerOptions[key]) ?
+              $scope.datepickerOptions[key] : datepickerConfig[key];
+            break;
+          case 'startingDay':
+            if (angular.isDefined($scope.datepickerOptions.startingDay)) {
+              self.startingDay = $scope.datepickerOptions.startingDay;
+            } else if (angular.isNumber(datepickerConfig.startingDay)) {
+              self.startingDay = datepickerConfig.startingDay;
+            } else {
+              self.startingDay = ($locale.DATETIME_FORMATS.FIRSTDAYOFWEEK + 8) % 7;
+            }
+
+            break;
+          case 'maxDate':
+          case 'minDate':
+            $scope.$watch('datepickerOptions.' + key, function(value) {
+              if (value) {
+                if (angular.isDate(value)) {
+                  self[key] = dateParser.fromTimezone(new Date(value), ngModelOptions.getOption('timezone'));
+                } else {
+                  if ($datepickerLiteralWarning) {
+                    $log.warn('Literal date support has been deprecated, please switch to date object usage');
+                  }
+
+                  self[key] = new Date(dateFilter(value, 'medium'));
+                }
+              } else {
+                self[key] = datepickerConfig[key] ?
+                  dateParser.fromTimezone(new Date(datepickerConfig[key]), ngModelOptions.getOption('timezone')) :
+                  null;
+              }
+
+              self.refreshView();
+            });
+
+            break;
+          case 'maxMode':
+          case 'minMode':
+            if ($scope.datepickerOptions[key]) {
+              $scope.$watch(function() { return $scope.datepickerOptions[key]; }, function(value) {
+                self[key] = $scope[key] = angular.isDefined(value) ? value : $scope.datepickerOptions[key];
+                if (key === 'minMode' && self.modes.indexOf($scope.datepickerOptions.datepickerMode) < self.modes.indexOf(self[key]) ||
+                  key === 'maxMode' && self.modes.indexOf($scope.datepickerOptions.datepickerMode) > self.modes.indexOf(self[key])) {
+                  $scope.datepickerMode = self[key];
+                  $scope.datepickerOptions.datepickerMode = self[key];
+                }
+              });
+            } else {
+              self[key] = $scope[key] = datepickerConfig[key] || null;
+            }
+
+            break;
+        }
+      });
+
+      $scope.uniqueId = 'datepicker-' + $scope.$id + '-' + Math.floor(Math.random() * 10000);
+
+      $scope.disabled = angular.isDefined($attrs.disabled) || false;
+      if (angular.isDefined($attrs.ngDisabled)) {
+        watchListeners.push($scope.$parent.$watch($attrs.ngDisabled, function(disabled) {
+          $scope.disabled = disabled;
+          self.refreshView();
+        }));
+      }
+
+      $scope.isActive = function(dateObject) {
+        if (self.compare(dateObject.date, self.activeDate) === 0) {
+          $scope.activeDateId = dateObject.uid;
+          return true;
+        }
+        return false;
+      };
+
+      this.init = function(ngModelCtrl_) {
+        ngModelCtrl = ngModelCtrl_;
+        ngModelOptions = extractOptions(ngModelCtrl);
+
+        if ($scope.datepickerOptions.initDate) {
+          self.activeDate = dateParser.fromTimezone($scope.datepickerOptions.initDate, ngModelOptions.getOption('timezone')) || new Date();
+          $scope.$watch('datepickerOptions.initDate', function(initDate) {
+            if (initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)) {
+              self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.getOption('timezone'));
+              self.refreshView();
+            }
+          });
+        } else {
+          self.activeDate = new Date();
+        }
+
+        var date = ngModelCtrl.$modelValue ? new Date(ngModelCtrl.$modelValue) : new Date();
+        this.activeDate = !isNaN(date) ?
+          dateParser.fromTimezone(date, ngModelOptions.getOption('timezone')) :
+          dateParser.fromTimezone(new Date(), ngModelOptions.getOption('timezone'));
+
+        ngModelCtrl.$render = function() {
+          self.render();
+        };
+      };
+
+      this.render = function() {
+        if (ngModelCtrl.$viewValue) {
+          var date = new Date(ngModelCtrl.$viewValue),
+            isValid = !isNaN(date);
+
+          if (isValid) {
+            this.activeDate = dateParser.fromTimezone(date, ngModelOptions.getOption('timezone'));
+          } else if (!$datepickerSuppressError) {
+            $log.error('Datepicker directive: "ng-model" value must be a Date object');
+          }
+        }
+        this.refreshView();
+      };
+
+      this.refreshView = function() {
+        if (this.element) {
+          $scope.selectedDt = null;
+          this._refreshView();
+          if ($scope.activeDt) {
+            $scope.activeDateId = $scope.activeDt.uid;
+          }
+
+          var date = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+          date = dateParser.fromTimezone(date, ngModelOptions.getOption('timezone'));
+          ngModelCtrl.$setValidity('dateDisabled', !date ||
+            this.element && !this.isDisabled(date));
+        }
+      };
+
+      this.createDateObject = function(date, format) {
+        var model = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+        model = dateParser.fromTimezone(model, ngModelOptions.getOption('timezone'));
+        var today = new Date();
+        today = dateParser.fromTimezone(today, ngModelOptions.getOption('timezone'));
+        var time = this.compare(date, today);
+        var dt = {
+          date: date,
+          label: dateParser.filter(date, format),
+          selected: model && this.compare(date, model) === 0,
+          disabled: this.isDisabled(date),
+          past: time < 0,
+          current: time === 0,
+          future: time > 0,
+          customClass: this.customClass(date) || null
+        };
+
+        if (model && this.compare(date, model) === 0) {
+          $scope.selectedDt = dt;
+        }
+
+        if (self.activeDate && this.compare(dt.date, self.activeDate) === 0) {
+          $scope.activeDt = dt;
+        }
+
+        return dt;
+      };
+
+      this.isDisabled = function(date) {
+        return $scope.disabled ||
+          this.minDate && this.compare(date, this.minDate) < 0 ||
+          this.maxDate && this.compare(date, this.maxDate) > 0 ||
+          $scope.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode});
+      };
+
+      this.customClass = function(date) {
+        return $scope.customClass({date: date, mode: $scope.datepickerMode});
+      };
+
+      // Split array into smaller arrays
+      this.split = function(arr, size) {
+        var arrays = [];
+        while (arr.length > 0) {
+          arrays.push(arr.splice(0, size));
+        }
+        return arrays;
+      };
+
+      $scope.select = function(date) {
+        if ($scope.datepickerMode === self.minMode) {
+          var dt = ngModelCtrl.$viewValue ? dateParser.fromTimezone(new Date(ngModelCtrl.$viewValue), ngModelOptions.getOption('timezone')) : new Date(0, 0, 0, 0, 0, 0, 0);
+          dt.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
+          dt = dateParser.toTimezone(dt, ngModelOptions.getOption('timezone'));
+          ngModelCtrl.$setViewValue(dt);
+          ngModelCtrl.$render();
+        } else {
+          self.activeDate = date;
+          setMode(self.modes[self.modes.indexOf($scope.datepickerMode) - 1]);
+
+          $scope.$emit('uib:datepicker.mode');
+        }
+
+        $scope.$broadcast('uib:datepicker.focus');
+      };
+
+      $scope.move = function(direction) {
+        var year = self.activeDate.getFullYear() + direction * (self.step.years || 0),
+          month = self.activeDate.getMonth() + direction * (self.step.months || 0);
+        self.activeDate.setFullYear(year, month, 1);
+        self.refreshView();
+      };
+
+      $scope.toggleMode = function(direction) {
+        direction = direction || 1;
+
+        if ($scope.datepickerMode === self.maxMode && direction === 1 ||
+          $scope.datepickerMode === self.minMode && direction === -1) {
+          return;
+        }
+
+        setMode(self.modes[self.modes.indexOf($scope.datepickerMode) + direction]);
+
+        $scope.$emit('uib:datepicker.mode');
+      };
+
+      // Key event mapper
+      $scope.keys = { 13: 'enter', 32: 'space', 33: 'pageup', 34: 'pagedown', 35: 'end', 36: 'home', 37: 'left', 38: 'up', 39: 'right', 40: 'down' };
+
+      var focusElement = function() {
+        self.element[0].focus();
+      };
+
+      // Listen for focus requests from popup directive
+      $scope.$on('uib:datepicker.focus', focusElement);
+
+      $scope.keydown = function(evt) {
+        var key = $scope.keys[evt.which];
+
+        if (!key || evt.shiftKey || evt.altKey || $scope.disabled) {
+          return;
+        }
+
+        evt.preventDefault();
+        if (!self.shortcutPropagation) {
+          evt.stopPropagation();
+        }
+
+        if (key === 'enter' || key === 'space') {
+          if (self.isDisabled(self.activeDate)) {
+            return; // do nothing
+          }
+          $scope.select(self.activeDate);
+        } else if (evt.ctrlKey && (key === 'up' || key === 'down')) {
+          $scope.toggleMode(key === 'up' ? 1 : -1);
+        } else {
+          self.handleKeyDown(key, evt);
+          self.refreshView();
+        }
+      };
+
+      $element.on('keydown', function(evt) {
+        $scope.$apply(function() {
+          $scope.keydown(evt);
+        });
+      });
+
+      $scope.$on('$destroy', function() {
+        //Clear all watch listeners on destroy
+        while (watchListeners.length) {
+          watchListeners.shift()();
+        }
+      });
+
+      function setMode(mode) {
+        $scope.datepickerMode = mode;
+        $scope.datepickerOptions.datepickerMode = mode;
+      }
+
+      function extractOptions(ngModelCtrl) {
+        var ngModelOptions;
+
+        if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
+          // guarantee a value
+          ngModelOptions = ngModelCtrl.$options ||
+            $scope.datepickerOptions.ngModelOptions ||
+            datepickerConfig.ngModelOptions ||
+            {};
+
+          // mimic 1.6+ api
+          ngModelOptions.getOption = function (key) {
+            return ngModelOptions[key];
+          };
+        } else { // in angular >=1.6 $options is always present
+          // ng-model-options defaults timezone to null; don't let its precedence squash a non-null value
+          var timezone = ngModelCtrl.$options.getOption('timezone') ||
+            ($scope.datepickerOptions.ngModelOptions ? $scope.datepickerOptions.ngModelOptions.timezone : null) ||
+            (datepickerConfig.ngModelOptions ? datepickerConfig.ngModelOptions.timezone : null);
+
+          // values passed to createChild override existing values
+          ngModelOptions = ngModelCtrl.$options // start with a ModelOptions instance
+            .createChild(datepickerConfig.ngModelOptions) // lowest precedence
+            .createChild($scope.datepickerOptions.ngModelOptions)
+            .createChild(ngModelCtrl.$options) // highest precedence
+            .createChild({timezone: timezone}); // to keep from squashing a non-null value
+        }
+
+        return ngModelOptions;
+      }
+    }])
+
+  .controller('UibDaypickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+    var DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+    this.step = { months: 1 };
+    this.element = $element;
+    function getDaysInMonth(year, month) {
+      return month === 1 && year % 4 === 0 &&
+      (year % 100 !== 0 || year % 400 === 0) ? 29 : DAYS_IN_MONTH[month];
+    }
+
+    this.init = function(ctrl) {
+      angular.extend(ctrl, this);
+      scope.showWeeks = ctrl.showWeeks;
+      ctrl.refreshView();
+    };
+
+    this.getDates = function(startDate, n) {
+      var dates = new Array(n), current = new Date(startDate), i = 0, date;
+      while (i < n) {
+        date = new Date(current);
+        dates[i++] = date;
+        current.setDate(current.getDate() + 1);
+      }
+      return dates;
+    };
+
+    this._refreshView = function() {
+      var year = this.activeDate.getFullYear(),
+        month = this.activeDate.getMonth(),
+        firstDayOfMonth = new Date(this.activeDate);
+
+      firstDayOfMonth.setFullYear(year, month, 1);
+
+      var difference = this.startingDay - firstDayOfMonth.getDay(),
+        numDisplayedFromPreviousMonth = difference > 0 ?
+          7 - difference : - difference,
+        firstDate = new Date(firstDayOfMonth);
+
+      if (numDisplayedFromPreviousMonth > 0) {
+        firstDate.setDate(-numDisplayedFromPreviousMonth + 1);
+      }
+
+      // 42 is the number of days on a six-week calendar
+      var days = this.getDates(firstDate, 42);
+      for (var i = 0; i < 42; i ++) {
+        days[i] = angular.extend(this.createDateObject(days[i], this.formatDay), {
+          secondary: days[i].getMonth() !== month,
+          uid: scope.uniqueId + '-' + i
+        });
+      }
+
+      scope.labels = new Array(7);
+      for (var j = 0; j < 7; j++) {
+        scope.labels[j] = {
+          abbr: dateFilter(days[j].date, this.formatDayHeader),
+          full: dateFilter(days[j].date, 'EEEE')
+        };
+      }
+
+      scope.title = dateFilter(this.activeDate, this.formatDayTitle);
+      scope.rows = this.split(days, 7);
+
+      if (scope.showWeeks) {
+        scope.weekNumbers = [];
+        var thursdayIndex = (4 + 7 - this.startingDay) % 7,
+          numWeeks = scope.rows.length;
+        for (var curWeek = 0; curWeek < numWeeks; curWeek++) {
+          scope.weekNumbers.push(
+            getISO8601WeekNumber(scope.rows[curWeek][thursdayIndex].date));
+        }
+      }
+    };
+
+    this.compare = function(date1, date2) {
+      var _date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+      var _date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+      _date1.setFullYear(date1.getFullYear());
+      _date2.setFullYear(date2.getFullYear());
+      return _date1 - _date2;
+    };
+
+    function getISO8601WeekNumber(date) {
+      var checkDate = new Date(date);
+      checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); // Thursday
+      var time = checkDate.getTime();
+      checkDate.setMonth(0); // Compare with Jan 1
+      checkDate.setDate(1);
+      return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+    }
+
+    this.handleKeyDown = function(key, evt) {
+      var date = this.activeDate.getDate();
+
+      if (key === 'left') {
+        date = date - 1;
+      } else if (key === 'up') {
+        date = date - 7;
+      } else if (key === 'right') {
+        date = date + 1;
+      } else if (key === 'down') {
+        date = date + 7;
+      } else if (key === 'pageup' || key === 'pagedown') {
+        var month = this.activeDate.getMonth() + (key === 'pageup' ? - 1 : 1);
+        this.activeDate.setMonth(month, 1);
+        date = Math.min(getDaysInMonth(this.activeDate.getFullYear(), this.activeDate.getMonth()), date);
+      } else if (key === 'home') {
+        date = 1;
+      } else if (key === 'end') {
+        date = getDaysInMonth(this.activeDate.getFullYear(), this.activeDate.getMonth());
+      }
+      this.activeDate.setDate(date);
+    };
+  }])
+
+  .controller('UibMonthpickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+    this.step = { years: 1 };
+    this.element = $element;
+
+    this.init = function(ctrl) {
+      angular.extend(ctrl, this);
+      ctrl.refreshView();
+    };
+
+    this._refreshView = function() {
+      var months = new Array(12),
+        year = this.activeDate.getFullYear(),
+        date;
+
+      for (var i = 0; i < 12; i++) {
+        date = new Date(this.activeDate);
+        date.setFullYear(year, i, 1);
+        months[i] = angular.extend(this.createDateObject(date, this.formatMonth), {
+          uid: scope.uniqueId + '-' + i
+        });
+      }
+
+      scope.title = dateFilter(this.activeDate, this.formatMonthTitle);
+      scope.rows = this.split(months, this.monthColumns);
+      scope.yearHeaderColspan = this.monthColumns > 3 ? this.monthColumns - 2 : 1;
+    };
+
+    this.compare = function(date1, date2) {
+      var _date1 = new Date(date1.getFullYear(), date1.getMonth());
+      var _date2 = new Date(date2.getFullYear(), date2.getMonth());
+      _date1.setFullYear(date1.getFullYear());
+      _date2.setFullYear(date2.getFullYear());
+      return _date1 - _date2;
+    };
+
+    this.handleKeyDown = function(key, evt) {
+      var date = this.activeDate.getMonth();
+
+      if (key === 'left') {
+        date = date - 1;
+      } else if (key === 'up') {
+        date = date - this.monthColumns;
+      } else if (key === 'right') {
+        date = date + 1;
+      } else if (key === 'down') {
+        date = date + this.monthColumns;
+      } else if (key === 'pageup' || key === 'pagedown') {
+        var year = this.activeDate.getFullYear() + (key === 'pageup' ? - 1 : 1);
+        this.activeDate.setFullYear(year);
+      } else if (key === 'home') {
+        date = 0;
+      } else if (key === 'end') {
+        date = 11;
+      }
+      this.activeDate.setMonth(date);
+    };
+  }])
+
+  .controller('UibYearpickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+    var columns, range;
+    this.element = $element;
+
+    function getStartingYear(year) {
+      return parseInt((year - 1) / range, 10) * range + 1;
+    }
+
+    this.yearpickerInit = function() {
+      columns = this.yearColumns;
+      range = this.yearRows * columns;
+      this.step = { years: range };
+    };
+
+    this._refreshView = function() {
+      var years = new Array(range), date;
+
+      for (var i = 0, start = getStartingYear(this.activeDate.getFullYear()); i < range; i++) {
+        date = new Date(this.activeDate);
+        date.setFullYear(start + i, 0, 1);
+        years[i] = angular.extend(this.createDateObject(date, this.formatYear), {
+          uid: scope.uniqueId + '-' + i
+        });
+      }
+
+      scope.title = [years[0].label, years[range - 1].label].join(' - ');
+      scope.rows = this.split(years, columns);
+      scope.columns = columns;
+    };
+
+    this.compare = function(date1, date2) {
+      return date1.getFullYear() - date2.getFullYear();
+    };
+
+    this.handleKeyDown = function(key, evt) {
+      var date = this.activeDate.getFullYear();
+
+      if (key === 'left') {
+        date = date - 1;
+      } else if (key === 'up') {
+        date = date - columns;
+      } else if (key === 'right') {
+        date = date + 1;
+      } else if (key === 'down') {
+        date = date + columns;
+      } else if (key === 'pageup' || key === 'pagedown') {
+        date += (key === 'pageup' ? - 1 : 1) * range;
+      } else if (key === 'home') {
+        date = getStartingYear(this.activeDate.getFullYear());
+      } else if (key === 'end') {
+        date = getStartingYear(this.activeDate.getFullYear()) + range - 1;
+      }
+      this.activeDate.setFullYear(date);
+    };
+  }])
+
+  .directive('uibDatepicker', function() {
+    return {
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/datepicker/datepicker.html';
+      },
+      scope: {
+        datepickerOptions: '=?'
+      },
+      require: ['uibDatepicker', '^ngModel'],
+      restrict: 'A',
+      controller: 'UibDatepickerController',
+      controllerAs: 'datepicker',
+      link: function(scope, element, attrs, ctrls) {
+        var datepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+        datepickerCtrl.init(ngModelCtrl);
+      }
+    };
+  })
+
+  .directive('uibDaypicker', function() {
+    return {
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/datepicker/day.html';
+      },
+      require: ['^uibDatepicker', 'uibDaypicker'],
+      restrict: 'A',
+      controller: 'UibDaypickerController',
+      link: function(scope, element, attrs, ctrls) {
+        var datepickerCtrl = ctrls[0],
+          daypickerCtrl = ctrls[1];
+
+        daypickerCtrl.init(datepickerCtrl);
+      }
+    };
+  })
+
+  .directive('uibMonthpicker', function() {
+    return {
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/datepicker/month.html';
+      },
+      require: ['^uibDatepicker', 'uibMonthpicker'],
+      restrict: 'A',
+      controller: 'UibMonthpickerController',
+      link: function(scope, element, attrs, ctrls) {
+        var datepickerCtrl = ctrls[0],
+          monthpickerCtrl = ctrls[1];
+
+        monthpickerCtrl.init(datepickerCtrl);
+      }
+    };
+  })
+
+  .directive('uibYearpicker', function() {
+    return {
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/datepicker/year.html';
+      },
+      require: ['^uibDatepicker', 'uibYearpicker'],
+      restrict: 'A',
+      controller: 'UibYearpickerController',
+      link: function(scope, element, attrs, ctrls) {
+        var ctrl = ctrls[0];
+        angular.extend(ctrl, ctrls[1]);
+        ctrl.yearpickerInit();
+
+        ctrl.refreshView();
+      }
+    };
+  });
+
 angular.module('ui.bootstrap.position', [])
 
 /**
- * A set of utility methods that can be use to retrieve position of DOM elements.
- * It is meant to be used where we need to absolute-position DOM elements in
- * relation to other, existing elements (this is the case for tooltips, popovers,
+ * A set of utility methods for working with the DOM.
+ * It is meant to be used where we need to absolute-position elements in
+ * relation to another element (this is the case for tooltips, popovers,
  * typeahead suggestions etc.).
  */
-    .factory('$position', ['$document', '$window', function ($document, $window) {
+  .factory('$uibPosition', ['$document', '$window', function($document, $window) {
+    /**
+     * Used by scrollbarWidth() function to cache scrollbar's width.
+     * Do not access this variable directly, use scrollbarWidth() instead.
+     */
+    var SCROLLBAR_WIDTH;
+    /**
+     * scrollbar on body and html element in IE and Edge overlay
+     * content and should be considered 0 width.
+     */
+    var BODY_SCROLLBAR_WIDTH;
+    var OVERFLOW_REGEX = {
+      normal: /(auto|scroll)/,
+      hidden: /(auto|scroll|hidden)/
+    };
+    var PLACEMENT_REGEX = {
+      auto: /\s?auto?\s?/i,
+      primary: /^(top|bottom|left|right)$/,
+      secondary: /^(top|bottom|left|right|center)$/,
+      vertical: /^(top|bottom)$/
+    };
+    var BODY_REGEX = /(HTML|BODY)/;
 
-      function getStyle(el, cssprop) {
-        if (el.currentStyle) { //IE
-          return el.currentStyle[cssprop];
-        } else if ($window.getComputedStyle) {
-          return $window.getComputedStyle(el)[cssprop];
+    return {
+
+      /**
+       * Provides a raw DOM element from a jQuery/jQLite element.
+       *
+       * @param {element} elem - The element to convert.
+       *
+       * @returns {element} A HTML element.
+       */
+      getRawNode: function(elem) {
+        return elem.nodeName ? elem : elem[0] || elem;
+      },
+
+      /**
+       * Provides a parsed number for a style property.  Strips
+       * units and casts invalid numbers to 0.
+       *
+       * @param {string} value - The style value to parse.
+       *
+       * @returns {number} A valid number.
+       */
+      parseStyle: function(value) {
+        value = parseFloat(value);
+        return isFinite(value) ? value : 0;
+      },
+
+      /**
+       * Provides the closest positioned ancestor.
+       *
+       * @param {element} element - The element to get the offest parent for.
+       *
+       * @returns {element} The closest positioned ancestor.
+       */
+      offsetParent: function(elem) {
+        elem = this.getRawNode(elem);
+
+        var offsetParent = elem.offsetParent || $document[0].documentElement;
+
+        function isStaticPositioned(el) {
+          return ($window.getComputedStyle(el).position || 'static') === 'static';
         }
-        // finally try and get inline style
-        return el.style[cssprop];
-      }
 
-      /**
-       * Checks if a given element is statically positioned
-       * @param element - raw DOM element
-       */
-      function isStaticPositioned(element) {
-        return (getStyle(element, "position") || 'static' ) === 'static';
-      }
-
-      /**
-       * returns the closest, non-statically positioned parentOffset of a given element
-       * @param element
-       */
-      var parentOffsetEl = function (element) {
-        var docDomEl = $document[0];
-        var offsetParent = element.offsetParent || docDomEl;
-        while (offsetParent && offsetParent !== docDomEl && isStaticPositioned(offsetParent) ) {
+        while (offsetParent && offsetParent !== $document[0].documentElement && isStaticPositioned(offsetParent)) {
           offsetParent = offsetParent.offsetParent;
         }
-        return offsetParent || docDomEl;
-      };
 
-      return {
-        /**
-         * Provides read-only equivalent of jQuery's position function:
-         * http://api.jquery.com/position/
-         */
-        position: function (element) {
-          var elBCR = this.offset(element);
-          var offsetParentBCR = { top: 0, left: 0 };
-          var offsetParentEl = parentOffsetEl(element[0]);
-          if (offsetParentEl != $document[0]) {
-            offsetParentBCR = this.offset(angular.element(offsetParentEl));
-            offsetParentBCR.top += offsetParentEl.clientTop - offsetParentEl.scrollTop;
-            offsetParentBCR.left += offsetParentEl.clientLeft - offsetParentEl.scrollLeft;
+        return offsetParent || $document[0].documentElement;
+      },
+
+      /**
+       * Provides the scrollbar width, concept from TWBS measureScrollbar()
+       * function in https://github.com/twbs/bootstrap/blob/master/js/modal.js
+       * In IE and Edge, scollbar on body and html element overlay and should
+       * return a width of 0.
+       *
+       * @returns {number} The width of the browser scollbar.
+       */
+      scrollbarWidth: function(isBody) {
+        if (isBody) {
+          if (angular.isUndefined(BODY_SCROLLBAR_WIDTH)) {
+            var bodyElem = $document.find('body');
+            bodyElem.addClass('uib-position-body-scrollbar-measure');
+            BODY_SCROLLBAR_WIDTH = $window.innerWidth - bodyElem[0].clientWidth;
+            BODY_SCROLLBAR_WIDTH = isFinite(BODY_SCROLLBAR_WIDTH) ? BODY_SCROLLBAR_WIDTH : 0;
+            bodyElem.removeClass('uib-position-body-scrollbar-measure');
           }
-
-          var boundingClientRect = element[0].getBoundingClientRect();
-          return {
-            width: boundingClientRect.width || element.prop('offsetWidth'),
-            height: boundingClientRect.height || element.prop('offsetHeight'),
-            top: elBCR.top - offsetParentBCR.top,
-            left: elBCR.left - offsetParentBCR.left
-          };
-        },
-
-        /**
-         * Provides read-only equivalent of jQuery's offset function:
-         * http://api.jquery.com/offset/
-         */
-        offset: function (element) {
-          var boundingClientRect = element[0].getBoundingClientRect();
-          return {
-            width: boundingClientRect.width || element.prop('offsetWidth'),
-            height: boundingClientRect.height || element.prop('offsetHeight'),
-            top: boundingClientRect.top + ($window.pageYOffset || $document[0].body.scrollTop || $document[0].documentElement.scrollTop),
-            left: boundingClientRect.left + ($window.pageXOffset || $document[0].body.scrollLeft  || $document[0].documentElement.scrollLeft)
-          };
+          return BODY_SCROLLBAR_WIDTH;
         }
-      };
-    }]);
 
-angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
-
-    .constant('datepickerConfig', {
-      dayFormat: 'dd',
-      monthFormat: 'MMMM',
-      yearFormat: 'yyyy',
-      dayHeaderFormat: 'EEE',
-      dayTitleFormat: 'MMMM yyyy',
-      monthTitleFormat: 'yyyy',
-      showWeeks: true,
-      startingDay: 0,
-      yearRange: 20,
-      minDate: null,
-      maxDate: null
-    })
-
-    .controller('DatepickerController', ['$scope', '$attrs', 'dateFilter', 'datepickerConfig', function($scope, $attrs, dateFilter, dtConfig) {
-      var format = {
-            day:        getValue($attrs.dayFormat,        dtConfig.dayFormat),
-            month:      getValue($attrs.monthFormat,      dtConfig.monthFormat),
-            year:       getValue($attrs.yearFormat,       dtConfig.yearFormat),
-            dayHeader:  getValue($attrs.dayHeaderFormat,  dtConfig.dayHeaderFormat),
-            dayTitle:   getValue($attrs.dayTitleFormat,   dtConfig.dayTitleFormat),
-            monthTitle: getValue($attrs.monthTitleFormat, dtConfig.monthTitleFormat)
-          },
-          startingDay = getValue($attrs.startingDay,      dtConfig.startingDay),
-          yearRange =   getValue($attrs.yearRange,        dtConfig.yearRange);
-
-      this.minDate = dtConfig.minDate ? new Date(dtConfig.minDate) : null;
-      this.maxDate = dtConfig.maxDate ? new Date(dtConfig.maxDate) : null;
-
-      function getValue(value, defaultValue) {
-        return angular.isDefined(value) ? $scope.$parent.$eval(value) : defaultValue;
-      }
-
-      function getDaysInMonth( year, month ) {
-        return new Date(year, month, 0).getDate();
-      }
-
-      function getDates(startDate, n) {
-        var dates = new Array(n);
-        var current = startDate, i = 0;
-        while (i < n) {
-          dates[i++] = new Date(current);
-          current.setDate( current.getDate() + 1 );
+        if (angular.isUndefined(SCROLLBAR_WIDTH)) {
+          var scrollElem = angular.element('<div class="uib-position-scrollbar-measure"></div>');
+          $document.find('body').append(scrollElem);
+          SCROLLBAR_WIDTH = scrollElem[0].offsetWidth - scrollElem[0].clientWidth;
+          SCROLLBAR_WIDTH = isFinite(SCROLLBAR_WIDTH) ? SCROLLBAR_WIDTH : 0;
+          scrollElem.remove();
         }
-        return dates;
-      }
 
-      function makeDate(date, format, isSelected, isSecondary) {
-        return { date: date, label: dateFilter(date, format), selected: !!isSelected, secondary: !!isSecondary };
-      }
+        return SCROLLBAR_WIDTH;
+      },
 
-      this.modes = [
-        {
-          name: 'day',
-          getVisibleDates: function(date, selected) {
-            var year = date.getFullYear(), month = date.getMonth(), firstDayOfMonth = new Date(year, month, 1);
-            var difference = startingDay - firstDayOfMonth.getDay(),
-                numDisplayedFromPreviousMonth = (difference > 0) ? 7 - difference : - difference,
-                firstDate = new Date(firstDayOfMonth), numDates = 0;
+      /**
+       * Provides the padding required on an element to replace the scrollbar.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**scrollbarWidth**: the width of the scrollbar</li>
+       *     <li>**widthOverflow**: whether the the width is overflowing</li>
+       *     <li>**right**: the amount of right padding on the element needed to replace the scrollbar</li>
+       *     <li>**rightOriginal**: the amount of right padding currently on the element</li>
+       *     <li>**heightOverflow**: whether the the height is overflowing</li>
+       *     <li>**bottom**: the amount of bottom padding on the element needed to replace the scrollbar</li>
+       *     <li>**bottomOriginal**: the amount of bottom padding currently on the element</li>
+       *   </ul>
+       */
+      scrollbarPadding: function(elem) {
+        elem = this.getRawNode(elem);
 
-            if ( numDisplayedFromPreviousMonth > 0 ) {
-              firstDate.setDate( - numDisplayedFromPreviousMonth + 1 );
-              numDates += numDisplayedFromPreviousMonth; // Previous
-            }
-            numDates += getDaysInMonth(year, month + 1); // Current
-            numDates += (7 - numDates % 7) % 7; // Next
+        var elemStyle = $window.getComputedStyle(elem);
+        var paddingRight = this.parseStyle(elemStyle.paddingRight);
+        var paddingBottom = this.parseStyle(elemStyle.paddingBottom);
+        var scrollParent = this.scrollParent(elem, false, true);
+        var scrollbarWidth = this.scrollbarWidth(BODY_REGEX.test(scrollParent.tagName));
 
-            var days = getDates(firstDate, numDates), labels = new Array(7);
-            for (var i = 0; i < numDates; i ++) {
-              var dt = new Date(days[i]);
-              days[i] = makeDate(dt, format.day, (selected && selected.getDate() === dt.getDate() && selected.getMonth() === dt.getMonth() && selected.getFullYear() === dt.getFullYear()), dt.getMonth() !== month);
-            }
-            for (var j = 0; j < 7; j++) {
-              labels[j] = dateFilter(days[j].date, format.dayHeader);
-            }
-            return { objects: days, title: dateFilter(date, format.dayTitle), labels: labels };
-          },
-          compare: function(date1, date2) {
-            return (new Date( date1.getFullYear(), date1.getMonth(), date1.getDate() ) - new Date( date2.getFullYear(), date2.getMonth(), date2.getDate() ) );
-          },
-          split: 7,
-          step: { months: 1 }
-        },
-        {
-          name: 'month',
-          getVisibleDates: function(date, selected) {
-            var months = new Array(12), year = date.getFullYear();
-            for ( var i = 0; i < 12; i++ ) {
-              var dt = new Date(year, i, 1);
-              months[i] = makeDate(dt, format.month, (selected && selected.getMonth() === i && selected.getFullYear() === year));
-            }
-            return { objects: months, title: dateFilter(date, format.monthTitle) };
-          },
-          compare: function(date1, date2) {
-            return new Date( date1.getFullYear(), date1.getMonth() ) - new Date( date2.getFullYear(), date2.getMonth() );
-          },
-          split: 3,
-          step: { years: 1 }
-        },
-        {
-          name: 'year',
-          getVisibleDates: function(date, selected) {
-            var years = new Array(yearRange), year = date.getFullYear(), startYear = parseInt((year - 1) / yearRange, 10) * yearRange + 1;
-            for ( var i = 0; i < yearRange; i++ ) {
-              var dt = new Date(startYear + i, 0, 1);
-              years[i] = makeDate(dt, format.year, (selected && selected.getFullYear() === dt.getFullYear()));
-            }
-            return { objects: years, title: [years[0].label, years[yearRange - 1].label].join(' - ') };
-          },
-          compare: function(date1, date2) {
-            return date1.getFullYear() - date2.getFullYear();
-          },
-          split: 5,
-          step: { years: yearRange }
-        }
-      ];
-
-      this.isDisabled = function(date, mode) {
-        var currentMode = this.modes[mode || 0];
-        return ((this.minDate && currentMode.compare(date, this.minDate) < 0) || (this.maxDate && currentMode.compare(date, this.maxDate) > 0) || ($scope.dateDisabled && $scope.dateDisabled({date: date, mode: currentMode.name})));
-      };
-    }])
-
-    .directive( 'datepicker', ['dateFilter', '$parse', 'datepickerConfig', '$log', function (dateFilter, $parse, datepickerConfig, $log) {
-      return {
-        restrict: 'EA',
-        replace: true,
-        templateUrl: 'template/datepicker/datepicker.html',
-        scope: {
-          dateDisabled: '&'
-        },
-        require: ['datepicker', '?^ngModel'],
-        controller: 'DatepickerController',
-        link: function(scope, element, attrs, ctrls) {
-          var datepickerCtrl = ctrls[0], ngModel = ctrls[1];
-
-          if (!ngModel) {
-            return; // do nothing if no ng-model
-          }
-
-          // Configuration parameters
-          var mode = 0, selected = new Date(), showWeeks = datepickerConfig.showWeeks;
-
-          if (attrs.showWeeks) {
-            scope.$parent.$watch($parse(attrs.showWeeks), function(value) {
-              showWeeks = !! value;
-              updateShowWeekNumbers();
-            });
-          } else {
-            updateShowWeekNumbers();
-          }
-
-          if (attrs.min) {
-            scope.$parent.$watch($parse(attrs.min), function(value) {
-              datepickerCtrl.minDate = value ? new Date(value) : null;
-              refill();
-            });
-          }
-          if (attrs.max) {
-            scope.$parent.$watch($parse(attrs.max), function(value) {
-              datepickerCtrl.maxDate = value ? new Date(value) : null;
-              refill();
-            });
-          }
-
-          function updateShowWeekNumbers() {
-            scope.showWeekNumbers = mode === 0 && showWeeks;
-          }
-
-          // Split array into smaller arrays
-          function split(arr, size) {
-            var arrays = [];
-            while (arr.length > 0) {
-              arrays.push(arr.splice(0, size));
-            }
-            return arrays;
-          }
-
-          function refill( updateSelected ) {
-            var date = null, valid = true;
-
-            if ( ngModel.$modelValue ) {
-              date = new Date( ngModel.$modelValue );
-
-              if ( isNaN(date) ) {
-                valid = false;
-                $log.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
-              } else if ( updateSelected ) {
-                selected = date;
-              }
-            }
-            ngModel.$setValidity('date', valid);
-
-            var currentMode = datepickerCtrl.modes[mode], data = currentMode.getVisibleDates(selected, date);
-            angular.forEach(data.objects, function(obj) {
-              obj.disabled = datepickerCtrl.isDisabled(obj.date, mode);
-            });
-
-            ngModel.$setValidity('date-disabled', (!date || !datepickerCtrl.isDisabled(date)));
-
-            scope.rows = split(data.objects, currentMode.split);
-            scope.labels = data.labels || [];
-            scope.title = data.title;
-          }
-
-          function setMode(value) {
-            mode = value;
-            updateShowWeekNumbers();
-            refill();
-          }
-
-          ngModel.$render = function() {
-            refill( true );
-          };
-
-          scope.select = function( date ) {
-            if ( mode === 0 ) {
-              var dt = ngModel.$modelValue ? new Date( ngModel.$modelValue ) : new Date(0, 0, 0, 0, 0, 0, 0);
-              dt.setFullYear( date.getFullYear(), date.getMonth(), date.getDate() );
-              ngModel.$setViewValue( dt );
-              refill( true );
-            } else {
-              selected = date;
-              setMode( mode - 1 );
-            }
-          };
-          scope.move = function(direction) {
-            var step = datepickerCtrl.modes[mode].step;
-            selected.setMonth( selected.getMonth() + direction * (step.months || 0) );
-            selected.setFullYear( selected.getFullYear() + direction * (step.years || 0) );
-            refill();
-          };
-          scope.toggleMode = function() {
-            setMode( (mode + 1) % datepickerCtrl.modes.length );
-          };
-          scope.getWeekNumber = function(row) {
-            return ( mode === 0 && scope.showWeekNumbers && row.length === 7 ) ? getISO8601WeekNumber(row[0].date) : null;
-          };
-
-          function getISO8601WeekNumber(date) {
-            var checkDate = new Date(date);
-            checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); // Thursday
-            var time = checkDate.getTime();
-            checkDate.setMonth(0); // Compare with Jan 1
-            checkDate.setDate(1);
-            return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
-          }
-        }
-      };
-    }])
-
-    .constant('datepickerPopupConfig', {
-      dateFormat: 'yyyy-MM-dd',
-      currentText: 'Today',
-      toggleWeeksText: 'Weeks',
-      clearText: 'Clear',
-      closeText: 'Done',
-      closeOnDateSelection: true,
-      appendToBody: false,
-      showButtonBar: true
-    })
-
-    .directive('datepickerPopup', ['$compile', '$parse', '$document', '$position', 'dateFilter', 'datepickerPopupConfig', 'datepickerConfig',
-      function ($compile, $parse, $document, $position, dateFilter, datepickerPopupConfig, datepickerConfig) {
         return {
-          restrict: 'EA',
-          require: 'ngModel',
-          link: function(originalScope, element, attrs, ngModel) {
-            var scope = originalScope.$new(), // create a child scope so we are not polluting original one
-                dateFormat,
-                closeOnDateSelection = angular.isDefined(attrs.closeOnDateSelection) ? originalScope.$eval(attrs.closeOnDateSelection) : datepickerPopupConfig.closeOnDateSelection,
-                appendToBody = angular.isDefined(attrs.datepickerAppendToBody) ? originalScope.$eval(attrs.datepickerAppendToBody) : datepickerPopupConfig.appendToBody;
+          scrollbarWidth: scrollbarWidth,
+          widthOverflow: scrollParent.scrollWidth > scrollParent.clientWidth,
+          right: paddingRight + scrollbarWidth,
+          originalRight: paddingRight,
+          heightOverflow: scrollParent.scrollHeight > scrollParent.clientHeight,
+          bottom: paddingBottom + scrollbarWidth,
+          originalBottom: paddingBottom
+        };
+      },
 
-            attrs.$observe('datepickerPopup', function(value) {
-              dateFormat = value || datepickerPopupConfig.dateFormat;
-              ngModel.$render();
-            });
+      /**
+       * Checks to see if the element is scrollable.
+       *
+       * @param {element} elem - The element to check.
+       * @param {boolean=} [includeHidden=false] - Should scroll style of 'hidden' be considered,
+       *   default is false.
+       *
+       * @returns {boolean} Whether the element is scrollable.
+       */
+      isScrollable: function(elem, includeHidden) {
+        elem = this.getRawNode(elem);
 
-            scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? originalScope.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
+        var overflowRegex = includeHidden ? OVERFLOW_REGEX.hidden : OVERFLOW_REGEX.normal;
+        var elemStyle = $window.getComputedStyle(elem);
+        return overflowRegex.test(elemStyle.overflow + elemStyle.overflowY + elemStyle.overflowX);
+      },
 
-            originalScope.$on('$destroy', function() {
-              $popup.remove();
-              scope.$destroy();
-            });
+      /**
+       * Provides the closest scrollable ancestor.
+       * A port of the jQuery UI scrollParent method:
+       * https://github.com/jquery/jquery-ui/blob/master/ui/scroll-parent.js
+       *
+       * @param {element} elem - The element to find the scroll parent of.
+       * @param {boolean=} [includeHidden=false] - Should scroll style of 'hidden' be considered,
+       *   default is false.
+       * @param {boolean=} [includeSelf=false] - Should the element being passed be
+       * included in the scrollable llokup.
+       *
+       * @returns {element} A HTML element.
+       */
+      scrollParent: function(elem, includeHidden, includeSelf) {
+        elem = this.getRawNode(elem);
 
-            attrs.$observe('currentText', function(text) {
-              scope.currentText = angular.isDefined(text) ? text : datepickerPopupConfig.currentText;
-            });
-            attrs.$observe('toggleWeeksText', function(text) {
-              scope.toggleWeeksText = angular.isDefined(text) ? text : datepickerPopupConfig.toggleWeeksText;
-            });
-            attrs.$observe('clearText', function(text) {
-              scope.clearText = angular.isDefined(text) ? text : datepickerPopupConfig.clearText;
-            });
-            attrs.$observe('closeText', function(text) {
-              scope.closeText = angular.isDefined(text) ? text : datepickerPopupConfig.closeText;
-            });
+        var overflowRegex = includeHidden ? OVERFLOW_REGEX.hidden : OVERFLOW_REGEX.normal;
+        var documentEl = $document[0].documentElement;
+        var elemStyle = $window.getComputedStyle(elem);
+        if (includeSelf && overflowRegex.test(elemStyle.overflow + elemStyle.overflowY + elemStyle.overflowX)) {
+          return elem;
+        }
+        var excludeStatic = elemStyle.position === 'absolute';
+        var scrollParent = elem.parentElement || documentEl;
 
-            var getIsOpen, setIsOpen;
-            if ( attrs.isOpen ) {
-              getIsOpen = $parse(attrs.isOpen);
-              setIsOpen = getIsOpen.assign;
+        if (scrollParent === documentEl || elemStyle.position === 'fixed') {
+          return documentEl;
+        }
 
-              originalScope.$watch(getIsOpen, function updateOpen(value) {
-                scope.isOpen = !! value;
-              });
-            }
-            scope.isOpen = getIsOpen ? getIsOpen(originalScope) : false; // Initial state
+        while (scrollParent.parentElement && scrollParent !== documentEl) {
+          var spStyle = $window.getComputedStyle(scrollParent);
+          if (excludeStatic && spStyle.position !== 'static') {
+            excludeStatic = false;
+          }
 
-            function setOpen( value ) {
-              if (setIsOpen) {
-                setIsOpen(originalScope, !!value);
-              } else {
-                scope.isOpen = !!value;
+          if (!excludeStatic && overflowRegex.test(spStyle.overflow + spStyle.overflowY + spStyle.overflowX)) {
+            break;
+          }
+          scrollParent = scrollParent.parentElement;
+        }
+
+        return scrollParent;
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's position function:
+       * http://api.jquery.com/position/ - distance to closest positioned
+       * ancestor.  Does not account for margins by default like jQuery position.
+       *
+       * @param {element} elem - The element to caclulate the position on.
+       * @param {boolean=} [includeMargins=false] - Should margins be accounted
+       * for, default is false.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**width**: the width of the element</li>
+       *     <li>**height**: the height of the element</li>
+       *     <li>**top**: distance to top edge of offset parent</li>
+       *     <li>**left**: distance to left edge of offset parent</li>
+       *   </ul>
+       */
+      position: function(elem, includeMagins) {
+        elem = this.getRawNode(elem);
+
+        var elemOffset = this.offset(elem);
+        if (includeMagins) {
+          var elemStyle = $window.getComputedStyle(elem);
+          elemOffset.top -= this.parseStyle(elemStyle.marginTop);
+          elemOffset.left -= this.parseStyle(elemStyle.marginLeft);
+        }
+        var parent = this.offsetParent(elem);
+        var parentOffset = {top: 0, left: 0};
+
+        if (parent !== $document[0].documentElement) {
+          parentOffset = this.offset(parent);
+          parentOffset.top += parent.clientTop - parent.scrollTop;
+          parentOffset.left += parent.clientLeft - parent.scrollLeft;
+        }
+
+        return {
+          width: Math.round(angular.isNumber(elemOffset.width) ? elemOffset.width : elem.offsetWidth),
+          height: Math.round(angular.isNumber(elemOffset.height) ? elemOffset.height : elem.offsetHeight),
+          top: Math.round(elemOffset.top - parentOffset.top),
+          left: Math.round(elemOffset.left - parentOffset.left)
+        };
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's offset function:
+       * http://api.jquery.com/offset/ - distance to viewport.  Does
+       * not account for borders, margins, or padding on the body
+       * element.
+       *
+       * @param {element} elem - The element to calculate the offset on.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**width**: the width of the element</li>
+       *     <li>**height**: the height of the element</li>
+       *     <li>**top**: distance to top edge of viewport</li>
+       *     <li>**right**: distance to bottom edge of viewport</li>
+       *   </ul>
+       */
+      offset: function(elem) {
+        elem = this.getRawNode(elem);
+
+        var elemBCR = elem.getBoundingClientRect();
+        return {
+          width: Math.round(angular.isNumber(elemBCR.width) ? elemBCR.width : elem.offsetWidth),
+          height: Math.round(angular.isNumber(elemBCR.height) ? elemBCR.height : elem.offsetHeight),
+          top: Math.round(elemBCR.top + ($window.pageYOffset || $document[0].documentElement.scrollTop)),
+          left: Math.round(elemBCR.left + ($window.pageXOffset || $document[0].documentElement.scrollLeft))
+        };
+      },
+
+      /**
+       * Provides offset distance to the closest scrollable ancestor
+       * or viewport.  Accounts for border and scrollbar width.
+       *
+       * Right and bottom dimensions represent the distance to the
+       * respective edge of the viewport element.  If the element
+       * edge extends beyond the viewport, a negative value will be
+       * reported.
+       *
+       * @param {element} elem - The element to get the viewport offset for.
+       * @param {boolean=} [useDocument=false] - Should the viewport be the document element instead
+       * of the first scrollable element, default is false.
+       * @param {boolean=} [includePadding=true] - Should the padding on the offset parent element
+       * be accounted for, default is true.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**top**: distance to the top content edge of viewport element</li>
+       *     <li>**bottom**: distance to the bottom content edge of viewport element</li>
+       *     <li>**left**: distance to the left content edge of viewport element</li>
+       *     <li>**right**: distance to the right content edge of viewport element</li>
+       *   </ul>
+       */
+      viewportOffset: function(elem, useDocument, includePadding) {
+        elem = this.getRawNode(elem);
+        includePadding = includePadding !== false ? true : false;
+
+        var elemBCR = elem.getBoundingClientRect();
+        var offsetBCR = {top: 0, left: 0, bottom: 0, right: 0};
+
+        var offsetParent = useDocument ? $document[0].documentElement : this.scrollParent(elem);
+        var offsetParentBCR = offsetParent.getBoundingClientRect();
+
+        offsetBCR.top = offsetParentBCR.top + offsetParent.clientTop;
+        offsetBCR.left = offsetParentBCR.left + offsetParent.clientLeft;
+        if (offsetParent === $document[0].documentElement) {
+          offsetBCR.top += $window.pageYOffset;
+          offsetBCR.left += $window.pageXOffset;
+        }
+        offsetBCR.bottom = offsetBCR.top + offsetParent.clientHeight;
+        offsetBCR.right = offsetBCR.left + offsetParent.clientWidth;
+
+        if (includePadding) {
+          var offsetParentStyle = $window.getComputedStyle(offsetParent);
+          offsetBCR.top += this.parseStyle(offsetParentStyle.paddingTop);
+          offsetBCR.bottom -= this.parseStyle(offsetParentStyle.paddingBottom);
+          offsetBCR.left += this.parseStyle(offsetParentStyle.paddingLeft);
+          offsetBCR.right -= this.parseStyle(offsetParentStyle.paddingRight);
+        }
+
+        return {
+          top: Math.round(elemBCR.top - offsetBCR.top),
+          bottom: Math.round(offsetBCR.bottom - elemBCR.bottom),
+          left: Math.round(elemBCR.left - offsetBCR.left),
+          right: Math.round(offsetBCR.right - elemBCR.right)
+        };
+      },
+
+      /**
+       * Provides an array of placement values parsed from a placement string.
+       * Along with the 'auto' indicator, supported placement strings are:
+       *   <ul>
+       *     <li>top: element on top, horizontally centered on host element.</li>
+       *     <li>top-left: element on top, left edge aligned with host element left edge.</li>
+       *     <li>top-right: element on top, lerightft edge aligned with host element right edge.</li>
+       *     <li>bottom: element on bottom, horizontally centered on host element.</li>
+       *     <li>bottom-left: element on bottom, left edge aligned with host element left edge.</li>
+       *     <li>bottom-right: element on bottom, right edge aligned with host element right edge.</li>
+       *     <li>left: element on left, vertically centered on host element.</li>
+       *     <li>left-top: element on left, top edge aligned with host element top edge.</li>
+       *     <li>left-bottom: element on left, bottom edge aligned with host element bottom edge.</li>
+       *     <li>right: element on right, vertically centered on host element.</li>
+       *     <li>right-top: element on right, top edge aligned with host element top edge.</li>
+       *     <li>right-bottom: element on right, bottom edge aligned with host element bottom edge.</li>
+       *   </ul>
+       * A placement string with an 'auto' indicator is expected to be
+       * space separated from the placement, i.e: 'auto bottom-left'  If
+       * the primary and secondary placement values do not match 'top,
+       * bottom, left, right' then 'top' will be the primary placement and
+       * 'center' will be the secondary placement.  If 'auto' is passed, true
+       * will be returned as the 3rd value of the array.
+       *
+       * @param {string} placement - The placement string to parse.
+       *
+       * @returns {array} An array with the following values
+       * <ul>
+       *   <li>**[0]**: The primary placement.</li>
+       *   <li>**[1]**: The secondary placement.</li>
+       *   <li>**[2]**: If auto is passed: true, else undefined.</li>
+       * </ul>
+       */
+      parsePlacement: function(placement) {
+        var autoPlace = PLACEMENT_REGEX.auto.test(placement);
+        if (autoPlace) {
+          placement = placement.replace(PLACEMENT_REGEX.auto, '');
+        }
+
+        placement = placement.split('-');
+
+        placement[0] = placement[0] || 'top';
+        if (!PLACEMENT_REGEX.primary.test(placement[0])) {
+          placement[0] = 'top';
+        }
+
+        placement[1] = placement[1] || 'center';
+        if (!PLACEMENT_REGEX.secondary.test(placement[1])) {
+          placement[1] = 'center';
+        }
+
+        if (autoPlace) {
+          placement[2] = true;
+        } else {
+          placement[2] = false;
+        }
+
+        return placement;
+      },
+
+      /**
+       * Provides coordinates for an element to be positioned relative to
+       * another element.  Passing 'auto' as part of the placement parameter
+       * will enable smart placement - where the element fits. i.e:
+       * 'auto left-top' will check to see if there is enough space to the left
+       * of the hostElem to fit the targetElem, if not place right (same for secondary
+       * top placement).  Available space is calculated using the viewportOffset
+       * function.
+       *
+       * @param {element} hostElem - The element to position against.
+       * @param {element} targetElem - The element to position.
+       * @param {string=} [placement=top] - The placement for the targetElem,
+       *   default is 'top'. 'center' is assumed as secondary placement for
+       *   'top', 'left', 'right', and 'bottom' placements.  Available placements are:
+       *   <ul>
+       *     <li>top</li>
+       *     <li>top-right</li>
+       *     <li>top-left</li>
+       *     <li>bottom</li>
+       *     <li>bottom-left</li>
+       *     <li>bottom-right</li>
+       *     <li>left</li>
+       *     <li>left-top</li>
+       *     <li>left-bottom</li>
+       *     <li>right</li>
+       *     <li>right-top</li>
+       *     <li>right-bottom</li>
+       *   </ul>
+       * @param {boolean=} [appendToBody=false] - Should the top and left values returned
+       *   be calculated from the body element, default is false.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**top**: Value for targetElem top.</li>
+       *     <li>**left**: Value for targetElem left.</li>
+       *     <li>**placement**: The resolved placement.</li>
+       *   </ul>
+       */
+      positionElements: function(hostElem, targetElem, placement, appendToBody) {
+        hostElem = this.getRawNode(hostElem);
+        targetElem = this.getRawNode(targetElem);
+
+        // need to read from prop to support tests.
+        var targetWidth = angular.isDefined(targetElem.offsetWidth) ? targetElem.offsetWidth : targetElem.prop('offsetWidth');
+        var targetHeight = angular.isDefined(targetElem.offsetHeight) ? targetElem.offsetHeight : targetElem.prop('offsetHeight');
+
+        placement = this.parsePlacement(placement);
+
+        var hostElemPos = appendToBody ? this.offset(hostElem) : this.position(hostElem);
+        var targetElemPos = {top: 0, left: 0, placement: ''};
+
+        if (placement[2]) {
+          var viewportOffset = this.viewportOffset(hostElem, appendToBody);
+
+          var targetElemStyle = $window.getComputedStyle(targetElem);
+          var adjustedSize = {
+            width: targetWidth + Math.round(Math.abs(this.parseStyle(targetElemStyle.marginLeft) + this.parseStyle(targetElemStyle.marginRight))),
+            height: targetHeight + Math.round(Math.abs(this.parseStyle(targetElemStyle.marginTop) + this.parseStyle(targetElemStyle.marginBottom)))
+          };
+
+          placement[0] = placement[0] === 'top' && adjustedSize.height > viewportOffset.top && adjustedSize.height <= viewportOffset.bottom ? 'bottom' :
+            placement[0] === 'bottom' && adjustedSize.height > viewportOffset.bottom && adjustedSize.height <= viewportOffset.top ? 'top' :
+              placement[0] === 'left' && adjustedSize.width > viewportOffset.left && adjustedSize.width <= viewportOffset.right ? 'right' :
+                placement[0] === 'right' && adjustedSize.width > viewportOffset.right && adjustedSize.width <= viewportOffset.left ? 'left' :
+                  placement[0];
+
+          placement[1] = placement[1] === 'top' && adjustedSize.height - hostElemPos.height > viewportOffset.bottom && adjustedSize.height - hostElemPos.height <= viewportOffset.top ? 'bottom' :
+            placement[1] === 'bottom' && adjustedSize.height - hostElemPos.height > viewportOffset.top && adjustedSize.height - hostElemPos.height <= viewportOffset.bottom ? 'top' :
+              placement[1] === 'left' && adjustedSize.width - hostElemPos.width > viewportOffset.right && adjustedSize.width - hostElemPos.width <= viewportOffset.left ? 'right' :
+                placement[1] === 'right' && adjustedSize.width - hostElemPos.width > viewportOffset.left && adjustedSize.width - hostElemPos.width <= viewportOffset.right ? 'left' :
+                  placement[1];
+
+          if (placement[1] === 'center') {
+            if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+              var xOverflow = hostElemPos.width / 2 - targetWidth / 2;
+              if (viewportOffset.left + xOverflow < 0 && adjustedSize.width - hostElemPos.width <= viewportOffset.right) {
+                placement[1] = 'left';
+              } else if (viewportOffset.right + xOverflow < 0 && adjustedSize.width - hostElemPos.width <= viewportOffset.left) {
+                placement[1] = 'right';
               }
-            }
-
-            var documentClickBind = function(event) {
-              if (scope.isOpen && event.target !== element[0]) {
-                scope.$apply(function() {
-                  setOpen(false);
-                });
-              }
-            };
-
-            var elementFocusBind = function() {
-              scope.$apply(function() {
-                setOpen( true );
-              });
-            };
-
-            // popup element used to display calendar
-            var popupEl = angular.element('<div datepicker-popup-wrap><div datepicker></div></div>');
-            popupEl.attr({
-              'ng-model': 'date',
-              'ng-change': 'dateSelection()'
-            });
-            var datepickerEl = angular.element(popupEl.children()[0]);
-            if (attrs.datepickerOptions) {
-              datepickerEl.attr(angular.extend({}, originalScope.$eval(attrs.datepickerOptions)));
-            }
-
-            // TODO: reverse from dateFilter string to Date object
-            function parseDate(viewValue) {
-              if (!viewValue) {
-                ngModel.$setValidity('date', true);
-                return null;
-              } else if (angular.isDate(viewValue)) {
-                ngModel.$setValidity('date', true);
-                return viewValue;
-              } else if (angular.isString(viewValue)) {
-                var date = new Date(viewValue);
-                if (isNaN(date)) {
-                  ngModel.$setValidity('date', false);
-                  return undefined;
-                } else {
-                  ngModel.$setValidity('date', true);
-                  return date;
-                }
-              } else {
-                ngModel.$setValidity('date', false);
-                return undefined;
-              }
-            }
-            ngModel.$parsers.unshift(parseDate);
-
-            // Inner change
-            scope.dateSelection = function(dt) {
-              if (angular.isDefined(dt)) {
-                scope.date = dt;
-              }
-              ngModel.$setViewValue(scope.date);
-              ngModel.$render();
-
-              if (closeOnDateSelection) {
-                setOpen( false );
-              }
-            };
-
-            element.bind('input change keyup', function() {
-              scope.$apply(function() {
-                scope.date = ngModel.$modelValue;
-              });
-            });
-
-            // Outter change
-            ngModel.$render = function() {
-              var date = ngModel.$viewValue ? dateFilter(ngModel.$viewValue, dateFormat) : '';
-              element.val(date);
-              scope.date = ngModel.$modelValue;
-            };
-
-            function addWatchableAttribute(attribute, scopeProperty, datepickerAttribute) {
-              if (attribute) {
-                originalScope.$watch($parse(attribute), function(value){
-                  scope[scopeProperty] = value;
-                });
-                datepickerEl.attr(datepickerAttribute || scopeProperty, scopeProperty);
-              }
-            }
-            addWatchableAttribute(attrs.min, 'min');
-            addWatchableAttribute(attrs.max, 'max');
-            if (attrs.showWeeks) {
-              addWatchableAttribute(attrs.showWeeks, 'showWeeks', 'show-weeks');
             } else {
-              scope.showWeeks = datepickerConfig.showWeeks;
-              datepickerEl.attr('show-weeks', 'showWeeks');
-            }
-            if (attrs.dateDisabled) {
-              datepickerEl.attr('date-disabled', attrs.dateDisabled);
-            }
-
-            function updatePosition() {
-              scope.position = appendToBody ? $position.offset(element) : $position.position(element);
-              scope.position.top = scope.position.top + element.prop('offsetHeight');
-            }
-
-            var documentBindingInitialized = false, elementFocusInitialized = false;
-            scope.$watch('isOpen', function(value) {
-              if (value) {
-                updatePosition();
-                $document.bind('click', documentClickBind);
-                if(elementFocusInitialized) {
-                  element.unbind('focus', elementFocusBind);
-                }
-                element[0].focus();
-                documentBindingInitialized = true;
-              } else {
-                if(documentBindingInitialized) {
-                  $document.unbind('click', documentClickBind);
-                }
-                element.bind('focus', elementFocusBind);
-                elementFocusInitialized = true;
+              var yOverflow = hostElemPos.height / 2 - adjustedSize.height / 2;
+              if (viewportOffset.top + yOverflow < 0 && adjustedSize.height - hostElemPos.height <= viewportOffset.bottom) {
+                placement[1] = 'top';
+              } else if (viewportOffset.bottom + yOverflow < 0 && adjustedSize.height - hostElemPos.height <= viewportOffset.top) {
+                placement[1] = 'bottom';
               }
+            }
+          }
+        }
 
-              if ( setIsOpen ) {
-                setIsOpen(originalScope, value);
-              }
-            });
+        switch (placement[0]) {
+          case 'top':
+            targetElemPos.top = hostElemPos.top - targetHeight;
+            break;
+          case 'bottom':
+            targetElemPos.top = hostElemPos.top + hostElemPos.height;
+            break;
+          case 'left':
+            targetElemPos.left = hostElemPos.left - targetWidth;
+            break;
+          case 'right':
+            targetElemPos.left = hostElemPos.left + hostElemPos.width;
+            break;
+        }
 
-            scope.today = function() {
-              scope.dateSelection(new Date());
-            };
-            scope.clear = function() {
-              scope.dateSelection(null);
-            };
-
-            var $popup = $compile(popupEl)(scope);
-            if ( appendToBody ) {
-              $document.find('body').append($popup);
+        switch (placement[1]) {
+          case 'top':
+            targetElemPos.top = hostElemPos.top;
+            break;
+          case 'bottom':
+            targetElemPos.top = hostElemPos.top + hostElemPos.height - targetHeight;
+            break;
+          case 'left':
+            targetElemPos.left = hostElemPos.left;
+            break;
+          case 'right':
+            targetElemPos.left = hostElemPos.left + hostElemPos.width - targetWidth;
+            break;
+          case 'center':
+            if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+              targetElemPos.left = hostElemPos.left + hostElemPos.width / 2 - targetWidth / 2;
             } else {
-              element.after($popup);
+              targetElemPos.top = hostElemPos.top + hostElemPos.height / 2 - targetHeight / 2;
+            }
+            break;
+        }
+
+        targetElemPos.top = Math.round(targetElemPos.top);
+        targetElemPos.left = Math.round(targetElemPos.left);
+        targetElemPos.placement = placement[1] === 'center' ? placement[0] : placement[0] + '-' + placement[1];
+
+        return targetElemPos;
+      },
+
+      /**
+       * Provides a way to adjust the top positioning after first
+       * render to correctly align element to top after content
+       * rendering causes resized element height
+       *
+       * @param {array} placementClasses - The array of strings of classes
+       * element should have.
+       * @param {object} containerPosition - The object with container
+       * position information
+       * @param {number} initialHeight - The initial height for the elem.
+       * @param {number} currentHeight - The current height for the elem.
+       */
+      adjustTop: function(placementClasses, containerPosition, initialHeight, currentHeight) {
+        if (placementClasses.indexOf('top') !== -1 && initialHeight !== currentHeight) {
+          return {
+            top: containerPosition.top - currentHeight + 'px'
+          };
+        }
+      },
+
+      /**
+       * Provides a way for positioning tooltip & dropdown
+       * arrows when using placement options beyond the standard
+       * left, right, top, or bottom.
+       *
+       * @param {element} elem - The tooltip/dropdown element.
+       * @param {string} placement - The placement for the elem.
+       */
+      positionArrow: function(elem, placement) {
+        elem = this.getRawNode(elem);
+
+        var innerElem = elem.querySelector('.tooltip-inner, .popover-inner');
+        if (!innerElem) {
+          return;
+        }
+
+        var isTooltip = angular.element(innerElem).hasClass('tooltip-inner');
+
+        var arrowElem = isTooltip ? elem.querySelector('.tooltip-arrow') : elem.querySelector('.arrow');
+        if (!arrowElem) {
+          return;
+        }
+
+        var arrowCss = {
+          top: '',
+          bottom: '',
+          left: '',
+          right: ''
+        };
+
+        placement = this.parsePlacement(placement);
+        if (placement[1] === 'center') {
+          // no adjustment necessary - just reset styles
+          angular.element(arrowElem).css(arrowCss);
+          return;
+        }
+
+        var borderProp = 'border-' + placement[0] + '-width';
+        var borderWidth = $window.getComputedStyle(arrowElem)[borderProp];
+
+        var borderRadiusProp = 'border-';
+        if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+          borderRadiusProp += placement[0] + '-' + placement[1];
+        } else {
+          borderRadiusProp += placement[1] + '-' + placement[0];
+        }
+        borderRadiusProp += '-radius';
+        var borderRadius = $window.getComputedStyle(isTooltip ? innerElem : elem)[borderRadiusProp];
+
+        switch (placement[0]) {
+          case 'top':
+            arrowCss.bottom = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'bottom':
+            arrowCss.top = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'left':
+            arrowCss.right = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'right':
+            arrowCss.left = isTooltip ? '0' : '-' + borderWidth;
+            break;
+        }
+
+        arrowCss[placement[1]] = borderRadius;
+
+        angular.element(arrowElem).css(arrowCss);
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.datepickerPopup', ['ui.bootstrap.datepicker', 'ui.bootstrap.position'])
+
+  .value('$datepickerPopupLiteralWarning', true)
+
+  .constant('uibDatepickerPopupConfig', {
+    altInputFormats: [],
+    appendToBody: false,
+    clearText: 'Clear',
+    closeOnDateSelection: true,
+    closeText: 'Done',
+    currentText: 'Today',
+    datepickerPopup: 'yyyy-MM-dd',
+    datepickerPopupTemplateUrl: 'uib/template/datepickerPopup/popup.html',
+    datepickerTemplateUrl: 'uib/template/datepicker/datepicker.html',
+    html5Types: {
+      date: 'yyyy-MM-dd',
+      'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+      'month': 'yyyy-MM'
+    },
+    onOpenFocus: true,
+    showButtonBar: true,
+    placement: 'auto bottom-left'
+  })
+
+  .controller('UibDatepickerPopupController', ['$scope', '$element', '$attrs', '$compile', '$log', '$parse', '$window', '$document', '$rootScope', '$uibPosition', 'dateFilter', 'uibDateParser', 'uibDatepickerPopupConfig', '$timeout', 'uibDatepickerConfig', '$datepickerPopupLiteralWarning',
+    function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $rootScope, $position, dateFilter, dateParser, datepickerPopupConfig, $timeout, datepickerConfig, $datepickerPopupLiteralWarning) {
+      var cache = {},
+        isHtml5DateInput = false;
+      var dateFormat, closeOnDateSelection, appendToBody, onOpenFocus,
+        datepickerPopupTemplateUrl, datepickerTemplateUrl, popupEl, datepickerEl, scrollParentEl,
+        ngModel, ngModelOptions, $popup, altInputFormats, watchListeners = [];
+
+      this.init = function(_ngModel_) {
+        ngModel = _ngModel_;
+        ngModelOptions = extractOptions(ngModel);
+        closeOnDateSelection = angular.isDefined($attrs.closeOnDateSelection) ?
+          $scope.$parent.$eval($attrs.closeOnDateSelection) :
+          datepickerPopupConfig.closeOnDateSelection;
+        appendToBody = angular.isDefined($attrs.datepickerAppendToBody) ?
+          $scope.$parent.$eval($attrs.datepickerAppendToBody) :
+          datepickerPopupConfig.appendToBody;
+        onOpenFocus = angular.isDefined($attrs.onOpenFocus) ?
+          $scope.$parent.$eval($attrs.onOpenFocus) : datepickerPopupConfig.onOpenFocus;
+        datepickerPopupTemplateUrl = angular.isDefined($attrs.datepickerPopupTemplateUrl) ?
+          $attrs.datepickerPopupTemplateUrl :
+          datepickerPopupConfig.datepickerPopupTemplateUrl;
+        datepickerTemplateUrl = angular.isDefined($attrs.datepickerTemplateUrl) ?
+          $attrs.datepickerTemplateUrl : datepickerPopupConfig.datepickerTemplateUrl;
+        altInputFormats = angular.isDefined($attrs.altInputFormats) ?
+          $scope.$parent.$eval($attrs.altInputFormats) :
+          datepickerPopupConfig.altInputFormats;
+
+        $scope.showButtonBar = angular.isDefined($attrs.showButtonBar) ?
+          $scope.$parent.$eval($attrs.showButtonBar) :
+          datepickerPopupConfig.showButtonBar;
+
+        if (datepickerPopupConfig.html5Types[$attrs.type]) {
+          dateFormat = datepickerPopupConfig.html5Types[$attrs.type];
+          isHtml5DateInput = true;
+        } else {
+          dateFormat = $attrs.uibDatepickerPopup || datepickerPopupConfig.datepickerPopup;
+          $attrs.$observe('uibDatepickerPopup', function(value, oldValue) {
+            var newDateFormat = value || datepickerPopupConfig.datepickerPopup;
+            // Invalidate the $modelValue to ensure that formatters re-run
+            // FIXME: Refactor when PR is merged: https://github.com/angular/angular.js/pull/10764
+            if (newDateFormat !== dateFormat) {
+              dateFormat = newDateFormat;
+              ngModel.$modelValue = null;
+
+              if (!dateFormat) {
+                throw new Error('uibDatepickerPopup must have a date format specified.');
+              }
+            }
+          });
+        }
+
+        if (!dateFormat) {
+          throw new Error('uibDatepickerPopup must have a date format specified.');
+        }
+
+        if (isHtml5DateInput && $attrs.uibDatepickerPopup) {
+          throw new Error('HTML5 date input types do not support custom formats.');
+        }
+
+        // popup element used to display calendar
+        popupEl = angular.element('<div uib-datepicker-popup-wrap><div uib-datepicker></div></div>');
+
+        popupEl.attr({
+          'ng-model': 'date',
+          'ng-change': 'dateSelection(date)',
+          'template-url': datepickerPopupTemplateUrl
+        });
+
+        // datepicker element
+        datepickerEl = angular.element(popupEl.children()[0]);
+        datepickerEl.attr('template-url', datepickerTemplateUrl);
+
+        if (!$scope.datepickerOptions) {
+          $scope.datepickerOptions = {};
+        }
+
+        if (isHtml5DateInput) {
+          if ($attrs.type === 'month') {
+            $scope.datepickerOptions.datepickerMode = 'month';
+            $scope.datepickerOptions.minMode = 'month';
+          }
+        }
+
+        datepickerEl.attr('datepicker-options', 'datepickerOptions');
+
+        if (!isHtml5DateInput) {
+          // Internal API to maintain the correct ng-invalid-[key] class
+          ngModel.$$parserName = 'date';
+          ngModel.$validators.date = validator;
+          ngModel.$parsers.unshift(parseDate);
+          ngModel.$formatters.push(function(value) {
+            if (ngModel.$isEmpty(value)) {
+              $scope.date = value;
+              return value;
+            }
+
+            if (angular.isNumber(value)) {
+              value = new Date(value);
+            }
+
+            $scope.date = dateParser.fromTimezone(value, ngModelOptions.getOption('timezone'));
+
+            return dateParser.filter($scope.date, dateFormat);
+          });
+        } else {
+          ngModel.$formatters.push(function(value) {
+            $scope.date = dateParser.fromTimezone(value, ngModelOptions.getOption('timezone'));
+            return value;
+          });
+        }
+
+        // Detect changes in the view from the text box
+        ngModel.$viewChangeListeners.push(function() {
+          $scope.date = parseDateString(ngModel.$viewValue);
+        });
+
+        $element.on('keydown', inputKeydownBind);
+
+        $popup = $compile(popupEl)($scope);
+        // Prevent jQuery cache memory leak (template is now redundant after linking)
+        popupEl.remove();
+
+        if (appendToBody) {
+          $document.find('body').append($popup);
+        } else {
+          $element.after($popup);
+        }
+
+        $scope.$on('$destroy', function() {
+          if ($scope.isOpen === true) {
+            if (!$rootScope.$$phase) {
+              $scope.$apply(function() {
+                $scope.isOpen = false;
+              });
+            }
+          }
+
+          $popup.remove();
+          $element.off('keydown', inputKeydownBind);
+          $document.off('click', documentClickBind);
+          if (scrollParentEl) {
+            scrollParentEl.off('scroll', positionPopup);
+          }
+          angular.element($window).off('resize', positionPopup);
+
+          //Clear all watch listeners on destroy
+          while (watchListeners.length) {
+            watchListeners.shift()();
+          }
+        });
+      };
+
+      $scope.getText = function(key) {
+        return $scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
+      };
+
+      $scope.isDisabled = function(date) {
+        if (date === 'today') {
+          date = dateParser.fromTimezone(new Date(), ngModelOptions.getOption('timezone'));
+        }
+
+        var dates = {};
+        angular.forEach(['minDate', 'maxDate'], function(key) {
+          if (!$scope.datepickerOptions[key]) {
+            dates[key] = null;
+          } else if (angular.isDate($scope.datepickerOptions[key])) {
+            dates[key] = new Date($scope.datepickerOptions[key]);
+          } else {
+            if ($datepickerPopupLiteralWarning) {
+              $log.warn('Literal date support has been deprecated, please switch to date object usage');
+            }
+
+            dates[key] = new Date(dateFilter($scope.datepickerOptions[key], 'medium'));
+          }
+        });
+
+        return $scope.datepickerOptions &&
+          dates.minDate && $scope.compare(date, dates.minDate) < 0 ||
+          dates.maxDate && $scope.compare(date, dates.maxDate) > 0;
+      };
+
+      $scope.compare = function(date1, date2) {
+        return new Date(date1.getFullYear(), date1.getMonth(), date1.getDate()) - new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+      };
+
+      // Inner change
+      $scope.dateSelection = function(dt) {
+        $scope.date = dt;
+        var date = $scope.date ? dateParser.filter($scope.date, dateFormat) : null; // Setting to NULL is necessary for form validators to function
+        $element.val(date);
+        ngModel.$setViewValue(date);
+
+        if (closeOnDateSelection) {
+          $scope.isOpen = false;
+          $element[0].focus();
+        }
+      };
+
+      $scope.keydown = function(evt) {
+        if (evt.which === 27) {
+          evt.stopPropagation();
+          $scope.isOpen = false;
+          $element[0].focus();
+        }
+      };
+
+      $scope.select = function(date, evt) {
+        evt.stopPropagation();
+
+        if (date === 'today') {
+          var today = new Date();
+          if (angular.isDate($scope.date)) {
+            date = new Date($scope.date);
+            date.setFullYear(today.getFullYear(), today.getMonth(), today.getDate());
+          } else {
+            date = dateParser.fromTimezone(today, ngModelOptions.getOption('timezone'));
+            date.setHours(0, 0, 0, 0);
+          }
+        }
+        $scope.dateSelection(date);
+      };
+
+      $scope.close = function(evt) {
+        evt.stopPropagation();
+
+        $scope.isOpen = false;
+        $element[0].focus();
+      };
+
+      $scope.disabled = angular.isDefined($attrs.disabled) || false;
+      if ($attrs.ngDisabled) {
+        watchListeners.push($scope.$parent.$watch($parse($attrs.ngDisabled), function(disabled) {
+          $scope.disabled = disabled;
+        }));
+      }
+
+      $scope.$watch('isOpen', function(value) {
+        if (value) {
+          if (!$scope.disabled) {
+            $timeout(function() {
+              positionPopup();
+
+              if (onOpenFocus) {
+                $scope.$broadcast('uib:datepicker.focus');
+              }
+
+              $document.on('click', documentClickBind);
+
+              var placement = $attrs.popupPlacement ? $attrs.popupPlacement : datepickerPopupConfig.placement;
+              if (appendToBody || $position.parsePlacement(placement)[2]) {
+                scrollParentEl = scrollParentEl || angular.element($position.scrollParent($element));
+                if (scrollParentEl) {
+                  scrollParentEl.on('scroll', positionPopup);
+                }
+              } else {
+                scrollParentEl = null;
+              }
+
+              angular.element($window).on('resize', positionPopup);
+            }, 0, false);
+          } else {
+            $scope.isOpen = false;
+          }
+        } else {
+          $document.off('click', documentClickBind);
+          if (scrollParentEl) {
+            scrollParentEl.off('scroll', positionPopup);
+          }
+          angular.element($window).off('resize', positionPopup);
+        }
+      });
+
+      function cameltoDash(string) {
+        return string.replace(/([A-Z])/g, function($1) { return '-' + $1.toLowerCase(); });
+      }
+
+      function parseDateString(viewValue) {
+        var date = dateParser.parse(viewValue, dateFormat, $scope.date);
+        if (isNaN(date)) {
+          for (var i = 0; i < altInputFormats.length; i++) {
+            date = dateParser.parse(viewValue, altInputFormats[i], $scope.date);
+            if (!isNaN(date)) {
+              return date;
+            }
+          }
+        }
+        return date;
+      }
+
+      function parseDate(viewValue) {
+        if (angular.isNumber(viewValue)) {
+          // presumably timestamp to date object
+          viewValue = new Date(viewValue);
+        }
+
+        if (!viewValue) {
+          return null;
+        }
+
+        if (angular.isDate(viewValue) && !isNaN(viewValue)) {
+          return viewValue;
+        }
+
+        if (angular.isString(viewValue)) {
+          var date = parseDateString(viewValue);
+          if (!isNaN(date)) {
+            return dateParser.toTimezone(date, ngModelOptions.getOption('timezone'));
+          }
+        }
+
+        return ngModelOptions.getOption('allowInvalid') ? viewValue : undefined;
+      }
+
+      function validator(modelValue, viewValue) {
+        var value = modelValue || viewValue;
+
+        if (!$attrs.ngRequired && !value) {
+          return true;
+        }
+
+        if (angular.isNumber(value)) {
+          value = new Date(value);
+        }
+
+        if (!value) {
+          return true;
+        }
+
+        if (angular.isDate(value) && !isNaN(value)) {
+          return true;
+        }
+
+        if (angular.isString(value)) {
+          return !isNaN(parseDateString(value));
+        }
+
+        return false;
+      }
+
+      function documentClickBind(event) {
+        if (!$scope.isOpen && $scope.disabled) {
+          return;
+        }
+
+        var popup = $popup[0];
+        var dpContainsTarget = $element[0].contains(event.target);
+        // The popup node may not be an element node
+        // In some browsers (IE) only element nodes have the 'contains' function
+        var popupContainsTarget = popup.contains !== undefined && popup.contains(event.target);
+        if ($scope.isOpen && !(dpContainsTarget || popupContainsTarget)) {
+          $scope.$apply(function() {
+            $scope.isOpen = false;
+          });
+        }
+      }
+
+      function inputKeydownBind(evt) {
+        if (evt.which === 27 && $scope.isOpen) {
+          evt.preventDefault();
+          evt.stopPropagation();
+          $scope.$apply(function() {
+            $scope.isOpen = false;
+          });
+          $element[0].focus();
+        } else if (evt.which === 40 && !$scope.isOpen) {
+          evt.preventDefault();
+          evt.stopPropagation();
+          $scope.$apply(function() {
+            $scope.isOpen = true;
+          });
+        }
+      }
+
+      function positionPopup() {
+        if ($scope.isOpen) {
+          var dpElement = angular.element($popup[0].querySelector('.uib-datepicker-popup'));
+          var placement = $attrs.popupPlacement ? $attrs.popupPlacement : datepickerPopupConfig.placement;
+          var position = $position.positionElements($element, dpElement, placement, appendToBody);
+          dpElement.css({top: position.top + 'px', left: position.left + 'px'});
+          if (dpElement.hasClass('uib-position-measure')) {
+            dpElement.removeClass('uib-position-measure');
+          }
+        }
+      }
+
+      function extractOptions(ngModelCtrl) {
+        var ngModelOptions;
+
+        if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
+          // guarantee a value
+          ngModelOptions = angular.isObject(ngModelCtrl.$options) ?
+            ngModelCtrl.$options :
+            {
+              timezone: null
+            };
+
+          // mimic 1.6+ api
+          ngModelOptions.getOption = function (key) {
+            return ngModelOptions[key];
+          };
+        } else { // in angular >=1.6 $options is always present
+          ngModelOptions = ngModelCtrl.$options;
+        }
+
+        return ngModelOptions;
+      }
+
+      $scope.$on('uib:datepicker.mode', function() {
+        $timeout(positionPopup, 0, false);
+      });
+    }])
+
+  .directive('uibDatepickerPopup', function() {
+    return {
+      require: ['ngModel', 'uibDatepickerPopup'],
+      controller: 'UibDatepickerPopupController',
+      scope: {
+        datepickerOptions: '=?',
+        isOpen: '=?',
+        currentText: '@',
+        clearText: '@',
+        closeText: '@'
+      },
+      link: function(scope, element, attrs, ctrls) {
+        var ngModel = ctrls[0],
+          ctrl = ctrls[1];
+
+        ctrl.init(ngModel);
+      }
+    };
+  })
+
+  .directive('uibDatepickerPopupWrap', function() {
+    return {
+      restrict: 'A',
+      transclude: true,
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/datepickerPopup/popup.html';
+      }
+    };
+  });
+
+angular.module('ui.bootstrap.debounce', [])
+/**
+ * A helper, internal service that debounces a function
+ */
+  .factory('$$debounce', ['$timeout', function($timeout) {
+    return function(callback, debounceTime) {
+      var timeoutPromise;
+
+      return function() {
+        var self = this;
+        var args = Array.prototype.slice.call(arguments);
+        if (timeoutPromise) {
+          $timeout.cancel(timeoutPromise);
+        }
+
+        timeoutPromise = $timeout(function() {
+          callback.apply(self, args);
+        }, debounceTime);
+      };
+    };
+  }]);
+
+angular.module('ui.bootstrap.multiMap', [])
+/**
+ * A helper, internal data structure that stores all references attached to key
+ */
+  .factory('$$multiMap', function() {
+    return {
+      createNew: function() {
+        var map = {};
+
+        return {
+          entries: function() {
+            return Object.keys(map).map(function(key) {
+              return {
+                key: key,
+                value: map[key]
+              };
+            });
+          },
+          get: function(key) {
+            return map[key];
+          },
+          hasKey: function(key) {
+            return !!map[key];
+          },
+          keys: function() {
+            return Object.keys(map);
+          },
+          put: function(key, value) {
+            if (!map[key]) {
+              map[key] = [];
+            }
+
+            map[key].push(value);
+          },
+          remove: function(key, value) {
+            var values = map[key];
+
+            if (!values) {
+              return;
+            }
+
+            var idx = values.indexOf(value);
+
+            if (idx !== -1) {
+              values.splice(idx, 1);
+            }
+
+            if (!values.length) {
+              delete map[key];
             }
           }
         };
-      }])
+      }
+    };
+  });
 
-    .directive('datepickerPopupWrap', function() {
-      return {
-        restrict:'EA',
-        replace: true,
-        transclude: true,
-        templateUrl: 'template/datepicker/popup.html',
-        link:function (scope, element, attrs) {
-          element.bind('click', function(event) {
-            event.preventDefault();
-            event.stopPropagation();
+angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.position'])
+
+  .constant('uibDropdownConfig', {
+    appendToOpenClass: 'uib-dropdown-open',
+    openClass: 'open'
+  })
+
+  .service('uibDropdownService', ['$document', '$rootScope', '$$multiMap', function($document, $rootScope, $$multiMap) {
+    var openScope = null;
+    var openedContainers = $$multiMap.createNew();
+
+    this.isOnlyOpen = function(dropdownScope, appendTo) {
+      var openedDropdowns = openedContainers.get(appendTo);
+      if (openedDropdowns) {
+        var openDropdown = openedDropdowns.reduce(function(toClose, dropdown) {
+          if (dropdown.scope === dropdownScope) {
+            return dropdown;
+          }
+
+          return toClose;
+        }, {});
+        if (openDropdown) {
+          return openedDropdowns.length === 1;
+        }
+      }
+
+      return false;
+    };
+
+    this.open = function(dropdownScope, element, appendTo) {
+      if (!openScope) {
+        $document.on('click', closeDropdown);
+      }
+
+      if (openScope && openScope !== dropdownScope) {
+        openScope.isOpen = false;
+      }
+
+      openScope = dropdownScope;
+
+      if (!appendTo) {
+        return;
+      }
+
+      var openedDropdowns = openedContainers.get(appendTo);
+      if (openedDropdowns) {
+        var openedScopes = openedDropdowns.map(function(dropdown) {
+          return dropdown.scope;
+        });
+        if (openedScopes.indexOf(dropdownScope) === -1) {
+          openedContainers.put(appendTo, {
+            scope: dropdownScope
           });
         }
-      };
-    });
+      } else {
+        openedContainers.put(appendTo, {
+          scope: dropdownScope
+        });
+      }
+    };
 
-/*
- * dropdownToggle - Provides dropdown menu functionality in place of bootstrap js
- * @restrict class or attribute
- * @example:
- <li class="dropdown">
- <a class="dropdown-toggle">My Dropdown Menu</a>
- <ul class="dropdown-menu">
- <li ng-repeat="choice in dropChoices">
- <a ng-href="{{choice.href}}">{{choice.text}}</a>
- </li>
- </ul>
- </li>
- */
+    this.close = function(dropdownScope, element, appendTo) {
+      if (openScope === dropdownScope) {
+        $document.off('click', closeDropdown);
+        $document.off('keydown', this.keybindFilter);
+        openScope = null;
+      }
 
-angular.module('ui.bootstrap.dropdownToggle', []).directive('dropdownToggle', ['$document', '$location', function ($document, $location) {
-  var openElement = null,
-      closeMenu   = angular.noop;
-  return {
-    restrict: 'CA',
-    link: function(scope, element, attrs) {
-      scope.$watch('$location.path', function() { closeMenu(); });
-      element.parent().bind('click', function() { closeMenu(); });
-      element.bind('click', function (event) {
+      if (!appendTo) {
+        return;
+      }
 
-        var elementWasOpen = (element === openElement);
+      var openedDropdowns = openedContainers.get(appendTo);
+      if (openedDropdowns) {
+        var dropdownToClose = openedDropdowns.reduce(function(toClose, dropdown) {
+          if (dropdown.scope === dropdownScope) {
+            return dropdown;
+          }
 
-        event.preventDefault();
-        event.stopPropagation();
-
-        if (!!openElement) {
-          closeMenu();
+          return toClose;
+        }, {});
+        if (dropdownToClose) {
+          openedContainers.remove(appendTo, dropdownToClose);
         }
+      }
+    };
 
-        if (!elementWasOpen && !element.hasClass('disabled') && !element.prop('disabled')) {
-          element.parent().addClass('open');
-          openElement = element;
-          closeMenu = function (event) {
-            if (event) {
-              event.preventDefault();
-              event.stopPropagation();
-            }
-            $document.unbind('click', closeMenu);
-            element.parent().removeClass('open');
-            closeMenu = angular.noop;
-            openElement = null;
-          };
-          $document.bind('click', closeMenu);
+    var closeDropdown = function(evt) {
+      // This method may still be called during the same mouse event that
+      // unbound this event handler. So check openScope before proceeding.
+      if (!openScope || !openScope.isOpen) { return; }
+
+      if (evt && openScope.getAutoClose() === 'disabled') { return; }
+
+      if (evt && evt.which === 3) { return; }
+
+      var toggleElement = openScope.getToggleElement();
+      if (evt && toggleElement && toggleElement[0].contains(evt.target)) {
+        return;
+      }
+
+      var dropdownElement = openScope.getDropdownElement();
+      if (evt && openScope.getAutoClose() === 'outsideClick' &&
+        dropdownElement && dropdownElement[0].contains(evt.target)) {
+        return;
+      }
+
+      openScope.focusToggleElement();
+      openScope.isOpen = false;
+
+      if (!$rootScope.$$phase) {
+        openScope.$apply();
+      }
+    };
+
+    this.keybindFilter = function(evt) {
+      if (!openScope) {
+        // see this.close as ESC could have been pressed which kills the scope so we can not proceed
+        return;
+      }
+
+      var dropdownElement = openScope.getDropdownElement();
+      var toggleElement = openScope.getToggleElement();
+      var dropdownElementTargeted = dropdownElement && dropdownElement[0].contains(evt.target);
+      var toggleElementTargeted = toggleElement && toggleElement[0].contains(evt.target);
+      if (evt.which === 27) {
+        evt.stopPropagation();
+        openScope.focusToggleElement();
+        closeDropdown();
+      } else if (openScope.isKeynavEnabled() && [38, 40].indexOf(evt.which) !== -1 && openScope.isOpen && (dropdownElementTargeted || toggleElementTargeted)) {
+        evt.preventDefault();
+        evt.stopPropagation();
+        openScope.focusDropdownEntry(evt.which);
+      }
+    };
+  }])
+
+  .controller('UibDropdownController', ['$scope', '$element', '$attrs', '$parse', 'uibDropdownConfig', 'uibDropdownService', '$animate', '$uibPosition', '$document', '$compile', '$templateRequest', function($scope, $element, $attrs, $parse, dropdownConfig, uibDropdownService, $animate, $position, $document, $compile, $templateRequest) {
+    var self = this,
+      scope = $scope.$new(), // create a child scope so we are not polluting original one
+      templateScope,
+      appendToOpenClass = dropdownConfig.appendToOpenClass,
+      openClass = dropdownConfig.openClass,
+      getIsOpen,
+      setIsOpen = angular.noop,
+      toggleInvoker = $attrs.onToggle ? $parse($attrs.onToggle) : angular.noop,
+      keynavEnabled = false,
+      selectedOption = null,
+      body = $document.find('body');
+
+    $element.addClass('dropdown');
+
+    this.init = function() {
+      if ($attrs.isOpen) {
+        getIsOpen = $parse($attrs.isOpen);
+        setIsOpen = getIsOpen.assign;
+
+        $scope.$watch(getIsOpen, function(value) {
+          scope.isOpen = !!value;
+        });
+      }
+
+      keynavEnabled = angular.isDefined($attrs.keyboardNav);
+    };
+
+    this.toggle = function(open) {
+      scope.isOpen = arguments.length ? !!open : !scope.isOpen;
+      if (angular.isFunction(setIsOpen)) {
+        setIsOpen(scope, scope.isOpen);
+      }
+
+      return scope.isOpen;
+    };
+
+    // Allow other directives to watch status
+    this.isOpen = function() {
+      return scope.isOpen;
+    };
+
+    scope.getToggleElement = function() {
+      return self.toggleElement;
+    };
+
+    scope.getAutoClose = function() {
+      return $attrs.autoClose || 'always'; //or 'outsideClick' or 'disabled'
+    };
+
+    scope.getElement = function() {
+      return $element;
+    };
+
+    scope.isKeynavEnabled = function() {
+      return keynavEnabled;
+    };
+
+    scope.focusDropdownEntry = function(keyCode) {
+      var elems = self.dropdownMenu ? //If append to body is used.
+        angular.element(self.dropdownMenu).find('a') :
+        $element.find('ul').eq(0).find('a');
+
+      switch (keyCode) {
+        case 40: {
+          if (!angular.isNumber(self.selectedOption)) {
+            self.selectedOption = 0;
+          } else {
+            self.selectedOption = self.selectedOption === elems.length - 1 ?
+              self.selectedOption :
+              self.selectedOption + 1;
+          }
+          break;
         }
-      });
+        case 38: {
+          if (!angular.isNumber(self.selectedOption)) {
+            self.selectedOption = elems.length - 1;
+          } else {
+            self.selectedOption = self.selectedOption === 0 ?
+              0 : self.selectedOption - 1;
+          }
+          break;
+        }
+      }
+      elems[self.selectedOption].focus();
+    };
+
+    scope.getDropdownElement = function() {
+      return self.dropdownMenu;
+    };
+
+    scope.focusToggleElement = function() {
+      if (self.toggleElement) {
+        self.toggleElement[0].focus();
+      }
+    };
+
+    function removeDropdownMenu() {
+      $element.append(self.dropdownMenu);
     }
-  };
-}]);
 
-angular.module('ui.bootstrap.modal', [])
+    scope.$watch('isOpen', function(isOpen, wasOpen) {
+      var appendTo = null,
+        appendToBody = false;
 
+      if (angular.isDefined($attrs.dropdownAppendTo)) {
+        var appendToEl = $parse($attrs.dropdownAppendTo)(scope);
+        if (appendToEl) {
+          appendTo = angular.element(appendToEl);
+        }
+      }
+
+      if (angular.isDefined($attrs.dropdownAppendToBody)) {
+        var appendToBodyValue = $parse($attrs.dropdownAppendToBody)(scope);
+        if (appendToBodyValue !== false) {
+          appendToBody = true;
+        }
+      }
+
+      if (appendToBody && !appendTo) {
+        appendTo = body;
+      }
+
+      if (appendTo && self.dropdownMenu) {
+        if (isOpen) {
+          appendTo.append(self.dropdownMenu);
+          $element.on('$destroy', removeDropdownMenu);
+        } else {
+          $element.off('$destroy', removeDropdownMenu);
+          removeDropdownMenu();
+        }
+      }
+
+      if (appendTo && self.dropdownMenu) {
+        var pos = $position.positionElements($element, self.dropdownMenu, 'bottom-left', true),
+          css,
+          rightalign,
+          scrollbarPadding,
+          scrollbarWidth = 0;
+
+        css = {
+          top: pos.top + 'px',
+          display: isOpen ? 'block' : 'none'
+        };
+
+        rightalign = self.dropdownMenu.hasClass('dropdown-menu-right');
+        if (!rightalign) {
+          css.left = pos.left + 'px';
+          css.right = 'auto';
+        } else {
+          css.left = 'auto';
+          scrollbarPadding = $position.scrollbarPadding(appendTo);
+
+          if (scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
+            scrollbarWidth = scrollbarPadding.scrollbarWidth;
+          }
+
+          css.right = window.innerWidth - scrollbarWidth -
+            (pos.left + $element.prop('offsetWidth')) + 'px';
+        }
+
+        // Need to adjust our positioning to be relative to the appendTo container
+        // if it's not the body element
+        if (!appendToBody) {
+          var appendOffset = $position.offset(appendTo);
+
+          css.top = pos.top - appendOffset.top + 'px';
+
+          if (!rightalign) {
+            css.left = pos.left - appendOffset.left + 'px';
+          } else {
+            css.right = window.innerWidth -
+              (pos.left - appendOffset.left + $element.prop('offsetWidth')) + 'px';
+          }
+        }
+
+        self.dropdownMenu.css(css);
+      }
+
+      var openContainer = appendTo ? appendTo : $element;
+      var dropdownOpenClass = appendTo ? appendToOpenClass : openClass;
+      var hasOpenClass = openContainer.hasClass(dropdownOpenClass);
+      var isOnlyOpen = uibDropdownService.isOnlyOpen($scope, appendTo);
+
+      if (hasOpenClass === !isOpen) {
+        var toggleClass;
+        if (appendTo) {
+          toggleClass = !isOnlyOpen ? 'addClass' : 'removeClass';
+        } else {
+          toggleClass = isOpen ? 'addClass' : 'removeClass';
+        }
+        $animate[toggleClass](openContainer, dropdownOpenClass).then(function() {
+          if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
+            toggleInvoker($scope, { open: !!isOpen });
+          }
+        });
+      }
+
+      if (isOpen) {
+        if (self.dropdownMenuTemplateUrl) {
+          $templateRequest(self.dropdownMenuTemplateUrl).then(function(tplContent) {
+            templateScope = scope.$new();
+            $compile(tplContent.trim())(templateScope, function(dropdownElement) {
+              var newEl = dropdownElement;
+              self.dropdownMenu.replaceWith(newEl);
+              self.dropdownMenu = newEl;
+              $document.on('keydown', uibDropdownService.keybindFilter);
+            });
+          });
+        } else {
+          $document.on('keydown', uibDropdownService.keybindFilter);
+        }
+
+        scope.focusToggleElement();
+        uibDropdownService.open(scope, $element, appendTo);
+      } else {
+        uibDropdownService.close(scope, $element, appendTo);
+        if (self.dropdownMenuTemplateUrl) {
+          if (templateScope) {
+            templateScope.$destroy();
+          }
+          var newEl = angular.element('<ul class="dropdown-menu"></ul>');
+          self.dropdownMenu.replaceWith(newEl);
+          self.dropdownMenu = newEl;
+        }
+
+        self.selectedOption = null;
+      }
+
+      if (angular.isFunction(setIsOpen)) {
+        setIsOpen($scope, isOpen);
+      }
+    });
+  }])
+
+  .directive('uibDropdown', function() {
+    return {
+      controller: 'UibDropdownController',
+      link: function(scope, element, attrs, dropdownCtrl) {
+        dropdownCtrl.init();
+      }
+    };
+  })
+
+  .directive('uibDropdownMenu', function() {
+    return {
+      restrict: 'A',
+      require: '?^uibDropdown',
+      link: function(scope, element, attrs, dropdownCtrl) {
+        if (!dropdownCtrl || angular.isDefined(attrs.dropdownNested)) {
+          return;
+        }
+
+        element.addClass('dropdown-menu');
+
+        var tplUrl = attrs.templateUrl;
+        if (tplUrl) {
+          dropdownCtrl.dropdownMenuTemplateUrl = tplUrl;
+        }
+
+        if (!dropdownCtrl.dropdownMenu) {
+          dropdownCtrl.dropdownMenu = element;
+        }
+      }
+    };
+  })
+
+  .directive('uibDropdownToggle', function() {
+    return {
+      require: '?^uibDropdown',
+      link: function(scope, element, attrs, dropdownCtrl) {
+        if (!dropdownCtrl) {
+          return;
+        }
+
+        element.addClass('dropdown-toggle');
+
+        dropdownCtrl.toggleElement = element;
+
+        var toggleDropdown = function(event) {
+          event.preventDefault();
+
+          if (!element.hasClass('disabled') && !attrs.disabled) {
+            scope.$apply(function() {
+              dropdownCtrl.toggle();
+            });
+          }
+        };
+
+        element.on('click', toggleDropdown);
+
+        // WAI-ARIA
+        element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
+        scope.$watch(dropdownCtrl.isOpen, function(isOpen) {
+          element.attr('aria-expanded', !!isOpen);
+        });
+
+        scope.$on('$destroy', function() {
+          element.off('click', toggleDropdown);
+        });
+      }
+    };
+  });
+
+angular.module('ui.bootstrap.stackedMap', [])
 /**
  * A helper, internal data structure that acts as a map but also allows getting / removing
  * elements in the LIFO order
  */
-    .factory('$$stackedMap', function () {
-      return {
-        createNew: function () {
-          var stack = [];
+  .factory('$$stackedMap', function() {
+    return {
+      createNew: function() {
+        var stack = [];
 
-          return {
-            add: function (key, value) {
-              stack.push({
-                key: key,
-                value: value
-              });
-            },
-            get: function (key) {
-              for (var i = 0; i < stack.length; i++) {
-                if (key == stack[i].key) {
-                  return stack[i];
-                }
+        return {
+          add: function(key, value) {
+            stack.push({
+              key: key,
+              value: value
+            });
+          },
+          get: function(key) {
+            for (var i = 0; i < stack.length; i++) {
+              if (key === stack[i].key) {
+                return stack[i];
               }
-            },
-            keys: function() {
-              var keys = [];
-              for (var i = 0; i < stack.length; i++) {
-                keys.push(stack[i].key);
-              }
-              return keys;
-            },
-            top: function () {
-              return stack[stack.length - 1];
-            },
-            remove: function (key) {
-              var idx = -1;
-              for (var i = 0; i < stack.length; i++) {
-                if (key == stack[i].key) {
-                  idx = i;
-                  break;
-                }
-              }
-              return stack.splice(idx, 1)[0];
-            },
-            removeTop: function () {
-              return stack.splice(stack.length - 1, 1)[0];
-            },
-            length: function () {
-              return stack.length;
             }
-          };
-        }
-      };
-    })
-
+          },
+          keys: function() {
+            var keys = [];
+            for (var i = 0; i < stack.length; i++) {
+              keys.push(stack[i].key);
+            }
+            return keys;
+          },
+          top: function() {
+            return stack[stack.length - 1];
+          },
+          remove: function(key) {
+            var idx = -1;
+            for (var i = 0; i < stack.length; i++) {
+              if (key === stack[i].key) {
+                idx = i;
+                break;
+              }
+            }
+            return stack.splice(idx, 1)[0];
+          },
+          removeTop: function() {
+            return stack.pop();
+          },
+          length: function() {
+            return stack.length;
+          }
+        };
+      }
+    };
+  });
+angular.module('ui.bootstrap.modal', ['ui.bootstrap.multiMap', 'ui.bootstrap.stackedMap', 'ui.bootstrap.position'])
 /**
- * A helper directive for the $modal service. It creates a backdrop element.
+ * Pluggable resolve mechanism for the modal resolve resolution
+ * Supports UI Router's $resolve service
  */
-    .directive('modalBackdrop', ['$timeout', function ($timeout) {
+  .provider('$uibResolve', function() {
+    var resolve = this;
+    this.resolver = null;
+
+    this.setResolver = function(resolver) {
+      this.resolver = resolver;
+    };
+
+    this.$get = ['$injector', '$q', function($injector, $q) {
+      var resolver = resolve.resolver ? $injector.get(resolve.resolver) : null;
       return {
-        restrict: 'EA',
-        replace: true,
-        templateUrl: 'template/modal/backdrop.html',
-        link: function (scope) {
+        resolve: function(invocables, locals, parent, self) {
+          if (resolver) {
+            return resolver.resolve(invocables, locals, parent, self);
+          }
 
-          scope.animate = false;
+          var promises = [];
 
-          //trigger CSS transitions
-          $timeout(function () {
-            scope.animate = true;
+          angular.forEach(invocables, function(value) {
+            if (angular.isFunction(value) || angular.isArray(value)) {
+              promises.push($q.resolve($injector.invoke(value)));
+            } else if (angular.isString(value)) {
+              promises.push($q.resolve($injector.get(value)));
+            } else {
+              promises.push($q.resolve(value));
+            }
+          });
+
+          return $q.all(promises).then(function(resolves) {
+            var resolveObj = {};
+            var resolveIter = 0;
+            angular.forEach(invocables, function(value, key) {
+              resolveObj[key] = resolves[resolveIter++];
+            });
+
+            return resolveObj;
           });
         }
       };
+    }];
+  })
+
+  /**
+   * A helper directive for the $modal service. It creates a backdrop element.
+   */
+  .directive('uibModalBackdrop', ['$animate', '$injector', '$uibModalStack',
+    function($animate, $injector, $modalStack) {
+      return {
+        restrict: 'A',
+        compile: function(tElement, tAttrs) {
+          tElement.addClass(tAttrs.backdropClass);
+          return linkFn;
+        }
+      };
+
+      function linkFn(scope, element, attrs) {
+        if (attrs.modalInClass) {
+          $animate.addClass(element, attrs.modalInClass);
+
+          scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) {
+            var done = setIsAsync();
+            if (scope.modalOptions.animation) {
+              $animate.removeClass(element, attrs.modalInClass).then(done);
+            } else {
+              done();
+            }
+          });
+        }
+      }
     }])
 
-    .directive('modalWindow', ['$modalStack', '$timeout', function ($modalStack, $timeout) {
+  .directive('uibModalWindow', ['$uibModalStack', '$q', '$animateCss', '$document',
+    function($modalStack, $q, $animateCss, $document) {
       return {
-        restrict: 'EA',
         scope: {
           index: '@'
         },
-        replace: true,
+        restrict: 'A',
         transclude: true,
-        templateUrl: 'template/modal/window.html',
-        link: function (scope, element, attrs) {
-          scope.windowClass = attrs.windowClass || '';
+        templateUrl: function(tElement, tAttrs) {
+          return tAttrs.templateUrl || 'uib/template/modal/window.html';
+        },
+        link: function(scope, element, attrs) {
+          element.addClass(attrs.windowTopClass || '');
+          scope.size = attrs.size;
 
-          $timeout(function () {
-            // trigger CSS transitions
-            scope.animate = true;
-            // focus a freshly-opened modal
-            element[0].focus();
-          });
-
-          scope.close = function (evt) {
+          scope.close = function(evt) {
             var modal = $modalStack.getTop();
-            if (modal && modal.value.backdrop && modal.value.backdrop != 'static' && (evt.target === evt.currentTarget)) {
+            if (modal && modal.value.backdrop &&
+              modal.value.backdrop !== 'static' &&
+              evt.target === evt.currentTarget) {
               evt.preventDefault();
               evt.stopPropagation();
               $modalStack.dismiss(modal.key, 'backdrop click');
             }
           };
+
+          // moved from template to fix issue #2280
+          element.on('click', scope.close);
+
+          // This property is only added to the scope for the purpose of detecting when this directive is rendered.
+          // We can detect that by using this property in the template associated with this directive and then use
+          // {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.
+          scope.$isRendered = true;
+
+          // Deferred object that will be resolved when this modal is rendered.
+          var modalRenderDeferObj = $q.defer();
+          // Resolve render promise post-digest
+          scope.$$postDigest(function() {
+            modalRenderDeferObj.resolve();
+          });
+
+          modalRenderDeferObj.promise.then(function() {
+            var animationPromise = null;
+
+            if (attrs.modalInClass) {
+              animationPromise = $animateCss(element, {
+                addClass: attrs.modalInClass
+              }).start();
+
+              scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) {
+                var done = setIsAsync();
+                $animateCss(element, {
+                  removeClass: attrs.modalInClass
+                }).start().then(done);
+              });
+            }
+
+
+            $q.when(animationPromise).then(function() {
+              // Notify {@link $modalStack} that modal is rendered.
+              var modal = $modalStack.getTop();
+              if (modal) {
+                $modalStack.modalRendered(modal.key);
+              }
+
+              /**
+               * If something within the freshly-opened modal already has focus (perhaps via a
+               * directive that causes focus) then there's no need to try to focus anything.
+               */
+              if (!($document[0].activeElement && element[0].contains($document[0].activeElement))) {
+                var inputWithAutofocus = element[0].querySelector('[autofocus]');
+                /**
+                 * Auto-focusing of a freshly-opened modal element causes any child elements
+                 * with the autofocus attribute to lose focus. This is an issue on touch
+                 * based devices which will show and then hide the onscreen keyboard.
+                 * Attempts to refocus the autofocus element via JavaScript will not reopen
+                 * the onscreen keyboard. Fixed by updated the focusing logic to only autofocus
+                 * the modal element if the modal does not contain an autofocus element.
+                 */
+                if (inputWithAutofocus) {
+                  inputWithAutofocus.focus();
+                } else {
+                  element[0].focus();
+                }
+              }
+            });
+          });
         }
       };
     }])
 
-    .factory('$modalStack', ['$document', '$compile', '$rootScope', '$$stackedMap',
-      function ($document, $compile, $rootScope, $$stackedMap) {
+  .directive('uibModalAnimationClass', function() {
+    return {
+      compile: function(tElement, tAttrs) {
+        if (tAttrs.modalAnimation) {
+          tElement.addClass(tAttrs.uibModalAnimationClass);
+        }
+      }
+    };
+  })
 
-        var OPENED_MODAL_CLASS = 'modal-open';
+  .directive('uibModalTransclude', ['$animate', function($animate) {
+    return {
+      link: function(scope, element, attrs, controller, transclude) {
+        transclude(scope.$parent, function(clone) {
+          element.empty();
+          $animate.enter(clone, element);
+        });
+      }
+    };
+  }])
 
-        var backdropjqLiteEl, backdropDomEl;
-        var backdropScope = $rootScope.$new(true);
-        var openedWindows = $$stackedMap.createNew();
-        var $modalStack = {};
+  .factory('$uibModalStack', ['$animate', '$animateCss', '$document',
+    '$compile', '$rootScope', '$q', '$$multiMap', '$$stackedMap', '$uibPosition',
+    function($animate, $animateCss, $document, $compile, $rootScope, $q, $$multiMap, $$stackedMap, $uibPosition) {
+      var OPENED_MODAL_CLASS = 'modal-open';
 
-        function backdropIndex() {
-          var topBackdropIndex = -1;
-          var opened = openedWindows.keys();
-          for (var i = 0; i < opened.length; i++) {
-            if (openedWindows.get(opened[i]).value.backdrop) {
-              topBackdropIndex = i;
-            }
+      var backdropDomEl, backdropScope;
+      var openedWindows = $$stackedMap.createNew();
+      var openedClasses = $$multiMap.createNew();
+      var $modalStack = {
+        NOW_CLOSING_EVENT: 'modal.stack.now-closing'
+      };
+      var topModalIndex = 0;
+      var previousTopOpenedModal = null;
+      var ARIA_HIDDEN_ATTRIBUTE_NAME = 'data-bootstrap-modal-aria-hidden-count';
+
+      //Modal focus behavior
+      var tabbableSelector = 'a[href], area[href], input:not([disabled]):not([tabindex=\'-1\']), ' +
+        'button:not([disabled]):not([tabindex=\'-1\']),select:not([disabled]):not([tabindex=\'-1\']), textarea:not([disabled]):not([tabindex=\'-1\']), ' +
+        'iframe, object, embed, *[tabindex]:not([tabindex=\'-1\']), *[contenteditable=true]';
+      var scrollbarPadding;
+      var SNAKE_CASE_REGEXP = /[A-Z]/g;
+
+      // TODO: extract into common dependency with tooltip
+      function snake_case(name) {
+        var separator = '-';
+        return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
+          return (pos ? separator : '') + letter.toLowerCase();
+        });
+      }
+
+      function isVisible(element) {
+        return !!(element.offsetWidth ||
+          element.offsetHeight ||
+          element.getClientRects().length);
+      }
+
+      function backdropIndex() {
+        var topBackdropIndex = -1;
+        var opened = openedWindows.keys();
+        for (var i = 0; i < opened.length; i++) {
+          if (openedWindows.get(opened[i]).value.backdrop) {
+            topBackdropIndex = i;
           }
-          return topBackdropIndex;
         }
 
-        $rootScope.$watch(backdropIndex, function(newBackdropIndex){
+        // If any backdrop exist, ensure that it's index is always
+        // right below the top modal
+        if (topBackdropIndex > -1 && topBackdropIndex < topModalIndex) {
+          topBackdropIndex = topModalIndex;
+        }
+        return topBackdropIndex;
+      }
+
+      $rootScope.$watch(backdropIndex, function(newBackdropIndex) {
+        if (backdropScope) {
           backdropScope.index = newBackdropIndex;
-        });
+        }
+      });
 
-        function removeModalWindow(modalInstance) {
+      function removeModalWindow(modalInstance, elementToReceiveFocus) {
+        var modalWindow = openedWindows.get(modalInstance).value;
+        var appendToElement = modalWindow.appendTo;
 
-          var body = $document.find('body').eq(0);
-          var modalWindow = openedWindows.get(modalInstance).value;
-
-          //clean up the stack
-          openedWindows.remove(modalInstance);
-
-          //remove window DOM element
-          modalWindow.modalDomEl.remove();
-          body.toggleClass(OPENED_MODAL_CLASS, openedWindows.length() > 0);
-
-          //remove backdrop if no longer needed
-          if (backdropDomEl && backdropIndex() == -1) {
-            backdropDomEl.remove();
-            backdropDomEl = undefined;
-          }
-
-          //destroy scope
-          modalWindow.modalScope.$destroy();
+        //clean up the stack
+        openedWindows.remove(modalInstance);
+        previousTopOpenedModal = openedWindows.top();
+        if (previousTopOpenedModal) {
+          topModalIndex = parseInt(previousTopOpenedModal.value.modalDomEl.attr('index'), 10);
         }
 
-        $document.bind('keydown', function (evt) {
-          var modal;
-
-          if (evt.which === 27) {
-            modal = openedWindows.top();
-            if (modal && modal.value.keyboard) {
-              $rootScope.$apply(function () {
-                $modalStack.dismiss(modal.key);
-              });
+        removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
+          var modalBodyClass = modalWindow.openedClass || OPENED_MODAL_CLASS;
+          openedClasses.remove(modalBodyClass, modalInstance);
+          var areAnyOpen = openedClasses.hasKey(modalBodyClass);
+          appendToElement.toggleClass(modalBodyClass, areAnyOpen);
+          if (!areAnyOpen && scrollbarPadding && scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
+            if (scrollbarPadding.originalRight) {
+              appendToElement.css({paddingRight: scrollbarPadding.originalRight + 'px'});
+            } else {
+              appendToElement.css({paddingRight: ''});
             }
+            scrollbarPadding = null;
           }
-        });
+          toggleTopWindowClass(true);
+        }, modalWindow.closedDeferred);
+        checkRemoveBackdrop();
 
-        $modalStack.open = function (modalInstance, modal) {
+        //move focus to specified element if available, or else to body
+        if (elementToReceiveFocus && elementToReceiveFocus.focus) {
+          elementToReceiveFocus.focus();
+        } else if (appendToElement.focus) {
+          appendToElement.focus();
+        }
+      }
 
-          openedWindows.add(modalInstance, {
-            deferred: modal.deferred,
-            modalScope: modal.scope,
-            backdrop: modal.backdrop,
-            keyboard: modal.keyboard
+      // Add or remove "windowTopClass" from the top window in the stack
+      function toggleTopWindowClass(toggleSwitch) {
+        var modalWindow;
+
+        if (openedWindows.length() > 0) {
+          modalWindow = openedWindows.top().value;
+          modalWindow.modalDomEl.toggleClass(modalWindow.windowTopClass || '', toggleSwitch);
+        }
+      }
+
+      function checkRemoveBackdrop() {
+        //remove backdrop if no longer needed
+        if (backdropDomEl && backdropIndex() === -1) {
+          var backdropScopeRef = backdropScope;
+          removeAfterAnimate(backdropDomEl, backdropScope, function() {
+            backdropScopeRef = null;
+          });
+          backdropDomEl = undefined;
+          backdropScope = undefined;
+        }
+      }
+
+      function removeAfterAnimate(domEl, scope, done, closedDeferred) {
+        var asyncDeferred;
+        var asyncPromise = null;
+        var setIsAsync = function() {
+          if (!asyncDeferred) {
+            asyncDeferred = $q.defer();
+            asyncPromise = asyncDeferred.promise;
+          }
+
+          return function asyncDone() {
+            asyncDeferred.resolve();
+          };
+        };
+        scope.$broadcast($modalStack.NOW_CLOSING_EVENT, setIsAsync);
+
+        // Note that it's intentional that asyncPromise might be null.
+        // That's when setIsAsync has not been called during the
+        // NOW_CLOSING_EVENT broadcast.
+        return $q.when(asyncPromise).then(afterAnimating);
+
+        function afterAnimating() {
+          if (afterAnimating.done) {
+            return;
+          }
+          afterAnimating.done = true;
+
+          $animate.leave(domEl).then(function() {
+            if (done) {
+              done();
+            }
+
+            domEl.remove();
+            if (closedDeferred) {
+              closedDeferred.resolve();
+            }
           });
 
-          var body = $document.find('body').eq(0);
+          scope.$destroy();
+        }
+      }
 
-          if (backdropIndex() >= 0 && !backdropDomEl) {
-            backdropjqLiteEl = angular.element('<div modal-backdrop></div>');
-            backdropDomEl = $compile(backdropjqLiteEl)(backdropScope);
-            body.append(backdropDomEl);
-          }
+      $document.on('keydown', keydownListener);
 
-          var angularDomEl = angular.element('<div modal-window></div>');
-          angularDomEl.attr('window-class', modal.windowClass);
-          angularDomEl.attr('index', openedWindows.length() - 1);
-          angularDomEl.html(modal.content);
+      $rootScope.$on('$destroy', function() {
+        $document.off('keydown', keydownListener);
+      });
 
-          var modalDomEl = $compile(angularDomEl)(modal.scope);
-          openedWindows.top().value.modalDomEl = modalDomEl;
-          body.append(modalDomEl);
-          body.addClass(OPENED_MODAL_CLASS);
-        };
+      function keydownListener(evt) {
+        if (evt.isDefaultPrevented()) {
+          return evt;
+        }
 
-        $modalStack.close = function (modalInstance, result) {
-          var modalWindow = openedWindows.get(modalInstance).value;
-          if (modalWindow) {
-            modalWindow.deferred.resolve(result);
-            removeModalWindow(modalInstance);
-          }
-        };
-
-        $modalStack.dismiss = function (modalInstance, reason) {
-          var modalWindow = openedWindows.get(modalInstance).value;
-          if (modalWindow) {
-            modalWindow.deferred.reject(reason);
-            removeModalWindow(modalInstance);
-          }
-        };
-
-        $modalStack.getTop = function () {
-          return openedWindows.top();
-        };
-
-        return $modalStack;
-      }])
-
-    .provider('$modal', function () {
-
-      var $modalProvider = {
-        options: {
-          backdrop: true, //can be also false or 'static'
-          keyboard: true
-        },
-        $get: ['$injector', '$rootScope', '$q', '$http', '$templateCache', '$controller', '$modalStack',
-          function ($injector, $rootScope, $q, $http, $templateCache, $controller, $modalStack) {
-
-            var $modal = {};
-
-            function getTemplatePromise(options) {
-              return options.template ? $q.when(options.template) :
-                  $http.get(options.templateUrl, {cache: $templateCache}).then(function (result) {
-                    return result.data;
-                  });
+        var modal = openedWindows.top();
+        if (modal) {
+          switch (evt.which) {
+            case 27: {
+              if (modal.value.keyboard) {
+                evt.preventDefault();
+                $rootScope.$apply(function() {
+                  $modalStack.dismiss(modal.key, 'escape key press');
+                });
+              }
+              break;
             }
-
-            function getResolvePromises(resolves) {
-              var promisesArr = [];
-              angular.forEach(resolves, function (value, key) {
-                if (angular.isFunction(value) || angular.isArray(value)) {
-                  promisesArr.push($q.when($injector.invoke(value)));
+            case 9: {
+              var list = $modalStack.loadFocusElementList(modal);
+              var focusChanged = false;
+              if (evt.shiftKey) {
+                if ($modalStack.isFocusInFirstItem(evt, list) || $modalStack.isModalFocused(evt, modal)) {
+                  focusChanged = $modalStack.focusLastFocusableElement(list);
                 }
-              });
-              return promisesArr;
-            }
-
-            $modal.open = function (modalOptions) {
-
-              var modalResultDeferred = $q.defer();
-              var modalOpenedDeferred = $q.defer();
-
-              //prepare an instance of a modal to be injected into controllers and returned to a caller
-              var modalInstance = {
-                result: modalResultDeferred.promise,
-                opened: modalOpenedDeferred.promise,
-                close: function (result) {
-                  $modalStack.close(modalInstance, result);
-                },
-                dismiss: function (reason) {
-                  $modalStack.dismiss(modalInstance, reason);
+              } else {
+                if ($modalStack.isFocusInLastItem(evt, list)) {
+                  focusChanged = $modalStack.focusFirstFocusableElement(list);
                 }
-              };
-
-              //merge and clean up options
-              modalOptions = angular.extend({}, $modalProvider.options, modalOptions);
-              modalOptions.resolve = modalOptions.resolve || {};
-
-              //verify options
-              if (!modalOptions.template && !modalOptions.templateUrl) {
-                throw new Error('One of template or templateUrl options is required.');
               }
 
-              var templateAndResolvePromise =
-                  $q.all([getTemplatePromise(modalOptions)].concat(getResolvePromises(modalOptions.resolve)));
+              if (focusChanged) {
+                evt.preventDefault();
+                evt.stopPropagation();
+              }
 
+              break;
+            }
+          }
+        }
+      }
 
-              templateAndResolvePromise.then(function resolveSuccess(tplAndVars) {
+      $modalStack.open = function(modalInstance, modal) {
+        var modalOpener = $document[0].activeElement,
+          modalBodyClass = modal.openedClass || OPENED_MODAL_CLASS;
 
-                var modalScope = (modalOptions.scope || $rootScope).$new();
+        toggleTopWindowClass(false);
+
+        // Store the current top first, to determine what index we ought to use
+        // for the current top modal
+        previousTopOpenedModal = openedWindows.top();
+
+        openedWindows.add(modalInstance, {
+          deferred: modal.deferred,
+          renderDeferred: modal.renderDeferred,
+          closedDeferred: modal.closedDeferred,
+          modalScope: modal.scope,
+          backdrop: modal.backdrop,
+          keyboard: modal.keyboard,
+          openedClass: modal.openedClass,
+          windowTopClass: modal.windowTopClass,
+          animation: modal.animation,
+          appendTo: modal.appendTo
+        });
+
+        openedClasses.put(modalBodyClass, modalInstance);
+
+        var appendToElement = modal.appendTo,
+          currBackdropIndex = backdropIndex();
+
+        if (currBackdropIndex >= 0 && !backdropDomEl) {
+          backdropScope = $rootScope.$new(true);
+          backdropScope.modalOptions = modal;
+          backdropScope.index = currBackdropIndex;
+          backdropDomEl = angular.element('<div uib-modal-backdrop="modal-backdrop"></div>');
+          backdropDomEl.attr({
+            'class': 'modal-backdrop',
+            'ng-style': '{\'z-index\': 1040 + (index && 1 || 0) + index*10}',
+            'uib-modal-animation-class': 'fade',
+            'modal-in-class': 'in'
+          });
+          if (modal.backdropClass) {
+            backdropDomEl.addClass(modal.backdropClass);
+          }
+
+          if (modal.animation) {
+            backdropDomEl.attr('modal-animation', 'true');
+          }
+          $compile(backdropDomEl)(backdropScope);
+          $animate.enter(backdropDomEl, appendToElement);
+          if ($uibPosition.isScrollable(appendToElement)) {
+            scrollbarPadding = $uibPosition.scrollbarPadding(appendToElement);
+            if (scrollbarPadding.heightOverflow && scrollbarPadding.scrollbarWidth) {
+              appendToElement.css({paddingRight: scrollbarPadding.right + 'px'});
+            }
+          }
+        }
+
+        var content;
+        if (modal.component) {
+          content = document.createElement(snake_case(modal.component.name));
+          content = angular.element(content);
+          content.attr({
+            resolve: '$resolve',
+            'modal-instance': '$uibModalInstance',
+            close: '$close($value)',
+            dismiss: '$dismiss($value)'
+          });
+        } else {
+          content = modal.content;
+        }
+
+        // Set the top modal index based on the index of the previous top modal
+        topModalIndex = previousTopOpenedModal ? parseInt(previousTopOpenedModal.value.modalDomEl.attr('index'), 10) + 1 : 0;
+        var angularDomEl = angular.element('<div uib-modal-window="modal-window"></div>');
+        angularDomEl.attr({
+          'class': 'modal',
+          'template-url': modal.windowTemplateUrl,
+          'window-top-class': modal.windowTopClass,
+          'role': 'dialog',
+          'aria-labelledby': modal.ariaLabelledBy,
+          'aria-describedby': modal.ariaDescribedBy,
+          'size': modal.size,
+          'index': topModalIndex,
+          'animate': 'animate',
+          'ng-style': '{\'z-index\': 1050 + $$topModalIndex*10, display: \'block\'}',
+          'tabindex': -1,
+          'uib-modal-animation-class': 'fade',
+          'modal-in-class': 'in'
+        }).append(content);
+        if (modal.windowClass) {
+          angularDomEl.addClass(modal.windowClass);
+        }
+
+        if (modal.animation) {
+          angularDomEl.attr('modal-animation', 'true');
+        }
+
+        appendToElement.addClass(modalBodyClass);
+        if (modal.scope) {
+          // we need to explicitly add the modal index to the modal scope
+          // because it is needed by ngStyle to compute the zIndex property.
+          modal.scope.$$topModalIndex = topModalIndex;
+        }
+        $animate.enter($compile(angularDomEl)(modal.scope), appendToElement);
+
+        openedWindows.top().value.modalDomEl = angularDomEl;
+        openedWindows.top().value.modalOpener = modalOpener;
+
+        applyAriaHidden(angularDomEl);
+
+        function applyAriaHidden(el) {
+          if (!el || el[0].tagName === 'BODY') {
+            return;
+          }
+
+          getSiblings(el).forEach(function(sibling) {
+            var elemIsAlreadyHidden = sibling.getAttribute('aria-hidden') === 'true',
+              ariaHiddenCount = parseInt(sibling.getAttribute(ARIA_HIDDEN_ATTRIBUTE_NAME), 10);
+
+            if (!ariaHiddenCount) {
+              ariaHiddenCount = elemIsAlreadyHidden ? 1 : 0;
+            }
+
+            sibling.setAttribute(ARIA_HIDDEN_ATTRIBUTE_NAME, ariaHiddenCount + 1);
+            sibling.setAttribute('aria-hidden', 'true');
+          });
+
+          return applyAriaHidden(el.parent());
+
+          function getSiblings(el) {
+            var children = el.parent() ? el.parent().children() : [];
+
+            return Array.prototype.filter.call(children, function(child) {
+              return child !== el[0];
+            });
+          }
+        }
+      };
+
+      function broadcastClosing(modalWindow, resultOrReason, closing) {
+        return !modalWindow.value.modalScope.$broadcast('modal.closing', resultOrReason, closing).defaultPrevented;
+      }
+
+      function unhideBackgroundElements() {
+        Array.prototype.forEach.call(
+          document.querySelectorAll('[' + ARIA_HIDDEN_ATTRIBUTE_NAME + ']'),
+          function(hiddenEl) {
+            var ariaHiddenCount = parseInt(hiddenEl.getAttribute(ARIA_HIDDEN_ATTRIBUTE_NAME), 10),
+              newHiddenCount = ariaHiddenCount - 1;
+            hiddenEl.setAttribute(ARIA_HIDDEN_ATTRIBUTE_NAME, newHiddenCount);
+
+            if (!newHiddenCount) {
+              hiddenEl.removeAttribute(ARIA_HIDDEN_ATTRIBUTE_NAME);
+              hiddenEl.removeAttribute('aria-hidden');
+            }
+          }
+        );
+      }
+
+      $modalStack.close = function(modalInstance, result) {
+        var modalWindow = openedWindows.get(modalInstance);
+        unhideBackgroundElements();
+        if (modalWindow && broadcastClosing(modalWindow, result, true)) {
+          modalWindow.value.modalScope.$$uibDestructionScheduled = true;
+          modalWindow.value.deferred.resolve(result);
+          removeModalWindow(modalInstance, modalWindow.value.modalOpener);
+          return true;
+        }
+
+        return !modalWindow;
+      };
+
+      $modalStack.dismiss = function(modalInstance, reason) {
+        var modalWindow = openedWindows.get(modalInstance);
+        unhideBackgroundElements();
+        if (modalWindow && broadcastClosing(modalWindow, reason, false)) {
+          modalWindow.value.modalScope.$$uibDestructionScheduled = true;
+          modalWindow.value.deferred.reject(reason);
+          removeModalWindow(modalInstance, modalWindow.value.modalOpener);
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismissAll = function(reason) {
+        var topModal = this.getTop();
+        while (topModal && this.dismiss(topModal.key, reason)) {
+          topModal = this.getTop();
+        }
+      };
+
+      $modalStack.getTop = function() {
+        return openedWindows.top();
+      };
+
+      $modalStack.modalRendered = function(modalInstance) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow) {
+          modalWindow.value.renderDeferred.resolve();
+        }
+      };
+
+      $modalStack.focusFirstFocusableElement = function(list) {
+        if (list.length > 0) {
+          list[0].focus();
+          return true;
+        }
+        return false;
+      };
+
+      $modalStack.focusLastFocusableElement = function(list) {
+        if (list.length > 0) {
+          list[list.length - 1].focus();
+          return true;
+        }
+        return false;
+      };
+
+      $modalStack.isModalFocused = function(evt, modalWindow) {
+        if (evt && modalWindow) {
+          var modalDomEl = modalWindow.value.modalDomEl;
+          if (modalDomEl && modalDomEl.length) {
+            return (evt.target || evt.srcElement) === modalDomEl[0];
+          }
+        }
+        return false;
+      };
+
+      $modalStack.isFocusInFirstItem = function(evt, list) {
+        if (list.length > 0) {
+          return (evt.target || evt.srcElement) === list[0];
+        }
+        return false;
+      };
+
+      $modalStack.isFocusInLastItem = function(evt, list) {
+        if (list.length > 0) {
+          return (evt.target || evt.srcElement) === list[list.length - 1];
+        }
+        return false;
+      };
+
+      $modalStack.loadFocusElementList = function(modalWindow) {
+        if (modalWindow) {
+          var modalDomE1 = modalWindow.value.modalDomEl;
+          if (modalDomE1 && modalDomE1.length) {
+            var elements = modalDomE1[0].querySelectorAll(tabbableSelector);
+            return elements ?
+              Array.prototype.filter.call(elements, function(element) {
+                return isVisible(element);
+              }) : elements;
+          }
+        }
+      };
+
+      return $modalStack;
+    }])
+
+  .provider('$uibModal', function() {
+    var $modalProvider = {
+      options: {
+        animation: true,
+        backdrop: true, //can also be false or 'static'
+        keyboard: true
+      },
+      $get: ['$rootScope', '$q', '$document', '$templateRequest', '$controller', '$uibResolve', '$uibModalStack',
+        function ($rootScope, $q, $document, $templateRequest, $controller, $uibResolve, $modalStack) {
+          var $modal = {};
+
+          function getTemplatePromise(options) {
+            return options.template ? $q.when(options.template) :
+              $templateRequest(angular.isFunction(options.templateUrl) ?
+                options.templateUrl() : options.templateUrl);
+          }
+
+          var promiseChain = null;
+          $modal.getPromiseChain = function() {
+            return promiseChain;
+          };
+
+          $modal.open = function(modalOptions) {
+            var modalResultDeferred = $q.defer();
+            var modalOpenedDeferred = $q.defer();
+            var modalClosedDeferred = $q.defer();
+            var modalRenderDeferred = $q.defer();
+
+            //prepare an instance of a modal to be injected into controllers and returned to a caller
+            var modalInstance = {
+              result: modalResultDeferred.promise,
+              opened: modalOpenedDeferred.promise,
+              closed: modalClosedDeferred.promise,
+              rendered: modalRenderDeferred.promise,
+              close: function (result) {
+                return $modalStack.close(modalInstance, result);
+              },
+              dismiss: function (reason) {
+                return $modalStack.dismiss(modalInstance, reason);
+              }
+            };
+
+            //merge and clean up options
+            modalOptions = angular.extend({}, $modalProvider.options, modalOptions);
+            modalOptions.resolve = modalOptions.resolve || {};
+            modalOptions.appendTo = modalOptions.appendTo || $document.find('body').eq(0);
+
+            if (!modalOptions.appendTo.length) {
+              throw new Error('appendTo element not found. Make sure that the element passed is in DOM.');
+            }
+
+            //verify options
+            if (!modalOptions.component && !modalOptions.template && !modalOptions.templateUrl) {
+              throw new Error('One of component or template or templateUrl options is required.');
+            }
+
+            var templateAndResolvePromise;
+            if (modalOptions.component) {
+              templateAndResolvePromise = $q.when($uibResolve.resolve(modalOptions.resolve, {}, null, null));
+            } else {
+              templateAndResolvePromise =
+                $q.all([getTemplatePromise(modalOptions), $uibResolve.resolve(modalOptions.resolve, {}, null, null)]);
+            }
+
+            function resolveWithTemplate() {
+              return templateAndResolvePromise;
+            }
+
+            // Wait for the resolution of the existing promise chain.
+            // Then switch to our own combined promise dependency (regardless of how the previous modal fared).
+            // Then add to $modalStack and resolve opened.
+            // Finally clean up the chain variable if no subsequent modal has overwritten it.
+            var samePromise;
+            samePromise = promiseChain = $q.all([promiseChain])
+              .then(resolveWithTemplate, resolveWithTemplate)
+              .then(function resolveSuccess(tplAndVars) {
+                var providedScope = modalOptions.scope || $rootScope;
+
+                var modalScope = providedScope.$new();
                 modalScope.$close = modalInstance.close;
                 modalScope.$dismiss = modalInstance.dismiss;
 
-                var ctrlInstance, ctrlLocals = {};
-                var resolveIter = 1;
-
-                //controllers
-                if (modalOptions.controller) {
-                  ctrlLocals.$scope = modalScope;
-                  ctrlLocals.$modalInstance = modalInstance;
-                  angular.forEach(modalOptions.resolve, function (value, key) {
-                    ctrlLocals[key] = tplAndVars[resolveIter++];
-                  });
-
-                  ctrlInstance = $controller(modalOptions.controller, ctrlLocals);
-                }
-
-                $modalStack.open(modalInstance, {
-                  scope: modalScope,
-                  deferred: modalResultDeferred,
-                  content: tplAndVars[0],
-                  backdrop: modalOptions.backdrop,
-                  keyboard: modalOptions.keyboard,
-                  windowClass: modalOptions.windowClass
+                modalScope.$on('$destroy', function() {
+                  if (!modalScope.$$uibDestructionScheduled) {
+                    modalScope.$dismiss('$uibUnscheduledDestruction');
+                  }
                 });
 
-              }, function resolveError(reason) {
-                modalResultDeferred.reject(reason);
-              });
+                var modal = {
+                  scope: modalScope,
+                  deferred: modalResultDeferred,
+                  renderDeferred: modalRenderDeferred,
+                  closedDeferred: modalClosedDeferred,
+                  animation: modalOptions.animation,
+                  backdrop: modalOptions.backdrop,
+                  keyboard: modalOptions.keyboard,
+                  backdropClass: modalOptions.backdropClass,
+                  windowTopClass: modalOptions.windowTopClass,
+                  windowClass: modalOptions.windowClass,
+                  windowTemplateUrl: modalOptions.windowTemplateUrl,
+                  ariaLabelledBy: modalOptions.ariaLabelledBy,
+                  ariaDescribedBy: modalOptions.ariaDescribedBy,
+                  size: modalOptions.size,
+                  openedClass: modalOptions.openedClass,
+                  appendTo: modalOptions.appendTo
+                };
 
-              templateAndResolvePromise.then(function () {
-                modalOpenedDeferred.resolve(true);
-              }, function () {
-                modalOpenedDeferred.reject(false);
-              });
+                var component = {};
+                var ctrlInstance, ctrlInstantiate, ctrlLocals = {};
 
-              return modalInstance;
-            };
+                if (modalOptions.component) {
+                  constructLocals(component, false, true, false);
+                  component.name = modalOptions.component;
+                  modal.component = component;
+                } else if (modalOptions.controller) {
+                  constructLocals(ctrlLocals, true, false, true);
 
-            return $modal;
-          }]
-      };
+                  // the third param will make the controller instantiate later,private api
+                  // @see https://github.com/angular/angular.js/blob/master/src/ng/controller.js#L126
+                  ctrlInstantiate = $controller(modalOptions.controller, ctrlLocals, true, modalOptions.controllerAs);
+                  if (modalOptions.controllerAs && modalOptions.bindToController) {
+                    ctrlInstance = ctrlInstantiate.instance;
+                    ctrlInstance.$close = modalScope.$close;
+                    ctrlInstance.$dismiss = modalScope.$dismiss;
+                    angular.extend(ctrlInstance, {
+                      $resolve: ctrlLocals.$scope.$resolve
+                    }, providedScope);
+                  }
 
-      return $modalProvider;
-    });
+                  ctrlInstance = ctrlInstantiate();
 
-angular.module('ui.bootstrap.pagination', [])
-
-    .controller('PaginationController', ['$scope', '$attrs', '$parse', '$interpolate', function ($scope, $attrs, $parse, $interpolate) {
-      var self = this,
-          setNumPages = $attrs.numPages ? $parse($attrs.numPages).assign : angular.noop;
-
-      this.init = function(defaultItemsPerPage) {
-        if ($attrs.itemsPerPage) {
-          $scope.$parent.$watch($parse($attrs.itemsPerPage), function(value) {
-            self.itemsPerPage = parseInt(value, 10);
-            $scope.totalPages = self.calculateTotalPages();
-          });
-        } else {
-          this.itemsPerPage = defaultItemsPerPage;
-        }
-      };
-
-      this.noPrevious = function() {
-        return this.page === 1;
-      };
-      this.noNext = function() {
-        return this.page === $scope.totalPages;
-      };
-
-      this.isActive = function(page) {
-        return this.page === page;
-      };
-
-      this.calculateTotalPages = function() {
-        var totalPages = this.itemsPerPage < 1 ? 1 : Math.ceil($scope.totalItems / this.itemsPerPage);
-        return Math.max(totalPages || 0, 1);
-      };
-
-      this.getAttributeValue = function(attribute, defaultValue, interpolate) {
-        return angular.isDefined(attribute) ? (interpolate ? $interpolate(attribute)($scope.$parent) : $scope.$parent.$eval(attribute)) : defaultValue;
-      };
-
-      this.render = function() {
-        this.page = parseInt($scope.page, 10) || 1;
-        if (this.page > 0 && this.page <= $scope.totalPages) {
-          $scope.pages = this.getPages(this.page, $scope.totalPages);
-        }
-      };
-
-      $scope.selectPage = function(page) {
-        if ( ! self.isActive(page) && page > 0 && page <= $scope.totalPages) {
-          $scope.page = page;
-          $scope.onSelectPage({ page: page });
-        }
-      };
-
-      $scope.$watch('page', function() {
-        self.render();
-      });
-
-      $scope.$watch('totalItems', function() {
-        $scope.totalPages = self.calculateTotalPages();
-      });
-
-      $scope.$watch('totalPages', function(value) {
-        setNumPages($scope.$parent, value); // Readonly variable
-
-        if ( self.page > value ) {
-          $scope.selectPage(value);
-        } else {
-          self.render();
-        }
-      });
-    }])
-
-    .constant('paginationConfig', {
-      itemsPerPage: 10,
-      boundaryLinks: false,
-      directionLinks: true,
-      firstText: 'First',
-      previousText: 'Previous',
-      nextText: 'Next',
-      lastText: 'Last',
-      rotate: true
-    })
-
-    .directive('pagination', ['$parse', 'paginationConfig', function($parse, config) {
-      return {
-        restrict: 'EA',
-        scope: {
-          page: '=',
-          totalItems: '=',
-          onSelectPage:' &'
-        },
-        controller: 'PaginationController',
-        templateUrl: 'template/pagination/pagination.html',
-        replace: true,
-        link: function(scope, element, attrs, paginationCtrl) {
-
-          // Setup configuration parameters
-          var maxSize,
-              boundaryLinks  = paginationCtrl.getAttributeValue(attrs.boundaryLinks,  config.boundaryLinks      ),
-              directionLinks = paginationCtrl.getAttributeValue(attrs.directionLinks, config.directionLinks     ),
-              firstText      = paginationCtrl.getAttributeValue(attrs.firstText,      config.firstText,     true),
-              previousText   = paginationCtrl.getAttributeValue(attrs.previousText,   config.previousText,  true),
-              nextText       = paginationCtrl.getAttributeValue(attrs.nextText,       config.nextText,      true),
-              lastText       = paginationCtrl.getAttributeValue(attrs.lastText,       config.lastText,      true),
-              rotate         = paginationCtrl.getAttributeValue(attrs.rotate,         config.rotate);
-
-          paginationCtrl.init(config.itemsPerPage);
-
-          if (attrs.maxSize) {
-            scope.$parent.$watch($parse(attrs.maxSize), function(value) {
-              maxSize = parseInt(value, 10);
-              paginationCtrl.render();
-            });
-          }
-
-          if (attrs.nextText) {
-            attrs.$observe('nextText', function(value) {
-              nextText = paginationCtrl.getAttributeValue(value, config.nextText, true);
-              paginationCtrl.render();
-            });
-          }
-
-          if (attrs.previousText) {
-            attrs.$observe('previousText', function(value) {
-              previousText = paginationCtrl.getAttributeValue(value, config.previousText, true);
-              paginationCtrl.render();
-            });
-          }
-
-          // Create page object used in template
-          function makePage(number, text, isActive, isDisabled) {
-            return {
-              number: number,
-              text: text,
-              active: isActive,
-              disabled: isDisabled
-            };
-          }
-
-          paginationCtrl.getPages = function(currentPage, totalPages) {
-            var pages = [];
-
-            // Default page limits
-            var startPage = 1, endPage = totalPages;
-            var isMaxSized = ( angular.isDefined(maxSize) && maxSize < totalPages );
-
-            // recompute if maxSize
-            if ( isMaxSized ) {
-              if ( rotate ) {
-                // Current page is displayed in the middle of the visible ones
-                startPage = Math.max(currentPage - Math.floor(maxSize/2), 1);
-                endPage   = startPage + maxSize - 1;
-
-                // Adjust if limit is exceeded
-                if (endPage > totalPages) {
-                  endPage   = totalPages;
-                  startPage = endPage - maxSize + 1;
+                  if (angular.isFunction(ctrlInstance.$onInit)) {
+                    ctrlInstance.$onInit();
+                  }
                 }
-              } else {
-                // Visible pages are paginated with maxSize
-                startPage = ((Math.ceil(currentPage / maxSize) - 1) * maxSize) + 1;
 
-                // Adjust last page if limit is exceeded
-                endPage = Math.min(startPage + maxSize - 1, totalPages);
+                if (!modalOptions.component) {
+                  modal.content = tplAndVars[0];
+                }
+
+                $modalStack.open(modalInstance, modal);
+                modalOpenedDeferred.resolve(true);
+
+                function constructLocals(obj, template, instanceOnScope, injectable) {
+                  obj.$scope = modalScope;
+                  obj.$scope.$resolve = {};
+                  if (instanceOnScope) {
+                    obj.$scope.$uibModalInstance = modalInstance;
+                  } else {
+                    obj.$uibModalInstance = modalInstance;
+                  }
+
+                  var resolves = template ? tplAndVars[1] : tplAndVars;
+                  angular.forEach(resolves, function(value, key) {
+                    if (injectable) {
+                      obj[key] = value;
+                    }
+
+                    obj.$scope.$resolve[key] = value;
+                  });
+                }
+              }, function resolveError(reason) {
+                modalOpenedDeferred.reject(reason);
+                modalResultDeferred.reject(reason);
+              })['finally'](function() {
+              if (promiseChain === samePromise) {
+                promiseChain = null;
               }
-            }
+            });
 
-            // Add page number links
-            for (var number = startPage; number <= endPage; number++) {
-              var page = makePage(number, number, paginationCtrl.isActive(number), false);
-              pages.push(page);
-            }
-
-            // Add links to move between page sets
-            if ( isMaxSized && ! rotate ) {
-              if ( startPage > 1 ) {
-                var previousPageSet = makePage(startPage - 1, '...', false, false);
-                pages.unshift(previousPageSet);
-              }
-
-              if ( endPage < totalPages ) {
-                var nextPageSet = makePage(endPage + 1, '...', false, false);
-                pages.push(nextPageSet);
-              }
-            }
-
-            // Add previous & next links
-            if (directionLinks) {
-              var previousPage = makePage(currentPage - 1, previousText, false, paginationCtrl.noPrevious());
-              pages.unshift(previousPage);
-
-              var nextPage = makePage(currentPage + 1, nextText, false, paginationCtrl.noNext());
-              pages.push(nextPage);
-            }
-
-            // Add first & last links
-            if (boundaryLinks) {
-              var firstPage = makePage(1, firstText, false, paginationCtrl.noPrevious());
-              pages.unshift(firstPage);
-
-              var lastPage = makePage(totalPages, lastText, false, paginationCtrl.noNext());
-              pages.push(lastPage);
-            }
-
-            return pages;
+            return modalInstance;
           };
+
+          return $modal;
         }
-      };
-    }])
+      ]
+    };
 
-    .constant('pagerConfig', {
-      itemsPerPage: 10,
-      previousText: '« Previous',
-      nextText: 'Next »',
-      align: true
-    })
+    return $modalProvider;
+  });
 
-    .directive('pager', ['pagerConfig', function(config) {
-      return {
-        restrict: 'EA',
-        scope: {
-          page: '=',
-          totalItems: '=',
-          onSelectPage:' &'
-        },
-        controller: 'PaginationController',
-        templateUrl: 'template/pagination/pager.html',
-        replace: true,
-        link: function(scope, element, attrs, paginationCtrl) {
+angular.module('ui.bootstrap.paging', [])
+/**
+ * Helper internal service for generating common controller code between the
+ * pager and pagination components
+ */
+  .factory('uibPaging', ['$parse', function($parse) {
+    return {
+      create: function(ctrl, $scope, $attrs) {
+        ctrl.setNumPages = $attrs.numPages ? $parse($attrs.numPages).assign : angular.noop;
+        ctrl.ngModelCtrl = { $setViewValue: angular.noop }; // nullModelCtrl
+        ctrl._watchers = [];
 
-          // Setup configuration parameters
-          var previousText = paginationCtrl.getAttributeValue(attrs.previousText, config.previousText, true),
-              nextText         = paginationCtrl.getAttributeValue(attrs.nextText,     config.nextText,     true),
-              align            = paginationCtrl.getAttributeValue(attrs.align,        config.align);
+        ctrl.init = function(ngModelCtrl, config) {
+          ctrl.ngModelCtrl = ngModelCtrl;
+          ctrl.config = config;
 
-          paginationCtrl.init(config.itemsPerPage);
+          ngModelCtrl.$render = function() {
+            ctrl.render();
+          };
 
-          // Create page object used in template
-          function makePage(number, text, isDisabled, isPrevious, isNext) {
-            return {
-              number: number,
-              text: text,
-              disabled: isDisabled,
-              previous: ( align && isPrevious ),
-              next: ( align && isNext )
-            };
+          if ($attrs.itemsPerPage) {
+            ctrl._watchers.push($scope.$parent.$watch($attrs.itemsPerPage, function(value) {
+              ctrl.itemsPerPage = parseInt(value, 10);
+              $scope.totalPages = ctrl.calculateTotalPages();
+              ctrl.updatePage();
+            }));
+          } else {
+            ctrl.itemsPerPage = config.itemsPerPage;
           }
 
-          paginationCtrl.getPages = function(currentPage) {
-            return [
-              makePage(currentPage - 1, previousText, paginationCtrl.noPrevious(), true, false),
-              makePage(currentPage + 1, nextText, paginationCtrl.noNext(), false, true)
-            ];
-          };
+          $scope.$watch('totalItems', function(newTotal, oldTotal) {
+            if (angular.isDefined(newTotal) || newTotal !== oldTotal) {
+              $scope.totalPages = ctrl.calculateTotalPages();
+              ctrl.updatePage();
+            }
+          });
+        };
+
+        ctrl.calculateTotalPages = function() {
+          var totalPages = ctrl.itemsPerPage < 1 ? 1 : Math.ceil($scope.totalItems / ctrl.itemsPerPage);
+          return Math.max(totalPages || 0, 1);
+        };
+
+        ctrl.render = function() {
+          $scope.page = parseInt(ctrl.ngModelCtrl.$viewValue, 10) || 1;
+        };
+
+        $scope.selectPage = function(page, evt) {
+          if (evt) {
+            evt.preventDefault();
+          }
+
+          var clickAllowed = !$scope.ngDisabled || !evt;
+          if (clickAllowed && $scope.page !== page && page > 0 && page <= $scope.totalPages) {
+            if (evt && evt.target) {
+              evt.target.blur();
+            }
+            ctrl.ngModelCtrl.$setViewValue(page);
+            ctrl.ngModelCtrl.$render();
+          }
+        };
+
+        $scope.getText = function(key) {
+          return $scope[key + 'Text'] || ctrl.config[key + 'Text'];
+        };
+
+        $scope.noPrevious = function() {
+          return $scope.page === 1;
+        };
+
+        $scope.noNext = function() {
+          return $scope.page === $scope.totalPages;
+        };
+
+        ctrl.updatePage = function() {
+          ctrl.setNumPages($scope.$parent, $scope.totalPages); // Readonly variable
+
+          if ($scope.page > $scope.totalPages) {
+            $scope.selectPage($scope.totalPages);
+          } else {
+            ctrl.ngModelCtrl.$render();
+          }
+        };
+
+        $scope.$on('$destroy', function() {
+          while (ctrl._watchers.length) {
+            ctrl._watchers.shift()();
+          }
+        });
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.pager', ['ui.bootstrap.paging', 'ui.bootstrap.tabindex'])
+
+  .controller('UibPagerController', ['$scope', '$attrs', 'uibPaging', 'uibPagerConfig', function($scope, $attrs, uibPaging, uibPagerConfig) {
+    $scope.align = angular.isDefined($attrs.align) ? $scope.$parent.$eval($attrs.align) : uibPagerConfig.align;
+
+    uibPaging.create(this, $scope, $attrs);
+  }])
+
+  .constant('uibPagerConfig', {
+    itemsPerPage: 10,
+    previousText: '« Previous',
+    nextText: 'Next »',
+    align: true
+  })
+
+  .directive('uibPager', ['uibPagerConfig', function(uibPagerConfig) {
+    return {
+      scope: {
+        totalItems: '=',
+        previousText: '@',
+        nextText: '@',
+        ngDisabled: '='
+      },
+      require: ['uibPager', '?ngModel'],
+      restrict: 'A',
+      controller: 'UibPagerController',
+      controllerAs: 'pager',
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/pager/pager.html';
+      },
+      link: function(scope, element, attrs, ctrls) {
+        element.addClass('pager');
+        var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+        if (!ngModelCtrl) {
+          return; // do nothing if no ng-model
         }
+
+        paginationCtrl.init(ngModelCtrl, uibPagerConfig);
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.pagination', ['ui.bootstrap.paging', 'ui.bootstrap.tabindex'])
+  .controller('UibPaginationController', ['$scope', '$attrs', '$parse', 'uibPaging', 'uibPaginationConfig', function($scope, $attrs, $parse, uibPaging, uibPaginationConfig) {
+    var ctrl = this;
+    // Setup configuration parameters
+    var maxSize = angular.isDefined($attrs.maxSize) ? $scope.$parent.$eval($attrs.maxSize) : uibPaginationConfig.maxSize,
+      rotate = angular.isDefined($attrs.rotate) ? $scope.$parent.$eval($attrs.rotate) : uibPaginationConfig.rotate,
+      forceEllipses = angular.isDefined($attrs.forceEllipses) ? $scope.$parent.$eval($attrs.forceEllipses) : uibPaginationConfig.forceEllipses,
+      boundaryLinkNumbers = angular.isDefined($attrs.boundaryLinkNumbers) ? $scope.$parent.$eval($attrs.boundaryLinkNumbers) : uibPaginationConfig.boundaryLinkNumbers,
+      pageLabel = angular.isDefined($attrs.pageLabel) ? function(idx) { return $scope.$parent.$eval($attrs.pageLabel, {$page: idx}); } : angular.identity;
+    $scope.boundaryLinks = angular.isDefined($attrs.boundaryLinks) ? $scope.$parent.$eval($attrs.boundaryLinks) : uibPaginationConfig.boundaryLinks;
+    $scope.directionLinks = angular.isDefined($attrs.directionLinks) ? $scope.$parent.$eval($attrs.directionLinks) : uibPaginationConfig.directionLinks;
+    $attrs.$set('role', 'menu');
+
+    uibPaging.create(this, $scope, $attrs);
+
+    if ($attrs.maxSize) {
+      ctrl._watchers.push($scope.$parent.$watch($parse($attrs.maxSize), function(value) {
+        maxSize = parseInt(value, 10);
+        ctrl.render();
+      }));
+    }
+
+    // Create page object used in template
+    function makePage(number, text, isActive) {
+      return {
+        number: number,
+        text: text,
+        active: isActive
       };
-    }]);
+    }
+
+    function getPages(currentPage, totalPages) {
+      var pages = [];
+
+      // Default page limits
+      var startPage = 1, endPage = totalPages;
+      var isMaxSized = angular.isDefined(maxSize) && maxSize < totalPages;
+
+      // recompute if maxSize
+      if (isMaxSized) {
+        if (rotate) {
+          // Current page is displayed in the middle of the visible ones
+          startPage = Math.max(currentPage - Math.floor(maxSize / 2), 1);
+          endPage = startPage + maxSize - 1;
+
+          // Adjust if limit is exceeded
+          if (endPage > totalPages) {
+            endPage = totalPages;
+            startPage = endPage - maxSize + 1;
+          }
+        } else {
+          // Visible pages are paginated with maxSize
+          startPage = (Math.ceil(currentPage / maxSize) - 1) * maxSize + 1;
+
+          // Adjust last page if limit is exceeded
+          endPage = Math.min(startPage + maxSize - 1, totalPages);
+        }
+      }
+
+      // Add page number links
+      for (var number = startPage; number <= endPage; number++) {
+        var page = makePage(number, pageLabel(number), number === currentPage);
+        pages.push(page);
+      }
+
+      // Add links to move between page sets
+      if (isMaxSized && maxSize > 0 && (!rotate || forceEllipses || boundaryLinkNumbers)) {
+        if (startPage > 1) {
+          if (!boundaryLinkNumbers || startPage > 3) { //need ellipsis for all options unless range is too close to beginning
+            var previousPageSet = makePage(startPage - 1, '...', false);
+            pages.unshift(previousPageSet);
+          }
+          if (boundaryLinkNumbers) {
+            if (startPage === 3) { //need to replace ellipsis when the buttons would be sequential
+              var secondPageLink = makePage(2, '2', false);
+              pages.unshift(secondPageLink);
+            }
+            //add the first page
+            var firstPageLink = makePage(1, '1', false);
+            pages.unshift(firstPageLink);
+          }
+        }
+
+        if (endPage < totalPages) {
+          if (!boundaryLinkNumbers || endPage < totalPages - 2) { //need ellipsis for all options unless range is too close to end
+            var nextPageSet = makePage(endPage + 1, '...', false);
+            pages.push(nextPageSet);
+          }
+          if (boundaryLinkNumbers) {
+            if (endPage === totalPages - 2) { //need to replace ellipsis when the buttons would be sequential
+              var secondToLastPageLink = makePage(totalPages - 1, totalPages - 1, false);
+              pages.push(secondToLastPageLink);
+            }
+            //add the last page
+            var lastPageLink = makePage(totalPages, totalPages, false);
+            pages.push(lastPageLink);
+          }
+        }
+      }
+      return pages;
+    }
+
+    var originalRender = this.render;
+    this.render = function() {
+      originalRender();
+      if ($scope.page > 0 && $scope.page <= $scope.totalPages) {
+        $scope.pages = getPages($scope.page, $scope.totalPages);
+      }
+    };
+  }])
+
+  .constant('uibPaginationConfig', {
+    itemsPerPage: 10,
+    boundaryLinks: false,
+    boundaryLinkNumbers: false,
+    directionLinks: true,
+    firstText: 'First',
+    previousText: 'Previous',
+    nextText: 'Next',
+    lastText: 'Last',
+    rotate: true,
+    forceEllipses: false
+  })
+
+  .directive('uibPagination', ['$parse', 'uibPaginationConfig', function($parse, uibPaginationConfig) {
+    return {
+      scope: {
+        totalItems: '=',
+        firstText: '@',
+        previousText: '@',
+        nextText: '@',
+        lastText: '@',
+        ngDisabled:'='
+      },
+      require: ['uibPagination', '?ngModel'],
+      restrict: 'A',
+      controller: 'UibPaginationController',
+      controllerAs: 'pagination',
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/pagination/pagination.html';
+      },
+      link: function(scope, element, attrs, ctrls) {
+        element.addClass('pagination');
+        var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+        if (!ngModelCtrl) {
+          return; // do nothing if no ng-model
+        }
+
+        paginationCtrl.init(ngModelCtrl, uibPaginationConfig);
+      }
+    };
+  }]);
 
 /**
  * The following features are still outstanding: animation as a
  * function, placement as a function, inside, support for more triggers than
  * just mouse enter/leave, html tooltips, and selector delegation.
  */
-angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap.bindHtml' ] )
+angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.stackedMap'])
 
 /**
  * The $tooltip service creates tooltip- and popover-like directives as well as
  * houses global options for them.
  */
-    .provider( '$tooltip', function () {
-      // The default options tooltip and popover.
-      var defaultOptions = {
-        placement: 'top',
-        animation: true,
-        popupDelay: 0
-      };
+  .provider('$uibTooltip', function() {
+    // The default options tooltip and popover.
+    var defaultOptions = {
+      placement: 'top',
+      placementClassPrefix: '',
+      animation: true,
+      popupDelay: 0,
+      popupCloseDelay: 0,
+      useContentExp: false
+    };
 
-      // Default hide triggers for each show trigger
-      var triggerMap = {
-        'mouseenter': 'mouseleave',
-        'click': 'click',
-        'focus': 'blur'
-      };
+    // Default hide triggers for each show trigger
+    var triggerMap = {
+      'mouseenter': 'mouseleave',
+      'click': 'click',
+      'outsideClick': 'outsideClick',
+      'focus': 'blur',
+      'none': ''
+    };
 
-      // The options specified to the provider globally.
-      var globalOptions = {};
+    // The options specified to the provider globally.
+    var globalOptions = {};
 
-      /**
-       * `options({})` allows global configuration of all tooltips in the
-       * application.
-       *
-       *   var app = angular.module( 'App', ['ui.bootstrap.tooltip'], function( $tooltipProvider ) {
+    /**
+     * `options({})` allows global configuration of all tooltips in the
+     * application.
+     *
+     *   var app = angular.module( 'App', ['ui.bootstrap.tooltip'], function( $tooltipProvider ) {
    *     // place tooltips left instead of top by default
    *     $tooltipProvider.options( { placement: 'left' } );
    *   });
-       */
-      this.options = function( value ) {
-        angular.extend( globalOptions, value );
-      };
+     */
+    this.options = function(value) {
+      angular.extend(globalOptions, value);
+    };
 
-      /**
-       * This allows you to extend the set of trigger mappings available. E.g.:
-       *
-       *   $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' );
-       */
-      this.setTriggers = function setTriggers ( triggers ) {
-        angular.extend( triggerMap, triggers );
-      };
+    /**
+     * This allows you to extend the set of trigger mappings available. E.g.:
+     *
+     *   $tooltipProvider.setTriggers( { 'openTrigger': 'closeTrigger' } );
+     */
+    this.setTriggers = function setTriggers(triggers) {
+      angular.extend(triggerMap, triggers);
+    };
 
-      /**
-       * This is a helper function for translating camel-case to snake-case.
-       */
-      function snake_case(name){
-        var regexp = /[A-Z]/g;
-        var separator = '-';
-        return name.replace(regexp, function(letter, pos) {
-          return (pos ? separator : '') + letter.toLowerCase();
-        });
+    /**
+     * This is a helper function for translating camel-case to snake_case.
+     */
+    function snake_case(name) {
+      var regexp = /[A-Z]/g;
+      var separator = '-';
+      return name.replace(regexp, function(letter, pos) {
+        return (pos ? separator : '') + letter.toLowerCase();
+      });
+    }
+
+    /**
+     * Returns the actual instance of the $tooltip service.
+     * TODO support multiple triggers
+     */
+    this.$get = ['$window', '$compile', '$timeout', '$document', '$uibPosition', '$interpolate', '$rootScope', '$parse', '$$stackedMap', function($window, $compile, $timeout, $document, $position, $interpolate, $rootScope, $parse, $$stackedMap) {
+      var openedTooltips = $$stackedMap.createNew();
+      $document.on('keyup', keypressListener);
+
+      $rootScope.$on('$destroy', function() {
+        $document.off('keyup', keypressListener);
+      });
+
+      function keypressListener(e) {
+        if (e.which === 27) {
+          var last = openedTooltips.top();
+          if (last) {
+            last.value.close();
+            last = null;
+          }
+        }
       }
 
-      /**
-       * Returns the actual instance of the $tooltip service.
-       * TODO support multiple triggers
-       */
-      this.$get = [ '$window', '$compile', '$timeout', '$parse', '$document', '$position', '$interpolate', function ( $window, $compile, $timeout, $parse, $document, $position, $interpolate ) {
-        return function $tooltip ( type, prefix, defaultTriggerShow ) {
-          var options = angular.extend( {}, defaultOptions, globalOptions );
-
-          /**
-           * Returns an object of show and hide triggers.
-           *
-           * If a trigger is supplied,
-           * it is used to show the tooltip; otherwise, it will use the `trigger`
-           * option passed to the `$tooltipProvider.options` method; else it will
-           * default to the trigger supplied to this directive factory.
-           *
-           * The hide trigger is based on the show trigger. If the `trigger` option
-           * was passed to the `$tooltipProvider.options` method, it will use the
-           * mapped trigger from `triggerMap` or the passed trigger if the map is
-           * undefined; otherwise, it uses the `triggerMap` value of the show
-           * trigger; else it will just use the show trigger.
-           */
-          function getTriggers ( trigger ) {
-            var show = trigger || options.trigger || defaultTriggerShow;
-            var hide = triggerMap[show] || show;
-            return {
-              show: show,
-              hide: hide
-            };
-          }
-
-          var directiveName = snake_case( type );
-
-          var startSym = $interpolate.startSymbol();
-          var endSym = $interpolate.endSymbol();
-          var template =
-              '<div '+ directiveName +'-popup '+
-                  'title="'+startSym+'tt_title'+endSym+'" '+
-                  'content="'+startSym+'tt_content'+endSym+'" '+
-                  'placement="'+startSym+'tt_placement'+endSym+'" '+
-                  'animation="tt_animation" '+
-                  'is-open="tt_isOpen"'+
-                  '>'+
-                  '</div>';
+      return function $tooltip(ttType, prefix, defaultTriggerShow, options) {
+        options = angular.extend({}, defaultOptions, globalOptions, options);
 
+        /**
+         * Returns an object of show and hide triggers.
+         *
+         * If a trigger is supplied,
+         * it is used to show the tooltip; otherwise, it will use the `trigger`
+         * option passed to the `$tooltipProvider.options` method; else it will
+         * default to the trigger supplied to this directive factory.
+         *
+         * The hide trigger is based on the show trigger. If the `trigger` option
+         * was passed to the `$tooltipProvider.options` method, it will use the
+         * mapped trigger from `triggerMap` or the passed trigger if the map is
+         * undefined; otherwise, it uses the `triggerMap` value of the show
+         * trigger; else it will just use the show trigger.
+         */
+        function getTriggers(trigger) {
+          var show = (trigger || options.trigger || defaultTriggerShow).split(' ');
+          var hide = show.map(function(trigger) {
+            return triggerMap[trigger] || trigger;
+          });
           return {
-            restrict: 'EA',
-            scope: true,
-            link: function link ( scope, element, attrs ) {
-              var tooltip = $compile( template )( scope );
+            show: show,
+            hide: hide
+          };
+        }
+
+        var directiveName = snake_case(ttType);
+
+        var startSym = $interpolate.startSymbol();
+        var endSym = $interpolate.endSymbol();
+        var template =
+          '<div '+ directiveName + '-popup ' +
+          'uib-title="' + startSym + 'title' + endSym + '" ' +
+          (options.useContentExp ?
+            'content-exp="contentExp()" ' :
+            'content="' + startSym + 'content' + endSym + '" ') +
+          'origin-scope="origScope" ' +
+          'class="uib-position-measure ' + prefix + '" ' +
+          'tooltip-animation-class="fade"' +
+          'uib-tooltip-classes ' +
+          'ng-class="{ in: isOpen }" ' +
+          '>' +
+          '</div>';
+
+        return {
+          compile: function(tElem, tAttrs) {
+            var tooltipLinker = $compile(template);
+
+            return function link(scope, element, attrs, tooltipCtrl) {
+              var tooltip;
+              var tooltipLinkedScope;
               var transitionTimeout;
-              var popupTimeout;
-              var appendToBody = angular.isDefined( options.appendToBody ) ? options.appendToBody : false;
-              var triggers = getTriggers( undefined );
-              var hasRegisteredTriggers = false;
-              var hasEnableExp = angular.isDefined(attrs[prefix+'Enable']);
+              var showTimeout;
+              var hideTimeout;
+              var positionTimeout;
+              var adjustmentTimeout;
+              var appendToBody = angular.isDefined(options.appendToBody) ? options.appendToBody : false;
+              var triggers = getTriggers(undefined);
+              var hasEnableExp = angular.isDefined(attrs[prefix + 'Enable']);
+              var ttScope = scope.$new(true);
+              var repositionScheduled = false;
+              var isOpenParse = angular.isDefined(attrs[prefix + 'IsOpen']) ? $parse(attrs[prefix + 'IsOpen']) : false;
+              var contentParse = options.useContentExp ? $parse(attrs[ttType]) : false;
+              var observers = [];
+              var lastPlacement;
 
-              var positionTooltip = function (){
-                var position,
-                    ttWidth,
-                    ttHeight,
-                    ttPosition;
-                // Get the position of the directive element.
-                position = appendToBody ? $position.offset( element ) : $position.position( element );
+              var positionTooltip = function() {
+                // check if tooltip exists and is not empty
+                if (!tooltip || !tooltip.html()) { return; }
 
-                // Get the height and width of the tooltip so we can center it.
-                ttWidth = tooltip.prop( 'offsetWidth' );
-                ttHeight = tooltip.prop( 'offsetHeight' );
+                if (!positionTimeout) {
+                  positionTimeout = $timeout(function() {
+                    var ttPosition = $position.positionElements(element, tooltip, ttScope.placement, appendToBody);
+                    var initialHeight = angular.isDefined(tooltip.offsetHeight) ? tooltip.offsetHeight : tooltip.prop('offsetHeight');
+                    var elementPos = appendToBody ? $position.offset(element) : $position.position(element);
+                    tooltip.css({ top: ttPosition.top + 'px', left: ttPosition.left + 'px' });
+                    var placementClasses = ttPosition.placement.split('-');
 
-                // Calculate the tooltip's top and left coordinates to center it with
-                // this directive.
-                switch ( scope.tt_placement ) {
-                  case 'right':
-                    ttPosition = {
-                      top: position.top + position.height / 2 - ttHeight / 2,
-                      left: position.left + position.width
-                    };
-                    break;
-                  case 'bottom':
-                    ttPosition = {
-                      top: position.top + position.height,
-                      left: position.left + position.width / 2 - ttWidth / 2
-                    };
-                    break;
-                  case 'left':
-                    ttPosition = {
-                      top: position.top + position.height / 2 - ttHeight / 2,
-                      left: position.left - ttWidth
-                    };
-                    break;
-                  default:
-                    ttPosition = {
-                      top: position.top - ttHeight,
-                      left: position.left + position.width / 2 - ttWidth / 2
-                    };
-                    break;
+                    if (!tooltip.hasClass(placementClasses[0])) {
+                      tooltip.removeClass(lastPlacement.split('-')[0]);
+                      tooltip.addClass(placementClasses[0]);
+                    }
+
+                    if (!tooltip.hasClass(options.placementClassPrefix + ttPosition.placement)) {
+                      tooltip.removeClass(options.placementClassPrefix + lastPlacement);
+                      tooltip.addClass(options.placementClassPrefix + ttPosition.placement);
+                    }
+
+                    adjustmentTimeout = $timeout(function() {
+                      var currentHeight = angular.isDefined(tooltip.offsetHeight) ? tooltip.offsetHeight : tooltip.prop('offsetHeight');
+                      var adjustment = $position.adjustTop(placementClasses, elementPos, initialHeight, currentHeight);
+                      if (adjustment) {
+                        tooltip.css(adjustment);
+                      }
+                      adjustmentTimeout = null;
+                    }, 0, false);
+
+                    // first time through tt element will have the
+                    // uib-position-measure class or if the placement
+                    // has changed we need to position the arrow.
+                    if (tooltip.hasClass('uib-position-measure')) {
+                      $position.positionArrow(tooltip, ttPosition.placement);
+                      tooltip.removeClass('uib-position-measure');
+                    } else if (lastPlacement !== ttPosition.placement) {
+                      $position.positionArrow(tooltip, ttPosition.placement);
+                    }
+                    lastPlacement = ttPosition.placement;
+
+                    positionTimeout = null;
+                  }, 0, false);
                 }
-
-                ttPosition.top += 'px';
-                ttPosition.left += 'px';
-
-                // Now set the calculated positioning.
-                tooltip.css( ttPosition );
-
               };
 
+              // Set up the correct scope to allow transclusion later
+              ttScope.origScope = scope;
+
               // By default, the tooltip is not open.
               // TODO add ability to start tooltip opened
-              scope.tt_isOpen = false;
+              ttScope.isOpen = false;
 
-              function toggleTooltipBind () {
-                if ( ! scope.tt_isOpen ) {
+              function toggleTooltipBind() {
+                if (!ttScope.isOpen) {
                   showTooltipBind();
                 } else {
                   hideTooltipBind();
@@ -2119,1506 +5112,2676 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap
 
               // Show the tooltip with delay if specified, otherwise show it immediately
               function showTooltipBind() {
-                if(hasEnableExp && !scope.$eval(attrs[prefix+'Enable'])) {
+                if (hasEnableExp && !scope.$eval(attrs[prefix + 'Enable'])) {
                   return;
                 }
-                if ( scope.tt_popupDelay ) {
-                  popupTimeout = $timeout( show, scope.tt_popupDelay );
-                  popupTimeout.then(function(reposition){reposition();});
+
+                cancelHide();
+                prepareTooltip();
+
+                if (ttScope.popupDelay) {
+                  // Do nothing if the tooltip was already scheduled to pop-up.
+                  // This happens if show is triggered multiple times before any hide is triggered.
+                  if (!showTimeout) {
+                    showTimeout = $timeout(show, ttScope.popupDelay, false);
+                  }
                 } else {
-                  scope.$apply( show )();
+                  show();
                 }
               }
 
-              function hideTooltipBind () {
-                scope.$apply(function () {
+              function hideTooltipBind() {
+                cancelShow();
+
+                if (ttScope.popupCloseDelay) {
+                  if (!hideTimeout) {
+                    hideTimeout = $timeout(hide, ttScope.popupCloseDelay, false);
+                  }
+                } else {
                   hide();
-                });
+                }
               }
 
               // Show the tooltip popup element.
               function show() {
-
+                cancelShow();
+                cancelHide();
 
                 // Don't show empty tooltips.
-                if ( ! scope.tt_content ) {
+                if (!ttScope.content) {
                   return angular.noop;
                 }
 
-                // If there is a pending remove transition, we must cancel it, lest the
-                // tooltip be mysteriously removed.
-                if ( transitionTimeout ) {
-                  $timeout.cancel( transitionTimeout );
-                }
-
-                // Set the initial positioning.
-                tooltip.css({ top: 0, left: 0, display: 'block' });
-
-                // Now we add it to the DOM because need some info about it. But it's not
-                // visible yet anyway.
-                if ( appendToBody ) {
-                  $document.find( 'body' ).append( tooltip );
-                } else {
-                  element.after( tooltip );
-                }
-
-                positionTooltip();
+                createTooltip();
 
                 // And show the tooltip.
-                scope.tt_isOpen = true;
+                ttScope.$evalAsync(function() {
+                  ttScope.isOpen = true;
+                  assignIsOpen(true);
+                  positionTooltip();
+                });
+              }
 
-                // Return positioning function as promise callback for correct
-                // positioning after draw.
-                return positionTooltip;
+              function cancelShow() {
+                if (showTimeout) {
+                  $timeout.cancel(showTimeout);
+                  showTimeout = null;
+                }
+
+                if (positionTimeout) {
+                  $timeout.cancel(positionTimeout);
+                  positionTimeout = null;
+                }
               }
 
               // Hide the tooltip popup element.
               function hide() {
+                if (!ttScope) {
+                  return;
+                }
+
                 // First things first: we don't show it anymore.
-                scope.tt_isOpen = false;
-
-                //if tooltip is going to be shown after delay, we must cancel this
-                $timeout.cancel( popupTimeout );
-
-                // And now we remove it from the DOM. However, if we have animation, we
-                // need to wait for it to expire beforehand.
-                // FIXME: this is a placeholder for a port of the transitions library.
-                if ( scope.tt_animation ) {
-                  transitionTimeout = $timeout(function () {
-                    tooltip.remove();
-                  }, 500);
-                } else {
-                  tooltip.remove();
-                }
-              }
-
-              /**
-               * Observe the relevant attributes.
-               */
-              attrs.$observe( type, function ( val ) {
-                scope.tt_content = val;
-
-                if (!val && scope.tt_isOpen ) {
-                  hide();
-                }
-              });
-
-              attrs.$observe( prefix+'Title', function ( val ) {
-                scope.tt_title = val;
-              });
-
-              attrs.$observe( prefix+'Placement', function ( val ) {
-                scope.tt_placement = angular.isDefined( val ) ? val : options.placement;
-              });
-
-              attrs.$observe( prefix+'PopupDelay', function ( val ) {
-                var delay = parseInt( val, 10 );
-                scope.tt_popupDelay = ! isNaN(delay) ? delay : options.popupDelay;
-              });
-
-              var unregisterTriggers = function() {
-                if (hasRegisteredTriggers) {
-                  element.unbind( triggers.show, showTooltipBind );
-                  element.unbind( triggers.hide, hideTooltipBind );
-                }
-              };
-
-              attrs.$observe( prefix+'Trigger', function ( val ) {
-                unregisterTriggers();
-
-                triggers = getTriggers( val );
-
-                if ( triggers.show === triggers.hide ) {
-                  element.bind( triggers.show, toggleTooltipBind );
-                } else {
-                  element.bind( triggers.show, showTooltipBind );
-                  element.bind( triggers.hide, hideTooltipBind );
-                }
-
-                hasRegisteredTriggers = true;
-              });
-
-              var animation = scope.$eval(attrs[prefix + 'Animation']);
-              scope.tt_animation = angular.isDefined(animation) ? !!animation : options.animation;
-
-              attrs.$observe( prefix+'AppendToBody', function ( val ) {
-                appendToBody = angular.isDefined( val ) ? $parse( val )( scope ) : appendToBody;
-              });
-
-              // if a tooltip is attached to <body> we need to remove it on
-              // location change as its parent scope will probably not be destroyed
-              // by the change.
-              if ( appendToBody ) {
-                scope.$on('$locationChangeSuccess', function closeTooltipOnLocationChangeSuccess () {
-                  if ( scope.tt_isOpen ) {
-                    hide();
+                ttScope.$evalAsync(function() {
+                  if (ttScope) {
+                    ttScope.isOpen = false;
+                    assignIsOpen(false);
+                    // And now we remove it from the DOM. However, if we have animation, we
+                    // need to wait for it to expire beforehand.
+                    // FIXME: this is a placeholder for a port of the transitions library.
+                    // The fade transition in TWBS is 150ms.
+                    if (ttScope.animation) {
+                      if (!transitionTimeout) {
+                        transitionTimeout = $timeout(removeTooltip, 150, false);
+                      }
+                    } else {
+                      removeTooltip();
+                    }
                   }
                 });
               }
 
+              function cancelHide() {
+                if (hideTimeout) {
+                  $timeout.cancel(hideTimeout);
+                  hideTimeout = null;
+                }
+
+                if (transitionTimeout) {
+                  $timeout.cancel(transitionTimeout);
+                  transitionTimeout = null;
+                }
+              }
+
+              function createTooltip() {
+                // There can only be one tooltip element per directive shown at once.
+                if (tooltip) {
+                  return;
+                }
+
+                tooltipLinkedScope = ttScope.$new();
+                tooltip = tooltipLinker(tooltipLinkedScope, function(tooltip) {
+                  if (appendToBody) {
+                    $document.find('body').append(tooltip);
+                  } else {
+                    element.after(tooltip);
+                  }
+                });
+
+                openedTooltips.add(ttScope, {
+                  close: hide
+                });
+
+                prepObservers();
+              }
+
+              function removeTooltip() {
+                cancelShow();
+                cancelHide();
+                unregisterObservers();
+
+                if (tooltip) {
+                  tooltip.remove();
+
+                  tooltip = null;
+                  if (adjustmentTimeout) {
+                    $timeout.cancel(adjustmentTimeout);
+                  }
+                }
+
+                openedTooltips.remove(ttScope);
+
+                if (tooltipLinkedScope) {
+                  tooltipLinkedScope.$destroy();
+                  tooltipLinkedScope = null;
+                }
+              }
+
+              /**
+               * Set the initial scope values. Once
+               * the tooltip is created, the observers
+               * will be added to keep things in sync.
+               */
+              function prepareTooltip() {
+                ttScope.title = attrs[prefix + 'Title'];
+                if (contentParse) {
+                  ttScope.content = contentParse(scope);
+                } else {
+                  ttScope.content = attrs[ttType];
+                }
+
+                ttScope.popupClass = attrs[prefix + 'Class'];
+                ttScope.placement = angular.isDefined(attrs[prefix + 'Placement']) ? attrs[prefix + 'Placement'] : options.placement;
+                var placement = $position.parsePlacement(ttScope.placement);
+                lastPlacement = placement[1] ? placement[0] + '-' + placement[1] : placement[0];
+
+                var delay = parseInt(attrs[prefix + 'PopupDelay'], 10);
+                var closeDelay = parseInt(attrs[prefix + 'PopupCloseDelay'], 10);
+                ttScope.popupDelay = !isNaN(delay) ? delay : options.popupDelay;
+                ttScope.popupCloseDelay = !isNaN(closeDelay) ? closeDelay : options.popupCloseDelay;
+              }
+
+              function assignIsOpen(isOpen) {
+                if (isOpenParse && angular.isFunction(isOpenParse.assign)) {
+                  isOpenParse.assign(scope, isOpen);
+                }
+              }
+
+              ttScope.contentExp = function() {
+                return ttScope.content;
+              };
+
+              /**
+               * Observe the relevant attributes.
+               */
+              attrs.$observe('disabled', function(val) {
+                if (val) {
+                  cancelShow();
+                }
+
+                if (val && ttScope.isOpen) {
+                  hide();
+                }
+              });
+
+              if (isOpenParse) {
+                scope.$watch(isOpenParse, function(val) {
+                  if (ttScope && !val === ttScope.isOpen) {
+                    toggleTooltipBind();
+                  }
+                });
+              }
+
+              function prepObservers() {
+                observers.length = 0;
+
+                if (contentParse) {
+                  observers.push(
+                    scope.$watch(contentParse, function(val) {
+                      ttScope.content = val;
+                      if (!val && ttScope.isOpen) {
+                        hide();
+                      }
+                    })
+                  );
+
+                  observers.push(
+                    tooltipLinkedScope.$watch(function() {
+                      if (!repositionScheduled) {
+                        repositionScheduled = true;
+                        tooltipLinkedScope.$$postDigest(function() {
+                          repositionScheduled = false;
+                          if (ttScope && ttScope.isOpen) {
+                            positionTooltip();
+                          }
+                        });
+                      }
+                    })
+                  );
+                } else {
+                  observers.push(
+                    attrs.$observe(ttType, function(val) {
+                      ttScope.content = val;
+                      if (!val && ttScope.isOpen) {
+                        hide();
+                      } else {
+                        positionTooltip();
+                      }
+                    })
+                  );
+                }
+
+                observers.push(
+                  attrs.$observe(prefix + 'Title', function(val) {
+                    ttScope.title = val;
+                    if (ttScope.isOpen) {
+                      positionTooltip();
+                    }
+                  })
+                );
+
+                observers.push(
+                  attrs.$observe(prefix + 'Placement', function(val) {
+                    ttScope.placement = val ? val : options.placement;
+                    if (ttScope.isOpen) {
+                      positionTooltip();
+                    }
+                  })
+                );
+              }
+
+              function unregisterObservers() {
+                if (observers.length) {
+                  angular.forEach(observers, function(observer) {
+                    observer();
+                  });
+                  observers.length = 0;
+                }
+              }
+
+              // hide tooltips/popovers for outsideClick trigger
+              function bodyHideTooltipBind(e) {
+                if (!ttScope || !ttScope.isOpen || !tooltip) {
+                  return;
+                }
+                // make sure the tooltip/popover link or tool tooltip/popover itself were not clicked
+                if (!element[0].contains(e.target) && !tooltip[0].contains(e.target)) {
+                  hideTooltipBind();
+                }
+              }
+
+              // KeyboardEvent handler to hide the tooltip on Escape key press
+              function hideOnEscapeKey(e) {
+                if (e.which === 27) {
+                  hideTooltipBind();
+                }
+              }
+
+              var unregisterTriggers = function() {
+                triggers.show.forEach(function(trigger) {
+                  if (trigger === 'outsideClick') {
+                    element.off('click', toggleTooltipBind);
+                  } else {
+                    element.off(trigger, showTooltipBind);
+                    element.off(trigger, toggleTooltipBind);
+                  }
+                  element.off('keypress', hideOnEscapeKey);
+                });
+                triggers.hide.forEach(function(trigger) {
+                  if (trigger === 'outsideClick') {
+                    $document.off('click', bodyHideTooltipBind);
+                  } else {
+                    element.off(trigger, hideTooltipBind);
+                  }
+                });
+              };
+
+              function prepTriggers() {
+                var showTriggers = [], hideTriggers = [];
+                var val = scope.$eval(attrs[prefix + 'Trigger']);
+                unregisterTriggers();
+
+                if (angular.isObject(val)) {
+                  Object.keys(val).forEach(function(key) {
+                    showTriggers.push(key);
+                    hideTriggers.push(val[key]);
+                  });
+                  triggers = {
+                    show: showTriggers,
+                    hide: hideTriggers
+                  };
+                } else {
+                  triggers = getTriggers(val);
+                }
+
+                if (triggers.show !== 'none') {
+                  triggers.show.forEach(function(trigger, idx) {
+                    if (trigger === 'outsideClick') {
+                      element.on('click', toggleTooltipBind);
+                      $document.on('click', bodyHideTooltipBind);
+                    } else if (trigger === triggers.hide[idx]) {
+                      element.on(trigger, toggleTooltipBind);
+                    } else if (trigger) {
+                      element.on(trigger, showTooltipBind);
+                      element.on(triggers.hide[idx], hideTooltipBind);
+                    }
+                    element.on('keypress', hideOnEscapeKey);
+                  });
+                }
+              }
+
+              prepTriggers();
+
+              var animation = scope.$eval(attrs[prefix + 'Animation']);
+              ttScope.animation = angular.isDefined(animation) ? !!animation : options.animation;
+
+              var appendToBodyVal;
+              var appendKey = prefix + 'AppendToBody';
+              if (appendKey in attrs && attrs[appendKey] === undefined) {
+                appendToBodyVal = true;
+              } else {
+                appendToBodyVal = scope.$eval(attrs[appendKey]);
+              }
+
+              appendToBody = angular.isDefined(appendToBodyVal) ? appendToBodyVal : appendToBody;
+
               // Make sure tooltip is destroyed and removed.
               scope.$on('$destroy', function onDestroyTooltip() {
-                $timeout.cancel( transitionTimeout );
-                $timeout.cancel( popupTimeout );
                 unregisterTriggers();
-                tooltip.remove();
-                tooltip.unbind();
-                tooltip = null;
+                removeTooltip();
+                ttScope = null;
               });
+            };
+          }
+        };
+      };
+    }];
+  })
+
+  // This is mostly ngInclude code but with a custom scope
+  .directive('uibTooltipTemplateTransclude', [
+    '$animate', '$sce', '$compile', '$templateRequest',
+    function ($animate, $sce, $compile, $templateRequest) {
+      return {
+        link: function(scope, elem, attrs) {
+          var origScope = scope.$eval(attrs.tooltipTemplateTranscludeScope);
+
+          var changeCounter = 0,
+            currentScope,
+            previousElement,
+            currentElement;
+
+          var cleanupLastIncludeContent = function() {
+            if (previousElement) {
+              previousElement.remove();
+              previousElement = null;
+            }
+
+            if (currentScope) {
+              currentScope.$destroy();
+              currentScope = null;
+            }
+
+            if (currentElement) {
+              $animate.leave(currentElement).then(function() {
+                previousElement = null;
+              });
+              previousElement = currentElement;
+              currentElement = null;
             }
           };
-        };
-      }];
-    })
 
-    .directive( 'tooltipPopup', function () {
-      return {
-        restrict: 'EA',
-        replace: true,
-        scope: { content: '@', placement: '@', animation: '&', isOpen: '&' },
-        templateUrl: 'template/tooltip/tooltip-popup.html'
+          scope.$watch($sce.parseAsResourceUrl(attrs.uibTooltipTemplateTransclude), function(src) {
+            var thisChangeId = ++changeCounter;
+
+            if (src) {
+              //set the 2nd param to true to ignore the template request error so that the inner
+              //contents and scope can be cleaned up.
+              $templateRequest(src, true).then(function(response) {
+                if (thisChangeId !== changeCounter) { return; }
+                var newScope = origScope.$new();
+                var template = response;
+
+                var clone = $compile(template)(newScope, function(clone) {
+                  cleanupLastIncludeContent();
+                  $animate.enter(clone, elem);
+                });
+
+                currentScope = newScope;
+                currentElement = clone;
+
+                currentScope.$emit('$includeContentLoaded', src);
+              }, function() {
+                if (thisChangeId === changeCounter) {
+                  cleanupLastIncludeContent();
+                  scope.$emit('$includeContentError', src);
+                }
+              });
+              scope.$emit('$includeContentRequested', src);
+            } else {
+              cleanupLastIncludeContent();
+            }
+          });
+
+          scope.$on('$destroy', cleanupLastIncludeContent);
+        }
       };
-    })
-
-    .directive( 'tooltip', [ '$tooltip', function ( $tooltip ) {
-      return $tooltip( 'tooltip', 'tooltip', 'mouseenter' );
     }])
 
-    .directive( 'tooltipHtmlUnsafePopup', function () {
-      return {
-        restrict: 'EA',
-        replace: true,
-        scope: { content: '@', placement: '@', animation: '&', isOpen: '&' },
-        templateUrl: 'template/tooltip/tooltip-html-unsafe-popup.html'
-      };
-    })
+  /**
+   * Note that it's intentional that these classes are *not* applied through $animate.
+   * They must not be animated as they're expected to be present on the tooltip on
+   * initialization.
+   */
+  .directive('uibTooltipClasses', ['$uibPosition', function($uibPosition) {
+    return {
+      restrict: 'A',
+      link: function(scope, element, attrs) {
+        // need to set the primary position so the
+        // arrow has space during position measure.
+        // tooltip.positionTooltip()
+        if (scope.placement) {
+          // // There are no top-left etc... classes
+          // // in TWBS, so we need the primary position.
+          var position = $uibPosition.parsePlacement(scope.placement);
+          element.addClass(position[0]);
+        }
 
-    .directive( 'tooltipHtmlUnsafe', [ '$tooltip', function ( $tooltip ) {
-      return $tooltip( 'tooltipHtmlUnsafe', 'tooltip', 'mouseenter' );
-    }]);
+        if (scope.popupClass) {
+          element.addClass(scope.popupClass);
+        }
+
+        if (scope.animation) {
+          element.addClass(attrs.tooltipAnimationClass);
+        }
+      }
+    };
+  }])
+
+  .directive('uibTooltipPopup', function() {
+    return {
+      restrict: 'A',
+      scope: { content: '@' },
+      templateUrl: 'uib/template/tooltip/tooltip-popup.html'
+    };
+  })
+
+  .directive('uibTooltip', [ '$uibTooltip', function($uibTooltip) {
+    return $uibTooltip('uibTooltip', 'tooltip', 'mouseenter');
+  }])
+
+  .directive('uibTooltipTemplatePopup', function() {
+    return {
+      restrict: 'A',
+      scope: { contentExp: '&', originScope: '&' },
+      templateUrl: 'uib/template/tooltip/tooltip-template-popup.html'
+    };
+  })
+
+  .directive('uibTooltipTemplate', ['$uibTooltip', function($uibTooltip) {
+    return $uibTooltip('uibTooltipTemplate', 'tooltip', 'mouseenter', {
+      useContentExp: true
+    });
+  }])
+
+  .directive('uibTooltipHtmlPopup', function() {
+    return {
+      restrict: 'A',
+      scope: { contentExp: '&' },
+      templateUrl: 'uib/template/tooltip/tooltip-html-popup.html'
+    };
+  })
+
+  .directive('uibTooltipHtml', ['$uibTooltip', function($uibTooltip) {
+    return $uibTooltip('uibTooltipHtml', 'tooltip', 'mouseenter', {
+      useContentExp: true
+    });
+  }]);
 
 /**
  * The following features are still outstanding: popup delay, animation as a
  * function, placement as a function, inside, support for more triggers than
- * just mouse enter/leave, html popovers, and selector delegatation.
+ * just mouse enter/leave, and selector delegatation.
  */
-angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
-    .directive( 'popoverPopup', function () {
-      return {
-        restrict: 'EA',
-        replace: true,
-        scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&' },
-        templateUrl: 'template/popover/popover.html'
-      };
-    })
-    .directive( 'popover', [ '$compile', '$timeout', '$parse', '$window', '$tooltip', function ( $compile, $timeout, $parse, $window, $tooltip ) {
-      return $tooltip( 'popover', 'popover', 'click' );
-    }]);
+angular.module('ui.bootstrap.popover', ['ui.bootstrap.tooltip'])
 
+  .directive('uibPopoverTemplatePopup', function() {
+    return {
+      restrict: 'A',
+      scope: { uibTitle: '@', contentExp: '&', originScope: '&' },
+      templateUrl: 'uib/template/popover/popover-template.html'
+    };
+  })
 
-angular.module('ui.bootstrap.progressbar', ['ui.bootstrap.transition'])
-
-    .constant('progressConfig', {
-      animate: true,
-      max: 100
-    })
-
-    .controller('ProgressController', ['$scope', '$attrs', 'progressConfig', '$transition', function($scope, $attrs, progressConfig, $transition) {
-      var self = this,
-          bars = [],
-          max = angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : progressConfig.max,
-          animate = angular.isDefined($attrs.animate) ? $scope.$parent.$eval($attrs.animate) : progressConfig.animate;
-
-      this.addBar = function(bar, element) {
-        var oldValue = 0, index = bar.$parent.$index;
-        if ( angular.isDefined(index) &&  bars[index] ) {
-          oldValue = bars[index].value;
-        }
-        bars.push(bar);
-
-        this.update(element, bar.value, oldValue);
-
-        bar.$watch('value', function(value, oldValue) {
-          if (value !== oldValue) {
-            self.update(element, value, oldValue);
-          }
-        });
-
-        bar.$on('$destroy', function() {
-          self.removeBar(bar);
-        });
-      };
-
-      // Update bar element width
-      this.update = function(element, newValue, oldValue) {
-        var percent = this.getPercentage(newValue);
-
-        if (animate) {
-          element.css('width', this.getPercentage(oldValue) + '%');
-          $transition(element, {width: percent + '%'});
-        } else {
-          element.css({'transition': 'none', 'width': percent + '%'});
-        }
-      };
-
-      this.removeBar = function(bar) {
-        bars.splice(bars.indexOf(bar), 1);
-      };
-
-      this.getPercentage = function(value) {
-        return Math.round(100 * value / max);
-      };
-    }])
-
-    .directive('progress', function() {
-      return {
-        restrict: 'EA',
-        replace: true,
-        transclude: true,
-        controller: 'ProgressController',
-        require: 'progress',
-        scope: {},
-        template: '<div class="progress" ng-transclude></div>'
-        //templateUrl: 'template/progressbar/progress.html' // Works in AngularJS 1.2
-      };
-    })
-
-    .directive('bar', function() {
-      return {
-        restrict: 'EA',
-        replace: true,
-        transclude: true,
-        require: '^progress',
-        scope: {
-          value: '=',
-          type: '@'
-        },
-        templateUrl: 'template/progressbar/bar.html',
-        link: function(scope, element, attrs, progressCtrl) {
-          progressCtrl.addBar(scope, element);
-        }
-      };
-    })
-
-    .directive('progressbar', function() {
-      return {
-        restrict: 'EA',
-        replace: true,
-        transclude: true,
-        controller: 'ProgressController',
-        scope: {
-          value: '=',
-          type: '@'
-        },
-        templateUrl: 'template/progressbar/progressbar.html',
-        link: function(scope, element, attrs, progressCtrl) {
-          progressCtrl.addBar(scope, angular.element(element.children()[0]));
-        }
-      };
+  .directive('uibPopoverTemplate', ['$uibTooltip', function($uibTooltip) {
+    return $uibTooltip('uibPopoverTemplate', 'popover', 'click', {
+      useContentExp: true
     });
-angular.module('ui.bootstrap.rating', [])
+  }])
 
-    .constant('ratingConfig', {
-      max: 5,
-      stateOn: null,
-      stateOff: null
-    })
+  .directive('uibPopoverHtmlPopup', function() {
+    return {
+      restrict: 'A',
+      scope: { contentExp: '&', uibTitle: '@' },
+      templateUrl: 'uib/template/popover/popover-html.html'
+    };
+  })
 
-    .controller('RatingController', ['$scope', '$attrs', '$parse', 'ratingConfig', function($scope, $attrs, $parse, ratingConfig) {
+  .directive('uibPopoverHtml', ['$uibTooltip', function($uibTooltip) {
+    return $uibTooltip('uibPopoverHtml', 'popover', 'click', {
+      useContentExp: true
+    });
+  }])
 
-      this.maxRange = angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max;
-      this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
-      this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
+  .directive('uibPopoverPopup', function() {
+    return {
+      restrict: 'A',
+      scope: { uibTitle: '@', content: '@' },
+      templateUrl: 'uib/template/popover/popover.html'
+    };
+  })
 
-      this.createRateObjects = function(states) {
-        var defaultOptions = {
-          stateOn: this.stateOn,
-          stateOff: this.stateOff
-        };
+  .directive('uibPopover', ['$uibTooltip', function($uibTooltip) {
+    return $uibTooltip('uibPopover', 'popover', 'click');
+  }]);
 
-        for (var i = 0, n = states.length; i < n; i++) {
-          states[i] = angular.extend({ index: i }, defaultOptions, states[i]);
-        }
-        return states;
-      };
+angular.module('ui.bootstrap.progressbar', [])
 
-      // Get objects used in template
-      $scope.range = angular.isDefined($attrs.ratingStates) ?  this.createRateObjects(angular.copy($scope.$parent.$eval($attrs.ratingStates))): this.createRateObjects(new Array(this.maxRange));
+  .constant('uibProgressConfig', {
+    animate: true,
+    max: 100
+  })
 
-      $scope.rate = function(value) {
-        if ( $scope.readonly || $scope.value === value) {
-          return;
-        }
+  .controller('UibProgressController', ['$scope', '$attrs', 'uibProgressConfig', function($scope, $attrs, progressConfig) {
+    var self = this,
+      animate = angular.isDefined($attrs.animate) ? $scope.$parent.$eval($attrs.animate) : progressConfig.animate;
 
-        $scope.value = value;
-      };
+    this.bars = [];
+    $scope.max = getMaxOrDefault();
 
-      $scope.enter = function(value) {
-        if ( ! $scope.readonly ) {
-          $scope.val = value;
-        }
-        $scope.onHover({value: value});
-      };
+    this.addBar = function(bar, element, attrs) {
+      if (!animate) {
+        element.css({'transition': 'none'});
+      }
 
-      $scope.reset = function() {
-        $scope.val = angular.copy($scope.value);
-        $scope.onLeave();
-      };
+      this.bars.push(bar);
 
-      $scope.$watch('value', function(value) {
-        $scope.val = value;
+      bar.max = getMaxOrDefault();
+      bar.title = attrs && angular.isDefined(attrs.title) ? attrs.title : 'progressbar';
+
+      bar.$watch('value', function(value) {
+        bar.recalculatePercentage();
       });
 
-      $scope.readonly = false;
-      if ($attrs.readonly) {
-        $scope.$parent.$watch($parse($attrs.readonly), function(value) {
-          $scope.readonly = !!value;
-        });
-      }
-    }])
+      bar.recalculatePercentage = function() {
+        var totalPercentage = self.bars.reduce(function(total, bar) {
+          bar.percent = +(100 * bar.value / bar.max).toFixed(2);
+          return total + bar.percent;
+        }, 0);
 
-    .directive('rating', function() {
-      return {
-        restrict: 'EA',
-        scope: {
-          value: '=',
-          onHover: '&',
-          onLeave: '&'
-        },
-        controller: 'RatingController',
-        templateUrl: 'template/rating/rating.html',
-        replace: true
+        if (totalPercentage > 100) {
+          bar.percent -= totalPercentage - 100;
+        }
       };
+
+      bar.$on('$destroy', function() {
+        element = null;
+        self.removeBar(bar);
+      });
+    };
+
+    this.removeBar = function(bar) {
+      this.bars.splice(this.bars.indexOf(bar), 1);
+      this.bars.forEach(function (bar) {
+        bar.recalculatePercentage();
+      });
+    };
+
+    //$attrs.$observe('maxParam', function(maxParam) {
+    $scope.$watch('maxParam', function(maxParam) {
+      self.bars.forEach(function(bar) {
+        bar.max = getMaxOrDefault();
+        bar.recalculatePercentage();
+      });
     });
 
-/**
- * @ngdoc overview
- * @name ui.bootstrap.tabs
- *
- * @description
- * AngularJS version of the tabs directive.
- */
+    function getMaxOrDefault () {
+      return angular.isDefined($scope.maxParam) ? $scope.maxParam : progressConfig.max;
+    }
+  }])
+
+  .directive('uibProgress', function() {
+    return {
+      replace: true,
+      transclude: true,
+      controller: 'UibProgressController',
+      require: 'uibProgress',
+      scope: {
+        maxParam: '=?max'
+      },
+      templateUrl: 'uib/template/progressbar/progress.html'
+    };
+  })
+
+  .directive('uibBar', function() {
+    return {
+      replace: true,
+      transclude: true,
+      require: '^uibProgress',
+      scope: {
+        value: '=',
+        type: '@'
+      },
+      templateUrl: 'uib/template/progressbar/bar.html',
+      link: function(scope, element, attrs, progressCtrl) {
+        progressCtrl.addBar(scope, element, attrs);
+      }
+    };
+  })
+
+  .directive('uibProgressbar', function() {
+    return {
+      replace: true,
+      transclude: true,
+      controller: 'UibProgressController',
+      scope: {
+        value: '=',
+        maxParam: '=?max',
+        type: '@'
+      },
+      templateUrl: 'uib/template/progressbar/progressbar.html',
+      link: function(scope, element, attrs, progressCtrl) {
+        progressCtrl.addBar(scope, angular.element(element.children()[0]), {title: attrs.title});
+      }
+    };
+  });
+
+angular.module('ui.bootstrap.rating', [])
+
+  .constant('uibRatingConfig', {
+    max: 5,
+    stateOn: null,
+    stateOff: null,
+    enableReset: true,
+    titles: ['one', 'two', 'three', 'four', 'five']
+  })
+
+  .controller('UibRatingController', ['$scope', '$attrs', 'uibRatingConfig', function($scope, $attrs, ratingConfig) {
+    var ngModelCtrl = { $setViewValue: angular.noop },
+      self = this;
+
+    this.init = function(ngModelCtrl_) {
+      ngModelCtrl = ngModelCtrl_;
+      ngModelCtrl.$render = this.render;
+
+      ngModelCtrl.$formatters.push(function(value) {
+        if (angular.isNumber(value) && value << 0 !== value) {
+          value = Math.round(value);
+        }
+
+        return value;
+      });
+
+      this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
+      this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
+      this.enableReset = angular.isDefined($attrs.enableReset) ?
+        $scope.$parent.$eval($attrs.enableReset) : ratingConfig.enableReset;
+      var tmpTitles = angular.isDefined($attrs.titles) ? $scope.$parent.$eval($attrs.titles) : ratingConfig.titles;
+      this.titles = angular.isArray(tmpTitles) && tmpTitles.length > 0 ?
+        tmpTitles : ratingConfig.titles;
+
+      var ratingStates = angular.isDefined($attrs.ratingStates) ?
+        $scope.$parent.$eval($attrs.ratingStates) :
+        new Array(angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max);
+      $scope.range = this.buildTemplateObjects(ratingStates);
+    };
+
+    this.buildTemplateObjects = function(states) {
+      for (var i = 0, n = states.length; i < n; i++) {
+        states[i] = angular.extend({ index: i }, { stateOn: this.stateOn, stateOff: this.stateOff, title: this.getTitle(i) }, states[i]);
+      }
+      return states;
+    };
+
+    this.getTitle = function(index) {
+      if (index >= this.titles.length) {
+        return index + 1;
+      }
+
+      return this.titles[index];
+    };
+
+    $scope.rate = function(value) {
+      if (!$scope.readonly && value >= 0 && value <= $scope.range.length) {
+        var newViewValue = self.enableReset && ngModelCtrl.$viewValue === value ? 0 : value;
+        ngModelCtrl.$setViewValue(newViewValue);
+        ngModelCtrl.$render();
+      }
+    };
+
+    $scope.enter = function(value) {
+      if (!$scope.readonly) {
+        $scope.value = value;
+      }
+      $scope.onHover({value: value});
+    };
+
+    $scope.reset = function() {
+      $scope.value = ngModelCtrl.$viewValue;
+      $scope.onLeave();
+    };
+
+    $scope.onKeydown = function(evt) {
+      if (/(37|38|39|40)/.test(evt.which)) {
+        evt.preventDefault();
+        evt.stopPropagation();
+        $scope.rate($scope.value + (evt.which === 38 || evt.which === 39 ? 1 : -1));
+      }
+    };
+
+    this.render = function() {
+      $scope.value = ngModelCtrl.$viewValue;
+      $scope.title = self.getTitle($scope.value - 1);
+    };
+  }])
+
+  .directive('uibRating', function() {
+    return {
+      require: ['uibRating', 'ngModel'],
+      restrict: 'A',
+      scope: {
+        readonly: '=?readOnly',
+        onHover: '&',
+        onLeave: '&'
+      },
+      controller: 'UibRatingController',
+      templateUrl: 'uib/template/rating/rating.html',
+      link: function(scope, element, attrs, ctrls) {
+        var ratingCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+        ratingCtrl.init(ngModelCtrl);
+      }
+    };
+  });
 
 angular.module('ui.bootstrap.tabs', [])
 
-    .controller('TabsetController', ['$scope', function TabsetCtrl($scope) {
-      var ctrl = this,
-          tabs = ctrl.tabs = $scope.tabs = [];
+  .controller('UibTabsetController', ['$scope', function ($scope) {
+    var ctrl = this,
+      oldIndex;
+    ctrl.tabs = [];
 
-      ctrl.select = function(tab) {
-        angular.forEach(tabs, function(tab) {
-          tab.active = false;
-        });
-        tab.active = true;
-      };
-
-      ctrl.addTab = function addTab(tab) {
-        tabs.push(tab);
-        if (tabs.length === 1 || tab.active) {
-          ctrl.select(tab);
-        }
-      };
-
-      ctrl.removeTab = function removeTab(tab) {
-        var index = tabs.indexOf(tab);
-        //Select a new tab if the tab to be removed is selected
-        if (tab.active && tabs.length > 1) {
-          //If this is the last tab, select the previous tab. else, the next tab.
-          var newActiveIndex = index == tabs.length - 1 ? index - 1 : index + 1;
-          ctrl.select(tabs[newActiveIndex]);
-        }
-        tabs.splice(index, 1);
-      };
-    }])
-
-/**
- * @ngdoc directive
- * @name ui.bootstrap.tabs.directive:tabset
- * @restrict EA
- *
- * @description
- * Tabset is the outer container for the tabs directive
- *
- * @param {boolean=} vertical Whether or not to use vertical styling for the tabs.
- * @param {boolean=} justified Whether or not to use justified styling for the tabs.
- *
- * @example
- <example module="ui.bootstrap">
- <file name="index.html">
- <tabset>
- <tab heading="Tab 1"><b>First</b> Content!</tab>
- <tab heading="Tab 2"><i>Second</i> Content!</tab>
- </tabset>
- <hr />
- <tabset vertical="true">
- <tab heading="Vertical Tab 1"><b>First</b> Vertical Content!</tab>
- <tab heading="Vertical Tab 2"><i>Second</i> Vertical Content!</tab>
- </tabset>
- <tabset justified="true">
- <tab heading="Justified Tab 1"><b>First</b> Justified Content!</tab>
- <tab heading="Justified Tab 2"><i>Second</i> Justified Content!</tab>
- </tabset>
- </file>
- </example>
- */
-    .directive('tabset', function() {
-      return {
-        restrict: 'EA',
-        transclude: true,
-        replace: true,
-        scope: {},
-        controller: 'TabsetController',
-        templateUrl: 'template/tabs/tabset.html',
-        link: function(scope, element, attrs) {
-          scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical) : false;
-          scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
-          scope.type = angular.isDefined(attrs.type) ? scope.$parent.$eval(attrs.type) : 'tabs';
-        }
-      };
-    })
-
-/**
- * @ngdoc directive
- * @name ui.bootstrap.tabs.directive:tab
- * @restrict EA
- *
- * @param {string=} heading The visible heading, or title, of the tab. Set HTML headings with {@link ui.bootstrap.tabs.directive:tabHeading tabHeading}.
- * @param {string=} select An expression to evaluate when the tab is selected.
- * @param {boolean=} active A binding, telling whether or not this tab is selected.
- * @param {boolean=} disabled A binding, telling whether or not this tab is disabled.
- *
- * @description
- * Creates a tab with a heading and content. Must be placed within a {@link ui.bootstrap.tabs.directive:tabset tabset}.
- *
- * @example
- <example module="ui.bootstrap">
- <file name="index.html">
- <div ng-controller="TabsDemoCtrl">
- <button class="btn btn-small" ng-click="items[0].active = true">
- Select item 1, using active binding
- </button>
- <button class="btn btn-small" ng-click="items[1].disabled = !items[1].disabled">
- Enable/disable item 2, using disabled binding
- </button>
- <br />
- <tabset>
- <tab heading="Tab 1">First Tab</tab>
- <tab select="alertMe()">
- <tab-heading><i class="icon-bell"></i> Alert me!</tab-heading>
- Second Tab, with alert callback and html heading!
- </tab>
- <tab ng-repeat="item in items"
- heading="{{item.title}}"
- disabled="item.disabled"
- active="item.active">
- {{item.content}}
- </tab>
- </tabset>
- </div>
- </file>
- <file name="script.js">
- function TabsDemoCtrl($scope) {
-      $scope.items = [
-        { title:"Dynamic Title 1", content:"Dynamic Item 0" },
-        { title:"Dynamic Title 2", content:"Dynamic Item 1", disabled: true }
-      ];
-
-      $scope.alertMe = function() {
-        setTimeout(function() {
-          alert("You've selected the alert tab!");
-        });
-      };
-    };
- </file>
- </example>
- */
-
-/**
- * @ngdoc directive
- * @name ui.bootstrap.tabs.directive:tabHeading
- * @restrict EA
- *
- * @description
- * Creates an HTML heading for a {@link ui.bootstrap.tabs.directive:tab tab}. Must be placed as a child of a tab element.
- *
- * @example
- <example module="ui.bootstrap">
- <file name="index.html">
- <tabset>
- <tab>
- <tab-heading><b>HTML</b> in my titles?!</tab-heading>
- And some content, too!
- </tab>
- <tab>
- <tab-heading><i class="icon-heart"></i> Icon heading?!?</tab-heading>
- That's right.
- </tab>
- </tabset>
- </file>
- </example>
- */
-    .directive('tab', ['$parse', function($parse) {
-      return {
-        require: '^tabset',
-        restrict: 'EA',
-        replace: true,
-        templateUrl: 'template/tabs/tab.html',
-        transclude: true,
-        scope: {
-          heading: '@',
-          onSelect: '&select', //This callback is called in contentHeadingTransclude
-          //once it inserts the tab's content into the dom
-          onDeselect: '&deselect'
-        },
-        controller: function() {
-          //Empty controller so other directives can require being 'under' a tab
-        },
-        compile: function(elm, attrs, transclude) {
-          return function postLink(scope, elm, attrs, tabsetCtrl) {
-            var getActive, setActive;
-            if (attrs.active) {
-              getActive = $parse(attrs.active);
-              setActive = getActive.assign;
-              scope.$parent.$watch(getActive, function updateActive(value, oldVal) {
-                // Avoid re-initializing scope.active as it is already initialized
-                // below. (watcher is called async during init with value ===
-                // oldVal)
-                if (value !== oldVal) {
-                  scope.active = !!value;
-                }
-              });
-              scope.active = getActive(scope.$parent);
-            } else {
-              setActive = getActive = angular.noop;
-            }
-
-            scope.$watch('active', function(active) {
-              // Note this watcher also initializes and assigns scope.active to the
-              // attrs.active expression.
-              setActive(scope.$parent, active);
-              if (active) {
-                tabsetCtrl.select(scope);
-                scope.onSelect();
-              } else {
-                scope.onDeselect();
-              }
-            });
-
-            scope.disabled = false;
-            if ( attrs.disabled ) {
-              scope.$parent.$watch($parse(attrs.disabled), function(value) {
-                scope.disabled = !! value;
-              });
-            }
-
-            scope.select = function() {
-              if ( ! scope.disabled ) {
-                scope.active = true;
-              }
-            };
-
-            tabsetCtrl.addTab(scope);
-            scope.$on('$destroy', function() {
-              tabsetCtrl.removeTab(scope);
-            });
-
-
-            //We need to transclude later, once the content container is ready.
-            //when this link happens, we're inside a tab heading.
-            scope.$transcludeFn = transclude;
-          };
-        }
-      };
-    }])
-
-    .directive('tabHeadingTransclude', [function() {
-      return {
-        restrict: 'A',
-        require: '^tab',
-        link: function(scope, elm, attrs, tabCtrl) {
-          scope.$watch('headingElement', function updateHeadingElement(heading) {
-            if (heading) {
-              elm.html('');
-              elm.append(heading);
-            }
+    ctrl.select = function(index, evt) {
+      if (!destroyed) {
+        var previousIndex = findTabIndex(oldIndex);
+        var previousSelected = ctrl.tabs[previousIndex];
+        if (previousSelected) {
+          previousSelected.tab.onDeselect({
+            $event: evt,
+            $selectedIndex: index
           });
+          if (evt && evt.isDefaultPrevented()) {
+            return;
+          }
+          previousSelected.tab.active = false;
         }
-      };
-    }])
 
-    .directive('tabContentTransclude', function() {
-      return {
-        restrict: 'A',
-        require: '^tabset',
-        link: function(scope, elm, attrs) {
-          var tab = scope.$eval(attrs.tabContentTransclude);
-
-          //Now our tab is ready to be transcluded: both the tab heading area
-          //and the tab content area are loaded.  Transclude 'em both.
-          tab.$transcludeFn(tab.$parent, function(contents) {
-            angular.forEach(contents, function(node) {
-              if (isTabHeading(node)) {
-                //Let tabHeadingTransclude know.
-                tab.headingElement = node;
-              } else {
-                elm.append(node);
-              }
-            });
+        var selected = ctrl.tabs[index];
+        if (selected) {
+          selected.tab.onSelect({
+            $event: evt
           });
+          selected.tab.active = true;
+          ctrl.active = selected.index;
+          oldIndex = selected.index;
+        } else if (!selected && angular.isDefined(oldIndex)) {
+          ctrl.active = null;
+          oldIndex = null;
         }
-      };
-      function isTabHeading(node) {
-        return node.tagName &&  (
-            node.hasAttribute('tab-heading') ||
-                node.hasAttribute('data-tab-heading') ||
-                node.tagName.toLowerCase() === 'tab-heading' ||
-                node.tagName.toLowerCase() === 'data-tab-heading'
-            );
       }
-    })
+    };
 
-;
+    ctrl.addTab = function addTab(tab) {
+      ctrl.tabs.push({
+        tab: tab,
+        index: tab.index
+      });
+      ctrl.tabs.sort(function(t1, t2) {
+        if (t1.index > t2.index) {
+          return 1;
+        }
+
+        if (t1.index < t2.index) {
+          return -1;
+        }
+
+        return 0;
+      });
+
+      if (tab.index === ctrl.active || !angular.isDefined(ctrl.active) && ctrl.tabs.length === 1) {
+        var newActiveIndex = findTabIndex(tab.index);
+        ctrl.select(newActiveIndex);
+      }
+    };
+
+    ctrl.removeTab = function removeTab(tab) {
+      var index;
+      for (var i = 0; i < ctrl.tabs.length; i++) {
+        if (ctrl.tabs[i].tab === tab) {
+          index = i;
+          break;
+        }
+      }
+
+      if (ctrl.tabs[index].index === ctrl.active) {
+        var newActiveTabIndex = index === ctrl.tabs.length - 1 ?
+          index - 1 : index + 1 % ctrl.tabs.length;
+        ctrl.select(newActiveTabIndex);
+      }
+
+      ctrl.tabs.splice(index, 1);
+    };
+
+    $scope.$watch('tabset.active', function(val) {
+      if (angular.isDefined(val) && val !== oldIndex) {
+        ctrl.select(findTabIndex(val));
+      }
+    });
+
+    var destroyed;
+    $scope.$on('$destroy', function() {
+      destroyed = true;
+    });
+
+    function findTabIndex(index) {
+      for (var i = 0; i < ctrl.tabs.length; i++) {
+        if (ctrl.tabs[i].index === index) {
+          return i;
+        }
+      }
+    }
+  }])
+
+  .directive('uibTabset', function() {
+    return {
+      transclude: true,
+      replace: true,
+      scope: {},
+      bindToController: {
+        active: '=?',
+        type: '@'
+      },
+      controller: 'UibTabsetController',
+      controllerAs: 'tabset',
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/tabs/tabset.html';
+      },
+      link: function(scope, element, attrs) {
+        scope.vertical = angular.isDefined(attrs.vertical) ?
+          scope.$parent.$eval(attrs.vertical) : false;
+        scope.justified = angular.isDefined(attrs.justified) ?
+          scope.$parent.$eval(attrs.justified) : false;
+      }
+    };
+  })
+
+  .directive('uibTab', ['$parse', function($parse) {
+    return {
+      require: '^uibTabset',
+      replace: true,
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || 'uib/template/tabs/tab.html';
+      },
+      transclude: true,
+      scope: {
+        heading: '@',
+        index: '=?',
+        classes: '@?',
+        onSelect: '&select', //This callback is called in contentHeadingTransclude
+        //once it inserts the tab's content into the dom
+        onDeselect: '&deselect'
+      },
+      controller: function() {
+        //Empty controller so other directives can require being 'under' a tab
+      },
+      controllerAs: 'tab',
+      link: function(scope, elm, attrs, tabsetCtrl, transclude) {
+        scope.disabled = false;
+        if (attrs.disable) {
+          scope.$parent.$watch($parse(attrs.disable), function(value) {
+            scope.disabled = !! value;
+          });
+        }
+
+        if (angular.isUndefined(attrs.index)) {
+          if (tabsetCtrl.tabs && tabsetCtrl.tabs.length) {
+            scope.index = Math.max.apply(null, tabsetCtrl.tabs.map(function(t) { return t.index; })) + 1;
+          } else {
+            scope.index = 0;
+          }
+        }
+
+        if (angular.isUndefined(attrs.classes)) {
+          scope.classes = '';
+        }
+
+        scope.select = function(evt) {
+          if (!scope.disabled) {
+            var index;
+            for (var i = 0; i < tabsetCtrl.tabs.length; i++) {
+              if (tabsetCtrl.tabs[i].tab === scope) {
+                index = i;
+                break;
+              }
+            }
+
+            tabsetCtrl.select(index, evt);
+          }
+        };
+
+        tabsetCtrl.addTab(scope);
+        scope.$on('$destroy', function() {
+          tabsetCtrl.removeTab(scope);
+        });
+
+        //We need to transclude later, once the content container is ready.
+        //when this link happens, we're inside a tab heading.
+        scope.$transcludeFn = transclude;
+      }
+    };
+  }])
+
+  .directive('uibTabHeadingTransclude', function() {
+    return {
+      restrict: 'A',
+      require: '^uibTab',
+      link: function(scope, elm) {
+        scope.$watch('headingElement', function updateHeadingElement(heading) {
+          if (heading) {
+            elm.html('');
+            elm.append(heading);
+          }
+        });
+      }
+    };
+  })
+
+  .directive('uibTabContentTransclude', function() {
+    return {
+      restrict: 'A',
+      require: '^uibTabset',
+      link: function(scope, elm, attrs) {
+        var tab = scope.$eval(attrs.uibTabContentTransclude).tab;
+
+        //Now our tab is ready to be transcluded: both the tab heading area
+        //and the tab content area are loaded.  Transclude 'em both.
+        tab.$transcludeFn(tab.$parent, function(contents) {
+          angular.forEach(contents, function(node) {
+            if (isTabHeading(node)) {
+              //Let tabHeadingTransclude know.
+              tab.headingElement = node;
+            } else {
+              elm.append(node);
+            }
+          });
+        });
+      }
+    };
+
+    function isTabHeading(node) {
+      return node.tagName && (
+        node.hasAttribute('uib-tab-heading') ||
+        node.hasAttribute('data-uib-tab-heading') ||
+        node.hasAttribute('x-uib-tab-heading') ||
+        node.tagName.toLowerCase() === 'uib-tab-heading' ||
+        node.tagName.toLowerCase() === 'data-uib-tab-heading' ||
+        node.tagName.toLowerCase() === 'x-uib-tab-heading' ||
+        node.tagName.toLowerCase() === 'uib:tab-heading'
+      );
+    }
+  });
 
 angular.module('ui.bootstrap.timepicker', [])
 
-    .constant('timepickerConfig', {
-      hourStep: 1,
-      minuteStep: 1,
-      showMeridian: true,
-      meridians: null,
-      readonlyInput: false,
-      mousewheel: true
-    })
+  .constant('uibTimepickerConfig', {
+    hourStep: 1,
+    minuteStep: 1,
+    secondStep: 1,
+    showMeridian: true,
+    showSeconds: false,
+    meridians: null,
+    readonlyInput: false,
+    mousewheel: true,
+    arrowkeys: true,
+    showSpinners: true,
+    templateUrl: 'uib/template/timepicker/timepicker.html'
+  })
 
-    .directive('timepicker', ['$parse', '$log', 'timepickerConfig', '$locale', function ($parse, $log, timepickerConfig, $locale) {
-      return {
-        restrict: 'EA',
-        require:'?^ngModel',
-        replace: true,
-        scope: {},
-        templateUrl: 'template/timepicker/timepicker.html',
-        link: function(scope, element, attrs, ngModel) {
-          if ( !ngModel ) {
-            return; // do nothing if no ng-model
-          }
+  .controller('UibTimepickerController', ['$scope', '$element', '$attrs', '$parse', '$log', '$locale', 'uibTimepickerConfig', function($scope, $element, $attrs, $parse, $log, $locale, timepickerConfig) {
+    var hoursModelCtrl, minutesModelCtrl, secondsModelCtrl;
+    var selected = new Date(),
+      watchers = [],
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+      meridians = angular.isDefined($attrs.meridians) ? $scope.$parent.$eval($attrs.meridians) : timepickerConfig.meridians || $locale.DATETIME_FORMATS.AMPMS,
+      padHours = angular.isDefined($attrs.padHours) ? $scope.$parent.$eval($attrs.padHours) : true;
 
-          var selected = new Date(),
-              meridians = angular.isDefined(attrs.meridians) ? scope.$parent.$eval(attrs.meridians) : timepickerConfig.meridians || $locale.DATETIME_FORMATS.AMPMS;
+    $scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
+    $element.removeAttr('tabindex');
 
-          var hourStep = timepickerConfig.hourStep;
-          if (attrs.hourStep) {
-            scope.$parent.$watch($parse(attrs.hourStep), function(value) {
-              hourStep = parseInt(value, 10);
-            });
-          }
+    this.init = function(ngModelCtrl_, inputs) {
+      ngModelCtrl = ngModelCtrl_;
+      ngModelCtrl.$render = this.render;
 
-          var minuteStep = timepickerConfig.minuteStep;
-          if (attrs.minuteStep) {
-            scope.$parent.$watch($parse(attrs.minuteStep), function(value) {
-              minuteStep = parseInt(value, 10);
-            });
-          }
+      ngModelCtrl.$formatters.unshift(function(modelValue) {
+        return modelValue ? new Date(modelValue) : null;
+      });
 
-          // 12H / 24H mode
-          scope.showMeridian = timepickerConfig.showMeridian;
-          if (attrs.showMeridian) {
-            scope.$parent.$watch($parse(attrs.showMeridian), function(value) {
-              scope.showMeridian = !!value;
+      var hoursInputEl = inputs.eq(0),
+        minutesInputEl = inputs.eq(1),
+        secondsInputEl = inputs.eq(2);
 
-              if ( ngModel.$error.time ) {
-                // Evaluate from template
-                var hours = getHoursFromTemplate(), minutes = getMinutesFromTemplate();
-                if (angular.isDefined( hours ) && angular.isDefined( minutes )) {
-                  selected.setHours( hours );
-                  refresh();
-                }
-              } else {
-                updateTemplate();
-              }
-            });
-          }
+      hoursModelCtrl = hoursInputEl.controller('ngModel');
+      minutesModelCtrl = minutesInputEl.controller('ngModel');
+      secondsModelCtrl = secondsInputEl.controller('ngModel');
 
-          // Get scope.hours in 24H mode if valid
-          function getHoursFromTemplate ( ) {
-            var hours = parseInt( scope.hours, 10 );
-            var valid = ( scope.showMeridian ) ? (hours > 0 && hours < 13) : (hours >= 0 && hours < 24);
-            if ( !valid ) {
-              return undefined;
-            }
+      var mousewheel = angular.isDefined($attrs.mousewheel) ? $scope.$parent.$eval($attrs.mousewheel) : timepickerConfig.mousewheel;
 
-            if ( scope.showMeridian ) {
-              if ( hours === 12 ) {
-                hours = 0;
-              }
-              if ( scope.meridian === meridians[1] ) {
-                hours = hours + 12;
-              }
-            }
-            return hours;
-          }
+      if (mousewheel) {
+        this.setupMousewheelEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+      }
 
-          function getMinutesFromTemplate() {
-            var minutes = parseInt(scope.minutes, 10);
-            return ( minutes >= 0 && minutes < 60 ) ? minutes : undefined;
-          }
+      var arrowkeys = angular.isDefined($attrs.arrowkeys) ? $scope.$parent.$eval($attrs.arrowkeys) : timepickerConfig.arrowkeys;
+      if (arrowkeys) {
+        this.setupArrowkeyEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+      }
 
-          function pad( value ) {
-            return ( angular.isDefined(value) && value.toString().length < 2 ) ? '0' + value : value;
-          }
+      $scope.readonlyInput = angular.isDefined($attrs.readonlyInput) ? $scope.$parent.$eval($attrs.readonlyInput) : timepickerConfig.readonlyInput;
+      this.setupInputEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+    };
 
-          // Input elements
-          var inputs = element.find('input'), hoursInputEl = inputs.eq(0), minutesInputEl = inputs.eq(1);
+    var hourStep = timepickerConfig.hourStep;
+    if ($attrs.hourStep) {
+      watchers.push($scope.$parent.$watch($parse($attrs.hourStep), function(value) {
+        hourStep = +value;
+      }));
+    }
 
-          // Respond on mousewheel spin
-          var mousewheel = (angular.isDefined(attrs.mousewheel)) ? scope.$eval(attrs.mousewheel) : timepickerConfig.mousewheel;
-          if ( mousewheel ) {
+    var minuteStep = timepickerConfig.minuteStep;
+    if ($attrs.minuteStep) {
+      watchers.push($scope.$parent.$watch($parse($attrs.minuteStep), function(value) {
+        minuteStep = +value;
+      }));
+    }
 
-            var isScrollingUp = function(e) {
-              if (e.originalEvent) {
-                e = e.originalEvent;
-              }
-              //pick correct delta variable depending on event
-              var delta = (e.wheelDelta) ? e.wheelDelta : -e.deltaY;
-              return (e.detail || delta > 0);
-            };
+    var min;
+    watchers.push($scope.$parent.$watch($parse($attrs.min), function(value) {
+      var dt = new Date(value);
+      min = isNaN(dt) ? undefined : dt;
+    }));
 
-            hoursInputEl.bind('mousewheel wheel', function(e) {
-              scope.$apply( (isScrollingUp(e)) ? scope.incrementHours() : scope.decrementHours() );
-              e.preventDefault();
-            });
+    var max;
+    watchers.push($scope.$parent.$watch($parse($attrs.max), function(value) {
+      var dt = new Date(value);
+      max = isNaN(dt) ? undefined : dt;
+    }));
 
-            minutesInputEl.bind('mousewheel wheel', function(e) {
-              scope.$apply( (isScrollingUp(e)) ? scope.incrementMinutes() : scope.decrementMinutes() );
-              e.preventDefault();
-            });
-          }
+    var disabled = false;
+    if ($attrs.ngDisabled) {
+      watchers.push($scope.$parent.$watch($parse($attrs.ngDisabled), function(value) {
+        disabled = value;
+      }));
+    }
 
-          scope.readonlyInput = (angular.isDefined(attrs.readonlyInput)) ? scope.$eval(attrs.readonlyInput) : timepickerConfig.readonlyInput;
-          if ( ! scope.readonlyInput ) {
+    $scope.noIncrementHours = function() {
+      var incrementedSelected = addMinutes(selected, hourStep * 60);
+      return disabled || incrementedSelected > max ||
+        incrementedSelected < selected && incrementedSelected < min;
+    };
 
-            var invalidate = function(invalidHours, invalidMinutes) {
-              ngModel.$setViewValue( null );
-              ngModel.$setValidity('time', false);
-              if (angular.isDefined(invalidHours)) {
-                scope.invalidHours = invalidHours;
-              }
-              if (angular.isDefined(invalidMinutes)) {
-                scope.invalidMinutes = invalidMinutes;
-              }
-            };
+    $scope.noDecrementHours = function() {
+      var decrementedSelected = addMinutes(selected, -hourStep * 60);
+      return disabled || decrementedSelected < min ||
+        decrementedSelected > selected && decrementedSelected > max;
+    };
 
-            scope.updateHours = function() {
-              var hours = getHoursFromTemplate();
+    $scope.noIncrementMinutes = function() {
+      var incrementedSelected = addMinutes(selected, minuteStep);
+      return disabled || incrementedSelected > max ||
+        incrementedSelected < selected && incrementedSelected < min;
+    };
 
-              if ( angular.isDefined(hours) ) {
-                selected.setHours( hours );
-                refresh( 'h' );
-              } else {
-                invalidate(true);
-              }
-            };
+    $scope.noDecrementMinutes = function() {
+      var decrementedSelected = addMinutes(selected, -minuteStep);
+      return disabled || decrementedSelected < min ||
+        decrementedSelected > selected && decrementedSelected > max;
+    };
 
-            hoursInputEl.bind('blur', function(e) {
-              if ( !scope.validHours && scope.hours < 10) {
-                scope.$apply( function() {
-                  scope.hours = pad( scope.hours );
-                });
-              }
-            });
+    $scope.noIncrementSeconds = function() {
+      var incrementedSelected = addSeconds(selected, secondStep);
+      return disabled || incrementedSelected > max ||
+        incrementedSelected < selected && incrementedSelected < min;
+    };
 
-            scope.updateMinutes = function() {
-              var minutes = getMinutesFromTemplate();
+    $scope.noDecrementSeconds = function() {
+      var decrementedSelected = addSeconds(selected, -secondStep);
+      return disabled || decrementedSelected < min ||
+        decrementedSelected > selected && decrementedSelected > max;
+    };
 
-              if ( angular.isDefined(minutes) ) {
-                selected.setMinutes( minutes );
-                refresh( 'm' );
-              } else {
-                invalidate(undefined, true);
-              }
-            };
+    $scope.noToggleMeridian = function() {
+      if (selected.getHours() < 12) {
+        return disabled || addMinutes(selected, 12 * 60) > max;
+      }
 
-            minutesInputEl.bind('blur', function(e) {
-              if ( !scope.invalidMinutes && scope.minutes < 10 ) {
-                scope.$apply( function() {
-                  scope.minutes = pad( scope.minutes );
-                });
-              }
-            });
-          } else {
-            scope.updateHours = angular.noop;
-            scope.updateMinutes = angular.noop;
-          }
+      return disabled || addMinutes(selected, -12 * 60) < min;
+    };
 
-          ngModel.$render = function() {
-            var date = ngModel.$modelValue ? new Date( ngModel.$modelValue ) : null;
+    var secondStep = timepickerConfig.secondStep;
+    if ($attrs.secondStep) {
+      watchers.push($scope.$parent.$watch($parse($attrs.secondStep), function(value) {
+        secondStep = +value;
+      }));
+    }
 
-            if ( isNaN(date) ) {
-              ngModel.$setValidity('time', false);
-              $log.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
-            } else {
-              if ( date ) {
-                selected = date;
-              }
-              makeValid();
-              updateTemplate();
-            }
-          };
+    $scope.showSeconds = timepickerConfig.showSeconds;
+    if ($attrs.showSeconds) {
+      watchers.push($scope.$parent.$watch($parse($attrs.showSeconds), function(value) {
+        $scope.showSeconds = !!value;
+      }));
+    }
 
-          // Call internally when we know that model is valid.
-          function refresh( keyboardChange ) {
-            makeValid();
-            ngModel.$setViewValue( new Date(selected) );
-            updateTemplate( keyboardChange );
-          }
+    // 12H / 24H mode
+    $scope.showMeridian = timepickerConfig.showMeridian;
+    if ($attrs.showMeridian) {
+      watchers.push($scope.$parent.$watch($parse($attrs.showMeridian), function(value) {
+        $scope.showMeridian = !!value;
 
-          function makeValid() {
-            ngModel.$setValidity('time', true);
-            scope.invalidHours = false;
-            scope.invalidMinutes = false;
-          }
-
-          function updateTemplate( keyboardChange ) {
-            var hours = selected.getHours(), minutes = selected.getMinutes();
-
-            if ( scope.showMeridian ) {
-              hours = ( hours === 0 || hours === 12 ) ? 12 : hours % 12; // Convert 24 to 12 hour system
-            }
-            scope.hours =  keyboardChange === 'h' ? hours : pad(hours);
-            scope.minutes = keyboardChange === 'm' ? minutes : pad(minutes);
-            scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
-          }
-
-          function addMinutes( minutes ) {
-            var dt = new Date( selected.getTime() + minutes * 60000 );
-            selected.setHours( dt.getHours(), dt.getMinutes() );
+        if (ngModelCtrl.$error.time) {
+          // Evaluate from template
+          var hours = getHoursFromTemplate(), minutes = getMinutesFromTemplate();
+          if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+            selected.setHours(hours);
             refresh();
           }
+        } else {
+          updateTemplate();
+        }
+      }));
+    }
 
-          scope.incrementHours = function() {
-            addMinutes( hourStep * 60 );
-          };
-          scope.decrementHours = function() {
-            addMinutes( - hourStep * 60 );
-          };
-          scope.incrementMinutes = function() {
-            addMinutes( minuteStep );
-          };
-          scope.decrementMinutes = function() {
-            addMinutes( - minuteStep );
-          };
-          scope.toggleMeridian = function() {
-            addMinutes( 12 * 60 * (( selected.getHours() < 12 ) ? 1 : -1) );
-          };
+    // Get $scope.hours in 24H mode if valid
+    function getHoursFromTemplate() {
+      var hours = +$scope.hours;
+      var valid = $scope.showMeridian ? hours > 0 && hours < 13 :
+        hours >= 0 && hours < 24;
+      if (!valid || $scope.hours === '') {
+        return undefined;
+      }
+
+      if ($scope.showMeridian) {
+        if (hours === 12) {
+          hours = 0;
+        }
+        if ($scope.meridian === meridians[1]) {
+          hours = hours + 12;
+        }
+      }
+      return hours;
+    }
+
+    function getMinutesFromTemplate() {
+      var minutes = +$scope.minutes;
+      var valid = minutes >= 0 && minutes < 60;
+      if (!valid || $scope.minutes === '') {
+        return undefined;
+      }
+      return minutes;
+    }
+
+    function getSecondsFromTemplate() {
+      var seconds = +$scope.seconds;
+      return seconds >= 0 && seconds < 60 ? seconds : undefined;
+    }
+
+    function pad(value, noPad) {
+      if (value === null) {
+        return '';
+      }
+
+      return angular.isDefined(value) && value.toString().length < 2 && !noPad ?
+        '0' + value : value.toString();
+    }
+
+    // Respond on mousewheel spin
+    this.setupMousewheelEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+      var isScrollingUp = function(e) {
+        if (e.originalEvent) {
+          e = e.originalEvent;
+        }
+        //pick correct delta variable depending on event
+        var delta = e.wheelDelta ? e.wheelDelta : -e.deltaY;
+        return e.detail || delta > 0;
+      };
+
+      hoursInputEl.on('mousewheel wheel', function(e) {
+        if (!disabled) {
+          $scope.$apply(isScrollingUp(e) ? $scope.incrementHours() : $scope.decrementHours());
+        }
+        e.preventDefault();
+      });
+
+      minutesInputEl.on('mousewheel wheel', function(e) {
+        if (!disabled) {
+          $scope.$apply(isScrollingUp(e) ? $scope.incrementMinutes() : $scope.decrementMinutes());
+        }
+        e.preventDefault();
+      });
+
+      secondsInputEl.on('mousewheel wheel', function(e) {
+        if (!disabled) {
+          $scope.$apply(isScrollingUp(e) ? $scope.incrementSeconds() : $scope.decrementSeconds());
+        }
+        e.preventDefault();
+      });
+    };
+
+    // Respond on up/down arrowkeys
+    this.setupArrowkeyEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+      hoursInputEl.on('keydown', function(e) {
+        if (!disabled) {
+          if (e.which === 38) { // up
+            e.preventDefault();
+            $scope.incrementHours();
+            $scope.$apply();
+          } else if (e.which === 40) { // down
+            e.preventDefault();
+            $scope.decrementHours();
+            $scope.$apply();
+          }
+        }
+      });
+
+      minutesInputEl.on('keydown', function(e) {
+        if (!disabled) {
+          if (e.which === 38) { // up
+            e.preventDefault();
+            $scope.incrementMinutes();
+            $scope.$apply();
+          } else if (e.which === 40) { // down
+            e.preventDefault();
+            $scope.decrementMinutes();
+            $scope.$apply();
+          }
+        }
+      });
+
+      secondsInputEl.on('keydown', function(e) {
+        if (!disabled) {
+          if (e.which === 38) { // up
+            e.preventDefault();
+            $scope.incrementSeconds();
+            $scope.$apply();
+          } else if (e.which === 40) { // down
+            e.preventDefault();
+            $scope.decrementSeconds();
+            $scope.$apply();
+          }
+        }
+      });
+    };
+
+    this.setupInputEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+      if ($scope.readonlyInput) {
+        $scope.updateHours = angular.noop;
+        $scope.updateMinutes = angular.noop;
+        $scope.updateSeconds = angular.noop;
+        return;
+      }
+
+      var invalidate = function(invalidHours, invalidMinutes, invalidSeconds) {
+        ngModelCtrl.$setViewValue(null);
+        ngModelCtrl.$setValidity('time', false);
+        if (angular.isDefined(invalidHours)) {
+          $scope.invalidHours = invalidHours;
+          if (hoursModelCtrl) {
+            hoursModelCtrl.$setValidity('hours', false);
+          }
+        }
+
+        if (angular.isDefined(invalidMinutes)) {
+          $scope.invalidMinutes = invalidMinutes;
+          if (minutesModelCtrl) {
+            minutesModelCtrl.$setValidity('minutes', false);
+          }
+        }
+
+        if (angular.isDefined(invalidSeconds)) {
+          $scope.invalidSeconds = invalidSeconds;
+          if (secondsModelCtrl) {
+            secondsModelCtrl.$setValidity('seconds', false);
+          }
         }
       };
-    }]);
 
-angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap.bindHtml'])
+      $scope.updateHours = function() {
+        var hours = getHoursFromTemplate(),
+          minutes = getMinutesFromTemplate();
+
+        ngModelCtrl.$setDirty();
+
+        if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+          selected.setHours(hours);
+          selected.setMinutes(minutes);
+          if (selected < min || selected > max) {
+            invalidate(true);
+          } else {
+            refresh('h');
+          }
+        } else {
+          invalidate(true);
+        }
+      };
+
+      hoursInputEl.on('blur', function(e) {
+        ngModelCtrl.$setTouched();
+        if (modelIsEmpty()) {
+          makeValid();
+        } else if ($scope.hours === null || $scope.hours === '') {
+          invalidate(true);
+        } else if (!$scope.invalidHours && $scope.hours < 10) {
+          $scope.$apply(function() {
+            $scope.hours = pad($scope.hours, !padHours);
+          });
+        }
+      });
+
+      $scope.updateMinutes = function() {
+        var minutes = getMinutesFromTemplate(),
+          hours = getHoursFromTemplate();
+
+        ngModelCtrl.$setDirty();
+
+        if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+          selected.setHours(hours);
+          selected.setMinutes(minutes);
+          if (selected < min || selected > max) {
+            invalidate(undefined, true);
+          } else {
+            refresh('m');
+          }
+        } else {
+          invalidate(undefined, true);
+        }
+      };
+
+      minutesInputEl.on('blur', function(e) {
+        ngModelCtrl.$setTouched();
+        if (modelIsEmpty()) {
+          makeValid();
+        } else if ($scope.minutes === null) {
+          invalidate(undefined, true);
+        } else if (!$scope.invalidMinutes && $scope.minutes < 10) {
+          $scope.$apply(function() {
+            $scope.minutes = pad($scope.minutes);
+          });
+        }
+      });
+
+      $scope.updateSeconds = function() {
+        var seconds = getSecondsFromTemplate();
+
+        ngModelCtrl.$setDirty();
+
+        if (angular.isDefined(seconds)) {
+          selected.setSeconds(seconds);
+          refresh('s');
+        } else {
+          invalidate(undefined, undefined, true);
+        }
+      };
+
+      secondsInputEl.on('blur', function(e) {
+        if (modelIsEmpty()) {
+          makeValid();
+        } else if (!$scope.invalidSeconds && $scope.seconds < 10) {
+          $scope.$apply( function() {
+            $scope.seconds = pad($scope.seconds);
+          });
+        }
+      });
+
+    };
+
+    this.render = function() {
+      var date = ngModelCtrl.$viewValue;
+
+      if (isNaN(date)) {
+        ngModelCtrl.$setValidity('time', false);
+        $log.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+      } else {
+        if (date) {
+          selected = date;
+        }
+
+        if (selected < min || selected > max) {
+          ngModelCtrl.$setValidity('time', false);
+          $scope.invalidHours = true;
+          $scope.invalidMinutes = true;
+        } else {
+          makeValid();
+        }
+        updateTemplate();
+      }
+    };
+
+    // Call internally when we know that model is valid.
+    function refresh(keyboardChange) {
+      makeValid();
+      ngModelCtrl.$setViewValue(new Date(selected));
+      updateTemplate(keyboardChange);
+    }
+
+    function makeValid() {
+      if (hoursModelCtrl) {
+        hoursModelCtrl.$setValidity('hours', true);
+      }
+
+      if (minutesModelCtrl) {
+        minutesModelCtrl.$setValidity('minutes', true);
+      }
+
+      if (secondsModelCtrl) {
+        secondsModelCtrl.$setValidity('seconds', true);
+      }
+
+      ngModelCtrl.$setValidity('time', true);
+      $scope.invalidHours = false;
+      $scope.invalidMinutes = false;
+      $scope.invalidSeconds = false;
+    }
+
+    function updateTemplate(keyboardChange) {
+      if (!ngModelCtrl.$modelValue) {
+        $scope.hours = null;
+        $scope.minutes = null;
+        $scope.seconds = null;
+        $scope.meridian = meridians[0];
+      } else {
+        var hours = selected.getHours(),
+          minutes = selected.getMinutes(),
+          seconds = selected.getSeconds();
+
+        if ($scope.showMeridian) {
+          hours = hours === 0 || hours === 12 ? 12 : hours % 12; // Convert 24 to 12 hour system
+        }
+
+        $scope.hours = keyboardChange === 'h' ? hours : pad(hours, !padHours);
+        if (keyboardChange !== 'm') {
+          $scope.minutes = pad(minutes);
+        }
+        $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+
+        if (keyboardChange !== 's') {
+          $scope.seconds = pad(seconds);
+        }
+        $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+      }
+    }
+
+    function addSecondsToSelected(seconds) {
+      selected = addSeconds(selected, seconds);
+      refresh();
+    }
+
+    function addMinutes(selected, minutes) {
+      return addSeconds(selected, minutes*60);
+    }
+
+    function addSeconds(date, seconds) {
+      var dt = new Date(date.getTime() + seconds * 1000);
+      var newDate = new Date(date);
+      newDate.setHours(dt.getHours(), dt.getMinutes(), dt.getSeconds());
+      return newDate;
+    }
+
+    function modelIsEmpty() {
+      return ($scope.hours === null || $scope.hours === '') &&
+        ($scope.minutes === null || $scope.minutes === '') &&
+        (!$scope.showSeconds || $scope.showSeconds && ($scope.seconds === null || $scope.seconds === ''));
+    }
+
+    $scope.showSpinners = angular.isDefined($attrs.showSpinners) ?
+      $scope.$parent.$eval($attrs.showSpinners) : timepickerConfig.showSpinners;
+
+    $scope.incrementHours = function() {
+      if (!$scope.noIncrementHours()) {
+        addSecondsToSelected(hourStep * 60 * 60);
+      }
+    };
+
+    $scope.decrementHours = function() {
+      if (!$scope.noDecrementHours()) {
+        addSecondsToSelected(-hourStep * 60 * 60);
+      }
+    };
+
+    $scope.incrementMinutes = function() {
+      if (!$scope.noIncrementMinutes()) {
+        addSecondsToSelected(minuteStep * 60);
+      }
+    };
+
+    $scope.decrementMinutes = function() {
+      if (!$scope.noDecrementMinutes()) {
+        addSecondsToSelected(-minuteStep * 60);
+      }
+    };
+
+    $scope.incrementSeconds = function() {
+      if (!$scope.noIncrementSeconds()) {
+        addSecondsToSelected(secondStep);
+      }
+    };
+
+    $scope.decrementSeconds = function() {
+      if (!$scope.noDecrementSeconds()) {
+        addSecondsToSelected(-secondStep);
+      }
+    };
+
+    $scope.toggleMeridian = function() {
+      var minutes = getMinutesFromTemplate(),
+        hours = getHoursFromTemplate();
+
+      if (!$scope.noToggleMeridian()) {
+        if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+          addSecondsToSelected(12 * 60 * (selected.getHours() < 12 ? 60 : -60));
+        } else {
+          $scope.meridian = $scope.meridian === meridians[0] ? meridians[1] : meridians[0];
+        }
+      }
+    };
+
+    $scope.blur = function() {
+      ngModelCtrl.$setTouched();
+    };
+
+    $scope.$on('$destroy', function() {
+      while (watchers.length) {
+        watchers.shift()();
+      }
+    });
+  }])
+
+  .directive('uibTimepicker', ['uibTimepickerConfig', function(uibTimepickerConfig) {
+    return {
+      require: ['uibTimepicker', '?^ngModel'],
+      restrict: 'A',
+      controller: 'UibTimepickerController',
+      controllerAs: 'timepicker',
+      scope: {},
+      templateUrl: function(element, attrs) {
+        return attrs.templateUrl || uibTimepickerConfig.templateUrl;
+      },
+      link: function(scope, element, attrs, ctrls) {
+        var timepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+        if (ngModelCtrl) {
+          timepickerCtrl.init(ngModelCtrl, element.find('input'));
+        }
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap.position'])
 
 /**
  * A helper service that can parse typeahead's syntax (string provided by users)
  * Extracted to a separate service for ease of unit testing
  */
-    .factory('typeaheadParser', ['$parse', function ($parse) {
-
-      //                      00000111000000000000022200000000000000003333333333333330000000000044000
-      var TYPEAHEAD_REGEXP = /^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;
-
-      return {
-        parse:function (input) {
-
-          var match = input.match(TYPEAHEAD_REGEXP), modelMapper, viewMapper, source;
-          if (!match) {
-            throw new Error(
-                "Expected typeahead specification in form of '_modelValue_ (as _label_)? for _item_ in _collection_'" +
-                    " but got '" + input + "'.");
-          }
-
-          return {
-            itemName:match[3],
-            source:$parse(match[4]),
-            viewMapper:$parse(match[2] || match[1]),
-            modelMapper:$parse(match[1])
-          };
+  .factory('uibTypeaheadParser', ['$parse', function($parse) {
+    //                      000001111111100000000000002222222200000000000000003333333333333330000000000044444444000
+    var TYPEAHEAD_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
+    return {
+      parse: function(input) {
+        var match = input.match(TYPEAHEAD_REGEXP);
+        if (!match) {
+          throw new Error(
+            'Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_"' +
+            ' but got "' + input + '".');
         }
-      };
-    }])
-
-    .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$position', 'typeaheadParser',
-      function ($compile, $parse, $q, $timeout, $document, $position, typeaheadParser) {
-
-        var HOT_KEYS = [9, 13, 27, 38, 40];
 
         return {
-          require:'ngModel',
-          link:function (originalScope, element, attrs, modelCtrl) {
-
-            //SUPPORTED ATTRIBUTES (OPTIONS)
-
-            //minimal no of characters that needs to be entered before typeahead kicks-in
-            var minSearch = originalScope.$eval(attrs.typeaheadMinLength) || 1;
-
-            //minimal wait time after last character typed before typehead kicks-in
-            var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
-
-            //should it restrict model values to the ones selected from the popup only?
-            var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
-
-            //binding to a variable that indicates if matches are being retrieved asynchronously
-            var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
-
-            //a callback executed when a match is selected
-            var onSelectCallback = $parse(attrs.typeaheadOnSelect);
-
-            var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
-
-            var appendToBody =  attrs.typeaheadAppendToBody ? $parse(attrs.typeaheadAppendToBody) : false;
-
-            //INTERNAL VARIABLES
-
-            //model setter executed upon match selection
-            var $setModelValue = $parse(attrs.ngModel).assign;
-
-            //expressions used by typeahead
-            var parserResult = typeaheadParser.parse(attrs.typeahead);
-
-            var hasFocus;
-
-            //pop-up element used to display matches
-            var popUpEl = angular.element('<div typeahead-popup></div>');
-            popUpEl.attr({
-              matches: 'matches',
-              active: 'activeIdx',
-              select: 'select(activeIdx)',
-              query: 'query',
-              position: 'position'
-            });
-            //custom item template
-            if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
-              popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
-            }
-
-            //create a child scope for the typeahead directive so we are not polluting original scope
-            //with typeahead-specific data (matches, query etc.)
-            var scope = originalScope.$new();
-            originalScope.$on('$destroy', function(){
-              scope.$destroy();
-            });
-
-            var resetMatches = function() {
-              scope.matches = [];
-              scope.activeIdx = -1;
-            };
-
-            var getMatchesAsync = function(inputValue) {
-
-              var locals = {$viewValue: inputValue};
-              isLoadingSetter(originalScope, true);
-              $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
-
-                //it might happen that several async queries were in progress if a user were typing fast
-                //but we are interested only in responses that correspond to the current view value
-                if (inputValue === modelCtrl.$viewValue && hasFocus) {
-                  if (matches.length > 0) {
-
-                    scope.activeIdx = 0;
-                    scope.matches.length = 0;
-
-                    //transform labels
-                    for(var i=0; i<matches.length; i++) {
-                      locals[parserResult.itemName] = matches[i];
-                      scope.matches.push({
-                        label: parserResult.viewMapper(scope, locals),
-                        model: matches[i]
-                      });
-                    }
-
-                    scope.query = inputValue;
-                    //position pop-up with matches - we need to re-calculate its position each time we are opening a window
-                    //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
-                    //due to other elements being rendered
-                    scope.position = appendToBody ? $position.offset(element) : $position.position(element);
-                    scope.position.top = scope.position.top + element.prop('offsetHeight');
-
-                  } else {
-                    resetMatches();
-                  }
-                  isLoadingSetter(originalScope, false);
-                }
-              }, function(){
-                resetMatches();
-                isLoadingSetter(originalScope, false);
-              });
-            };
-
-            resetMatches();
-
-            //we need to propagate user's query so we can higlight matches
-            scope.query = undefined;
-
-            //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
-            var timeoutPromise;
-
-            //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
-            //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
-            modelCtrl.$parsers.unshift(function (inputValue) {
-
-              hasFocus = true;
-
-              if (inputValue && inputValue.length >= minSearch) {
-                if (waitTime > 0) {
-                  if (timeoutPromise) {
-                    $timeout.cancel(timeoutPromise);//cancel previous timeout
-                  }
-                  timeoutPromise = $timeout(function () {
-                    getMatchesAsync(inputValue);
-                  }, waitTime);
-                } else {
-                  getMatchesAsync(inputValue);
-                }
-              } else {
-                isLoadingSetter(originalScope, false);
-                resetMatches();
-              }
-
-              if (isEditable) {
-                return inputValue;
-              } else {
-                if (!inputValue) {
-                  // Reset in case user had typed something previously.
-                  modelCtrl.$setValidity('editable', true);
-                  return inputValue;
-                } else {
-                  modelCtrl.$setValidity('editable', false);
-                  return undefined;
-                }
-              }
-            });
-
-            modelCtrl.$formatters.push(function (modelValue) {
-
-              var candidateViewValue, emptyViewValue;
-              var locals = {};
-
-              if (inputFormatter) {
-
-                locals['$model'] = modelValue;
-                return inputFormatter(originalScope, locals);
-
-              } else {
-
-                //it might happen that we don't have enough info to properly render input value
-                //we need to check for this situation and simply return model value if we can't apply custom formatting
-                locals[parserResult.itemName] = modelValue;
-                candidateViewValue = parserResult.viewMapper(originalScope, locals);
-                locals[parserResult.itemName] = undefined;
-                emptyViewValue = parserResult.viewMapper(originalScope, locals);
-
-                return candidateViewValue!== emptyViewValue ? candidateViewValue : modelValue;
-              }
-            });
-
-            scope.select = function (activeIdx) {
-              //called from within the $digest() cycle
-              var locals = {};
-              var model, item;
-
-              locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
-              model = parserResult.modelMapper(originalScope, locals);
-              $setModelValue(originalScope, model);
-              modelCtrl.$setValidity('editable', true);
-
-              onSelectCallback(originalScope, {
-                $item: item,
-                $model: model,
-                $label: parserResult.viewMapper(originalScope, locals)
-              });
-
-              resetMatches();
-
-              //return focus to the input element if a mach was selected via a mouse click event
-              element[0].focus();
-            };
-
-            //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
-            element.bind('keydown', function (evt) {
-
-              //typeahead is open and an "interesting" key was pressed
-              if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
-                return;
-              }
-
-              evt.preventDefault();
-
-              if (evt.which === 40) {
-                scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
-                scope.$digest();
-
-              } else if (evt.which === 38) {
-                scope.activeIdx = (scope.activeIdx ? scope.activeIdx : scope.matches.length) - 1;
-                scope.$digest();
-
-              } else if (evt.which === 13 || evt.which === 9) {
-                scope.$apply(function () {
-                  scope.select(scope.activeIdx);
-                });
-
-              } else if (evt.which === 27) {
-                evt.stopPropagation();
-
-                resetMatches();
-                scope.$digest();
-              }
-            });
-
-            element.bind('blur', function (evt) {
-              hasFocus = false;
-            });
-
-            // Keep reference to click handler to unbind it.
-            var dismissClickHandler = function (evt) {
-              if (element[0] !== evt.target) {
-                resetMatches();
-                scope.$digest();
-              }
-            };
-
-            $document.bind('click', dismissClickHandler);
-
-            originalScope.$on('$destroy', function(){
-              $document.unbind('click', dismissClickHandler);
-            });
-
-            var $popup = $compile(popUpEl)(scope);
-            if ( appendToBody ) {
-              $document.find('body').append($popup);
-            } else {
-              element.after($popup);
-            }
-          }
+          itemName: match[3],
+          source: $parse(match[4]),
+          viewMapper: $parse(match[2] || match[1]),
+          modelMapper: $parse(match[1])
         };
+      }
+    };
+  }])
 
-      }])
+  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser',
+    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser) {
+      var HOT_KEYS = [9, 13, 27, 38, 40];
+      var eventDebounceTime = 200;
+      var modelCtrl, ngModelOptions;
+      //SUPPORTED ATTRIBUTES (OPTIONS)
 
-    .directive('typeaheadPopup', function () {
-      return {
-        restrict:'EA',
-        scope:{
-          matches:'=',
-          query:'=',
-          active:'=',
-          position:'=',
-          select:'&'
-        },
-        replace:true,
-        templateUrl:'template/typeahead/typeahead-popup.html',
-        link:function (scope, element, attrs) {
-
-          scope.templateUrl = attrs.templateUrl;
-
-          scope.isOpen = function () {
-            return scope.matches.length > 0;
-          };
-
-          scope.isActive = function (matchIdx) {
-            return scope.active == matchIdx;
-          };
-
-          scope.selectActive = function (matchIdx) {
-            scope.active = matchIdx;
-          };
-
-          scope.selectMatch = function (activeIdx) {
-            scope.select({activeIdx:activeIdx});
-          };
-        }
-      };
-    })
-
-    .directive('typeaheadMatch', ['$http', '$templateCache', '$compile', '$parse', function ($http, $templateCache, $compile, $parse) {
-      return {
-        restrict:'EA',
-        scope:{
-          index:'=',
-          match:'=',
-          query:'='
-        },
-        link:function (scope, element, attrs) {
-          var tplUrl = $parse(attrs.templateUrl)(scope.$parent) || 'template/typeahead/typeahead-match.html';
-          $http.get(tplUrl, {cache: $templateCache}).success(function(tplContent){
-            element.replaceWith($compile(tplContent.trim())(scope));
-          });
-        }
-      };
-    }])
-
-    .filter('typeaheadHighlight', function() {
-
-      function escapeRegexp(queryToEscape) {
-        return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      //minimal no of characters that needs to be entered before typeahead kicks-in
+      var minLength = originalScope.$eval(attrs.typeaheadMinLength);
+      if (!minLength && minLength !== 0) {
+        minLength = 1;
       }
 
-      return function(matchItem, query) {
-        return query ? matchItem.replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : matchItem;
+      originalScope.$watch(attrs.typeaheadMinLength, function (newVal) {
+        minLength = !newVal && newVal !== 0 ? 1 : newVal;
+      });
+
+      //minimal wait time after last character typed before typeahead kicks-in
+      var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
+
+      //should it restrict model values to the ones selected from the popup only?
+      var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+      originalScope.$watch(attrs.typeaheadEditable, function (newVal) {
+        isEditable = newVal !== false;
+      });
+
+      //binding to a variable that indicates if matches are being retrieved asynchronously
+      var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
+
+      //a function to determine if an event should cause selection
+      var isSelectEvent = attrs.typeaheadShouldSelect ? $parse(attrs.typeaheadShouldSelect) : function(scope, vals) {
+        var evt = vals.$event;
+        return evt.which === 13 || evt.which === 9;
       };
-    });
-angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/accordion/accordion-group.html",
-      "<div class=\"panel panel-default\">\n" +
-          "  <div class=\"panel-heading\">\n" +
-          "    <h4 class=\"panel-title\">\n" +
-          "      <a class=\"accordion-toggle\" ng-click=\"isOpen = !isOpen\" accordion-transclude=\"heading\">{{heading}}</a>\n" +
-          "    </h4>\n" +
-          "  </div>\n" +
-          "  <div class=\"panel-collapse\" collapse=\"!isOpen\">\n" +
-          "	  <div class=\"panel-body\" ng-transclude></div>\n" +
-          "  </div>\n" +
-          "</div>");
+
+      //a callback executed when a match is selected
+      var onSelectCallback = $parse(attrs.typeaheadOnSelect);
+
+      //should it select highlighted popup value when losing focus?
+      var isSelectOnBlur = angular.isDefined(attrs.typeaheadSelectOnBlur) ? originalScope.$eval(attrs.typeaheadSelectOnBlur) : false;
+
+      //binding to a variable that indicates if there were no results after the query is completed
+      var isNoResultsSetter = $parse(attrs.typeaheadNoResults).assign || angular.noop;
+
+      var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
+
+      var appendToBody = attrs.typeaheadAppendToBody ? originalScope.$eval(attrs.typeaheadAppendToBody) : false;
+
+      var appendTo = attrs.typeaheadAppendTo ?
+        originalScope.$eval(attrs.typeaheadAppendTo) : null;
+
+      var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
+
+      //If input matches an item of the list exactly, select it automatically
+      var selectOnExact = attrs.typeaheadSelectOnExact ? originalScope.$eval(attrs.typeaheadSelectOnExact) : false;
+
+      //binding to a variable that indicates if dropdown is open
+      var isOpenSetter = $parse(attrs.typeaheadIsOpen).assign || angular.noop;
+
+      var showHint = originalScope.$eval(attrs.typeaheadShowHint) || false;
+
+      //INTERNAL VARIABLES
+
+      //model setter executed upon match selection
+      var parsedModel = $parse(attrs.ngModel);
+      var invokeModelSetter = $parse(attrs.ngModel + '($$$p)');
+      var $setModelValue = function(scope, newValue) {
+        if (angular.isFunction(parsedModel(originalScope)) &&
+          ngModelOptions.getOption('getterSetter')) {
+          return invokeModelSetter(scope, {$$$p: newValue});
+        }
+
+        return parsedModel.assign(scope, newValue);
+      };
+
+      //expressions used by typeahead
+      var parserResult = typeaheadParser.parse(attrs.uibTypeahead);
+
+      var hasFocus;
+
+      //Used to avoid bug in iOS webview where iOS keyboard does not fire
+      //mousedown & mouseup events
+      //Issue #3699
+      var selected;
+
+      //create a child scope for the typeahead directive so we are not polluting original scope
+      //with typeahead-specific data (matches, query etc.)
+      var scope = originalScope.$new();
+      var offDestroy = originalScope.$on('$destroy', function() {
+        scope.$destroy();
+      });
+      scope.$on('$destroy', offDestroy);
+
+      // WAI-ARIA
+      var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+      element.attr({
+        'aria-autocomplete': 'list',
+        'aria-expanded': false,
+        'aria-owns': popupId
+      });
+
+      var inputsContainer, hintInputElem;
+      //add read-only input to show hint
+      if (showHint) {
+        inputsContainer = angular.element('<div></div>');
+        inputsContainer.css('position', 'relative');
+        element.after(inputsContainer);
+        hintInputElem = element.clone();
+        hintInputElem.attr('placeholder', '');
+        hintInputElem.attr('tabindex', '-1');
+        hintInputElem.val('');
+        hintInputElem.css({
+          'position': 'absolute',
+          'top': '0px',
+          'left': '0px',
+          'border-color': 'transparent',
+          'box-shadow': 'none',
+          'opacity': 1,
+          'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
+          'color': '#999'
+        });
+        element.css({
+          'position': 'relative',
+          'vertical-align': 'top',
+          'background-color': 'transparent'
+        });
+
+        if (hintInputElem.attr('id')) {
+          hintInputElem.removeAttr('id'); // remove duplicate id if present.
+        }
+        inputsContainer.append(hintInputElem);
+        hintInputElem.after(element);
+      }
+
+      //pop-up element used to display matches
+      var popUpEl = angular.element('<div uib-typeahead-popup></div>');
+      popUpEl.attr({
+        id: popupId,
+        matches: 'matches',
+        active: 'activeIdx',
+        select: 'select(activeIdx, evt)',
+        'move-in-progress': 'moveInProgress',
+        query: 'query',
+        position: 'position',
+        'assign-is-open': 'assignIsOpen(isOpen)',
+        debounce: 'debounceUpdate'
+      });
+      //custom item template
+      if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
+        popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
+      }
+
+      if (angular.isDefined(attrs.typeaheadPopupTemplateUrl)) {
+        popUpEl.attr('popup-template-url', attrs.typeaheadPopupTemplateUrl);
+      }
+
+      var resetHint = function() {
+        if (showHint) {
+          hintInputElem.val('');
+        }
+      };
+
+      var resetMatches = function() {
+        scope.matches = [];
+        scope.activeIdx = -1;
+        element.attr('aria-expanded', false);
+        resetHint();
+      };
+
+      var getMatchId = function(index) {
+        return popupId + '-option-' + index;
+      };
+
+      // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
+      // This attribute is added or removed automatically when the `activeIdx` changes.
+      scope.$watch('activeIdx', function(index) {
+        if (index < 0) {
+          element.removeAttr('aria-activedescendant');
+        } else {
+          element.attr('aria-activedescendant', getMatchId(index));
+        }
+      });
+
+      var inputIsExactMatch = function(inputValue, index) {
+        if (scope.matches.length > index && inputValue) {
+          return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
+        }
+
+        return false;
+      };
+
+      var getMatchesAsync = function(inputValue, evt) {
+        var locals = {$viewValue: inputValue};
+        isLoadingSetter(originalScope, true);
+        isNoResultsSetter(originalScope, false);
+        $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+          //it might happen that several async queries were in progress if a user were typing fast
+          //but we are interested only in responses that correspond to the current view value
+          var onCurrentRequest = inputValue === modelCtrl.$viewValue;
+          if (onCurrentRequest && hasFocus) {
+            if (matches && matches.length > 0) {
+              scope.activeIdx = focusFirst ? 0 : -1;
+              isNoResultsSetter(originalScope, false);
+              scope.matches.length = 0;
+
+              //transform labels
+              for (var i = 0; i < matches.length; i++) {
+                locals[parserResult.itemName] = matches[i];
+                scope.matches.push({
+                  id: getMatchId(i),
+                  label: parserResult.viewMapper(scope, locals),
+                  model: matches[i]
+                });
+              }
+
+              scope.query = inputValue;
+              //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+              //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+              //due to other elements being rendered
+              recalculatePosition();
+
+              element.attr('aria-expanded', true);
+
+              //Select the single remaining option if user input matches
+              if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
+                if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                  $$debounce(function() {
+                    scope.select(0, evt);
+                  }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                } else {
+                  scope.select(0, evt);
+                }
+              }
+
+              if (showHint) {
+                var firstLabel = scope.matches[0].label;
+                if (angular.isString(inputValue) &&
+                  inputValue.length > 0 &&
+                  firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
+                  hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+                } else {
+                  hintInputElem.val('');
+                }
+              }
+            } else {
+              resetMatches();
+              isNoResultsSetter(originalScope, true);
+            }
+          }
+          if (onCurrentRequest) {
+            isLoadingSetter(originalScope, false);
+          }
+        }, function() {
+          resetMatches();
+          isLoadingSetter(originalScope, false);
+          isNoResultsSetter(originalScope, true);
+        });
+      };
+
+      // bind events only if appendToBody params exist - performance feature
+      if (appendToBody) {
+        angular.element($window).on('resize', fireRecalculating);
+        $document.find('body').on('scroll', fireRecalculating);
+      }
+
+      // Declare the debounced function outside recalculating for
+      // proper debouncing
+      var debouncedRecalculate = $$debounce(function() {
+        // if popup is visible
+        if (scope.matches.length) {
+          recalculatePosition();
+        }
+
+        scope.moveInProgress = false;
+      }, eventDebounceTime);
+
+      // Default progress type
+      scope.moveInProgress = false;
+
+      function fireRecalculating() {
+        if (!scope.moveInProgress) {
+          scope.moveInProgress = true;
+          scope.$digest();
+        }
+
+        debouncedRecalculate();
+      }
+
+      // recalculate actual position and set new values to scope
+      // after digest loop is popup in right position
+      function recalculatePosition() {
+        scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+        scope.position.top += element.prop('offsetHeight');
+      }
+
+      //we need to propagate user's query so we can higlight matches
+      scope.query = undefined;
+
+      //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+      var timeoutPromise;
+
+      var scheduleSearchWithTimeout = function(inputValue) {
+        timeoutPromise = $timeout(function() {
+          getMatchesAsync(inputValue);
+        }, waitTime);
+      };
+
+      var cancelPreviousTimeout = function() {
+        if (timeoutPromise) {
+          $timeout.cancel(timeoutPromise);
+        }
+      };
+
+      resetMatches();
+
+      scope.assignIsOpen = function (isOpen) {
+        isOpenSetter(originalScope, isOpen);
+      };
+
+      scope.select = function(activeIdx, evt) {
+        //called from within the $digest() cycle
+        var locals = {};
+        var model, item;
+
+        selected = true;
+        locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
+        model = parserResult.modelMapper(originalScope, locals);
+        $setModelValue(originalScope, model);
+        modelCtrl.$setValidity('editable', true);
+        modelCtrl.$setValidity('parse', true);
+
+        onSelectCallback(originalScope, {
+          $item: item,
+          $model: model,
+          $label: parserResult.viewMapper(originalScope, locals),
+          $event: evt
+        });
+
+        resetMatches();
+
+        //return focus to the input element if a match was selected via a mouse click event
+        // use timeout to avoid $rootScope:inprog error
+        if (scope.$eval(attrs.typeaheadFocusOnSelect) !== false) {
+          $timeout(function() { element[0].focus(); }, 0, false);
+        }
+      };
+
+      //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+      element.on('keydown', function(evt) {
+        //typeahead is open and an "interesting" key was pressed
+        if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+          return;
+        }
+
+        var shouldSelect = isSelectEvent(originalScope, {$event: evt});
+
+        /**
+         * if there's nothing selected (i.e. focusFirst) and enter or tab is hit
+         * or
+         * shift + tab is pressed to bring focus to the previous element
+         * then clear the results
+         */
+        if (scope.activeIdx === -1 && shouldSelect || evt.which === 9 && !!evt.shiftKey) {
+          resetMatches();
+          scope.$digest();
+          return;
+        }
+
+        evt.preventDefault();
+        var target;
+        switch (evt.which) {
+          case 27: // escape
+            evt.stopPropagation();
+
+            resetMatches();
+            originalScope.$digest();
+            break;
+          case 38: // up arrow
+            scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+            scope.$digest();
+            target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
+            target.parentNode.scrollTop = target.offsetTop;
+            break;
+          case 40: // down arrow
+            scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+            scope.$digest();
+            target = popUpEl[0].querySelectorAll('.uib-typeahead-match')[scope.activeIdx];
+            target.parentNode.scrollTop = target.offsetTop;
+            break;
+          default:
+            if (shouldSelect) {
+              scope.$apply(function() {
+                if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                  $$debounce(function() {
+                    scope.select(scope.activeIdx, evt);
+                  }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+                } else {
+                  scope.select(scope.activeIdx, evt);
+                }
+              });
+            }
+        }
+      });
+
+      element.on('focus', function (evt) {
+        hasFocus = true;
+        if (minLength === 0 && !modelCtrl.$viewValue) {
+          $timeout(function() {
+            getMatchesAsync(modelCtrl.$viewValue, evt);
+          }, 0);
+        }
+      });
+
+      element.on('blur', function(evt) {
+        if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
+          selected = true;
+          scope.$apply(function() {
+            if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
+              $$debounce(function() {
+                scope.select(scope.activeIdx, evt);
+              }, scope.debounceUpdate.blur);
+            } else {
+              scope.select(scope.activeIdx, evt);
+            }
+          });
+        }
+        if (!isEditable && modelCtrl.$error.editable) {
+          modelCtrl.$setViewValue();
+          scope.$apply(function() {
+            // Reset validity as we are clearing
+            modelCtrl.$setValidity('editable', true);
+            modelCtrl.$setValidity('parse', true);
+          });
+          element.val('');
+        }
+        hasFocus = false;
+        selected = false;
+      });
+
+      // Keep reference to click handler to unbind it.
+      var dismissClickHandler = function(evt) {
+        // Issue #3973
+        // Firefox treats right click as a click on document
+        if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
+          resetMatches();
+          if (!$rootScope.$$phase) {
+            originalScope.$digest();
+          }
+        }
+      };
+
+      $document.on('click', dismissClickHandler);
+
+      originalScope.$on('$destroy', function() {
+        $document.off('click', dismissClickHandler);
+        if (appendToBody || appendTo) {
+          $popup.remove();
+        }
+
+        if (appendToBody) {
+          angular.element($window).off('resize', fireRecalculating);
+          $document.find('body').off('scroll', fireRecalculating);
+        }
+        // Prevent jQuery cache memory leak
+        popUpEl.remove();
+
+        if (showHint) {
+          inputsContainer.remove();
+        }
+      });
+
+      var $popup = $compile(popUpEl)(scope);
+
+      if (appendToBody) {
+        $document.find('body').append($popup);
+      } else if (appendTo) {
+        angular.element(appendTo).eq(0).append($popup);
+      } else {
+        element.after($popup);
+      }
+
+      this.init = function(_modelCtrl) {
+        modelCtrl = _modelCtrl;
+        ngModelOptions = extractOptions(modelCtrl);
+
+        scope.debounceUpdate = $parse(ngModelOptions.getOption('debounce'))(originalScope);
+
+        //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+        //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+        modelCtrl.$parsers.unshift(function(inputValue) {
+          hasFocus = true;
+
+          if (minLength === 0 || inputValue && inputValue.length >= minLength) {
+            if (waitTime > 0) {
+              cancelPreviousTimeout();
+              scheduleSearchWithTimeout(inputValue);
+            } else {
+              getMatchesAsync(inputValue);
+            }
+          } else {
+            isLoadingSetter(originalScope, false);
+            cancelPreviousTimeout();
+            resetMatches();
+          }
+
+          if (isEditable) {
+            return inputValue;
+          }
+
+          if (!inputValue) {
+            // Reset in case user had typed something previously.
+            modelCtrl.$setValidity('editable', true);
+            return null;
+          }
+
+          modelCtrl.$setValidity('editable', false);
+          return undefined;
+        });
+
+        modelCtrl.$formatters.push(function(modelValue) {
+          var candidateViewValue, emptyViewValue;
+          var locals = {};
+
+          // The validity may be set to false via $parsers (see above) if
+          // the model is restricted to selected values. If the model
+          // is set manually it is considered to be valid.
+          if (!isEditable) {
+            modelCtrl.$setValidity('editable', true);
+          }
+
+          if (inputFormatter) {
+            locals.$model = modelValue;
+            return inputFormatter(originalScope, locals);
+          }
+
+          //it might happen that we don't have enough info to properly render input value
+          //we need to check for this situation and simply return model value if we can't apply custom formatting
+          locals[parserResult.itemName] = modelValue;
+          candidateViewValue = parserResult.viewMapper(originalScope, locals);
+          locals[parserResult.itemName] = undefined;
+          emptyViewValue = parserResult.viewMapper(originalScope, locals);
+
+          return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
+        });
+      };
+
+      function extractOptions(ngModelCtrl) {
+        var ngModelOptions;
+
+        if (angular.version.minor < 6) { // in angular < 1.6 $options could be missing
+          // guarantee a value
+          ngModelOptions = ngModelCtrl.$options || {};
+
+          // mimic 1.6+ api
+          ngModelOptions.getOption = function (key) {
+            return ngModelOptions[key];
+          };
+        } else { // in angular >=1.6 $options is always present
+          ngModelOptions = ngModelCtrl.$options;
+        }
+
+        return ngModelOptions;
+      }
+    }])
+
+  .directive('uibTypeahead', function() {
+    return {
+      controller: 'UibTypeaheadController',
+      require: ['ngModel', 'uibTypeahead'],
+      link: function(originalScope, element, attrs, ctrls) {
+        ctrls[1].init(ctrls[0]);
+      }
+    };
+  })
+
+  .directive('uibTypeaheadPopup', ['$$debounce', function($$debounce) {
+    return {
+      scope: {
+        matches: '=',
+        query: '=',
+        active: '=',
+        position: '&',
+        moveInProgress: '=',
+        select: '&',
+        assignIsOpen: '&',
+        debounce: '&'
+      },
+      replace: true,
+      templateUrl: function(element, attrs) {
+        return attrs.popupTemplateUrl || 'uib/template/typeahead/typeahead-popup.html';
+      },
+      link: function(scope, element, attrs) {
+        scope.templateUrl = attrs.templateUrl;
+
+        scope.isOpen = function() {
+          var isDropdownOpen = scope.matches.length > 0;
+          scope.assignIsOpen({ isOpen: isDropdownOpen });
+          return isDropdownOpen;
+        };
+
+        scope.isActive = function(matchIdx) {
+          return scope.active === matchIdx;
+        };
+
+        scope.selectActive = function(matchIdx) {
+          scope.active = matchIdx;
+        };
+
+        scope.selectMatch = function(activeIdx, evt) {
+          var debounce = scope.debounce();
+          if (angular.isNumber(debounce) || angular.isObject(debounce)) {
+            $$debounce(function() {
+              scope.select({activeIdx: activeIdx, evt: evt});
+            }, angular.isNumber(debounce) ? debounce : debounce['default']);
+          } else {
+            scope.select({activeIdx: activeIdx, evt: evt});
+          }
+        };
+      }
+    };
+  }])
+
+  .directive('uibTypeaheadMatch', ['$templateRequest', '$compile', '$parse', function($templateRequest, $compile, $parse) {
+    return {
+      scope: {
+        index: '=',
+        match: '=',
+        query: '='
+      },
+      link: function(scope, element, attrs) {
+        var tplUrl = $parse(attrs.templateUrl)(scope.$parent) || 'uib/template/typeahead/typeahead-match.html';
+        $templateRequest(tplUrl).then(function(tplContent) {
+          var tplEl = angular.element(tplContent.trim());
+          element.replaceWith(tplEl);
+          $compile(tplEl)(scope);
+        });
+      }
+    };
+  }])
+
+  .filter('uibTypeaheadHighlight', ['$sce', '$injector', '$log', function($sce, $injector, $log) {
+    var isSanitizePresent;
+    isSanitizePresent = $injector.has('$sanitize');
+
+    function escapeRegexp(queryToEscape) {
+      // Regex: capture the whole query string and replace it with the string that will be used to match
+      // the results, for example if the capture is "a" the result will be \a
+      return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
+    }
+
+    function containsHtml(matchItem) {
+      return /<.*>/g.test(matchItem);
+    }
+
+    return function(matchItem, query) {
+      if (!isSanitizePresent && containsHtml(matchItem)) {
+        $log.warn('Unsafe use of typeahead please use ngSanitize'); // Warn the user about the danger
+      }
+      matchItem = query ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : matchItem; // Replaces the capture string with a the same string inside of a "strong" tag
+      if (!isSanitizePresent) {
+        matchItem = $sce.trustAsHtml(matchItem); // If $sanitize is not present we pack the string in a $sce object for the ng-bind-html directive
+      }
+      return matchItem;
+    };
+  }]);
+
+angular.module("uib/template/accordion/accordion-group.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/accordion/accordion-group.html",
+    "<div role=\"tab\" id=\"{{::headingId}}\" aria-selected=\"{{isOpen}}\" class=\"panel-heading\" ng-keypress=\"toggleOpen($event)\">\n" +
+    "  <h4 class=\"panel-title\">\n" +
+    "    <a role=\"button\" data-toggle=\"collapse\" href aria-expanded=\"{{isOpen}}\" aria-controls=\"{{::panelId}}\" tabindex=\"0\" class=\"accordion-toggle\" ng-click=\"toggleOpen()\" uib-accordion-transclude=\"heading\" ng-disabled=\"isDisabled\" uib-tabindex-toggle><span uib-accordion-header ng-class=\"{'text-muted': isDisabled}\">{{heading}}</span></a>\n" +
+    "  </h4>\n" +
+    "</div>\n" +
+    "<div id=\"{{::panelId}}\" aria-labelledby=\"{{::headingId}}\" aria-hidden=\"{{!isOpen}}\" role=\"tabpanel\" class=\"panel-collapse collapse\" uib-collapse=\"!isOpen\">\n" +
+    "  <div class=\"panel-body\" ng-transclude></div>\n" +
+    "</div>\n" +
+    "");
 }]);
 
-angular.module("template/accordion/accordion.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/accordion/accordion.html",
-      "<div class=\"panel-group\" ng-transclude></div>");
+angular.module("uib/template/accordion/accordion.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/accordion/accordion.html",
+    "<div role=\"tablist\" class=\"panel-group\" ng-transclude></div>");
 }]);
 
-angular.module("template/alert/alert.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/alert/alert.html",
-      "<div class='alert' ng-class='\"alert-\" + (type || \"warning\")'>\n" +
-          "    <button ng-show='closeable' type='button' class='close' ng-click='close()'>&times;</button>\n" +
-          "    <div ng-transclude></div>\n" +
-          "</div>\n" +
-          "");
+angular.module("uib/template/alert/alert.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/alert/alert.html",
+    "<button ng-show=\"closeable\" type=\"button\" class=\"close\" ng-click=\"close({$event: $event})\">\n" +
+    "  <span aria-hidden=\"true\">&times;</span>\n" +
+    "  <span class=\"sr-only\">Close</span>\n" +
+    "</button>\n" +
+    "<div ng-transclude></div>\n" +
+    "");
 }]);
 
-angular.module("template/carousel/carousel.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/carousel/carousel.html",
-      "<div ng-mouseenter=\"pause()\" ng-mouseleave=\"play()\" class=\"carousel\">\n" +
-          "    <ol class=\"carousel-indicators\" ng-show=\"slides().length > 1\">\n" +
-          "        <li ng-repeat=\"slide in slides()\" ng-class=\"{active: isActive(slide)}\" ng-click=\"select(slide)\"></li>\n" +
-          "    </ol>\n" +
-          "    <div class=\"carousel-inner\" ng-transclude></div>\n" +
-          "    <a class=\"left carousel-control\" ng-click=\"prev()\" ng-show=\"slides().length > 1\"><span class=\"icon-prev\"></span></a>\n" +
-          "    <a class=\"right carousel-control\" ng-click=\"next()\" ng-show=\"slides().length > 1\"><span class=\"icon-next\"></span></a>\n" +
-          "</div>\n" +
-          "");
+angular.module("uib/template/carousel/carousel.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/carousel/carousel.html",
+    "<div class=\"carousel-inner\" ng-transclude></div>\n" +
+    "<a role=\"button\" href class=\"left carousel-control\" ng-click=\"prev()\" ng-class=\"{ disabled: isPrevDisabled() }\" ng-show=\"slides.length > 1\">\n" +
+    "  <span aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-left\"></span>\n" +
+    "  <span class=\"sr-only\">previous</span>\n" +
+    "</a>\n" +
+    "<a role=\"button\" href class=\"right carousel-control\" ng-click=\"next()\" ng-class=\"{ disabled: isNextDisabled() }\" ng-show=\"slides.length > 1\">\n" +
+    "  <span aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-right\"></span>\n" +
+    "  <span class=\"sr-only\">next</span>\n" +
+    "</a>\n" +
+    "<ol class=\"carousel-indicators\" ng-show=\"slides.length > 1\">\n" +
+    "  <li ng-repeat=\"slide in slides | orderBy:indexOfSlide track by $index\" ng-class=\"{ active: isActive(slide) }\" ng-click=\"select(slide)\">\n" +
+    "    <span class=\"sr-only\">slide {{ $index + 1 }} of {{ slides.length }}<span ng-if=\"isActive(slide)\">, currently active</span></span>\n" +
+    "  </li>\n" +
+    "</ol>\n" +
+    "");
 }]);
 
-angular.module("template/carousel/slide.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/carousel/slide.html",
-      "<div ng-class=\"{\n" +
-          "    'active': leaving || (active && !entering),\n" +
-          "    'prev': (next || active) && direction=='prev',\n" +
-          "    'next': (next || active) && direction=='next',\n" +
-          "    'right': direction=='prev',\n" +
-          "    'left': direction=='next'\n" +
-          "  }\" class=\"item text-center\" ng-transclude></div>\n" +
-          "");
+angular.module("uib/template/carousel/slide.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/carousel/slide.html",
+    "<div class=\"text-center\" ng-transclude></div>\n" +
+    "");
 }]);
 
-angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/datepicker/datepicker.html",
-      "<table>\n" +
-          "  <thead>\n" +
-          "    <tr>\n" +
-          "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left\" ng-click=\"move(-1)\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
-          "      <th colspan=\"{{rows[0].length - 2 + showWeekNumbers}}\"><button type=\"button\" class=\"btn btn-default btn-sm btn-block\" ng-click=\"toggleMode()\"><strong>{{title}}</strong></button></th>\n" +
-          "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right\" ng-click=\"move(1)\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
-          "    </tr>\n" +
-          "    <tr ng-show=\"labels.length > 0\" class=\"h6\">\n" +
-          "      <th ng-show=\"showWeekNumbers\" class=\"text-center\">#</th>\n" +
-          "      <th ng-repeat=\"label in labels\" class=\"text-center\">{{label}}</th>\n" +
-          "    </tr>\n" +
-          "  </thead>\n" +
-          "  <tbody>\n" +
-          "    <tr ng-repeat=\"row in rows\">\n" +
-          "      <td ng-show=\"showWeekNumbers\" class=\"text-center\"><em>{{ getWeekNumber(row) }}</em></td>\n" +
-          "      <td ng-repeat=\"dt in row\" class=\"text-center\">\n" +
-          "        <button type=\"button\" style=\"width:100%;\" class=\"btn btn-default btn-sm\" ng-class=\"{'btn-info': dt.selected}\" ng-click=\"select(dt.date)\" ng-disabled=\"dt.disabled\"><span ng-class=\"{'text-muted': dt.secondary}\">{{dt.label}}</span></button>\n" +
-          "      </td>\n" +
-          "    </tr>\n" +
-          "  </tbody>\n" +
-          "</table>\n" +
-          "");
+angular.module("uib/template/datepicker/datepicker.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/datepicker.html",
+    "<div ng-switch=\"datepickerMode\">\n" +
+    "  <div uib-daypicker ng-switch-when=\"day\" tabindex=\"0\" class=\"uib-daypicker\"></div>\n" +
+    "  <div uib-monthpicker ng-switch-when=\"month\" tabindex=\"0\" class=\"uib-monthpicker\"></div>\n" +
+    "  <div uib-yearpicker ng-switch-when=\"year\" tabindex=\"0\" class=\"uib-yearpicker\"></div>\n" +
+    "</div>\n" +
+    "");
 }]);
 
-angular.module("template/datepicker/popup.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/datepicker/popup.html",
-      "<ul class=\"dropdown-menu\" ng-style=\"{display: (isOpen && 'block') || 'none', top: position.top+'px', left: position.left+'px'}\">\n" +
-          "	<li ng-transclude></li>\n" +
-          "	<li ng-show=\"showButtonBar\" style=\"padding:10px 9px 2px\">\n" +
-          "		<span class=\"btn-group\">\n" +
-          "			<button type=\"button\" class=\"btn btn-sm btn-info\" ng-click=\"today()\">{{currentText}}</button>\n" +
-          "			<button type=\"button\" class=\"btn btn-sm btn-default\" ng-click=\"showWeeks = ! showWeeks\" ng-class=\"{active: showWeeks}\">{{toggleWeeksText}}</button>\n" +
-          "			<button type=\"button\" class=\"btn btn-sm btn-danger\" ng-click=\"clear()\">{{clearText}}</button>\n" +
-          "		</span>\n" +
-          "		<button type=\"button\" class=\"btn btn-sm btn-success pull-right\" ng-click=\"isOpen = false\">{{closeText}}</button>\n" +
-          "	</li>\n" +
-          "</ul>\n" +
-          "");
+angular.module("uib/template/datepicker/day.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/day.html",
+    "<table role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left uib-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-left\"></i><span class=\"sr-only\">previous</span></button></th>\n" +
+    "      <th colspan=\"{{::5 + showWeeks}}\"><button id=\"{{::uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm uib-title\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right uib-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-right\"></i><span class=\"sr-only\">next</span></button></th>\n" +
+    "    </tr>\n" +
+    "    <tr>\n" +
+    "      <th ng-if=\"showWeeks\" class=\"text-center\"></th>\n" +
+    "      <th ng-repeat=\"label in ::labels track by $index\" class=\"text-center\"><small aria-label=\"{{::label.full}}\">{{::label.abbr}}</small></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"uib-weeks\" ng-repeat=\"row in rows track by $index\" role=\"row\">\n" +
+    "      <td ng-if=\"showWeeks\" class=\"text-center h6\"><em>{{ weekNumbers[$index] }}</em></td>\n" +
+    "      <td ng-repeat=\"dt in row\" class=\"uib-day text-center\" role=\"gridcell\"\n" +
+    "        id=\"{{::dt.uid}}\"\n" +
+    "        ng-class=\"::dt.customClass\">\n" +
+    "        <button type=\"button\" class=\"btn btn-default btn-sm\"\n" +
+    "          uib-is-class=\"\n" +
+    "            'btn-info' for selectedDt,\n" +
+    "            'active' for activeDt\n" +
+    "            on dt\"\n" +
+    "          ng-click=\"select(dt.date)\"\n" +
+    "          ng-disabled=\"::dt.disabled\"\n" +
+    "          tabindex=\"-1\"><span ng-class=\"::{'text-muted': dt.secondary, 'text-info': dt.current}\">{{::dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
 }]);
 
-angular.module("template/modal/backdrop.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/modal/backdrop.html",
-      "<div class=\"modal-backdrop fade\" ng-class=\"{in: animate}\" ng-style=\"{'z-index': 1040 + index*10}\"></div>");
+angular.module("uib/template/datepicker/month.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/month.html",
+    "<table role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left uib-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-left\"></i><span class=\"sr-only\">previous</span></button></th>\n" +
+    "      <th colspan=\"{{::yearHeaderColspan}}\"><button id=\"{{::uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm uib-title\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right uib-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-right\"></i><span class=\"sr-only\">next</span></i></button></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"uib-months\" ng-repeat=\"row in rows track by $index\" role=\"row\">\n" +
+    "      <td ng-repeat=\"dt in row\" class=\"uib-month text-center\" role=\"gridcell\"\n" +
+    "        id=\"{{::dt.uid}}\"\n" +
+    "        ng-class=\"::dt.customClass\">\n" +
+    "        <button type=\"button\" class=\"btn btn-default\"\n" +
+    "          uib-is-class=\"\n" +
+    "            'btn-info' for selectedDt,\n" +
+    "            'active' for activeDt\n" +
+    "            on dt\"\n" +
+    "          ng-click=\"select(dt.date)\"\n" +
+    "          ng-disabled=\"::dt.disabled\"\n" +
+    "          tabindex=\"-1\"><span ng-class=\"::{'text-info': dt.current}\">{{::dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
 }]);
 
-angular.module("template/modal/window.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/modal/window.html",
-      "<div tabindex=\"-1\" class=\"modal fade {{ windowClass }}\" ng-class=\"{in: animate}\" ng-style=\"{'z-index': 1050 + index*10, display: 'block'}\" ng-click=\"close($event)\">\n" +
-          "    <div class=\"modal-dialog\"><div class=\"modal-content\" ng-transclude></div></div>\n" +
-          "</div>");
+angular.module("uib/template/datepicker/year.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/year.html",
+    "<table role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left uib-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-left\"></i><span class=\"sr-only\">previous</span></button></th>\n" +
+    "      <th colspan=\"{{::columns - 2}}\"><button id=\"{{::uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm uib-title\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right uib-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-right\"></i><span class=\"sr-only\">next</span></button></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"uib-years\" ng-repeat=\"row in rows track by $index\" role=\"row\">\n" +
+    "      <td ng-repeat=\"dt in row\" class=\"uib-year text-center\" role=\"gridcell\"\n" +
+    "        id=\"{{::dt.uid}}\"\n" +
+    "        ng-class=\"::dt.customClass\">\n" +
+    "        <button type=\"button\" class=\"btn btn-default\"\n" +
+    "          uib-is-class=\"\n" +
+    "            'btn-info' for selectedDt,\n" +
+    "            'active' for activeDt\n" +
+    "            on dt\"\n" +
+    "          ng-click=\"select(dt.date)\"\n" +
+    "          ng-disabled=\"::dt.disabled\"\n" +
+    "          tabindex=\"-1\"><span ng-class=\"::{'text-info': dt.current}\">{{::dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
 }]);
 
-angular.module("template/pagination/pager.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/pagination/pager.html",
-      "<ul class=\"pager\">\n" +
-          "  <li ng-repeat=\"page in pages\" ng-class=\"{disabled: page.disabled, previous: page.previous, next: page.next}\"><a ng-click=\"selectPage(page.number)\">{{page.text}}</a></li>\n" +
-          "</ul>");
+angular.module("uib/template/datepickerPopup/popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepickerPopup/popup.html",
+    "<ul role=\"presentation\" class=\"uib-datepicker-popup dropdown-menu uib-position-measure\" dropdown-nested ng-if=\"isOpen\" ng-keydown=\"keydown($event)\" ng-click=\"$event.stopPropagation()\">\n" +
+    "  <li ng-transclude></li>\n" +
+    "  <li ng-if=\"showButtonBar\" class=\"uib-button-bar\">\n" +
+    "    <span class=\"btn-group pull-left\">\n" +
+    "      <button type=\"button\" class=\"btn btn-sm btn-info uib-datepicker-current\" ng-click=\"select('today', $event)\" ng-disabled=\"isDisabled('today')\">{{ getText('current') }}</button>\n" +
+    "      <button type=\"button\" class=\"btn btn-sm btn-danger uib-clear\" ng-click=\"select(null, $event)\">{{ getText('clear') }}</button>\n" +
+    "    </span>\n" +
+    "    <button type=\"button\" class=\"btn btn-sm btn-success pull-right uib-close\" ng-click=\"close($event)\">{{ getText('close') }}</button>\n" +
+    "  </li>\n" +
+    "</ul>\n" +
+    "");
 }]);
 
-angular.module("template/pagination/pagination.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/pagination/pagination.html",
-      "<ul class=\"pagination\">\n" +
-          "  <li ng-repeat=\"page in pages\" ng-class=\"{active: page.active, disabled: page.disabled}\"><a ng-click=\"selectPage(page.number)\">{{page.text}}</a></li>\n" +
-          "</ul>");
+angular.module("uib/template/modal/window.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/modal/window.html",
+    "<div class=\"modal-dialog {{size ? 'modal-' + size : ''}}\"><div class=\"modal-content\" uib-modal-transclude></div></div>\n" +
+    "");
 }]);
 
-angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/tooltip/tooltip-html-unsafe-popup.html",
-      "<div class=\"tooltip {{placement}}\" ng-class=\"{ in: isOpen(), fade: animation() }\">\n" +
-          "  <div class=\"tooltip-arrow\"></div>\n" +
-          "  <div class=\"tooltip-inner\" bind-html-unsafe=\"content\"></div>\n" +
-          "</div>\n" +
-          "");
+angular.module("uib/template/pager/pager.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/pager/pager.html",
+    "<li ng-class=\"{disabled: noPrevious()||ngDisabled, previous: align}\"><a href ng-click=\"selectPage(page - 1, $event)\" ng-disabled=\"noPrevious()||ngDisabled\" uib-tabindex-toggle>{{::getText('previous')}}</a></li>\n" +
+    "<li ng-class=\"{disabled: noNext()||ngDisabled, next: align}\"><a href ng-click=\"selectPage(page + 1, $event)\" ng-disabled=\"noNext()||ngDisabled\" uib-tabindex-toggle>{{::getText('next')}}</a></li>\n" +
+    "");
 }]);
 
-angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/tooltip/tooltip-popup.html",
-      "<div class=\"tooltip {{placement}}\" ng-class=\"{ in: isOpen(), fade: animation() }\">\n" +
-          "  <div class=\"tooltip-arrow\"></div>\n" +
-          "  <div class=\"tooltip-inner\" ng-bind=\"content\"></div>\n" +
-          "</div>\n" +
-          "");
+angular.module("uib/template/pagination/pagination.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/pagination/pagination.html",
+    "<li role=\"menuitem\" ng-if=\"::boundaryLinks\" ng-class=\"{disabled: noPrevious()||ngDisabled}\" class=\"pagination-first\"><a href ng-click=\"selectPage(1, $event)\" ng-disabled=\"noPrevious()||ngDisabled\" uib-tabindex-toggle>{{::getText('first')}}</a></li>\n" +
+    "<li role=\"menuitem\" ng-if=\"::directionLinks\" ng-class=\"{disabled: noPrevious()||ngDisabled}\" class=\"pagination-prev\"><a href ng-click=\"selectPage(page - 1, $event)\" ng-disabled=\"noPrevious()||ngDisabled\" uib-tabindex-toggle>{{::getText('previous')}}</a></li>\n" +
+    "<li role=\"menuitem\" ng-repeat=\"page in pages track by $index\" ng-class=\"{active: page.active,disabled: ngDisabled&&!page.active}\" class=\"pagination-page\"><a href ng-click=\"selectPage(page.number, $event)\" ng-disabled=\"ngDisabled&&!page.active\" uib-tabindex-toggle>{{page.text}}</a></li>\n" +
+    "<li role=\"menuitem\" ng-if=\"::directionLinks\" ng-class=\"{disabled: noNext()||ngDisabled}\" class=\"pagination-next\"><a href ng-click=\"selectPage(page + 1, $event)\" ng-disabled=\"noNext()||ngDisabled\" uib-tabindex-toggle>{{::getText('next')}}</a></li>\n" +
+    "<li role=\"menuitem\" ng-if=\"::boundaryLinks\" ng-class=\"{disabled: noNext()||ngDisabled}\" class=\"pagination-last\"><a href ng-click=\"selectPage(totalPages, $event)\" ng-disabled=\"noNext()||ngDisabled\" uib-tabindex-toggle>{{::getText('last')}}</a></li>\n" +
+    "");
 }]);
 
-angular.module("template/popover/popover.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/popover/popover.html",
-      "<div class=\"popover {{placement}}\" ng-class=\"{ in: isOpen(), fade: animation() }\">\n" +
-          "  <div class=\"arrow\"></div>\n" +
-          "\n" +
-          "  <div class=\"popover-inner\">\n" +
-          "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-show=\"title\"></h3>\n" +
-          "      <div class=\"popover-content\" ng-bind=\"content\"></div>\n" +
-          "  </div>\n" +
-          "</div>\n" +
-          "");
+angular.module("uib/template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tooltip/tooltip-html-popup.html",
+    "<div class=\"tooltip-arrow\"></div>\n" +
+    "<div class=\"tooltip-inner\" ng-bind-html=\"contentExp()\"></div>\n" +
+    "");
 }]);
 
-angular.module("template/progressbar/bar.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/progressbar/bar.html",
-      "<div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" ng-transclude></div>");
+angular.module("uib/template/tooltip/tooltip-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tooltip/tooltip-popup.html",
+    "<div class=\"tooltip-arrow\"></div>\n" +
+    "<div class=\"tooltip-inner\" ng-bind=\"content\"></div>\n" +
+    "");
 }]);
 
-angular.module("template/progressbar/progress.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/progressbar/progress.html",
-      "<div class=\"progress\" ng-transclude></div>");
+angular.module("uib/template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tooltip/tooltip-template-popup.html",
+    "<div class=\"tooltip-arrow\"></div>\n" +
+    "<div class=\"tooltip-inner\"\n" +
+    "  uib-tooltip-template-transclude=\"contentExp()\"\n" +
+    "  tooltip-template-transclude-scope=\"originScope()\"></div>\n" +
+    "");
 }]);
 
-angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/progressbar/progressbar.html",
-      "<div class=\"progress\"><div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" ng-transclude></div></div>");
+angular.module("uib/template/popover/popover-html.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/popover/popover-html.html",
+    "<div class=\"arrow\"></div>\n" +
+    "\n" +
+    "<div class=\"popover-inner\">\n" +
+    "    <h3 class=\"popover-title\" ng-bind=\"uibTitle\" ng-if=\"uibTitle\"></h3>\n" +
+    "    <div class=\"popover-content\" ng-bind-html=\"contentExp()\"></div>\n" +
+    "</div>\n" +
+    "");
 }]);
 
-angular.module("template/rating/rating.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/rating/rating.html",
-      "<span ng-mouseleave=\"reset()\">\n" +
-          "    <i ng-repeat=\"r in range\" ng-mouseenter=\"enter($index + 1)\" ng-click=\"rate($index + 1)\" class=\"glyphicon\" ng-class=\"$index < val && (r.stateOn || 'glyphicon-star') || (r.stateOff || 'glyphicon-star-empty')\"></i>\n" +
-          "</span>");
+angular.module("uib/template/popover/popover-template.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/popover/popover-template.html",
+    "<div class=\"arrow\"></div>\n" +
+    "\n" +
+    "<div class=\"popover-inner\">\n" +
+    "    <h3 class=\"popover-title\" ng-bind=\"uibTitle\" ng-if=\"uibTitle\"></h3>\n" +
+    "    <div class=\"popover-content\"\n" +
+    "      uib-tooltip-template-transclude=\"contentExp()\"\n" +
+    "      tooltip-template-transclude-scope=\"originScope()\"></div>\n" +
+    "</div>\n" +
+    "");
 }]);
 
-angular.module("template/tabs/tab.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/tabs/tab.html",
-      "<li ng-class=\"{active: active, disabled: disabled}\">\n" +
-          "  <a ng-click=\"select()\" tab-heading-transclude>{{heading}}</a>\n" +
-          "</li>\n" +
-          "");
+angular.module("uib/template/popover/popover.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/popover/popover.html",
+    "<div class=\"arrow\"></div>\n" +
+    "\n" +
+    "<div class=\"popover-inner\">\n" +
+    "    <h3 class=\"popover-title\" ng-bind=\"uibTitle\" ng-if=\"uibTitle\"></h3>\n" +
+    "    <div class=\"popover-content\" ng-bind=\"content\"></div>\n" +
+    "</div>\n" +
+    "");
 }]);
 
-angular.module("template/tabs/tabset-titles.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/tabs/tabset-titles.html",
-      "<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n" +
-          "</ul>\n" +
-          "");
+angular.module("uib/template/progressbar/bar.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/progressbar/bar.html",
+    "<div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" aria-labelledby=\"{{::title}}\" ng-transclude></div>\n" +
+    "");
 }]);
 
-angular.module("template/tabs/tabset.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/tabs/tabset.html",
-      "\n" +
-          "<div class=\"tabbable\">\n" +
-          "  <ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical, 'nav-justified': justified}\" ng-transclude></ul>\n" +
-          "  <div class=\"tab-content\">\n" +
-          "    <div class=\"tab-pane\" \n" +
-          "         ng-repeat=\"tab in tabs\" \n" +
-          "         ng-class=\"{active: tab.active}\"\n" +
-          "         tab-content-transclude=\"tab\">\n" +
-          "    </div>\n" +
-          "  </div>\n" +
-          "</div>\n" +
-          "");
+angular.module("uib/template/progressbar/progress.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/progressbar/progress.html",
+    "<div class=\"progress\" ng-transclude aria-labelledby=\"{{::title}}\"></div>");
 }]);
 
-angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/timepicker/timepicker.html",
-      "<table>\n" +
-          "	<tbody>\n" +
-          "		<tr class=\"text-center\">\n" +
-          "			<td><a ng-click=\"incrementHours()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
-          "			<td>&nbsp;</td>\n" +
-          "			<td><a ng-click=\"incrementMinutes()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
-          "			<td ng-show=\"showMeridian\"></td>\n" +
-          "		</tr>\n" +
-          "		<tr>\n" +
-          "			<td style=\"width:50px;\" class=\"form-group\" ng-class=\"{'has-error': invalidHours}\">\n" +
-          "				<input type=\"text\" ng-model=\"hours\" ng-change=\"updateHours()\" class=\"form-control text-center\" ng-mousewheel=\"incrementHours()\" ng-readonly=\"readonlyInput\" maxlength=\"2\">\n" +
-          "			</td>\n" +
-          "			<td>:</td>\n" +
-          "			<td style=\"width:50px;\" class=\"form-group\" ng-class=\"{'has-error': invalidMinutes}\">\n" +
-          "				<input type=\"text\" ng-model=\"minutes\" ng-change=\"updateMinutes()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\">\n" +
-          "			</td>\n" +
-          "			<td ng-show=\"showMeridian\"><button class=\"btn btn-default text-center\" ng-click=\"toggleMeridian()\">{{meridian}}</button></td>\n" +
-          "		</tr>\n" +
-          "		<tr class=\"text-center\">\n" +
-          "			<td><a ng-click=\"decrementHours()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
-          "			<td>&nbsp;</td>\n" +
-          "			<td><a ng-click=\"decrementMinutes()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
-          "			<td ng-show=\"showMeridian\"></td>\n" +
-          "		</tr>\n" +
-          "	</tbody>\n" +
-          "</table>\n" +
-          "");
+angular.module("uib/template/progressbar/progressbar.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/progressbar/progressbar.html",
+    "<div class=\"progress\">\n" +
+    "  <div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" aria-labelledby=\"{{::title}}\" ng-transclude></div>\n" +
+    "</div>\n" +
+    "");
 }]);
 
-angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/typeahead/typeahead-match.html",
-      "<a tabindex=\"-1\" bind-html-unsafe=\"match.label | typeaheadHighlight:query\"></a>");
+angular.module("uib/template/rating/rating.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/rating/rating.html",
+    "<span ng-mouseleave=\"reset()\" ng-keydown=\"onKeydown($event)\" tabindex=\"0\" role=\"slider\" aria-valuemin=\"0\" aria-valuemax=\"{{range.length}}\" aria-valuenow=\"{{value}}\" aria-valuetext=\"{{title}}\">\n" +
+    "    <span ng-repeat-start=\"r in range track by $index\" class=\"sr-only\">({{ $index < value ? '*' : ' ' }})</span>\n" +
+    "    <i ng-repeat-end ng-mouseenter=\"enter($index + 1)\" ng-click=\"rate($index + 1)\" class=\"glyphicon\" ng-class=\"$index < value && (r.stateOn || 'glyphicon-star') || (r.stateOff || 'glyphicon-star-empty')\" ng-attr-title=\"{{r.title}}\"></i>\n" +
+    "</span>\n" +
+    "");
 }]);
 
-angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/typeahead/typeahead-popup.html",
-      "<ul class=\"dropdown-menu\" ng-style=\"{display: isOpen()&&'block' || 'none', top: position.top+'px', left: position.left+'px'}\">\n" +
-          "    <li ng-repeat=\"match in matches\" ng-class=\"{active: isActive($index) }\" ng-mouseenter=\"selectActive($index)\" ng-click=\"selectMatch($index)\">\n" +
-          "        <div typeahead-match index=\"$index\" match=\"match\" query=\"query\" template-url=\"templateUrl\"></div>\n" +
-          "    </li>\n" +
-          "</ul>");
+angular.module("uib/template/tabs/tab.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tabs/tab.html",
+    "<li ng-class=\"[{active: active, disabled: disabled}, classes]\" class=\"uib-tab nav-item\">\n" +
+    "  <a href ng-click=\"select($event)\" class=\"nav-link\" uib-tab-heading-transclude>{{heading}}</a>\n" +
+    "</li>\n" +
+    "");
 }]);
 
+angular.module("uib/template/tabs/tabset.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tabs/tabset.html",
+    "<div>\n" +
+    "  <ul class=\"nav nav-{{tabset.type || 'tabs'}}\" ng-class=\"{'nav-stacked': vertical, 'nav-justified': justified}\" ng-transclude></ul>\n" +
+    "  <div class=\"tab-content\">\n" +
+    "    <div class=\"tab-pane\"\n" +
+    "         ng-repeat=\"tab in tabset.tabs\"\n" +
+    "         ng-class=\"{active: tabset.active === tab.index}\"\n" +
+    "         uib-tab-content-transclude=\"tab\">\n" +
+    "    </div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/timepicker/timepicker.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/timepicker/timepicker.html",
+    "<table class=\"uib-timepicker\">\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"text-center\" ng-show=\"::showSpinners\">\n" +
+    "      <td class=\"uib-increment hours\"><a ng-click=\"incrementHours()\" ng-class=\"{disabled: noIncrementHours()}\" class=\"btn btn-link\" ng-disabled=\"noIncrementHours()\" tabindex=\"-1\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "      <td>&nbsp;</td>\n" +
+    "      <td class=\"uib-increment minutes\"><a ng-click=\"incrementMinutes()\" ng-class=\"{disabled: noIncrementMinutes()}\" class=\"btn btn-link\" ng-disabled=\"noIncrementMinutes()\" tabindex=\"-1\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "      <td ng-show=\"showSeconds\">&nbsp;</td>\n" +
+    "      <td ng-show=\"showSeconds\" class=\"uib-increment seconds\"><a ng-click=\"incrementSeconds()\" ng-class=\"{disabled: noIncrementSeconds()}\" class=\"btn btn-link\" ng-disabled=\"noIncrementSeconds()\" tabindex=\"-1\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "      <td ng-show=\"showMeridian\"></td>\n" +
+    "    </tr>\n" +
+    "    <tr>\n" +
+    "      <td class=\"form-group uib-time hours\" ng-class=\"{'has-error': invalidHours}\">\n" +
+    "        <input type=\"text\" placeholder=\"HH\" ng-model=\"hours\" ng-change=\"updateHours()\" class=\"form-control text-center\" ng-readonly=\"::readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementHours()\" ng-blur=\"blur()\">\n" +
+    "      </td>\n" +
+    "      <td class=\"uib-separator\">:</td>\n" +
+    "      <td class=\"form-group uib-time minutes\" ng-class=\"{'has-error': invalidMinutes}\">\n" +
+    "        <input type=\"text\" placeholder=\"MM\" ng-model=\"minutes\" ng-change=\"updateMinutes()\" class=\"form-control text-center\" ng-readonly=\"::readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementMinutes()\" ng-blur=\"blur()\">\n" +
+    "      </td>\n" +
+    "      <td ng-show=\"showSeconds\" class=\"uib-separator\">:</td>\n" +
+    "      <td class=\"form-group uib-time seconds\" ng-class=\"{'has-error': invalidSeconds}\" ng-show=\"showSeconds\">\n" +
+    "        <input type=\"text\" placeholder=\"SS\" ng-model=\"seconds\" ng-change=\"updateSeconds()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementSeconds()\" ng-blur=\"blur()\">\n" +
+    "      </td>\n" +
+    "      <td ng-show=\"showMeridian\" class=\"uib-time am-pm\"><button type=\"button\" ng-class=\"{disabled: noToggleMeridian()}\" class=\"btn btn-default text-center\" ng-click=\"toggleMeridian()\" ng-disabled=\"noToggleMeridian()\" tabindex=\"{{::tabindex}}\">{{meridian}}</button></td>\n" +
+    "    </tr>\n" +
+    "    <tr class=\"text-center\" ng-show=\"::showSpinners\">\n" +
+    "      <td class=\"uib-decrement hours\"><a ng-click=\"decrementHours()\" ng-class=\"{disabled: noDecrementHours()}\" class=\"btn btn-link\" ng-disabled=\"noDecrementHours()\" tabindex=\"-1\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "      <td>&nbsp;</td>\n" +
+    "      <td class=\"uib-decrement minutes\"><a ng-click=\"decrementMinutes()\" ng-class=\"{disabled: noDecrementMinutes()}\" class=\"btn btn-link\" ng-disabled=\"noDecrementMinutes()\" tabindex=\"-1\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "      <td ng-show=\"showSeconds\">&nbsp;</td>\n" +
+    "      <td ng-show=\"showSeconds\" class=\"uib-decrement seconds\"><a ng-click=\"decrementSeconds()\" ng-class=\"{disabled: noDecrementSeconds()}\" class=\"btn btn-link\" ng-disabled=\"noDecrementSeconds()\" tabindex=\"-1\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "      <td ng-show=\"showMeridian\"></td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("uib/template/typeahead/typeahead-match.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/typeahead/typeahead-match.html",
+    "<a href\n" +
+    "   tabindex=\"-1\"\n" +
+    "   ng-bind-html=\"match.label | uibTypeaheadHighlight:query\"\n" +
+    "   ng-attr-title=\"{{match.label}}\"></a>\n" +
+    "");
+}]);
+
+angular.module("uib/template/typeahead/typeahead-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/typeahead/typeahead-popup.html",
+    "<ul class=\"dropdown-menu\" ng-show=\"isOpen() && !moveInProgress\" ng-style=\"{top: position().top+'px', left: position().left+'px'}\" role=\"listbox\" aria-hidden=\"{{!isOpen()}}\">\n" +
+    "    <li class=\"uib-typeahead-match\" ng-repeat=\"match in matches track by $index\" ng-class=\"{active: isActive($index) }\" ng-mouseenter=\"selectActive($index)\" ng-click=\"selectMatch($index, $event)\" role=\"option\" id=\"{{::match.id}}\">\n" +
+    "        <div uib-typeahead-match index=\"$index\" match=\"match\" query=\"query\" template-url=\"templateUrl\"></div>\n" +
+    "    </li>\n" +
+    "</ul>\n" +
+    "");
+}]);
+angular.module('ui.bootstrap.carousel').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibCarouselCss && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>'); angular.$$uibCarouselCss = true; });
+angular.module('ui.bootstrap.datepicker').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibDatepickerCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-left,.uib-right{width:100%}</style>'); angular.$$uibDatepickerCss = true; });
+angular.module('ui.bootstrap.position').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibPositionCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-position-measure{display:block !important;visibility:hidden !important;position:absolute !important;top:-9999px !important;left:-9999px !important;}.uib-position-scrollbar-measure{position:absolute !important;top:-9999px !important;width:50px !important;height:50px !important;overflow:scroll !important;}.uib-position-body-scrollbar-measure{overflow:scroll !important;}</style>'); angular.$$uibPositionCss = true; });
+angular.module('ui.bootstrap.datepickerPopup').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibDatepickerpopupCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker-popup.dropdown-menu{display:block;float:none;margin:0;}.uib-button-bar{padding:10px 9px 2px;}</style>'); angular.$$uibDatepickerpopupCss = true; });
+angular.module('ui.bootstrap.tooltip').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibTooltipCss && angular.element(document).find('head').prepend('<style type="text/css">[uib-tooltip-popup].tooltip.top-left > .tooltip-arrow,[uib-tooltip-popup].tooltip.top-right > .tooltip-arrow,[uib-tooltip-popup].tooltip.bottom-left > .tooltip-arrow,[uib-tooltip-popup].tooltip.bottom-right > .tooltip-arrow,[uib-tooltip-popup].tooltip.left-top > .tooltip-arrow,[uib-tooltip-popup].tooltip.left-bottom > .tooltip-arrow,[uib-tooltip-popup].tooltip.right-top > .tooltip-arrow,[uib-tooltip-popup].tooltip.right-bottom > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.top-left > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.top-right > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.bottom-left > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.bottom-right > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.left-top > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.left-bottom > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.right-top > .tooltip-arrow,[uib-tooltip-html-popup].tooltip.right-bottom > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.top-left > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.top-right > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.bottom-left > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.bottom-right > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.left-top > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.left-bottom > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.right-top > .tooltip-arrow,[uib-tooltip-template-popup].tooltip.right-bottom > .tooltip-arrow,[uib-popover-popup].popover.top-left > .arrow,[uib-popover-popup].popover.top-right > .arrow,[uib-popover-popup].popover.bottom-left > .arrow,[uib-popover-popup].popover.bottom-right > .arrow,[uib-popover-popup].popover.left-top > .arrow,[uib-popover-popup].popover.left-bottom > .arrow,[uib-popover-popup].popover.right-top > .arrow,[uib-popover-popup].popover.right-bottom > .arrow,[uib-popover-html-popup].popover.top-left > .arrow,[uib-popover-html-popup].popover.top-right > .arrow,[uib-popover-html-popup].popover.bottom-left > .arrow,[uib-popover-html-popup].popover.bottom-right > .arrow,[uib-popover-html-popup].popover.left-top > .arrow,[uib-popover-html-popup].popover.left-bottom > .arrow,[uib-popover-html-popup].popover.right-top > .arrow,[uib-popover-html-popup].popover.right-bottom > .arrow,[uib-popover-template-popup].popover.top-left > .arrow,[uib-popover-template-popup].popover.top-right > .arrow,[uib-popover-template-popup].popover.bottom-left > .arrow,[uib-popover-template-popup].popover.bottom-right > .arrow,[uib-popover-template-popup].popover.left-top > .arrow,[uib-popover-template-popup].popover.left-bottom > .arrow,[uib-popover-template-popup].popover.right-top > .arrow,[uib-popover-template-popup].popover.right-bottom > .arrow{top:auto;bottom:auto;left:auto;right:auto;margin:0;}[uib-popover-popup].popover,[uib-popover-html-popup].popover,[uib-popover-template-popup].popover{display:block !important;}</style>'); angular.$$uibTooltipCss = true; });
+angular.module('ui.bootstrap.timepicker').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibTimepickerCss && angular.element(document).find('head').prepend('<style type="text/css">.uib-time input{width:50px;}</style>'); angular.$$uibTimepickerCss = true; });
+angular.module('ui.bootstrap.typeahead').run(function() {!angular.$$csp().noInlineStyle && !angular.$$uibTypeaheadCss && angular.element(document).find('head').prepend('<style type="text/css">[uib-typeahead-popup].dropdown-menu{display:block;}</style>'); angular.$$uibTypeaheadCss = true; });
+
 var dialogModule = angular.module("dialog", [ 'ui.bootstrap' ]);
 
 
-dialogModule.factory('$dialog', ['$rootScope', '$modal', '$sce', function($rootScope, $modal, $sce) {
+dialogModule.factory('$dialog', ['$rootScope', '$uibModal', '$sce', function($rootScope, $uibModal, $sce) {
 
   function dialog(modalOptions, resultFn) {
-    var dialog = $modal.open(modalOptions);
+    var dialog = $uibModal.open(modalOptions);
     if (resultFn) dialog.result.then(resultFn);
     dialog.values = modalOptions;
     return dialog;
@@ -3655,12 +7818,12 @@ dialogModule.factory('$dialog', ['$rootScope', '$modal', '$sce', function($rootS
 
 dialogModule.run(["$templateCache", function($templateCache) {
   $templateCache.put("template/messageBox/message.html",
-      '<div class="modal-header"><h3>{{ title }}</h3></div>\n' +
-          '<div class="modal-body"><p ng-bind-html="message"></p></div>\n' +
-          '<div class="modal-footer"><button ng-repeat="btn in buttons" ng-click="close(btn.result)" class="btn" ng-class="btn.cssClass">{{ btn.label }}</button></div>\n');
+    '<div class="modal-header"><h3>{{ title }}</h3></div>\n' +
+    '<div class="modal-body"><p ng-bind-html="message"></p></div>\n' +
+    '<div class="modal-footer"><button ng-repeat="btn in buttons" ng-click="close(btn.result)" class="btn" ng-class="btn.cssClass">{{ btn.label }}</button></div>\n');
 }]);
 
 
-dialogModule.controller('MessageBoxController', ['$scope', '$modalInstance', function ($scope, $modalInstance) {
-  $scope.close = function (result) { $modalInstance.close(result); }
+dialogModule.controller('MessageBoxController', ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) {
+  $scope.close = function (result) { $uibModalInstance.close(result); }
 }]);
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.ui-router.js b/docs-web/src/main/webapp/src/lib/angular.ui-router.js
index 44908f40..9880b681 100644
--- a/docs-web/src/main/webapp/src/lib/angular.ui-router.js
+++ b/docs-web/src/main/webapp/src/lib/angular.ui-router.js
@@ -1,44 +1,636 @@
 /**
- * State-based routing for AngularJS
- * @version v0.2.7
- * @link http://angular-ui.github.com/
+ * State-based routing for AngularJS 1.x
+ * NOTICE: This monolithic bundle also bundles the @uirouter/core code.
+ *         This causes it to be incompatible with plugins that depend on @uirouter/core.
+ *         We recommend switching to the ui-router-core.js and ui-router-angularjs.js bundles instead.
+ *         For more information, see https://ui-router.github.io/blog/uirouter-for-angularjs-umd-bundles
+ * @version v1.0.10
+ * @link https://ui-router.github.io
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('angular')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'angular'], factory) :
+      (factory((global['@uirouter/angularjs'] = {}),global.angular));
+}(this, (function (exports,ng_from_import) { 'use strict';
 
-/* commonjs package manager support (eg componentjs) */
-if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
-  module.exports = 'ui.router';
-}
+  var ng_from_global = angular;
+  var ng = (ng_from_import && ng_from_import.module) ? ng_from_import : ng_from_global;
 
-(function (window, angular, undefined) {
-  /*jshint globalstrict:true*/
-  /*global angular:false*/
-  'use strict';
-
-  var isDefined = angular.isDefined,
-      isFunction = angular.isFunction,
-      isString = angular.isString,
-      isObject = angular.isObject,
-      isArray = angular.isArray,
-      forEach = angular.forEach,
-      extend = angular.extend,
-      copy = angular.copy;
-
-  function inherit(parent, extra) {
-    return extend(new (extend(function() {}, { prototype: parent }))(), extra);
+  /**
+   * Higher order functions
+   *
+   * These utility functions are exported, but are subject to change without notice.
+   *
+   * @module common_hof
+   */ /** */
+  /**
+   * Returns a new function for [Partial Application](https://en.wikipedia.org/wiki/Partial_application) of the original function.
+   *
+   * Given a function with N parameters, returns a new function that supports partial application.
+   * The new function accepts anywhere from 1 to N parameters.  When that function is called with M parameters,
+   * where M is less than N, it returns a new function that accepts the remaining parameters.  It continues to
+   * accept more parameters until all N parameters have been supplied.
+   *
+   *
+   * This contrived example uses a partially applied function as an predicate, which returns true
+   * if an object is found in both arrays.
+   * @example
+   * ```
+   * // returns true if an object is in both of the two arrays
+   * function inBoth(array1, array2, object) {
+ *   return array1.indexOf(object) !== -1 &&
+ *          array2.indexOf(object) !== 1;
+ * }
+   * let obj1, obj2, obj3, obj4, obj5, obj6, obj7
+   * let foos = [obj1, obj3]
+   * let bars = [obj3, obj4, obj5]
+   *
+   * // A curried "copy" of inBoth
+   * let curriedInBoth = curry(inBoth);
+   * // Partially apply both the array1 and array2
+   * let inFoosAndBars = curriedInBoth(foos, bars);
+   *
+   * // Supply the final argument; since all arguments are
+   * // supplied, the original inBoth function is then called.
+   * let obj1InBoth = inFoosAndBars(obj1); // false
+   *
+   * // Use the inFoosAndBars as a predicate.
+   * // Filter, on each iteration, supplies the final argument
+   * let allObjs = [ obj1, obj2, obj3, obj4, obj5, obj6, obj7 ];
+   * let foundInBoth = allObjs.filter(inFoosAndBars); // [ obj3 ]
+   *
+   * ```
+   *
+   * Stolen from: http://stackoverflow.com/questions/4394747/javascript-curry-function
+   *
+   * @param fn
+   * @returns {*|function(): (*|any)}
+   */
+  function curry(fn) {
+    var initial_args = [].slice.apply(arguments, [1]);
+    var func_args_length = fn.length;
+    function curried(args) {
+      if (args.length >= func_args_length)
+        return fn.apply(null, args);
+      return function () {
+        return curried(args.concat([].slice.apply(arguments)));
+      };
+    }
+    return curried(initial_args);
   }
-
-  function merge(dst) {
-    forEach(arguments, function(obj) {
-      if (obj !== dst) {
-        forEach(obj, function(value, key) {
-          if (!dst.hasOwnProperty(key)) dst[key] = value;
-        });
+  /**
+   * Given a varargs list of functions, returns a function that composes the argument functions, right-to-left
+   * given: f(x), g(x), h(x)
+   * let composed = compose(f,g,h)
+   * then, composed is: f(g(h(x)))
+   */
+  function compose() {
+    var args = arguments;
+    var start = args.length - 1;
+    return function () {
+      var i = start, result = args[start].apply(this, arguments);
+      while (i--)
+        result = args[i].call(this, result);
+      return result;
+    };
+  }
+  /**
+   * Given a varargs list of functions, returns a function that is composes the argument functions, left-to-right
+   * given: f(x), g(x), h(x)
+   * let piped = pipe(f,g,h);
+   * then, piped is: h(g(f(x)))
+   */
+  function pipe() {
+    var funcs = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+      funcs[_i] = arguments[_i];
+    }
+    return compose.apply(null, [].slice.call(arguments).reverse());
+  }
+  /**
+   * Given a property name, returns a function that returns that property from an object
+   * let obj = { foo: 1, name: "blarg" };
+   * let getName = prop("name");
+   * getName(obj) === "blarg"
+   */
+  var prop = function (name) {
+    return function (obj) { return obj && obj[name]; };
+  };
+  /**
+   * Given a property name and a value, returns a function that returns a boolean based on whether
+   * the passed object has a property that matches the value
+   * let obj = { foo: 1, name: "blarg" };
+   * let getName = propEq("name", "blarg");
+   * getName(obj) === true
+   */
+  var propEq = curry(function (name, val, obj) { return obj && obj[name] === val; });
+  /**
+   * Given a dotted property name, returns a function that returns a nested property from an object, or undefined
+   * let obj = { id: 1, nestedObj: { foo: 1, name: "blarg" }, };
+   * let getName = prop("nestedObj.name");
+   * getName(obj) === "blarg"
+   * let propNotFound = prop("this.property.doesnt.exist");
+   * propNotFound(obj) === undefined
+   */
+  var parse = function (name) {
+    return pipe.apply(null, name.split(".").map(prop));
+  };
+  /**
+   * Given a function that returns a truthy or falsey value, returns a
+   * function that returns the opposite (falsey or truthy) value given the same inputs
+   */
+  var not = function (fn) {
+    return function () {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
       }
-    });
-    return dst;
+      return !fn.apply(null, args);
+    };
+  };
+  /**
+   * Given two functions that return truthy or falsey values, returns a function that returns truthy
+   * if both functions return truthy for the given arguments
+   */
+  function and(fn1, fn2) {
+    return function () {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+      }
+      return fn1.apply(null, args) && fn2.apply(null, args);
+    };
+  }
+  /**
+   * Given two functions that return truthy or falsey values, returns a function that returns truthy
+   * if at least one of the functions returns truthy for the given arguments
+   */
+  function or(fn1, fn2) {
+    return function () {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+      }
+      return fn1.apply(null, args) || fn2.apply(null, args);
+    };
+  }
+  /**
+   * Check if all the elements of an array match a predicate function
+   *
+   * @param fn1 a predicate function `fn1`
+   * @returns a function which takes an array and returns true if `fn1` is true for all elements of the array
+   */
+  var all = function (fn1) {
+    return function (arr) { return arr.reduce(function (b, x) { return b && !!fn1(x); }, true); };
+  };
+  var any = function (fn1) {
+    return function (arr) { return arr.reduce(function (b, x) { return b || !!fn1(x); }, false); };
+  };
+  /** Given a class, returns a Predicate function that returns true if the object is of that class */
+  var is = function (ctor) {
+    return function (obj) {
+      return (obj != null && obj.constructor === ctor || obj instanceof ctor);
+    };
+  };
+  /** Given a value, returns a Predicate function that returns true if another value is === equal to the original value */
+  var eq = function (val) { return function (other) {
+    return val === other;
+  }; };
+  /** Given a value, returns a function which returns the value */
+  var val = function (v) { return function () { return v; }; };
+  function invoke(fnName, args) {
+    return function (obj) {
+      return obj[fnName].apply(obj, args);
+    };
+  }
+  /**
+   * Sorta like Pattern Matching (a functional programming conditional construct)
+   *
+   * See http://c2.com/cgi/wiki?PatternMatching
+   *
+   * This is a conditional construct which allows a series of predicates and output functions
+   * to be checked and then applied.  Each predicate receives the input.  If the predicate
+   * returns truthy, then its matching output function (mapping function) is provided with
+   * the input and, then the result is returned.
+   *
+   * Each combination (2-tuple) of predicate + output function should be placed in an array
+   * of size 2: [ predicate, mapFn ]
+   *
+   * These 2-tuples should be put in an outer array.
+   *
+   * @example
+   * ```
+   *
+   * // Here's a 2-tuple where the first element is the isString predicate
+   * // and the second element is a function that returns a description of the input
+   * let firstTuple = [ angular.isString, (input) => `Heres your string ${input}` ];
+   *
+   * // Second tuple: predicate "isNumber", mapfn returns a description
+   * let secondTuple = [ angular.isNumber, (input) => `(${input}) That's a number!` ];
+   *
+   * let third = [ (input) => input === null,  (input) => `Oh, null...` ];
+   *
+   * let fourth = [ (input) => input === undefined,  (input) => `notdefined` ];
+   *
+   * let descriptionOf = pattern([ firstTuple, secondTuple, third, fourth ]);
+   *
+   * console.log(descriptionOf(undefined)); // 'notdefined'
+   * console.log(descriptionOf(55)); // '(55) That's a number!'
+   * console.log(descriptionOf("foo")); // 'Here's your string foo'
+   * ```
+   *
+   * @param struct A 2D array.  Each element of the array should be an array, a 2-tuple,
+   * with a Predicate and a mapping/output function
+   * @returns {function(any): *}
+   */
+  function pattern(struct) {
+    return function (x) {
+      for (var i = 0; i < struct.length; i++) {
+        if (struct[i][0](x))
+          return struct[i][1](x);
+      }
+    };
   }
 
+  /**
+   * @coreapi
+   * @module core
+   */
+  /**
+   * Matches state names using glob-like pattern strings.
+   *
+   * Globs can be used in specific APIs including:
+   *
+   * - [[StateService.is]]
+   * - [[StateService.includes]]
+   * - The first argument to Hook Registration functions like [[TransitionService.onStart]]
+   *    - [[HookMatchCriteria]] and [[HookMatchCriterion]]
+   *
+   * A `Glob` string is a pattern which matches state names.
+   * Nested state names are split into segments (separated by a dot) when processing.
+   * The state named `foo.bar.baz` is split into three segments ['foo', 'bar', 'baz']
+   *
+   * Globs work according to the following rules:
+   *
+   * ### Exact match:
+   *
+   * The glob `'A.B'` matches the state named exactly `'A.B'`.
+   *
+   * | Glob        |Matches states named|Does not match state named|
+   * |:------------|:--------------------|:---------------------|
+   * | `'A'`       | `'A'`               | `'B'` , `'A.C'`      |
+   * | `'A.B'`     | `'A.B'`             | `'A'` , `'A.B.C'`    |
+   * | `'foo'`     | `'foo'`             | `'FOO'` , `'foo.bar'`|
+   *
+   * ### Single star (`*`)
+   *
+   * A single star (`*`) is a wildcard that matches exactly one segment.
+   *
+   * | Glob        |Matches states named  |Does not match state named |
+   * |:------------|:---------------------|:--------------------------|
+   * | `'*'`       | `'A'` , `'Z'`        | `'A.B'` , `'Z.Y.X'`       |
+   * | `'A.*'`     | `'A.B'` , `'A.C'`    | `'A'` , `'A.B.C'`         |
+   * | `'A.*.*'`   | `'A.B.C'` , `'A.X.Y'`| `'A'`, `'A.B'` , `'Z.Y.X'`|
+   *
+   * ### Double star (`**`)
+   *
+   * A double star (`'**'`) is a wildcard that matches *zero or more segments*
+   *
+   * | Glob        |Matches states named                           |Does not match state named         |
+   * |:------------|:----------------------------------------------|:----------------------------------|
+   * | `'**'`      | `'A'` , `'A.B'`, `'Z.Y.X'`                    | (matches all states)              |
+   * | `'A.**'`    | `'A'` , `'A.B'` , `'A.C.X'`                   | `'Z.Y.X'`                         |
+   * | `'**.X'`    | `'X'` , `'A.X'` , `'Z.Y.X'`                   | `'A'` , `'A.login.Z'`             |
+   * | `'A.**.X'`  | `'A.X'` , `'A.B.X'` , `'A.B.C.X'`             | `'A'` , `'A.B.C'`                 |
+   *
+   */
+  var Glob = /** @class */ (function () {
+    function Glob(text) {
+      this.text = text;
+      this.glob = text.split('.');
+      var regexpString = this.text.split('.')
+        .map(function (seg) {
+          if (seg === '**')
+            return '(?:|(?:\\.[^.]*)*)';
+          if (seg === '*')
+            return '\\.[^.]*';
+          return '\\.' + seg;
+        }).join('');
+      this.regexp = new RegExp("^" + regexpString + "$");
+    }
+    Glob.prototype.matches = function (name) {
+      return this.regexp.test('.' + name);
+    };
+    /** Returns true if the string has glob-like characters in it */
+    Glob.is = function (text) {
+      return !!/[!,*]+/.exec(text);
+    };
+    /** Returns a glob from the string, or null if the string isn't Glob-like */
+    Glob.fromString = function (text) {
+      return Glob.is(text) ? new Glob(text) : null;
+    };
+    return Glob;
+  }());
+
+  /**
+   * Internal representation of a UI-Router state.
+   *
+   * Instances of this class are created when a [[StateDeclaration]] is registered with the [[StateRegistry]].
+   *
+   * A registered [[StateDeclaration]] is augmented with a getter ([[StateDeclaration.$$state]]) which returns the corresponding [[StateObject]] object.
+   *
+   * This class prototypally inherits from the corresponding [[StateDeclaration]].
+   * Each of its own properties (i.e., `hasOwnProperty`) are built using builders from the [[StateBuilder]].
+   */
+  var StateObject = /** @class */ (function () {
+    /** @deprecated use State.create() */
+    function StateObject(config) {
+      return StateObject.create(config || {});
+    }
+    /**
+     * Create a state object to put the private/internal implementation details onto.
+     * The object's prototype chain looks like:
+     * (Internal State Object) -> (Copy of State.prototype) -> (State Declaration object) -> (State Declaration's prototype...)
+     *
+     * @param stateDecl the user-supplied State Declaration
+     * @returns {StateObject} an internal State object
+     */
+    StateObject.create = function (stateDecl) {
+      stateDecl = StateObject.isStateClass(stateDecl) ? new stateDecl() : stateDecl;
+      var state = inherit(inherit(stateDecl, StateObject.prototype));
+      stateDecl.$$state = function () { return state; };
+      state.self = stateDecl;
+      state.__stateObjectCache = {
+        nameGlob: Glob.fromString(state.name) // might return null
+      };
+      return state;
+    };
+    /**
+     * Returns true if the provided parameter is the same state.
+     *
+     * Compares the identity of the state against the passed value, which is either an object
+     * reference to the actual `State` instance, the original definition object passed to
+     * `$stateProvider.state()`, or the fully-qualified name.
+     *
+     * @param ref Can be one of (a) a `State` instance, (b) an object that was passed
+     *        into `$stateProvider.state()`, (c) the fully-qualified name of a state as a string.
+     * @returns Returns `true` if `ref` matches the current `State` instance.
+     */
+    StateObject.prototype.is = function (ref) {
+      return this === ref || this.self === ref || this.fqn() === ref;
+    };
+    /**
+     * @deprecated this does not properly handle dot notation
+     * @returns Returns a dot-separated name of the state.
+     */
+    StateObject.prototype.fqn = function () {
+      if (!this.parent || !(this.parent instanceof this.constructor))
+        return this.name;
+      var name = this.parent.fqn();
+      return name ? name + "." + this.name : this.name;
+    };
+    /**
+     * Returns the root node of this state's tree.
+     *
+     * @returns The root of this state's tree.
+     */
+    StateObject.prototype.root = function () {
+      return this.parent && this.parent.root() || this;
+    };
+    /**
+     * Gets the state's `Param` objects
+     *
+     * Gets the list of [[Param]] objects owned by the state.
+     * If `opts.inherit` is true, it also includes the ancestor states' [[Param]] objects.
+     * If `opts.matchingKeys` exists, returns only `Param`s whose `id` is a key on the `matchingKeys` object
+     *
+     * @param opts options
+     */
+    StateObject.prototype.parameters = function (opts) {
+      opts = defaults(opts, { inherit: true, matchingKeys: null });
+      var inherited = opts.inherit && this.parent && this.parent.parameters() || [];
+      return inherited.concat(values(this.params))
+        .filter(function (param) { return !opts.matchingKeys || opts.matchingKeys.hasOwnProperty(param.id); });
+    };
+    /**
+     * Returns a single [[Param]] that is owned by the state
+     *
+     * If `opts.inherit` is true, it also searches the ancestor states` [[Param]]s.
+     * @param id the name of the [[Param]] to return
+     * @param opts options
+     */
+    StateObject.prototype.parameter = function (id, opts) {
+      if (opts === void 0) { opts = {}; }
+      return (this.url && this.url.parameter(id, opts) ||
+        find(values(this.params), propEq('id', id)) ||
+        opts.inherit && this.parent && this.parent.parameter(id));
+    };
+    StateObject.prototype.toString = function () {
+      return this.fqn();
+    };
+    /** Predicate which returns true if the object is an class with @State() decorator */
+    StateObject.isStateClass = function (stateDecl) {
+      return isFunction(stateDecl) && stateDecl['__uiRouterState'] === true;
+    };
+    /** Predicate which returns true if the object is an internal [[StateObject]] object */
+    StateObject.isState = function (obj) {
+      return isObject(obj['__stateObjectCache']);
+    };
+    return StateObject;
+  }());
+
+  /** Predicates
+   *
+   * These predicates return true/false based on the input.
+   * Although these functions are exported, they are subject to change without notice.
+   *
+   * @module common_predicates
+   */
+  /** */
+  var toStr = Object.prototype.toString;
+  var tis = function (t) { return function (x) { return typeof (x) === t; }; };
+  var isUndefined = tis('undefined');
+  var isDefined = not(isUndefined);
+  var isNull = function (o) { return o === null; };
+  var isNullOrUndefined = or(isNull, isUndefined);
+  var isFunction = tis('function');
+  var isNumber = tis('number');
+  var isString = tis('string');
+  var isObject = function (x) { return x !== null && typeof x === 'object'; };
+  var isArray = Array.isArray;
+  var isDate = (function (x) { return toStr.call(x) === '[object Date]'; });
+  var isRegExp = (function (x) { return toStr.call(x) === '[object RegExp]'; });
+  var isState = StateObject.isState;
+  /**
+   * Predicate which checks if a value is injectable
+   *
+   * A value is "injectable" if it is a function, or if it is an ng1 array-notation-style array
+   * where all the elements in the array are Strings, except the last one, which is a Function
+   */
+  function isInjectable(val$$1) {
+    if (isArray(val$$1) && val$$1.length) {
+      var head = val$$1.slice(0, -1), tail = val$$1.slice(-1);
+      return !(head.filter(not(isString)).length || tail.filter(not(isFunction)).length);
+    }
+    return isFunction(val$$1);
+  }
+  /**
+   * Predicate which checks if a value looks like a Promise
+   *
+   * It is probably a Promise if it's an object, and it has a `then` property which is a Function
+   */
+  var isPromise = and(isObject, pipe(prop('then'), isFunction));
+
+  var notImplemented = function (fnname) { return function () {
+    throw new Error(fnname + "(): No coreservices implementation for UI-Router is loaded.");
+  }; };
+  var services = {
+    $q: undefined,
+    $injector: undefined,
+  };
+
+  /**
+   * Random utility functions used in the UI-Router code
+   *
+   * These functions are exported, but are subject to change without notice.
+   *
+   * @preferred
+   * @module common
+   */
+  /** for typedoc */
+  var root = (typeof self === 'object' && self.self === self && self) ||
+    (typeof global === 'object' && global.global === global && global) || undefined;
+  var angular$1 = root.angular || {};
+  var fromJson = angular$1.fromJson || JSON.parse.bind(JSON);
+  var toJson = angular$1.toJson || JSON.stringify.bind(JSON);
+  var forEach = angular$1.forEach || _forEach;
+  var extend = Object.assign || _extend;
+  var equals = angular$1.equals || _equals;
+  function identity(x) { return x; }
+  function noop$1() { }
+  /**
+   * Builds proxy functions on the `to` object which pass through to the `from` object.
+   *
+   * For each key in `fnNames`, creates a proxy function on the `to` object.
+   * The proxy function calls the real function on the `from` object.
+   *
+   *
+   * #### Example:
+   * This example creates an new class instance whose functions are prebound to the new'd object.
+   * ```js
+   * class Foo {
+ *   constructor(data) {
+ *     // Binds all functions from Foo.prototype to 'this',
+ *     // then copies them to 'this'
+ *     bindFunctions(Foo.prototype, this, this);
+ *     this.data = data;
+ *   }
+ *
+ *   log() {
+ *     console.log(this.data);
+ *   }
+ * }
+   *
+   * let myFoo = new Foo([1,2,3]);
+   * var logit = myFoo.log;
+   * logit(); // logs [1, 2, 3] from the myFoo 'this' instance
+   * ```
+   *
+   * #### Example:
+   * This example creates a bound version of a service function, and copies it to another object
+   * ```
+   *
+   * var SomeService = {
+ *   this.data = [3, 4, 5];
+ *   this.log = function() {
+ *     console.log(this.data);
+ *   }
+ * }
+   *
+   * // Constructor fn
+   * function OtherThing() {
+ *   // Binds all functions from SomeService to SomeService,
+ *   // then copies them to 'this'
+ *   bindFunctions(SomeService, this, SomeService);
+ * }
+   *
+   * let myOtherThing = new OtherThing();
+   * myOtherThing.log(); // logs [3, 4, 5] from SomeService's 'this'
+   * ```
+   *
+   * @param source A function that returns the source object which contains the original functions to be bound
+   * @param target A function that returns the target object which will receive the bound functions
+   * @param bind A function that returns the object which the functions will be bound to
+   * @param fnNames The function names which will be bound (Defaults to all the functions found on the 'from' object)
+   * @param latebind If true, the binding of the function is delayed until the first time it's invoked
+   */
+  function createProxyFunctions(source, target, bind, fnNames, latebind) {
+    if (latebind === void 0) { latebind = false; }
+    var bindFunction = function (fnName) {
+      return source()[fnName].bind(bind());
+    };
+    var makeLateRebindFn = function (fnName) { return function lateRebindFunction() {
+      target[fnName] = bindFunction(fnName);
+      return target[fnName].apply(null, arguments);
+    }; };
+    fnNames = fnNames || Object.keys(source());
+    return fnNames.reduce(function (acc, name) {
+      acc[name] = latebind ? makeLateRebindFn(name) : bindFunction(name);
+      return acc;
+    }, target);
+  }
+  /**
+   * prototypal inheritance helper.
+   * Creates a new object which has `parent` object as its prototype, and then copies the properties from `extra` onto it
+   */
+  var inherit = function (parent, extra) {
+    return extend(Object.create(parent), extra);
+  };
+  /** Given an array, returns true if the object is found in the array, (using indexOf) */
+  var inArray = curry(_inArray);
+  function _inArray(array, obj) {
+    return array.indexOf(obj) !== -1;
+  }
+  /**
+   * Given an array, and an item, if the item is found in the array, it removes it (in-place).
+   * The same array is returned
+   */
+  var removeFrom = curry(_removeFrom);
+  function _removeFrom(array, obj) {
+    var idx = array.indexOf(obj);
+    if (idx >= 0)
+      array.splice(idx, 1);
+    return array;
+  }
+  /** pushes a values to an array and returns the value */
+  var pushTo = curry(_pushTo);
+  function _pushTo(arr, val$$1) {
+    return (arr.push(val$$1), val$$1);
+  }
+  /** Given an array of (deregistration) functions, calls all functions and removes each one from the source array */
+  var deregAll = function (functions) {
+    return functions.slice().forEach(function (fn) {
+      typeof fn === 'function' && fn();
+      removeFrom(functions, fn);
+    });
+  };
+  /**
+   * Applies a set of defaults to an options object.  The options object is filtered
+   * to only those properties of the objects in the defaultsList.
+   * Earlier objects in the defaultsList take precedence when applying defaults.
+   */
+  function defaults(opts) {
+    var defaultsList = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+      defaultsList[_i - 1] = arguments[_i];
+    }
+    var _defaultsList = defaultsList.concat({}).reverse();
+    var defaultVals = extend.apply(null, _defaultsList);
+    return extend({}, defaultVals, pick(opts || {}, Object.keys(defaultVals)));
+  }
+  /** Reduce function that merges each element of the list into a single object, using extend */
+  var mergeR = function (memo, item) { return extend(memo, item); };
   /**
    * Finds the common ancestor path between two states.
    *
@@ -48,1722 +640,9435 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
    */
   function ancestors(first, second) {
     var path = [];
-
     for (var n in first.path) {
-      if (first.path[n] === "") continue;
-      if (!second.path[n]) break;
+      if (first.path[n] !== second.path[n])
+        break;
       path.push(first.path[n]);
     }
     return path;
   }
-
   /**
-   * IE8-safe wrapper for `Object.keys()`.
+   * Return a copy of the object only containing the whitelisted properties.
    *
-   * @param {Object} object A JavaScript object.
-   * @return {Array} Returns the keys of the object as an array.
+   * #### Example:
+   * ```
+   * var foo = { a: 1, b: 2, c: 3 };
+   * var ab = pick(foo, ['a', 'b']); // { a: 1, b: 2 }
+   * ```
+   * @param obj the source object
+   * @param propNames an Array of strings, which are the whitelisted property names
    */
-  function keys(object) {
-    if (Object.keys) {
-      return Object.keys(object);
+  function pick(obj, propNames) {
+    var objCopy = {};
+    for (var prop_1 in obj) {
+      if (propNames.indexOf(prop_1) !== -1) {
+        objCopy[prop_1] = obj[prop_1];
+      }
     }
-    var result = [];
-
-    angular.forEach(object, function(val, key) {
-      result.push(key);
+    return objCopy;
+  }
+  /**
+   * Return a copy of the object omitting the blacklisted properties.
+   *
+   * @example
+   * ```
+   *
+   * var foo = { a: 1, b: 2, c: 3 };
+   * var ab = omit(foo, ['a', 'b']); // { c: 3 }
+   * ```
+   * @param obj the source object
+   * @param propNames an Array of strings, which are the blacklisted property names
+   */
+  function omit(obj, propNames) {
+    return Object.keys(obj)
+      .filter(not(inArray(propNames)))
+      .reduce(function (acc, key) { return (acc[key] = obj[key], acc); }, {});
+  }
+  /**
+   * Maps an array, or object to a property (by name)
+   */
+  function pluck(collection, propName) {
+    return map(collection, prop(propName));
+  }
+  /** Filters an Array or an Object's properties based on a predicate */
+  function filter(collection, callback) {
+    var arr = isArray(collection), result = arr ? [] : {};
+    var accept = arr ? function (x) { return result.push(x); } : function (x, key) { return result[key] = x; };
+    forEach(collection, function (item, i) {
+      if (callback(item, i))
+        accept(item, i);
     });
     return result;
   }
-
-  /**
-   * IE8-safe wrapper for `Array.prototype.indexOf()`.
-   *
-   * @param {Array} array A JavaScript array.
-   * @param {*} value A value to search the array for.
-   * @return {Number} Returns the array index value of `value`, or `-1` if not present.
-   */
-  function arraySearch(array, value) {
-    if (Array.prototype.indexOf) {
-      return array.indexOf(value, Number(arguments[2]) || 0);
-    }
-    var len = array.length >>> 0, from = Number(arguments[2]) || 0;
-    from = (from < 0) ? Math.ceil(from) : Math.floor(from);
-
-    if (from < 0) from += len;
-
-    for (; from < len; from++) {
-      if (from in array && array[from] === value) return from;
-    }
-    return -1;
+  /** Finds an object from an array, or a property of an object, that matches a predicate */
+  function find(collection, callback) {
+    var result;
+    forEach(collection, function (item, i) {
+      if (result)
+        return;
+      if (callback(item, i))
+        result = item;
+    });
+    return result;
+  }
+  /** Given an object, returns a new object, where each property is transformed by the callback function */
+  var mapObj = map;
+  /** Maps an array or object properties using a callback function */
+  function map(collection, callback) {
+    var result = isArray(collection) ? [] : {};
+    forEach(collection, function (item, i) { return result[i] = callback(item, i); });
+    return result;
   }
-
   /**
-   * Merges a set of parameters with all parameters inherited between the common parents of the
-   * current state and a given destination state.
+   * Given an object, return its enumerable property values
    *
-   * @param {Object} currentParams The value of the current state parameters ($stateParams).
-   * @param {Object} newParams The set of parameters which will be composited with inherited params.
-   * @param {Object} $current Internal definition of object representing the current state.
-   * @param {Object} $to Internal definition of object representing state to transition to.
+   * @example
+   * ```
+   *
+   * let foo = { a: 1, b: 2, c: 3 }
+   * let vals = values(foo); // [ 1, 2, 3 ]
+   * ```
    */
-  function inheritParams(currentParams, newParams, $current, $to) {
-    var parents = ancestors($current, $to), parentParams, inherited = {}, inheritList = [];
-
-    for (var i in parents) {
-      if (!parents[i].params || !parents[i].params.length) continue;
-      parentParams = parents[i].params;
-
-      for (var j in parentParams) {
-        if (arraySearch(inheritList, parentParams[j]) >= 0) continue;
-        inheritList.push(parentParams[j]);
-        inherited[parentParams[j]] = currentParams[parentParams[j]];
+  var values = function (obj) {
+    return Object.keys(obj).map(function (key) { return obj[key]; });
+  };
+  /**
+   * Reduce function that returns true if all of the values are truthy.
+   *
+   * @example
+   * ```
+   *
+   * let vals = [ 1, true, {}, "hello world"];
+   * vals.reduce(allTrueR, true); // true
+   *
+   * vals.push(0);
+   * vals.reduce(allTrueR, true); // false
+   * ```
+   */
+  var allTrueR = function (memo, elem) { return memo && elem; };
+  /**
+   * Reduce function that returns true if any of the values are truthy.
+   *
+   *  * @example
+   * ```
+   *
+   * let vals = [ 0, null, undefined ];
+   * vals.reduce(anyTrueR, true); // false
+   *
+   * vals.push("hello world");
+   * vals.reduce(anyTrueR, true); // true
+   * ```
+   */
+  var anyTrueR = function (memo, elem) { return memo || elem; };
+  /**
+   * Reduce function which un-nests a single level of arrays
+   * @example
+   * ```
+   *
+   * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ];
+   * input.reduce(unnestR, []) // [ "a", "b", "c", "d", [ "double, "nested" ] ]
+   * ```
+   */
+  var unnestR = function (memo, elem) { return memo.concat(elem); };
+  /**
+   * Reduce function which recursively un-nests all arrays
+   *
+   * @example
+   * ```
+   *
+   * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ];
+   * input.reduce(unnestR, []) // [ "a", "b", "c", "d", "double, "nested" ]
+   * ```
+   */
+  var flattenR = function (memo, elem) {
+    return isArray(elem) ? memo.concat(elem.reduce(flattenR, [])) : pushR(memo, elem);
+  };
+  /**
+   * Reduce function that pushes an object to an array, then returns the array.
+   * Mostly just for [[flattenR]] and [[uniqR]]
+   */
+  function pushR(arr, obj) {
+    arr.push(obj);
+    return arr;
+  }
+  /** Reduce function that filters out duplicates */
+  var uniqR = function (acc, token) {
+    return inArray(acc, token) ? acc : pushR(acc, token);
+  };
+  /**
+   * Return a new array with a single level of arrays unnested.
+   *
+   * @example
+   * ```
+   *
+   * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ];
+   * unnest(input) // [ "a", "b", "c", "d", [ "double, "nested" ] ]
+   * ```
+   */
+  var unnest = function (arr) { return arr.reduce(unnestR, []); };
+  /**
+   * Return a completely flattened version of an array.
+   *
+   * @example
+   * ```
+   *
+   * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ];
+   * flatten(input) // [ "a", "b", "c", "d", "double, "nested" ]
+   * ```
+   */
+  var flatten = function (arr) { return arr.reduce(flattenR, []); };
+  /**
+   * Given a .filter Predicate, builds a .filter Predicate which throws an error if any elements do not pass.
+   * @example
+   * ```
+   *
+   * let isNumber = (obj) => typeof(obj) === 'number';
+   * let allNumbers = [ 1, 2, 3, 4, 5 ];
+   * allNumbers.filter(assertPredicate(isNumber)); //OK
+   *
+   * let oneString = [ 1, 2, 3, 4, "5" ];
+   * oneString.filter(assertPredicate(isNumber, "Not all numbers")); // throws Error(""Not all numbers"");
+   * ```
+   */
+  var assertPredicate = assertFn;
+  /**
+   * Given a .map function, builds a .map function which throws an error if any mapped elements do not pass a truthyness test.
+   * @example
+   * ```
+   *
+   * var data = { foo: 1, bar: 2 };
+   *
+   * let keys = [ 'foo', 'bar' ]
+   * let values = keys.map(assertMap(key => data[key], "Key not found"));
+   * // values is [1, 2]
+   *
+   * let keys = [ 'foo', 'bar', 'baz' ]
+   * let values = keys.map(assertMap(key => data[key], "Key not found"));
+   * // throws Error("Key not found")
+   * ```
+   */
+  var assertMap = assertFn;
+  function assertFn(predicateOrMap, errMsg) {
+    if (errMsg === void 0) { errMsg = "assert failure"; }
+    return function (obj) {
+      var result = predicateOrMap(obj);
+      if (!result) {
+        throw new Error(isFunction(errMsg) ? errMsg(obj) : errMsg);
+      }
+      return result;
+    };
+  }
+  /**
+   * Like _.pairs: Given an object, returns an array of key/value pairs
+   *
+   * @example
+   * ```
+   *
+   * pairs({ foo: "FOO", bar: "BAR }) // [ [ "foo", "FOO" ], [ "bar": "BAR" ] ]
+   * ```
+   */
+  var pairs = function (obj) {
+    return Object.keys(obj).map(function (key) { return [key, obj[key]]; });
+  };
+  /**
+   * Given two or more parallel arrays, returns an array of tuples where
+   * each tuple is composed of [ a[i], b[i], ... z[i] ]
+   *
+   * @example
+   * ```
+   *
+   * let foo = [ 0, 2, 4, 6 ];
+   * let bar = [ 1, 3, 5, 7 ];
+   * let baz = [ 10, 30, 50, 70 ];
+   * arrayTuples(foo, bar);       // [ [0, 1], [2, 3], [4, 5], [6, 7] ]
+   * arrayTuples(foo, bar, baz);  // [ [0, 1, 10], [2, 3, 30], [4, 5, 50], [6, 7, 70] ]
+   * ```
+   */
+  function arrayTuples() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+      args[_i] = arguments[_i];
+    }
+    if (args.length === 0)
+      return [];
+    var maxArrayLen = args.reduce(function (min, arr) { return Math.min(arr.length, min); }, 9007199254740991); // aka 2^53 − 1 aka Number.MAX_SAFE_INTEGER
+    var i, result = [];
+    for (i = 0; i < maxArrayLen; i++) {
+      // This is a hot function
+      // Unroll when there are 1-4 arguments
+      switch (args.length) {
+        case 1:
+          result.push([args[0][i]]);
+          break;
+        case 2:
+          result.push([args[0][i], args[1][i]]);
+          break;
+        case 3:
+          result.push([args[0][i], args[1][i], args[2][i]]);
+          break;
+        case 4:
+          result.push([args[0][i], args[1][i], args[2][i], args[3][i]]);
+          break;
+        default:
+          result.push(args.map(function (array) { return array[i]; }));
+          break;
       }
     }
-    return extend({}, inherited, newParams);
+    return result;
   }
-
   /**
-   * Normalizes a set of values to string or `null`, filtering them by a list of keys.
+   * Reduce function which builds an object from an array of [key, value] pairs.
    *
-   * @param {Array} keys The list of keys to normalize/return.
-   * @param {Object} values An object hash of values to normalize.
-   * @return {Object} Returns an object hash of normalized string values.
+   * Each iteration sets the key/val pair on the memo object, then returns the memo for the next iteration.
+   *
+   * Each keyValueTuple should be an array with values [ key: string, value: any ]
+   *
+   * @example
+   * ```
+   *
+   * var pairs = [ ["fookey", "fooval"], ["barkey", "barval"] ]
+   *
+   * var pairsToObj = pairs.reduce((memo, pair) => applyPairs(memo, pair), {})
+   * // pairsToObj == { fookey: "fooval", barkey: "barval" }
+   *
+   * // Or, more simply:
+   * var pairsToObj = pairs.reduce(applyPairs, {})
+   * // pairsToObj == { fookey: "fooval", barkey: "barval" }
+   * ```
    */
-  function normalize(keys, values) {
-    var normalized = {};
-
-    forEach(keys, function (name) {
-      var value = values[name];
-      normalized[name] = (value != null) ? String(value) : null;
-    });
-    return normalized;
+  function applyPairs(memo, keyValTuple) {
+    var key, value;
+    if (isArray(keyValTuple))
+      key = keyValTuple[0], value = keyValTuple[1];
+    if (!isString(key))
+      throw new Error("invalid parameters to applyPairs");
+    memo[key] = value;
+    return memo;
+  }
+  /** Get the last element of an array */
+  function tail(arr) {
+    return arr.length && arr[arr.length - 1] || undefined;
   }
-
   /**
-   * Performs a non-strict comparison of the subset of two objects, defined by a list of keys.
-   *
-   * @param {Object} a The first object.
-   * @param {Object} b The second object.
-   * @param {Array} keys The list of keys within each object to compare. If the list is empty or not specified,
-   *                     it defaults to the list of keys in `a`.
-   * @return {Boolean} Returns `true` if the keys match, otherwise `false`.
+   * shallow copy from src to dest
    */
-  function equalForKeys(a, b, keys) {
-    if (!keys) {
-      keys = [];
-      for (var n in a) keys.push(n); // Used instead of Object.keys() for IE8 compatibility
+  function copy(src, dest) {
+    if (dest)
+      Object.keys(dest).forEach(function (key) { return delete dest[key]; });
+    if (!dest)
+      dest = {};
+    return extend(dest, src);
+  }
+  /** Naive forEach implementation works with Objects or Arrays */
+  function _forEach(obj, cb, _this) {
+    if (isArray(obj))
+      return obj.forEach(cb, _this);
+    Object.keys(obj).forEach(function (key) { return cb(obj[key], key); });
+  }
+  function _extend(toObj) {
+    for (var i = 1; i < arguments.length; i++) {
+      var obj = arguments[i];
+      if (!obj)
+        continue;
+      var keys = Object.keys(obj);
+      for (var j = 0; j < keys.length; j++) {
+        toObj[keys[j]] = obj[keys[j]];
+      }
     }
-
-    for (var i=0; i<keys.length; i++) {
-      var k = keys[i];
-      if (a[k] != b[k]) return false; // Not '===', values aren't necessarily normalized
+    return toObj;
+  }
+  function _equals(o1, o2) {
+    if (o1 === o2)
+      return true;
+    if (o1 === null || o2 === null)
+      return false;
+    if (o1 !== o1 && o2 !== o2)
+      return true; // NaN === NaN
+    var t1 = typeof o1, t2 = typeof o2;
+    if (t1 !== t2 || t1 !== 'object')
+      return false;
+    var tup = [o1, o2];
+    if (all(isArray)(tup))
+      return _arraysEq(o1, o2);
+    if (all(isDate)(tup))
+      return o1.getTime() === o2.getTime();
+    if (all(isRegExp)(tup))
+      return o1.toString() === o2.toString();
+    if (all(isFunction)(tup))
+      return true; // meh
+    var predicates = [isFunction, isArray, isDate, isRegExp];
+    if (predicates.map(any).reduce(function (b, fn) { return b || !!fn(tup); }, false))
+      return false;
+    var key, keys = {};
+    for (key in o1) {
+      if (!_equals(o1[key], o2[key]))
+        return false;
+      keys[key] = true;
+    }
+    for (key in o2) {
+      if (!keys[key])
+        return false;
     }
     return true;
   }
-
-  /**
-   * Returns the subset of an object, based on a list of keys.
-   *
-   * @param {Array} keys
-   * @param {Object} values
-   * @return {Boolean} Returns a subset of `values`.
-   */
-  function filterByKeys(keys, values) {
-    var filtered = {};
-
-    forEach(keys, function (name) {
-      filtered[name] = values[name];
-    });
-    return filtered;
+  function _arraysEq(a1, a2) {
+    if (a1.length !== a2.length)
+      return false;
+    return arrayTuples(a1, a2).reduce(function (b, t) { return b && _equals(t[0], t[1]); }, true);
   }
-
-  angular.module('ui.router.util', ['ng']);
-  angular.module('ui.router.router', ['ui.router.util']);
-  angular.module('ui.router.state', ['ui.router.router', 'ui.router.util']);
-  angular.module('ui.router', ['ui.router.state']);
-  angular.module('ui.router.compat', ['ui.router']);
-
+// issue #2676
+  var silenceUncaughtInPromise = function (promise) {
+    return promise.catch(function (e) { return 0; }) && promise;
+  };
+  var silentRejection = function (error) {
+    return silenceUncaughtInPromise(services.$q.reject(error));
+  };
 
   /**
-   * Service (`ui-util`). Manages resolution of (acyclic) graphs of promises.
-   * @module $resolve
-   * @requires $q
-   * @requires $injector
-   */
-  $Resolve.$inject = ['$q', '$injector'];
-  function $Resolve(  $q,    $injector) {
-
-    var VISIT_IN_PROGRESS = 1,
-        VISIT_DONE = 2,
-        NOTHING = {},
-        NO_DEPENDENCIES = [],
-        NO_LOCALS = NOTHING,
-        NO_PARENT = extend($q.when(NOTHING), { $$promises: NOTHING, $$values: NOTHING });
-
-
-    /**
-     * Studies a set of invocables that are likely to be used multiple times.
-     *      $resolve.study(invocables)(locals, parent, self)
-     * is equivalent to
-     *      $resolve.resolve(invocables, locals, parent, self)
-     * but the former is more efficient (in fact `resolve` just calls `study` internally).
-     * See {@link module:$resolve/resolve} for details.
-     * @function
-     * @param {Object} invocables
-     * @return {Function}
-     */
-    this.study = function (invocables) {
-      if (!isObject(invocables)) throw new Error("'invocables' must be an object");
-
-      // Perform a topological sort of invocables to build an ordered plan
-      var plan = [], cycle = [], visited = {};
-      function visit(value, key) {
-        if (visited[key] === VISIT_DONE) return;
-
-        cycle.push(key);
-        if (visited[key] === VISIT_IN_PROGRESS) {
-          cycle.splice(0, cycle.indexOf(key));
-          throw new Error("Cyclic dependency: " + cycle.join(" -> "));
-        }
-        visited[key] = VISIT_IN_PROGRESS;
-
-        if (isString(value)) {
-          plan.push(key, [ function() { return $injector.get(value); }], NO_DEPENDENCIES);
-        } else {
-          var params = $injector.annotate(value);
-          forEach(params, function (param) {
-            if (param !== key && invocables.hasOwnProperty(param)) visit(invocables[param], param);
-          });
-          plan.push(key, value, params);
-        }
-
-        cycle.pop();
-        visited[key] = VISIT_DONE;
+   * @module common
+   */ /** for typedoc */
+  var Queue = /** @class */ (function () {
+      function Queue(_items, _limit) {
+        if (_items === void 0) { _items = []; }
+        if (_limit === void 0) { _limit = null; }
+        this._items = _items;
+        this._limit = _limit;
       }
-      forEach(invocables, visit);
-      invocables = cycle = visited = null; // plan is all that's required
-
-      function isResolve(value) {
-        return isObject(value) && value.then && value.$$promises;
-      }
-
-      return function (locals, parent, self) {
-        if (isResolve(locals) && self === undefined) {
-          self = parent; parent = locals; locals = null;
-        }
-        if (!locals) locals = NO_LOCALS;
-        else if (!isObject(locals)) {
-          throw new Error("'locals' must be an object");
-        }
-        if (!parent) parent = NO_PARENT;
-        else if (!isResolve(parent)) {
-          throw new Error("'parent' must be a promise returned by $resolve.resolve()");
-        }
-
-        // To complete the overall resolution, we have to wait for the parent
-        // promise and for the promise for each invokable in our plan.
-        var resolution = $q.defer(),
-            result = resolution.promise,
-            promises = result.$$promises = {},
-            values = extend({}, locals),
-            wait = 1 + plan.length/3,
-            merged = false;
-
-        function done() {
-          // Merge parent values we haven't got yet and publish our own $$values
-          if (!--wait) {
-            if (!merged) merge(values, parent.$$values);
-            result.$$values = values;
-            result.$$promises = true; // keep for isResolve()
-            resolution.resolve(values);
-          }
-        }
-
-        function fail(reason) {
-          result.$$failure = reason;
-          resolution.reject(reason);
-        }
-
-        // Short-circuit if parent has already failed
-        if (isDefined(parent.$$failure)) {
-          fail(parent.$$failure);
-          return result;
-        }
-
-        // Merge parent values if the parent has already resolved, or merge
-        // parent promises and wait if the parent resolve is still in progress.
-        if (parent.$$values) {
-          merged = merge(values, parent.$$values);
-          done();
-        } else {
-          extend(promises, parent.$$promises);
-          parent.then(done, fail);
-        }
-
-        // Process each invocable in the plan, but ignore any where a local of the same name exists.
-        for (var i=0, ii=plan.length; i<ii; i+=3) {
-          if (locals.hasOwnProperty(plan[i])) done();
-          else invoke(plan[i], plan[i+1], plan[i+2]);
-        }
-
-        function invoke(key, invocable, params) {
-          // Create a deferred for this invocation. Failures will propagate to the resolution as well.
-          var invocation = $q.defer(), waitParams = 0;
-          function onfailure(reason) {
-            invocation.reject(reason);
-            fail(reason);
-          }
-          // Wait for any parameter that we have a promise for (either from parent or from this
-          // resolve; in that case study() will have made sure it's ordered before us in the plan).
-          forEach(params, function (dep) {
-            if (promises.hasOwnProperty(dep) && !locals.hasOwnProperty(dep)) {
-              waitParams++;
-              promises[dep].then(function (result) {
-                values[dep] = result;
-                if (!(--waitParams)) proceed();
-              }, onfailure);
-            }
-          });
-          if (!waitParams) proceed();
-          function proceed() {
-            if (isDefined(result.$$failure)) return;
-            try {
-              invocation.resolve($injector.invoke(invocable, self, values));
-              invocation.promise.then(function (result) {
-                values[key] = result;
-                done();
-              }, onfailure);
-            } catch (e) {
-              onfailure(e);
-            }
-          }
-          // Publish promise synchronously; invocations further down in the plan may depend on it.
-          promises[key] = invocation.promise;
-        }
-
-        return result;
+      Queue.prototype.enqueue = function (item) {
+        var items = this._items;
+        items.push(item);
+        if (this._limit && items.length > this._limit)
+          items.shift();
+        return item;
       };
-    };
-
-    /**
-     * Resolves a set of invocables. An invocable is a function to be invoked via `$injector.invoke()`,
-     * and can have an arbitrary number of dependencies. An invocable can either return a value directly,
-     * or a `$q` promise. If a promise is returned it will be resolved and the resulting value will be
-     * used instead. Dependencies of invocables are resolved (in this order of precedence)
-     *
-     * - from the specified `locals`
-     * - from another invocable that is part of this `$resolve` call
-     * - from an invocable that is inherited from a `parent` call to `$resolve` (or recursively
-     *   from any ancestor `$resolve` of that parent).
-     *
-     * The return value of `$resolve` is a promise for an object that contains (in this order of precedence)
-     *
-     * - any `locals` (if specified)
-     * - the resolved return values of all injectables
-     * - any values inherited from a `parent` call to `$resolve` (if specified)
-     *
-     * The promise will resolve after the `parent` promise (if any) and all promises returned by injectables
-     * have been resolved. If any invocable (or `$injector.invoke`) throws an exception, or if a promise
-     * returned by an invocable is rejected, the `$resolve` promise is immediately rejected with the same error.
-     * A rejection of a `parent` promise (if specified) will likewise be propagated immediately. Once the
-     * `$resolve` promise has been rejected, no further invocables will be called.
-     *
-     * Cyclic dependencies between invocables are not permitted and will caues `$resolve` to throw an
-     * error. As a special case, an injectable can depend on a parameter with the same name as the injectable,
-     * which will be fulfilled from the `parent` injectable of the same name. This allows inherited values
-     * to be decorated. Note that in this case any other injectable in the same `$resolve` with the same
-     * dependency would see the decorated value, not the inherited value.
-     *
-     * Note that missing dependencies -- unlike cyclic dependencies -- will cause an (asynchronous) rejection
-     * of the `$resolve` promise rather than a (synchronous) exception.
-     *
-     * Invocables are invoked eagerly as soon as all dependencies are available. This is true even for
-     * dependencies inherited from a `parent` call to `$resolve`.
-     *
-     * As a special case, an invocable can be a string, in which case it is taken to be a service name
-     * to be passed to `$injector.get()`. This is supported primarily for backwards-compatibility with the
-     * `resolve` property of `$routeProvider` routes.
-     *
-     * @function
-     * @param {Object.<string, Function|string>} invocables  functions to invoke or `$injector` services to fetch.
-     * @param {Object.<string, *>} [locals]  values to make available to the injectables
-     * @param {Promise.<Object>} [parent]  a promise returned by another call to `$resolve`.
-     * @param {Object} [self]  the `this` for the invoked methods
-     * @return {Promise.<Object>}  Promise for an object that contains the resolved return value
-     *    of all invocables, as well as any inherited and local values.
-     */
-    this.resolve = function (invocables, locals, parent, self) {
-      return this.study(invocables)(locals, parent, self);
-    };
-  }
-
-  angular.module('ui.router.util').service('$resolve', $Resolve);
-
+      Queue.prototype.dequeue = function () {
+        if (this.size())
+          return this._items.splice(0, 1)[0];
+      };
+      Queue.prototype.clear = function () {
+        var current = this._items;
+        this._items = [];
+        return current;
+      };
+      Queue.prototype.size = function () {
+        return this._items.length;
+      };
+      Queue.prototype.remove = function (item) {
+        var idx = this._items.indexOf(item);
+        return idx > -1 && this._items.splice(idx, 1)[0];
+      };
+      Queue.prototype.peekTail = function () {
+        return this._items[this._items.length - 1];
+      };
+      Queue.prototype.peekHead = function () {
+        if (this.size())
+          return this._items[0];
+      };
+      return Queue;
+    }());
 
   /**
-   * Service. Manages loading of templates.
-   * @constructor
-   * @name $templateFactory
-   * @requires $http
-   * @requires $templateCache
-   * @requires $injector
-   */
-  $TemplateFactory.$inject = ['$http', '$templateCache', '$injector'];
-  function $TemplateFactory(  $http,   $templateCache,   $injector) {
+   * @coreapi
+   * @module transition
+   */ /** for typedoc */
+  "use strict";
 
-    /**
-     * Creates a template from a configuration object.
-     * @function
-     * @name $templateFactory#fromConfig
-     * @methodOf $templateFactory
-     * @param {Object} config  Configuration object for which to load a template. The following
-     *    properties are search in the specified order, and the first one that is defined is
-     *    used to create the template:
-     * @param {string|Function} config.template  html string template or function to load via
-     *    {@link $templateFactory#fromString fromString}.
-     * @param {string|Function} config.templateUrl  url to load or a function returning the url
-     *    to load via {@link $templateFactory#fromUrl fromUrl}.
-     * @param {Function} config.templateProvider  function to invoke via
-     *    {@link $templateFactory#fromProvider fromProvider}.
-     * @param {Object} params  Parameters to pass to the template function.
-     * @param {Object} [locals] Locals to pass to `invoke` if the template is loaded via a
-     *      `templateProvider`. Defaults to `{ params: params }`.
-     * @return {string|Promise.<string>}  The template html as a string, or a promise for that string,
-     *      or `null` if no template is configured.
-     */
-    this.fromConfig = function (config, params, locals) {
-      return (
-          isDefined(config.template) ? this.fromString(config.template, params) :
-              isDefined(config.templateUrl) ? this.fromUrl(config.templateUrl, params) :
-                  isDefined(config.templateProvider) ? this.fromProvider(config.templateProvider, params, locals) :
-                      null
-          );
+  (function (RejectType) {
+    RejectType[RejectType["SUPERSEDED"] = 2] = "SUPERSEDED";
+    RejectType[RejectType["ABORTED"] = 3] = "ABORTED";
+    RejectType[RejectType["INVALID"] = 4] = "INVALID";
+    RejectType[RejectType["IGNORED"] = 5] = "IGNORED";
+    RejectType[RejectType["ERROR"] = 6] = "ERROR";
+  })(exports.RejectType || (exports.RejectType = {}));
+  /** @hidden */ var id = 0;
+  var Rejection = /** @class */ (function () {
+    function Rejection(type, message, detail) {
+      this.$id = id++;
+      this.type = type;
+      this.message = message;
+      this.detail = detail;
+    }
+    Rejection.prototype.toString = function () {
+      var detailString = function (d) {
+        return d && d.toString !== Object.prototype.toString ? d.toString() : stringify(d);
+      };
+      var detail = detailString(this.detail);
+      var _a = this, $id = _a.$id, type = _a.type, message = _a.message;
+      return "Transition Rejection($id: " + $id + " type: " + type + ", message: " + message + ", detail: " + detail + ")";
     };
-
-    /**
-     * Creates a template from a string or a function returning a string.
-     * @function
-     * @name $templateFactory#fromString
-     * @methodOf $templateFactory
-     * @param {string|Function} template  html template as a string or function that returns an html
-     *      template as a string.
-     * @param {Object} params  Parameters to pass to the template function.
-     * @return {string|Promise.<string>}  The template html as a string, or a promise for that string.
-     */
-    this.fromString = function (template, params) {
-      return isFunction(template) ? template(params) : template;
+    Rejection.prototype.toPromise = function () {
+      return extend(silentRejection(this), { _transitionRejection: this });
     };
-
-    /**
-     * Loads a template from the a URL via `$http` and `$templateCache`.
-     * @function
-     * @name $templateFactory#fromUrl
-     * @methodOf $templateFactory
-     * @param {string|Function} url  url of the template to load, or a function that returns a url.
-     * @param {Object} params  Parameters to pass to the url function.
-     * @return {string|Promise.<string>}  The template html as a string, or a promise for that string.
-     */
-    this.fromUrl = function (url, params) {
-      if (isFunction(url)) url = url(params);
-      if (url == null) return null;
-      else return $http
-          .get(url, { cache: $templateCache })
-          .then(function(response) { return response.data; });
+    /** Returns true if the obj is a rejected promise created from the `asPromise` factory */
+    Rejection.isRejectionPromise = function (obj) {
+      return obj && (typeof obj.then === 'function') && is(Rejection)(obj._transitionRejection);
     };
-
-    /**
-     * Creates a template by invoking an injectable provider function.
-     * @function
-     * @name $templateFactory#fromUrl
-     * @methodOf $templateFactory
-     * @param {Function} provider Function to invoke via `$injector.invoke`
-     * @param {Object} params Parameters for the template.
-     * @param {Object} [locals] Locals to pass to `invoke`. Defaults to `{ params: params }`.
-     * @return {string|Promise.<string>} The template html as a string, or a promise for that string.
-     */
-    this.fromProvider = function (provider, params, locals) {
-      return $injector.invoke(provider, null, locals || { params: params });
+    /** Returns a Rejection due to transition superseded */
+    Rejection.superseded = function (detail, options) {
+      var message = "The transition has been superseded by a different transition";
+      var rejection = new Rejection(exports.RejectType.SUPERSEDED, message, detail);
+      if (options && options.redirected) {
+        rejection.redirected = true;
+      }
+      return rejection;
     };
-  }
-
-  angular.module('ui.router.util').service('$templateFactory', $TemplateFactory);
+    /** Returns a Rejection due to redirected transition */
+    Rejection.redirected = function (detail) {
+      return Rejection.superseded(detail, { redirected: true });
+    };
+    /** Returns a Rejection due to invalid transition */
+    Rejection.invalid = function (detail) {
+      var message = "This transition is invalid";
+      return new Rejection(exports.RejectType.INVALID, message, detail);
+    };
+    /** Returns a Rejection due to ignored transition */
+    Rejection.ignored = function (detail) {
+      var message = "The transition was ignored";
+      return new Rejection(exports.RejectType.IGNORED, message, detail);
+    };
+    /** Returns a Rejection due to aborted transition */
+    Rejection.aborted = function (detail) {
+      var message = "The transition has been aborted";
+      return new Rejection(exports.RejectType.ABORTED, message, detail);
+    };
+    /** Returns a Rejection due to aborted transition */
+    Rejection.errored = function (detail) {
+      var message = "The transition errored";
+      return new Rejection(exports.RejectType.ERROR, message, detail);
+    };
+    /**
+     * Returns a Rejection
+     *
+     * Normalizes a value as a Rejection.
+     * If the value is already a Rejection, returns it.
+     * Otherwise, wraps and returns the value as a Rejection (Rejection type: ERROR).
+     *
+     * @returns `detail` if it is already a `Rejection`, else returns an ERROR Rejection.
+     */
+    Rejection.normalize = function (detail) {
+      return is(Rejection)(detail) ? detail : Rejection.errored(detail);
+    };
+    return Rejection;
+  }());
 
   /**
-   * Matches URLs against patterns and extracts named parameters from the path or the search
-   * part of the URL. A URL pattern consists of a path pattern, optionally followed by '?' and a list
-   * of search parameters. Multiple search parameter names are separated by '&'. Search parameters
-   * do not influence whether or not a URL is matched, but their values are passed through into
-   * the matched parameters returned by {@link UrlMatcher#exec exec}.
+   * # Transition tracing (debug)
    *
-   * Path parameter placeholders can be specified using simple colon/catch-all syntax or curly brace
-   * syntax, which optionally allows a regular expression for the parameter to be specified:
+   * Enable transition tracing to print transition information to the console,
+   * in order to help debug your application.
+   * Tracing logs detailed information about each Transition to your console.
    *
-   * * ':' name - colon placeholder
-   * * '*' name - catch-all placeholder
-   * * '{' name '}' - curly placeholder
-   * * '{' name ':' regexp '}' - curly placeholder with regexp. Should the regexp itself contain
-   *   curly braces, they must be in matched pairs or escaped with a backslash.
+   * To enable tracing, import the [[Trace]] singleton and enable one or more categories.
    *
-   * Parameter names may contain only word characters (latin letters, digits, and underscore) and
-   * must be unique within the pattern (across both path and search parameters). For colon
-   * placeholders or curly placeholders without an explicit regexp, a path parameter matches any
-   * number of characters other than '/'. For catch-all placeholders the path parameter matches
-   * any number of characters.
+   * ### ES6
+   * ```js
+   * import {trace} from "ui-router-ng2"; // or "angular-ui-router"
+   * trace.enable(1, 5); // TRANSITION and VIEWCONFIG
+   * ```
    *
-   * ### Examples
+   * ### CJS
+   * ```js
+   * let trace = require("angular-ui-router").trace; // or "ui-router-ng2"
+   * trace.enable("TRANSITION", "VIEWCONFIG");
+   * ```
    *
-   * * '/hello/' - Matches only if the path is exactly '/hello/'. There is no special treatment for
-   *   trailing slashes, and patterns have to match the entire path, not just a prefix.
-   * * '/user/:id' - Matches '/user/bob' or '/user/1234!!!' or even '/user/' but not '/user' or
-   *   '/user/bob/details'. The second path segment will be captured as the parameter 'id'.
-   * * '/user/{id}' - Same as the previous example, but using curly brace syntax.
-   * * '/user/{id:[^/]*}' - Same as the previous example.
-   * * '/user/{id:[0-9a-fA-F]{1,8}}' - Similar to the previous example, but only matches if the id
-   *   parameter consists of 1 to 8 hex digits.
-   * * '/files/{path:.*}' - Matches any URL starting with '/files/' and captures the rest of the
-   *   path into the parameter 'path'.
-   * * '/files/*path' - ditto.
+   * ### Globals
+   * ```js
+   * let trace = window["angular-ui-router"].trace; // or "ui-router-ng2"
+   * trace.enable(); // Trace everything (very verbose)
+   * ```
    *
-   * @constructor
-   * @param {string} pattern  the pattern to compile into a matcher.
+   * ### Angular 1:
+   * ```js
+   * app.run($trace => $trace.enable());
+   * ```
    *
-   * @property {string} prefix  A static prefix of this pattern. The matcher guarantees that any
-   *   URL matching this matcher (i.e. any string for which {@link UrlMatcher#exec exec()} returns
-   *   non-null) will start with this prefix.
+   * @coreapi
+   * @module trace
+   */ /** for typedoc */
+  /** @hidden */
+  function uiViewString(uiview) {
+    if (!uiview)
+      return 'ui-view (defunct)';
+    var state = uiview.creationContext ? uiview.creationContext.name || '(root)' : '(none)';
+    return "[ui-view#" + uiview.id + " " + uiview.$type + ":" + uiview.fqn + " (" + uiview.name + "@" + state + ")]";
+  }
+  /** @hidden */
+  var viewConfigString = function (viewConfig) {
+    var view = viewConfig.viewDecl;
+    var state = view.$context.name || '(root)';
+    return "[View#" + viewConfig.$id + " from '" + state + "' state]: target ui-view: '" + view.$uiViewName + "@" + view.$uiViewContextAnchor + "'";
+  };
+  /** @hidden */
+  function normalizedCat(input) {
+    return isNumber(input) ? exports.Category[input] : exports.Category[exports.Category[input]];
+  }
+  /** @hidden */
+  var consoleLog = Function.prototype.bind.call(console.log, console);
+  /** @hidden */
+  var consoletable = isFunction(console.table) ? console.table.bind(console) : consoleLog.bind(console);
+  /**
+   * Trace categories Enum
+   *
+   * Enable or disable a category using [[Trace.enable]] or [[Trace.disable]]
+   *
+   * `trace.enable(Category.TRANSITION)`
+   *
+   * These can also be provided using a matching string, or position ordinal
+   *
+   * `trace.enable("TRANSITION")`
+   *
+   * `trace.enable(1)`
    */
-  function UrlMatcher(pattern) {
 
-    // Find all placeholders and create a compiled pattern, using either classic or curly syntax:
-    //   '*' name
-    //   ':' name
-    //   '{' name '}'
-    //   '{' name ':' regexp '}'
-    // The regular expression is somewhat complicated due to the need to allow curly braces
-    // inside the regular expression. The placeholder regexp breaks down as follows:
-    //    ([:*])(\w+)               classic placeholder ($1 / $2)
-    //    \{(\w+)(?:\:( ... ))?\}   curly brace placeholder ($3) with optional regexp ... ($4)
-    //    (?: ... | ... | ... )+    the regexp consists of any number of atoms, an atom being either
-    //    [^{}\\]+                  - anything other than curly braces or backslash
-    //    \\.                       - a backslash escape
-    //    \{(?:[^{}\\]+|\\.)*\}     - a matched set of curly braces containing other atoms
-    var placeholder = /([:*])(\w+)|\{(\w+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,
-        names = {}, compiled = '^', last = 0, m,
-        segments = this.segments = [],
-        params = this.params = [];
-
-    function addParameter(id) {
-      if (!/^\w+(-+\w+)*$/.test(id)) throw new Error("Invalid parameter name '" + id + "' in pattern '" + pattern + "'");
-      if (names[id]) throw new Error("Duplicate parameter name '" + id + "' in pattern '" + pattern + "'");
-      names[id] = true;
-      params.push(id);
+  (function (Category) {
+    Category[Category["RESOLVE"] = 0] = "RESOLVE";
+    Category[Category["TRANSITION"] = 1] = "TRANSITION";
+    Category[Category["HOOK"] = 2] = "HOOK";
+    Category[Category["UIVIEW"] = 3] = "UIVIEW";
+    Category[Category["VIEWCONFIG"] = 4] = "VIEWCONFIG";
+  })(exports.Category || (exports.Category = {}));
+  /** @hidden */ var _tid = parse("$id");
+  /** @hidden */ var _rid = parse("router.$id");
+  /** @hidden */ var transLbl = function (trans) { return "Transition #" + _tid(trans) + "-" + _rid(trans); };
+  /**
+   * Prints UI-Router Transition trace information to the console.
+   */
+  var Trace = /** @class */ (function () {
+    /** @hidden */
+    function Trace() {
+      /** @hidden */
+      this._enabled = {};
+      this.approximateDigests = 0;
     }
+    /** @hidden */
+    Trace.prototype._set = function (enabled, categories) {
+      var _this = this;
+      if (!categories.length) {
+        categories = Object.keys(exports.Category)
+          .map(function (k) { return parseInt(k, 10); })
+          .filter(function (k) { return !isNaN(k); })
+          .map(function (key) { return exports.Category[key]; });
+      }
+      categories.map(normalizedCat).forEach(function (category) { return _this._enabled[category] = enabled; });
+    };
+    Trace.prototype.enable = function () {
+      var categories = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        categories[_i] = arguments[_i];
+      }
+      this._set(true, categories);
+    };
+    Trace.prototype.disable = function () {
+      var categories = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        categories[_i] = arguments[_i];
+      }
+      this._set(false, categories);
+    };
+    /**
+     * Retrieves the enabled stateus of a [[Category]]
+     *
+     * ```js
+     * trace.enabled("VIEWCONFIG"); // true or false
+     * ```
+     *
+     * @returns boolean true if the category is enabled
+     */
+    Trace.prototype.enabled = function (category) {
+      return !!this._enabled[normalizedCat(category)];
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceTransitionStart = function (trans) {
+      if (!this.enabled(exports.Category.TRANSITION))
+        return;
+      console.log(transLbl(trans) + ": Started  -> " + stringify(trans));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceTransitionIgnored = function (trans) {
+      if (!this.enabled(exports.Category.TRANSITION))
+        return;
+      console.log(transLbl(trans) + ": Ignored  <> " + stringify(trans));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceHookInvocation = function (step, trans, options) {
+      if (!this.enabled(exports.Category.HOOK))
+        return;
+      var event = parse("traceData.hookType")(options) || "internal", context = parse("traceData.context.state.name")(options) || parse("traceData.context")(options) || "unknown", name = functionToString(step.registeredHook.callback);
+      console.log(transLbl(trans) + ":   Hook -> " + event + " context: " + context + ", " + maxLength(200, name));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceHookResult = function (hookResult, trans, transitionOptions) {
+      if (!this.enabled(exports.Category.HOOK))
+        return;
+      console.log(transLbl(trans) + ":   <- Hook returned: " + maxLength(200, stringify(hookResult)));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceResolvePath = function (path, when, trans) {
+      if (!this.enabled(exports.Category.RESOLVE))
+        return;
+      console.log(transLbl(trans) + ":         Resolving " + path + " (" + when + ")");
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceResolvableResolved = function (resolvable, trans) {
+      if (!this.enabled(exports.Category.RESOLVE))
+        return;
+      console.log(transLbl(trans) + ":               <- Resolved  " + resolvable + " to: " + maxLength(200, stringify(resolvable.data)));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceError = function (reason, trans) {
+      if (!this.enabled(exports.Category.TRANSITION))
+        return;
+      console.log(transLbl(trans) + ": <- Rejected " + stringify(trans) + ", reason: " + reason);
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceSuccess = function (finalState, trans) {
+      if (!this.enabled(exports.Category.TRANSITION))
+        return;
+      console.log(transLbl(trans) + ": <- Success  " + stringify(trans) + ", final state: " + finalState.name);
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceUIViewEvent = function (event, viewData, extra) {
+      if (extra === void 0) { extra = ""; }
+      if (!this.enabled(exports.Category.UIVIEW))
+        return;
+      console.log("ui-view: " + padString(30, event) + " " + uiViewString(viewData) + extra);
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceUIViewConfigUpdated = function (viewData, context) {
+      if (!this.enabled(exports.Category.UIVIEW))
+        return;
+      this.traceUIViewEvent("Updating", viewData, " with ViewConfig from context='" + context + "'");
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceUIViewFill = function (viewData, html) {
+      if (!this.enabled(exports.Category.UIVIEW))
+        return;
+      this.traceUIViewEvent("Fill", viewData, " with: " + maxLength(200, html));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceViewSync = function (pairs) {
+      if (!this.enabled(exports.Category.VIEWCONFIG))
+        return;
+      var mapping = pairs.map(function (_a) {
+        var uiViewData = _a[0], config = _a[1];
+        var uiView = uiViewData.$type + ":" + uiViewData.fqn;
+        var view = config && config.viewDecl.$context.name + ": " + config.viewDecl.$name + " (" + config.viewDecl.$type + ")";
+        return { 'ui-view fqn': uiView, 'state: view name': view };
+      }).sort(function (a, b) { return a['ui-view fqn'].localeCompare(b['ui-view fqn']); });
+      consoletable(mapping);
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceViewServiceEvent = function (event, viewConfig) {
+      if (!this.enabled(exports.Category.VIEWCONFIG))
+        return;
+      console.log("VIEWCONFIG: " + event + " " + viewConfigString(viewConfig));
+    };
+    /** @internalapi called by ui-router code */
+    Trace.prototype.traceViewServiceUIViewEvent = function (event, viewData) {
+      if (!this.enabled(exports.Category.VIEWCONFIG))
+        return;
+      console.log("VIEWCONFIG: " + event + " " + uiViewString(viewData));
+    };
+    return Trace;
+  }());
+  /**
+   * The [[Trace]] singleton
+   *
+   * #### Example:
+   * ```js
+   * import {trace} from "angular-ui-router";
+   * trace.enable(1, 5);
+   * ```
+   */
+  var trace = new Trace();
 
-    function quoteRegExp(string) {
-      return string.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&");
+  (function (TransitionHookPhase) {
+    TransitionHookPhase[TransitionHookPhase["CREATE"] = 0] = "CREATE";
+    TransitionHookPhase[TransitionHookPhase["BEFORE"] = 1] = "BEFORE";
+    TransitionHookPhase[TransitionHookPhase["RUN"] = 2] = "RUN";
+    TransitionHookPhase[TransitionHookPhase["SUCCESS"] = 3] = "SUCCESS";
+    TransitionHookPhase[TransitionHookPhase["ERROR"] = 4] = "ERROR";
+  })(exports.TransitionHookPhase || (exports.TransitionHookPhase = {}));
+
+  (function (TransitionHookScope) {
+    TransitionHookScope[TransitionHookScope["TRANSITION"] = 0] = "TRANSITION";
+    TransitionHookScope[TransitionHookScope["STATE"] = 1] = "STATE";
+  })(exports.TransitionHookScope || (exports.TransitionHookScope = {}));
+
+  /**
+   * @coreapi
+   * @module state
+   */ /** for typedoc */
+  /**
+   * Encapsulate the target (destination) state/params/options of a [[Transition]].
+   *
+   * This class is frequently used to redirect a transition to a new destination.
+   *
+   * See:
+   *
+   * - [[HookResult]]
+   * - [[TransitionHookFn]]
+   * - [[TransitionService.onStart]]
+   *
+   * To create a `TargetState`, use [[StateService.target]].
+   *
+   * ---
+   *
+   * This class wraps:
+   *
+   * 1) an identifier for a state
+   * 2) a set of parameters
+   * 3) and transition options
+   * 4) the registered state object (the [[StateDeclaration]])
+   *
+   * Many UI-Router APIs such as [[StateService.go]] take a [[StateOrName]] argument which can
+   * either be a *state object* (a [[StateDeclaration]] or [[StateObject]]) or a *state name* (a string).
+   * The `TargetState` class normalizes those options.
+   *
+   * A `TargetState` may be valid (the state being targeted exists in the registry)
+   * or invalid (the state being targeted is not registered).
+   */
+  var TargetState = /** @class */ (function () {
+    /**
+     * The TargetState constructor
+     *
+     * Note: Do not construct a `TargetState` manually.
+     * To create a `TargetState`, use the [[StateService.target]] factory method.
+     *
+     * @param _stateRegistry The StateRegistry to use to look up the _definition
+     * @param _identifier An identifier for a state.
+     *    Either a fully-qualified state name, or the object used to define the state.
+     * @param _params Parameters for the target state
+     * @param _options Transition options.
+     *
+     * @internalapi
+     */
+    function TargetState(_stateRegistry, _identifier, _params, _options) {
+      this._stateRegistry = _stateRegistry;
+      this._identifier = _identifier;
+      this._identifier = _identifier;
+      this._params = extend({}, _params || {});
+      this._options = extend({}, _options || {});
+      this._definition = _stateRegistry.matcher.find(_identifier, this._options.relative);
     }
+    /** The name of the state this object targets */
+    TargetState.prototype.name = function () {
+      return this._definition && this._definition.name || this._identifier;
+    };
+    /** The identifier used when creating this TargetState */
+    TargetState.prototype.identifier = function () {
+      return this._identifier;
+    };
+    /** The target parameter values */
+    TargetState.prototype.params = function () {
+      return this._params;
+    };
+    /** The internal state object (if it was found) */
+    TargetState.prototype.$state = function () {
+      return this._definition;
+    };
+    /** The internal state declaration (if it was found) */
+    TargetState.prototype.state = function () {
+      return this._definition && this._definition.self;
+    };
+    /** The target options */
+    TargetState.prototype.options = function () {
+      return this._options;
+    };
+    /** True if the target state was found */
+    TargetState.prototype.exists = function () {
+      return !!(this._definition && this._definition.self);
+    };
+    /** True if the object is valid */
+    TargetState.prototype.valid = function () {
+      return !this.error();
+    };
+    /** If the object is invalid, returns the reason why */
+    TargetState.prototype.error = function () {
+      var base = this.options().relative;
+      if (!this._definition && !!base) {
+        var stateName = base.name ? base.name : base;
+        return "Could not resolve '" + this.name() + "' from state '" + stateName + "'";
+      }
+      if (!this._definition)
+        return "No such state '" + this.name() + "'";
+      if (!this._definition.self)
+        return "State '" + this.name() + "' has an invalid definition";
+    };
+    TargetState.prototype.toString = function () {
+      return "'" + this.name() + "'" + stringify(this.params());
+    };
+    /**
+     * Returns a copy of this TargetState which targets a different state.
+     * The new TargetState has the same parameter values and transition options.
+     *
+     * @param state The new state that should be targeted
+     */
+    TargetState.prototype.withState = function (state) {
+      return new TargetState(this._stateRegistry, state, this._params, this._options);
+    };
+    /**
+     * Returns a copy of this TargetState, using the specified parameter values.
+     *
+     * @param params the new parameter values to use
+     * @param replace When false (default) the new parameter values will be merged with the current values.
+     *                When true the parameter values will be used instead of the current values.
+     */
+    TargetState.prototype.withParams = function (params, replace) {
+      if (replace === void 0) { replace = false; }
+      var newParams = replace ? params : extend({}, this._params, params);
+      return new TargetState(this._stateRegistry, this._identifier, newParams, this._options);
+    };
+    /**
+     * Returns a copy of this TargetState, using the specified Transition Options.
+     *
+     * @param options the new options to use
+     * @param replace When false (default) the new options will be merged with the current options.
+     *                When true the options will be used instead of the current options.
+     */
+    TargetState.prototype.withOptions = function (options, replace) {
+      if (replace === void 0) { replace = false; }
+      var newOpts = replace ? options : extend({}, this._options, options);
+      return new TargetState(this._stateRegistry, this._identifier, this._params, newOpts);
+    };
+    /** Returns true if the object has a state property that might be a state or state name */
+    TargetState.isDef = function (obj) {
+      return obj && obj.state && (isString(obj.state) || isString(obj.state.name));
+    };
+    return TargetState;
+  }());
 
-    this.source = pattern;
-
-    // Split into static segments separated by path parameter placeholders.
-    // The number of segments is always 1 more than the number of parameters.
-    var id, regexp, segment;
-    while ((m = placeholder.exec(pattern))) {
-      id = m[2] || m[3]; // IE[78] returns '' for unmatched groups instead of null
-      regexp = m[4] || (m[1] == '*' ? '.*' : '[^/]*');
-      segment = pattern.substring(last, m.index);
-      if (segment.indexOf('?') >= 0) break; // we're into the search part
-      compiled += quoteRegExp(segment) + '(' + regexp + ')';
-      addParameter(id);
-      segments.push(segment);
-      last = placeholder.lastIndex;
+  /**
+   * @coreapi
+   * @module transition
+   */
+  /** for typedoc */
+  var defaultOptions = {
+    current: noop$1,
+    transition: null,
+    traceData: {},
+    bind: null,
+  };
+  /** @hidden */
+  var TransitionHook = /** @class */ (function () {
+    function TransitionHook(transition, stateContext, registeredHook, options) {
+      var _this = this;
+      this.transition = transition;
+      this.stateContext = stateContext;
+      this.registeredHook = registeredHook;
+      this.options = options;
+      this.isSuperseded = function () {
+        return _this.type.hookPhase === exports.TransitionHookPhase.RUN && !_this.options.transition.isActive();
+      };
+      this.options = defaults(options, defaultOptions);
+      this.type = registeredHook.eventType;
     }
-    segment = pattern.substring(last);
+    TransitionHook.prototype.logError = function (err) {
+      this.transition.router.stateService.defaultErrorHandler()(err);
+    };
+    TransitionHook.prototype.invokeHook = function () {
+      var _this = this;
+      var hook = this.registeredHook;
+      if (hook._deregistered)
+        return;
+      var notCurrent = this.getNotCurrentRejection();
+      if (notCurrent)
+        return notCurrent;
+      var options = this.options;
+      trace.traceHookInvocation(this, this.transition, options);
+      var invokeCallback = function () {
+        return hook.callback.call(options.bind, _this.transition, _this.stateContext);
+      };
+      var normalizeErr = function (err) {
+        return Rejection.normalize(err).toPromise();
+      };
+      var handleError = function (err) {
+        return hook.eventType.getErrorHandler(_this)(err);
+      };
+      var handleResult = function (result) {
+        return hook.eventType.getResultHandler(_this)(result);
+      };
+      try {
+        var result = invokeCallback();
+        if (!this.type.synchronous && isPromise(result)) {
+          return result.catch(normalizeErr)
+            .then(handleResult, handleError);
+        }
+        else {
+          return handleResult(result);
+        }
+      }
+      catch (err) {
+        // If callback throws (synchronously)
+        return handleError(Rejection.normalize(err));
+      }
+      finally {
+        if (hook.invokeLimit && ++hook.invokeCount >= hook.invokeLimit) {
+          hook.deregister();
+        }
+      }
+    };
+    /**
+     * This method handles the return value of a Transition Hook.
+     *
+     * A hook can return false (cancel), a TargetState (redirect),
+     * or a promise (which may later resolve to false or a redirect)
+     *
+     * This also handles "transition superseded" -- when a new transition
+     * was started while the hook was still running
+     */
+    TransitionHook.prototype.handleHookResult = function (result) {
+      var _this = this;
+      var notCurrent = this.getNotCurrentRejection();
+      if (notCurrent)
+        return notCurrent;
+      // Hook returned a promise
+      if (isPromise(result)) {
+        // Wait for the promise, then reprocess with the resulting value
+        return result.then(function (val$$1) { return _this.handleHookResult(val$$1); });
+      }
+      trace.traceHookResult(result, this.transition, this.options);
+      // Hook returned false
+      if (result === false) {
+        // Abort this Transition
+        return Rejection.aborted("Hook aborted transition").toPromise();
+      }
+      var isTargetState = is(TargetState);
+      // hook returned a TargetState
+      if (isTargetState(result)) {
+        // Halt the current Transition and redirect (a new Transition) to the TargetState.
+        return Rejection.redirected(result).toPromise();
+      }
+    };
+    /**
+     * Return a Rejection promise if the transition is no longer current due
+     * to a stopped router (disposed), or a new transition has started and superseded this one.
+     */
+    TransitionHook.prototype.getNotCurrentRejection = function () {
+      var router = this.transition.router;
+      // The router is stopped
+      if (router._disposed) {
+        return Rejection.aborted("UIRouter instance #" + router.$id + " has been stopped (disposed)").toPromise();
+      }
+      if (this.transition._aborted) {
+        return Rejection.aborted().toPromise();
+      }
+      // This transition is no longer current.
+      // Another transition started while this hook was still running.
+      if (this.isSuperseded()) {
+        // Abort this transition
+        return Rejection.superseded(this.options.current()).toPromise();
+      }
+    };
+    TransitionHook.prototype.toString = function () {
+      var _a = this, options = _a.options, registeredHook = _a.registeredHook;
+      var event = parse("traceData.hookType")(options) || "internal", context = parse("traceData.context.state.name")(options) || parse("traceData.context")(options) || "unknown", name = fnToString(registeredHook.callback);
+      return event + " context: " + context + ", " + maxLength(200, name);
+    };
+    /**
+     * Chains together an array of TransitionHooks.
+     *
+     * Given a list of [[TransitionHook]] objects, chains them together.
+     * Each hook is invoked after the previous one completes.
+     *
+     * #### Example:
+     * ```js
+     * var hooks: TransitionHook[] = getHooks();
+     * let promise: Promise<any> = TransitionHook.chain(hooks);
+     *
+     * promise.then(handleSuccess, handleError);
+     * ```
+     *
+     * @param hooks the list of hooks to chain together
+     * @param waitFor if provided, the chain is `.then()`'ed off this promise
+     * @returns a `Promise` for sequentially invoking the hooks (in order)
+     */
+    TransitionHook.chain = function (hooks, waitFor) {
+      // Chain the next hook off the previous
+      var createHookChainR = function (prev, nextHook) {
+        return prev.then(function () { return nextHook.invokeHook(); });
+      };
+      return hooks.reduce(createHookChainR, waitFor || services.$q.when());
+    };
+    /**
+     * Invokes all the provided TransitionHooks, in order.
+     * Each hook's return value is checked.
+     * If any hook returns a promise, then the rest of the hooks are chained off that promise, and the promise is returned.
+     * If no hook returns a promise, then all hooks are processed synchronously.
+     *
+     * @param hooks the list of TransitionHooks to invoke
+     * @param doneCallback a callback that is invoked after all the hooks have successfully completed
+     *
+     * @returns a promise for the async result, or the result of the callback
+     */
+    TransitionHook.invokeHooks = function (hooks, doneCallback) {
+      for (var idx = 0; idx < hooks.length; idx++) {
+        var hookResult = hooks[idx].invokeHook();
+        if (isPromise(hookResult)) {
+          var remainingHooks = hooks.slice(idx + 1);
+          return TransitionHook.chain(remainingHooks, hookResult)
+            .then(doneCallback);
+        }
+      }
+      return doneCallback();
+    };
+    /**
+     * Run all TransitionHooks, ignoring their return value.
+     */
+    TransitionHook.runAllHooks = function (hooks) {
+      hooks.forEach(function (hook) { return hook.invokeHook(); });
+    };
+    /**
+     * These GetResultHandler(s) are used by [[invokeHook]] below
+     * Each HookType chooses a GetResultHandler (See: [[TransitionService._defineCoreEvents]])
+     */
+    TransitionHook.HANDLE_RESULT = function (hook) { return function (result) {
+      return hook.handleHookResult(result);
+    }; };
+    /**
+     * If the result is a promise rejection, log it.
+     * Otherwise, ignore the result.
+     */
+    TransitionHook.LOG_REJECTED_RESULT = function (hook) { return function (result) {
+      isPromise(result) && result.catch(function (err) {
+        return hook.logError(Rejection.normalize(err));
+      });
+      return undefined;
+    }; };
+    /**
+     * These GetErrorHandler(s) are used by [[invokeHook]] below
+     * Each HookType chooses a GetErrorHandler (See: [[TransitionService._defineCoreEvents]])
+     */
+    TransitionHook.LOG_ERROR = function (hook) { return function (error) {
+      return hook.logError(error);
+    }; };
+    TransitionHook.REJECT_ERROR = function (hook) { return function (error) {
+      return silentRejection(error);
+    }; };
+    TransitionHook.THROW_ERROR = function (hook) { return function (error) {
+      throw error;
+    }; };
+    return TransitionHook;
+  }());
 
-    // Find any search parameter names and remove them from the last segment
-    var i = segment.indexOf('?');
-    if (i >= 0) {
-      var search = this.sourceSearch = segment.substring(i);
-      segment = segment.substring(0, i);
-      this.sourcePath = pattern.substring(0, last+i);
-
-      // Allow parameters to be separated by '?' as well as '&' to make concat() easier
-      forEach(search.substring(1).split(/[&?]/), addParameter);
-    } else {
-      this.sourcePath = pattern;
-      this.sourceSearch = '';
+  /**
+   * @coreapi
+   * @module transition
+   */ /** for typedoc */
+  /**
+   * Determines if the given state matches the matchCriteria
+   *
+   * @hidden
+   *
+   * @param state a State Object to test against
+   * @param criterion
+   * - If a string, matchState uses the string as a glob-matcher against the state name
+   * - If an array (of strings), matchState uses each string in the array as a glob-matchers against the state name
+   *   and returns a positive match if any of the globs match.
+   * - If a function, matchState calls the function with the state and returns true if the function's result is truthy.
+   * @returns {boolean}
+   */
+  function matchState(state, criterion) {
+    var toMatch = isString(criterion) ? [criterion] : criterion;
+    function matchGlobs(_state) {
+      var globStrings = toMatch;
+      for (var i = 0; i < globStrings.length; i++) {
+        var glob = new Glob(globStrings[i]);
+        if ((glob && glob.matches(_state.name)) || (!glob && globStrings[i] === _state.name)) {
+          return true;
+        }
+      }
+      return false;
     }
-
-    compiled += quoteRegExp(segment) + '$';
-    segments.push(segment);
-    this.regexp = new RegExp(compiled);
-    this.prefix = segments[0];
+    var matchFn = (isFunction(toMatch) ? toMatch : matchGlobs);
+    return !!matchFn(state);
+  }
+  /**
+   * @internalapi
+   * The registration data for a registered transition hook
+   */
+  var RegisteredHook = /** @class */ (function () {
+    function RegisteredHook(tranSvc, eventType, callback, matchCriteria, removeHookFromRegistry, options) {
+      if (options === void 0) { options = {}; }
+      this.tranSvc = tranSvc;
+      this.eventType = eventType;
+      this.callback = callback;
+      this.matchCriteria = matchCriteria;
+      this.removeHookFromRegistry = removeHookFromRegistry;
+      this.invokeCount = 0;
+      this._deregistered = false;
+      this.priority = options.priority || 0;
+      this.bind = options.bind || null;
+      this.invokeLimit = options.invokeLimit;
+    }
+    /**
+     * Gets the matching [[PathNode]]s
+     *
+     * Given an array of [[PathNode]]s, and a [[HookMatchCriterion]], returns an array containing
+     * the [[PathNode]]s that the criteria matches, or `null` if there were no matching nodes.
+     *
+     * Returning `null` is significant to distinguish between the default
+     * "match-all criterion value" of `true` compared to a `() => true` function,
+     * when the nodes is an empty array.
+     *
+     * This is useful to allow a transition match criteria of `entering: true`
+     * to still match a transition, even when `entering === []`.  Contrast that
+     * with `entering: (state) => true` which only matches when a state is actually
+     * being entered.
+     */
+    RegisteredHook.prototype._matchingNodes = function (nodes, criterion) {
+      if (criterion === true)
+        return nodes;
+      var matching = nodes.filter(function (node) { return matchState(node.state, criterion); });
+      return matching.length ? matching : null;
+    };
+    /**
+     * Gets the default match criteria (all `true`)
+     *
+     * Returns an object which has all the criteria match paths as keys and `true` as values, i.e.:
+     *
+     * ```js
+     * {
+     *   to: true,
+     *   from: true,
+     *   entering: true,
+     *   exiting: true,
+     *   retained: true,
+     * }
+     */
+    RegisteredHook.prototype._getDefaultMatchCriteria = function () {
+      return map(this.tranSvc._pluginapi._getPathTypes(), function () { return true; });
+    };
+    /**
+     * Gets matching nodes as [[IMatchingNodes]]
+     *
+     * Create a IMatchingNodes object from the TransitionHookTypes that is roughly equivalent to:
+     *
+     * ```js
+     * let matches: IMatchingNodes = {
+     *   to:       _matchingNodes([tail(treeChanges.to)],   mc.to),
+     *   from:     _matchingNodes([tail(treeChanges.from)], mc.from),
+     *   exiting:  _matchingNodes(treeChanges.exiting,      mc.exiting),
+     *   retained: _matchingNodes(treeChanges.retained,     mc.retained),
+     *   entering: _matchingNodes(treeChanges.entering,     mc.entering),
+     * };
+     * ```
+     */
+    RegisteredHook.prototype._getMatchingNodes = function (treeChanges) {
+      var _this = this;
+      var criteria = extend(this._getDefaultMatchCriteria(), this.matchCriteria);
+      var paths = values(this.tranSvc._pluginapi._getPathTypes());
+      return paths.reduce(function (mn, pathtype) {
+        // STATE scope criteria matches against every node in the path.
+        // TRANSITION scope criteria matches against only the last node in the path
+        var isStateHook = pathtype.scope === exports.TransitionHookScope.STATE;
+        var path = treeChanges[pathtype.name] || [];
+        var nodes = isStateHook ? path : [tail(path)];
+        mn[pathtype.name] = _this._matchingNodes(nodes, criteria[pathtype.name]);
+        return mn;
+      }, {});
+    };
+    /**
+     * Determines if this hook's [[matchCriteria]] match the given [[TreeChanges]]
+     *
+     * @returns an IMatchingNodes object, or null. If an IMatchingNodes object is returned, its values
+     * are the matching [[PathNode]]s for each [[HookMatchCriterion]] (to, from, exiting, retained, entering)
+     */
+    RegisteredHook.prototype.matches = function (treeChanges) {
+      var matches = this._getMatchingNodes(treeChanges);
+      // Check if all the criteria matched the TreeChanges object
+      var allMatched = values(matches).every(identity);
+      return allMatched ? matches : null;
+    };
+    RegisteredHook.prototype.deregister = function () {
+      this.removeHookFromRegistry(this);
+      this._deregistered = true;
+    };
+    return RegisteredHook;
+  }());
+  /** @hidden Return a registration function of the requested type. */
+  function makeEvent(registry, transitionService, eventType) {
+    // Create the object which holds the registered transition hooks.
+    var _registeredHooks = registry._registeredHooks = (registry._registeredHooks || {});
+    var hooks = _registeredHooks[eventType.name] = [];
+    var removeHookFn = removeFrom(hooks);
+    // Create hook registration function on the IHookRegistry for the event
+    registry[eventType.name] = hookRegistrationFn;
+    function hookRegistrationFn(matchObject, callback, options) {
+      if (options === void 0) { options = {}; }
+      var registeredHook = new RegisteredHook(transitionService, eventType, callback, matchObject, removeHookFn, options);
+      hooks.push(registeredHook);
+      return registeredHook.deregister.bind(registeredHook);
+    }
+    return hookRegistrationFn;
   }
 
   /**
-   * Returns a new matcher for a pattern constructed by appending the path part and adding the
-   * search parameters of the specified pattern to this pattern. The current pattern is not
-   * modified. This can be understood as creating a pattern for URLs that are relative to (or
-   * suffixes of) the current pattern.
-   *
-   * ### Example
-   * The following two matchers are equivalent:
-   * ```
-   * new UrlMatcher('/user/{id}?q').concat('/details?date');
-   * new UrlMatcher('/user/{id}/details?q&date');
-   * ```
-   *
-   * @param {string} pattern  The pattern to append.
-   * @return {UrlMatcher}  A matcher for the concatenated pattern.
-   */
-  UrlMatcher.prototype.concat = function (pattern) {
-    // Because order of search parameters is irrelevant, we can add our own search
-    // parameters to the end of the new pattern. Parse the new pattern by itself
-    // and then join the bits together, but it's much easier to do this on a string level.
-    return new UrlMatcher(this.sourcePath + pattern + this.sourceSearch);
-  };
-
-  UrlMatcher.prototype.toString = function () {
-    return this.source;
-  };
-
+   * @coreapi
+   * @module transition
+   */ /** for typedoc */
   /**
-   * Tests the specified path against this matcher, and returns an object containing the captured
-   * parameter values, or null if the path does not match. The returned object contains the values
-   * of any search parameters that are mentioned in the pattern, but their value may be null if
-   * they are not present in `searchParams`. This means that search parameters are always treated
-   * as optional.
+   * This class returns applicable TransitionHooks for a specific Transition instance.
    *
-   * ### Example
-   * ```
-   * new UrlMatcher('/user/{id}?q&r').exec('/user/bob', { x:'1', q:'hello' });
-   * // returns { id:'bob', q:'hello', r:null }
-   * ```
+   * Hooks ([[RegisteredHook]]) may be registered globally, e.g., $transitions.onEnter(...), or locally, e.g.
+   * myTransition.onEnter(...).  The HookBuilder finds matching RegisteredHooks (where the match criteria is
+   * determined by the type of hook)
+   *
+   * The HookBuilder also converts RegisteredHooks objects to TransitionHook objects, which are used to run a Transition.
+   *
+   * The HookBuilder constructor is given the $transitions service and a Transition instance.  Thus, a HookBuilder
+   * instance may only be used for one specific Transition object. (side note: the _treeChanges accessor is private
+   * in the Transition class, so we must also provide the Transition's _treeChanges)
    *
-   * @param {string} path  The URL path to match, e.g. `$location.path()`.
-   * @param {Object} searchParams  URL search parameters, e.g. `$location.search()`.
-   * @return {Object}  The captured parameter values.
    */
-  UrlMatcher.prototype.exec = function (path, searchParams) {
-    var m = this.regexp.exec(path);
-    if (!m) return null;
-
-    var params = this.params, nTotal = params.length,
-        nPath = this.segments.length-1,
-        values = {}, i;
-
-    if (nPath !== m.length - 1) throw new Error("Unbalanced capture group in route '" + this.source + "'");
-
-    for (i=0; i<nPath; i++) values[params[i]] = m[i+1];
-    for (/**/; i<nTotal; i++) values[params[i]] = searchParams[params[i]];
-
-    return values;
-  };
-
-  /**
-   * Returns the names of all path and search parameters of this pattern in an unspecified order.
-   * @return {Array.<string>}  An array of parameter names. Must be treated as read-only. If the
-   *    pattern has no parameters, an empty array is returned.
-   */
-  UrlMatcher.prototype.parameters = function () {
-    return this.params;
-  };
-
-  /**
-   * Creates a URL that matches this pattern by substituting the specified values
-   * for the path and search parameters. Null values for path parameters are
-   * treated as empty strings.
-   *
-   * ### Example
-   * ```
-   * new UrlMatcher('/user/{id}?q').format({ id:'bob', q:'yes' });
-   * // returns '/user/bob?q=yes'
-   * ```
-   *
-   * @param {Object} values  the values to substitute for the parameters in this pattern.
-   * @return {string}  the formatted URL (path and optionally search part).
-   */
-  UrlMatcher.prototype.format = function (values) {
-    var segments = this.segments, params = this.params;
-    if (!values) return segments.join('');
-
-    var nPath = segments.length-1, nTotal = params.length,
-        result = segments[0], i, search, value;
-
-    for (i=0; i<nPath; i++) {
-      value = values[params[i]];
-      // TODO: Maybe we should throw on null here? It's not really good style to use '' and null interchangeabley
-      if (value != null) result += encodeURIComponent(value);
-      result += segments[i+1];
+  var HookBuilder = /** @class */ (function () {
+    function HookBuilder(transition) {
+      this.transition = transition;
     }
-    for (/**/; i<nTotal; i++) {
-      value = values[params[i]];
-      if (value != null) {
-        result += (search ? '&' : '?') + params[i] + '=' + encodeURIComponent(value);
-        search = true;
+    HookBuilder.prototype.buildHooksForPhase = function (phase) {
+      var _this = this;
+      var $transitions = this.transition.router.transitionService;
+      return $transitions._pluginapi._getEvents(phase)
+        .map(function (type) { return _this.buildHooks(type); })
+        .reduce(unnestR, [])
+        .filter(identity);
+    };
+    /**
+     * Returns an array of newly built TransitionHook objects.
+     *
+     * - Finds all RegisteredHooks registered for the given `hookType` which matched the transition's [[TreeChanges]].
+     * - Finds [[PathNode]] (or `PathNode[]`) to use as the TransitionHook context(s)
+     * - For each of the [[PathNode]]s, creates a TransitionHook
+     *
+     * @param hookType the type of the hook registration function, e.g., 'onEnter', 'onFinish'.
+     */
+    HookBuilder.prototype.buildHooks = function (hookType) {
+      var transition = this.transition;
+      var treeChanges = transition.treeChanges();
+      // Find all the matching registered hooks for a given hook type
+      var matchingHooks = this.getMatchingHooks(hookType, treeChanges);
+      if (!matchingHooks)
+        return [];
+      var baseHookOptions = {
+        transition: transition,
+        current: transition.options().current
+      };
+      var makeTransitionHooks = function (hook) {
+        // Fetch the Nodes that caused this hook to match.
+        var matches = hook.matches(treeChanges);
+        // Select the PathNode[] that will be used as TransitionHook context objects
+        var matchingNodes = matches[hookType.criteriaMatchPath.name];
+        // Return an array of HookTuples
+        return matchingNodes.map(function (node) {
+          var _options = extend({
+            bind: hook.bind,
+            traceData: { hookType: hookType.name, context: node }
+          }, baseHookOptions);
+          var state = hookType.criteriaMatchPath.scope === exports.TransitionHookScope.STATE ? node.state.self : null;
+          var transitionHook = new TransitionHook(transition, state, hook, _options);
+          return { hook: hook, node: node, transitionHook: transitionHook };
+        });
+      };
+      return matchingHooks.map(makeTransitionHooks)
+        .reduce(unnestR, [])
+        .sort(tupleSort(hookType.reverseSort))
+        .map(function (tuple) { return tuple.transitionHook; });
+    };
+    /**
+     * Finds all RegisteredHooks from:
+     * - The Transition object instance hook registry
+     * - The TransitionService ($transitions) global hook registry
+     *
+     * which matched:
+     * - the eventType
+     * - the matchCriteria (to, from, exiting, retained, entering)
+     *
+     * @returns an array of matched [[RegisteredHook]]s
+     */
+    HookBuilder.prototype.getMatchingHooks = function (hookType, treeChanges) {
+      var isCreate = hookType.hookPhase === exports.TransitionHookPhase.CREATE;
+      // Instance and Global hook registries
+      var $transitions = this.transition.router.transitionService;
+      var registries = isCreate ? [$transitions] : [this.transition, $transitions];
+      return registries.map(function (reg) { return reg.getHooks(hookType.name); }) // Get named hooks from registries
+        .filter(assertPredicate(isArray, "broken event named: " + hookType.name)) // Sanity check
+        .reduce(unnestR, []) // Un-nest RegisteredHook[][] to RegisteredHook[] array
+        .filter(function (hook) { return hook.matches(treeChanges); }); // Only those satisfying matchCriteria
+    };
+    return HookBuilder;
+  }());
+  /**
+   * A factory for a sort function for HookTuples.
+   *
+   * The sort function first compares the PathNode depth (how deep in the state tree a node is), then compares
+   * the EventHook priority.
+   *
+   * @param reverseDepthSort a boolean, when true, reverses the sort order for the node depth
+   * @returns a tuple sort function
+   */
+  function tupleSort(reverseDepthSort) {
+    if (reverseDepthSort === void 0) { reverseDepthSort = false; }
+    return function nodeDepthThenPriority(l, r) {
+      var factor = reverseDepthSort ? -1 : 1;
+      var depthDelta = (l.node.state.path.length - r.node.state.path.length) * factor;
+      return depthDelta !== 0 ? depthDelta : r.hook.priority - l.hook.priority;
+    };
+  }
+
+  /**
+   * @coreapi
+   * @module params
+   */
+  /** */
+  /**
+   * An internal class which implements [[ParamTypeDefinition]].
+   *
+   * A [[ParamTypeDefinition]] is a plain javascript object used to register custom parameter types.
+   * When a param type definition is registered, an instance of this class is created internally.
+   *
+   * This class has naive implementations for all the [[ParamTypeDefinition]] methods.
+   *
+   * Used by [[UrlMatcher]] when matching or formatting URLs, or comparing and validating parameter values.
+   *
+   * #### Example:
+   * ```js
+   * var paramTypeDef = {
+ *   decode: function(val) { return parseInt(val, 10); },
+ *   encode: function(val) { return val && val.toString(); },
+ *   equals: function(a, b) { return this.is(a) && a === b; },
+ *   is: function(val) { return angular.isNumber(val) && isFinite(val) && val % 1 === 0; },
+ *   pattern: /\d+/
+ * }
+   *
+   * var paramType = new ParamType(paramTypeDef);
+   * ```
+   * @internalapi
+   */
+  var ParamType = /** @class */ (function () {
+    /**
+     * @param def  A configuration object which contains the custom type definition.  The object's
+     *        properties will override the default methods and/or pattern in `ParamType`'s public interface.
+     * @returns a new ParamType object
+     */
+    function ParamType(def) {
+      /** @inheritdoc */
+      this.pattern = /.*/;
+      /** @inheritdoc */
+      this.inherit = true;
+      extend(this, def);
+    }
+    // consider these four methods to be "abstract methods" that should be overridden
+    /** @inheritdoc */
+    ParamType.prototype.is = function (val, key) { return true; };
+    /** @inheritdoc */
+    ParamType.prototype.encode = function (val, key) { return val; };
+    /** @inheritdoc */
+    ParamType.prototype.decode = function (val, key) { return val; };
+    /** @inheritdoc */
+    ParamType.prototype.equals = function (a, b) { return a == b; };
+    ParamType.prototype.$subPattern = function () {
+      var sub = this.pattern.toString();
+      return sub.substr(1, sub.length - 2);
+    };
+    ParamType.prototype.toString = function () {
+      return "{ParamType:" + this.name + "}";
+    };
+    /** Given an encoded string, or a decoded object, returns a decoded object */
+    ParamType.prototype.$normalize = function (val) {
+      return this.is(val) ? val : this.decode(val);
+    };
+    /**
+     * Wraps an existing custom ParamType as an array of ParamType, depending on 'mode'.
+     * e.g.:
+     * - urlmatcher pattern "/path?{queryParam[]:int}"
+     * - url: "/path?queryParam=1&queryParam=2
+     * - $stateParams.queryParam will be [1, 2]
+     * if `mode` is "auto", then
+     * - url: "/path?queryParam=1 will create $stateParams.queryParam: 1
+     * - url: "/path?queryParam=1&queryParam=2 will create $stateParams.queryParam: [1, 2]
+     */
+    ParamType.prototype.$asArray = function (mode, isSearch) {
+      if (!mode)
+        return this;
+      if (mode === "auto" && !isSearch)
+        throw new Error("'auto' array mode is for query parameters only");
+      return new ArrayType(this, mode);
+    };
+    return ParamType;
+  }());
+  /**
+   * Wraps up a `ParamType` object to handle array values.
+   * @internalapi
+   */
+  function ArrayType(type, mode) {
+    var _this = this;
+    // Wrap non-array value as array
+    function arrayWrap(val) {
+      return isArray(val) ? val : (isDefined(val) ? [val] : []);
+    }
+    // Unwrap array value for "auto" mode. Return undefined for empty array.
+    function arrayUnwrap(val) {
+      switch (val.length) {
+        case 0: return undefined;
+        case 1: return mode === "auto" ? val[0] : val;
+        default: return val;
       }
     }
-
-    return result;
-  };
+    // Wraps type (.is/.encode/.decode) functions to operate on each value of an array
+    function arrayHandler(callback, allTruthyMode) {
+      return function handleArray(val) {
+        if (isArray(val) && val.length === 0)
+          return val;
+        var arr = arrayWrap(val);
+        var result = map(arr, callback);
+        return (allTruthyMode === true) ? filter(result, function (x) { return !x; }).length === 0 : arrayUnwrap(result);
+      };
+    }
+    // Wraps type (.equals) functions to operate on each value of an array
+    function arrayEqualsHandler(callback) {
+      return function handleArray(val1, val2) {
+        var left = arrayWrap(val1), right = arrayWrap(val2);
+        if (left.length !== right.length)
+          return false;
+        for (var i = 0; i < left.length; i++) {
+          if (!callback(left[i], right[i]))
+            return false;
+        }
+        return true;
+      };
+    }
+    ['encode', 'decode', 'equals', '$normalize'].forEach(function (name) {
+      var paramTypeFn = type[name].bind(type);
+      var wrapperFn = name === 'equals' ? arrayEqualsHandler : arrayHandler;
+      _this[name] = wrapperFn(paramTypeFn);
+    });
+    extend(this, {
+      dynamic: type.dynamic,
+      name: type.name,
+      pattern: type.pattern,
+      inherit: type.inherit,
+      is: arrayHandler(type.is.bind(type), true),
+      $arrayMode: mode
+    });
+  }
 
   /**
-   * Service. Factory for {@link UrlMatcher} instances. The factory is also available to providers
-   * under the name `$urlMatcherFactoryProvider`.
-   * @constructor
-   * @name $urlMatcherFactory
+   * @coreapi
+   * @module params
+   */ /** for typedoc */
+  /** @hidden */ var hasOwn = Object.prototype.hasOwnProperty;
+  /** @hidden */ var isShorthand = function (cfg) {
+    return ["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {})).length === 0;
+  };
+  /** @internalapi */
+
+  (function (DefType) {
+    DefType[DefType["PATH"] = 0] = "PATH";
+    DefType[DefType["SEARCH"] = 1] = "SEARCH";
+    DefType[DefType["CONFIG"] = 2] = "CONFIG";
+  })(exports.DefType || (exports.DefType = {}));
+  /** @hidden */
+  function unwrapShorthand(cfg) {
+    cfg = isShorthand(cfg) && { value: cfg } || cfg;
+    getStaticDefaultValue['__cacheable'] = true;
+    function getStaticDefaultValue() {
+      return cfg.value;
+    }
+    return extend(cfg, {
+      $$fn: isInjectable(cfg.value) ? cfg.value : getStaticDefaultValue,
+    });
+  }
+  /** @hidden */
+  function getType(cfg, urlType, location, id, paramTypes) {
+    if (cfg.type && urlType && urlType.name !== 'string')
+      throw new Error("Param '" + id + "' has two type configurations.");
+    if (cfg.type && urlType && urlType.name === 'string' && paramTypes.type(cfg.type))
+      return paramTypes.type(cfg.type);
+    if (urlType)
+      return urlType;
+    if (!cfg.type) {
+      var type = location === exports.DefType.CONFIG ? "any" :
+        location === exports.DefType.PATH ? "path" :
+          location === exports.DefType.SEARCH ? "query" : "string";
+      return paramTypes.type(type);
+    }
+    return cfg.type instanceof ParamType ? cfg.type : paramTypes.type(cfg.type);
+  }
+  /**
+   * @internalapi
+   * returns false, true, or the squash value to indicate the "default parameter url squash policy".
    */
-  function $UrlMatcherFactory() {
-    /**
-     * Creates a {@link UrlMatcher} for the specified pattern.
-     * @function
-     * @name $urlMatcherFactory#compile
-     * @methodOf $urlMatcherFactory
-     * @param {string} pattern  The URL pattern.
-     * @return {UrlMatcher}  The UrlMatcher.
-     */
-    this.compile = function (pattern) {
-      return new UrlMatcher(pattern);
+  function getSquashPolicy(config, isOptional, defaultPolicy) {
+    var squash = config.squash;
+    if (!isOptional || squash === false)
+      return false;
+    if (!isDefined(squash) || squash == null)
+      return defaultPolicy;
+    if (squash === true || isString(squash))
+      return squash;
+    throw new Error("Invalid squash policy: '" + squash + "'. Valid policies: false, true, or arbitrary string");
+  }
+  /** @internalapi */
+  function getReplace(config, arrayMode, isOptional, squash) {
+    var replace, configuredKeys, defaultPolicy = [
+      { from: "", to: (isOptional || arrayMode ? undefined : "") },
+      { from: null, to: (isOptional || arrayMode ? undefined : "") },
+    ];
+    replace = isArray(config.replace) ? config.replace : [];
+    if (isString(squash))
+      replace.push({ from: squash, to: undefined });
+    configuredKeys = map(replace, prop("from"));
+    return filter(defaultPolicy, function (item) { return configuredKeys.indexOf(item.from) === -1; }).concat(replace);
+  }
+  /** @internalapi */
+  var Param = /** @class */ (function () {
+    function Param(id, type, config, location, urlMatcherFactory) {
+      config = unwrapShorthand(config);
+      type = getType(config, type, location, id, urlMatcherFactory.paramTypes);
+      var arrayMode = getArrayMode();
+      type = arrayMode ? type.$asArray(arrayMode, location === exports.DefType.SEARCH) : type;
+      var isOptional = config.value !== undefined || location === exports.DefType.SEARCH;
+      var dynamic = isDefined(config.dynamic) ? !!config.dynamic : !!type.dynamic;
+      var raw = isDefined(config.raw) ? !!config.raw : !!type.raw;
+      var squash = getSquashPolicy(config, isOptional, urlMatcherFactory.defaultSquashPolicy());
+      var replace = getReplace(config, arrayMode, isOptional, squash);
+      var inherit$$1 = isDefined(config.inherit) ? !!config.inherit : !!type.inherit;
+      // array config: param name (param[]) overrides default settings.  explicit config overrides param name.
+      function getArrayMode() {
+        var arrayDefaults = { array: (location === exports.DefType.SEARCH ? "auto" : false) };
+        var arrayParamNomenclature = id.match(/\[\]$/) ? { array: true } : {};
+        return extend(arrayDefaults, arrayParamNomenclature, config).array;
+      }
+      extend(this, { id: id, type: type, location: location, isOptional: isOptional, dynamic: dynamic, raw: raw, squash: squash, replace: replace, inherit: inherit$$1, array: arrayMode, config: config });
+    }
+    Param.prototype.isDefaultValue = function (value) {
+      return this.isOptional && this.type.equals(this.value(), value);
     };
-
     /**
-     * Returns true if the specified object is a UrlMatcher, or false otherwise.
-     * @function
-     * @name $urlMatcherFactory#isMatcher
-     * @methodOf $urlMatcherFactory
-     * @param {Object} o
-     * @return {boolean}
+     * [Internal] Gets the decoded representation of a value if the value is defined, otherwise, returns the
+     * default value, which may be the result of an injectable function.
      */
-    this.isMatcher = function (o) {
-      return isObject(o) && isFunction(o.exec) && isFunction(o.format) && isFunction(o.concat);
+    Param.prototype.value = function (value) {
+      var _this = this;
+      /**
+       * [Internal] Get the default value of a parameter, which may be an injectable function.
+       */
+      var getDefaultValue = function () {
+        if (_this._defaultValueCache)
+          return _this._defaultValueCache.defaultValue;
+        if (!services.$injector)
+          throw new Error("Injectable functions cannot be called at configuration time");
+        var defaultValue = services.$injector.invoke(_this.config.$$fn);
+        if (defaultValue !== null && defaultValue !== undefined && !_this.type.is(defaultValue))
+          throw new Error("Default value (" + defaultValue + ") for parameter '" + _this.id + "' is not an instance of ParamType (" + _this.type.name + ")");
+        if (_this.config.$$fn['__cacheable']) {
+          _this._defaultValueCache = { defaultValue: defaultValue };
+        }
+        return defaultValue;
+      };
+      var replaceSpecialValues = function (val$$1) {
+        for (var _i = 0, _a = _this.replace; _i < _a.length; _i++) {
+          var tuple = _a[_i];
+          if (tuple.from === val$$1)
+            return tuple.to;
+        }
+        return val$$1;
+      };
+      value = replaceSpecialValues(value);
+      return isUndefined(value) ? getDefaultValue() : this.type.$normalize(value);
     };
+    Param.prototype.isSearch = function () {
+      return this.location === exports.DefType.SEARCH;
+    };
+    Param.prototype.validates = function (value) {
+      // There was no parameter value, but the param is optional
+      if ((isUndefined(value) || value === null) && this.isOptional)
+        return true;
+      // The value was not of the correct ParamType, and could not be decoded to the correct ParamType
+      var normalized = this.type.$normalize(value);
+      if (!this.type.is(normalized))
+        return false;
+      // The value was of the correct type, but when encoded, did not match the ParamType's regexp
+      var encoded = this.type.encode(normalized);
+      return !(isString(encoded) && !this.type.pattern.exec(encoded));
+    };
+    Param.prototype.toString = function () {
+      return "{Param:" + this.id + " " + this.type + " squash: '" + this.squash + "' optional: " + this.isOptional + "}";
+    };
+    Param.values = function (params, values$$1) {
+      if (values$$1 === void 0) { values$$1 = {}; }
+      var paramValues = {};
+      for (var _i = 0, params_1 = params; _i < params_1.length; _i++) {
+        var param = params_1[_i];
+        paramValues[param.id] = param.value(values$$1[param.id]);
+      }
+      return paramValues;
+    };
+    /**
+     * Finds [[Param]] objects which have different param values
+     *
+     * Filters a list of [[Param]] objects to only those whose parameter values differ in two param value objects
+     *
+     * @param params: The list of Param objects to filter
+     * @param values1: The first set of parameter values
+     * @param values2: the second set of parameter values
+     *
+     * @returns any Param objects whose values were different between values1 and values2
+     */
+    Param.changed = function (params, values1, values2) {
+      if (values1 === void 0) { values1 = {}; }
+      if (values2 === void 0) { values2 = {}; }
+      return params.filter(function (param) { return !param.type.equals(values1[param.id], values2[param.id]); });
+    };
+    /**
+     * Checks if two param value objects are equal (for a set of [[Param]] objects)
+     *
+     * @param params The list of [[Param]] objects to check
+     * @param values1 The first set of param values
+     * @param values2 The second set of param values
+     *
+     * @returns true if the param values in values1 and values2 are equal
+     */
+    Param.equals = function (params, values1, values2) {
+      if (values1 === void 0) { values1 = {}; }
+      if (values2 === void 0) { values2 = {}; }
+      return Param.changed(params, values1, values2).length === 0;
+    };
+    /** Returns true if a the parameter values are valid, according to the Param definitions */
+    Param.validates = function (params, values$$1) {
+      if (values$$1 === void 0) { values$$1 = {}; }
+      return params.map(function (param) { return param.validates(values$$1[param.id]); }).reduce(allTrueR, true);
+    };
+    return Param;
+  }());
 
-    this.$get = function () {
+  /** @module path */ /** for typedoc */
+  /**
+   * @internalapi
+   *
+   * A node in a [[TreeChanges]] path
+   *
+   * For a [[TreeChanges]] path, this class holds the stateful information for a single node in the path.
+   * Each PathNode corresponds to a state being entered, exited, or retained.
+   * The stateful information includes parameter values and resolve data.
+   */
+  var PathNode = /** @class */ (function () {
+    function PathNode(stateOrNode) {
+      if (stateOrNode instanceof PathNode) {
+        var node = stateOrNode;
+        this.state = node.state;
+        this.paramSchema = node.paramSchema.slice();
+        this.paramValues = extend({}, node.paramValues);
+        this.resolvables = node.resolvables.slice();
+        this.views = node.views && node.views.slice();
+      }
+      else {
+        var state = stateOrNode;
+        this.state = state;
+        this.paramSchema = state.parameters({ inherit: false });
+        this.paramValues = {};
+        this.resolvables = state.resolvables.map(function (res) { return res.clone(); });
+      }
+    }
+    /** Sets [[paramValues]] for the node, from the values of an object hash */
+    PathNode.prototype.applyRawParams = function (params) {
+      var getParamVal = function (paramDef) { return [paramDef.id, paramDef.value(params[paramDef.id])]; };
+      this.paramValues = this.paramSchema.reduce(function (memo, pDef) { return applyPairs(memo, getParamVal(pDef)); }, {});
       return this;
     };
-  }
+    /** Gets a specific [[Param]] metadata that belongs to the node */
+    PathNode.prototype.parameter = function (name) {
+      return find(this.paramSchema, propEq("id", name));
+    };
+    /**
+     * @returns true if the state and parameter values for another PathNode are
+     * equal to the state and param values for this PathNode
+     */
+    PathNode.prototype.equals = function (node, paramsFn) {
+      var diff = this.diff(node, paramsFn);
+      return diff && diff.length === 0;
+    };
+    /**
+     * Finds Params with different parameter values on another PathNode.
+     *
+     * Given another node (of the same state), finds the parameter values which differ.
+     * Returns the [[Param]] (schema objects) whose parameter values differ.
+     *
+     * Given another node for a different state, returns `false`
+     *
+     * @param node The node to compare to
+     * @param paramsFn A function that returns which parameters should be compared.
+     * @returns The [[Param]]s which differ, or null if the two nodes are for different states
+     */
+    PathNode.prototype.diff = function (node, paramsFn) {
+      if (this.state !== node.state)
+        return false;
+      var params = paramsFn ? paramsFn(this) : this.paramSchema;
+      return Param.changed(params, this.paramValues, node.paramValues);
+    };
+    /** Returns a clone of the PathNode */
+    PathNode.clone = function (node) {
+      return new PathNode(node);
+    };
+    return PathNode;
+  }());
 
-// Register as a provider so it's available to other providers
-  angular.module('ui.router.util').provider('$urlMatcherFactory', $UrlMatcherFactory);
-
-
-  $UrlRouterProvider.$inject = ['$urlMatcherFactoryProvider'];
-  function $UrlRouterProvider(  $urlMatcherFactory) {
-    var rules = [],
-        otherwise = null;
-
-    // Returns a string that is a prefix of all strings matching the RegExp
-    function regExpPrefix(re) {
-      var prefix = /^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(re.source);
-      return (prefix != null) ? prefix[1].replace(/\\(.)/g, "$1") : '';
+  /** @module path */ /** for typedoc */
+  /**
+   * This class contains functions which convert TargetStates, Nodes and paths from one type to another.
+   */
+  var PathUtils = /** @class */ (function () {
+    function PathUtils() {
     }
-
-    // Interpolates matched values into a String.replace()-style pattern
-    function interpolate(pattern, match) {
-      return pattern.replace(/\$(\$|\d{1,2})/, function (m, what) {
-        return match[what === '$' ? 0 : Number(what)];
+    /** Given a PathNode[], create an TargetState */
+    PathUtils.makeTargetState = function (registry, path) {
+      var state = tail(path).state;
+      return new TargetState(registry, state, path.map(prop("paramValues")).reduce(mergeR, {}), {});
+    };
+    PathUtils.buildPath = function (targetState) {
+      var toParams = targetState.params();
+      return targetState.$state().path.map(function (state) { return new PathNode(state).applyRawParams(toParams); });
+    };
+    /** Given a fromPath: PathNode[] and a TargetState, builds a toPath: PathNode[] */
+    PathUtils.buildToPath = function (fromPath, targetState) {
+      var toPath = PathUtils.buildPath(targetState);
+      if (targetState.options().inherit) {
+        return PathUtils.inheritParams(fromPath, toPath, Object.keys(targetState.params()));
+      }
+      return toPath;
+    };
+    /**
+     * Creates ViewConfig objects and adds to nodes.
+     *
+     * On each [[PathNode]], creates ViewConfig objects from the views: property of the node's state
+     */
+    PathUtils.applyViewConfigs = function ($view, path, states) {
+      // Only apply the viewConfigs to the nodes for the given states
+      path.filter(function (node) { return inArray(states, node.state); }).forEach(function (node) {
+        var viewDecls = values(node.state.views || {});
+        var subPath = PathUtils.subPath(path, function (n) { return n === node; });
+        var viewConfigs = viewDecls.map(function (view) { return $view.createViewConfig(subPath, view); });
+        node.views = viewConfigs.reduce(unnestR, []);
       });
+    };
+    /**
+     * Given a fromPath and a toPath, returns a new to path which inherits parameters from the fromPath
+     *
+     * For a parameter in a node to be inherited from the from path:
+     * - The toPath's node must have a matching node in the fromPath (by state).
+     * - The parameter name must not be found in the toKeys parameter array.
+     *
+     * Note: the keys provided in toKeys are intended to be those param keys explicitly specified by some
+     * caller, for instance, $state.transitionTo(..., toParams).  If a key was found in toParams,
+     * it is not inherited from the fromPath.
+     */
+    PathUtils.inheritParams = function (fromPath, toPath, toKeys) {
+      if (toKeys === void 0) { toKeys = []; }
+      function nodeParamVals(path, state) {
+        var node = find(path, propEq('state', state));
+        return extend({}, node && node.paramValues);
+      }
+      var noInherit = fromPath.map(function (node) { return node.paramSchema; })
+        .reduce(unnestR, [])
+        .filter(function (param) { return !param.inherit; })
+        .map(prop('id'));
+      /**
+       * Given an [[PathNode]] "toNode", return a new [[PathNode]] with param values inherited from the
+       * matching node in fromPath.  Only inherit keys that aren't found in "toKeys" from the node in "fromPath""
+       */
+      function makeInheritedParamsNode(toNode) {
+        // All param values for the node (may include default key/vals, when key was not found in toParams)
+        var toParamVals = extend({}, toNode && toNode.paramValues);
+        // limited to only those keys found in toParams
+        var incomingParamVals = pick(toParamVals, toKeys);
+        toParamVals = omit(toParamVals, toKeys);
+        var fromParamVals = omit(nodeParamVals(fromPath, toNode.state) || {}, noInherit);
+        // extend toParamVals with any fromParamVals, then override any of those those with incomingParamVals
+        var ownParamVals = extend(toParamVals, fromParamVals, incomingParamVals);
+        return new PathNode(toNode.state).applyRawParams(ownParamVals);
+      }
+      // The param keys specified by the incoming toParams
+      return toPath.map(makeInheritedParamsNode);
+    };
+    /**
+     * Computes the tree changes (entering, exiting) between a fromPath and toPath.
+     */
+    PathUtils.treeChanges = function (fromPath, toPath, reloadState) {
+      var keep = 0, max = Math.min(fromPath.length, toPath.length);
+      var nodesMatch = function (node1, node2) {
+        return node1.equals(node2, PathUtils.nonDynamicParams);
+      };
+      while (keep < max && fromPath[keep].state !== reloadState && nodesMatch(fromPath[keep], toPath[keep])) {
+        keep++;
+      }
+      /** Given a retained node, return a new node which uses the to node's param values */
+      function applyToParams(retainedNode, idx) {
+        var cloned = PathNode.clone(retainedNode);
+        cloned.paramValues = toPath[idx].paramValues;
+        return cloned;
+      }
+      var from, retained, exiting, entering, to;
+      from = fromPath;
+      retained = from.slice(0, keep);
+      exiting = from.slice(keep);
+      // Create a new retained path (with shallow copies of nodes) which have the params of the toPath mapped
+      var retainedWithToParams = retained.map(applyToParams);
+      entering = toPath.slice(keep);
+      to = (retainedWithToParams).concat(entering);
+      return { from: from, to: to, retained: retained, exiting: exiting, entering: entering };
+    };
+    /**
+     * Returns a new path which is: the subpath of the first path which matches the second path.
+     *
+     * The new path starts from root and contains any nodes that match the nodes in the second path.
+     * It stops before the first non-matching node.
+     *
+     * Nodes are compared using their state property and their parameter values.
+     * If a `paramsFn` is provided, only the [[Param]] returned by the function will be considered when comparing nodes.
+     *
+     * @param pathA the first path
+     * @param pathB the second path
+     * @param paramsFn a function which returns the parameters to consider when comparing
+     *
+     * @returns an array of PathNodes from the first path which match the nodes in the second path
+     */
+    PathUtils.matching = function (pathA, pathB, paramsFn) {
+      var done = false;
+      var tuples = arrayTuples(pathA, pathB);
+      return tuples.reduce(function (matching, _a) {
+        var nodeA = _a[0], nodeB = _a[1];
+        done = done || !nodeA.equals(nodeB, paramsFn);
+        return done ? matching : matching.concat(nodeA);
+      }, []);
+    };
+    /**
+     * Returns true if two paths are identical.
+     *
+     * @param pathA
+     * @param pathB
+     * @param paramsFn a function which returns the parameters to consider when comparing
+     * @returns true if the the states and parameter values for both paths are identical
+     */
+    PathUtils.equals = function (pathA, pathB, paramsFn) {
+      return pathA.length === pathB.length &&
+        PathUtils.matching(pathA, pathB, paramsFn).length === pathA.length;
+    };
+    /**
+     * Return a subpath of a path, which stops at the first matching node
+     *
+     * Given an array of nodes, returns a subset of the array starting from the first node,
+     * stopping when the first node matches the predicate.
+     *
+     * @param path a path of [[PathNode]]s
+     * @param predicate a [[Predicate]] fn that matches [[PathNode]]s
+     * @returns a subpath up to the matching node, or undefined if no match is found
+     */
+    PathUtils.subPath = function (path, predicate) {
+      var node = find(path, predicate);
+      var elementIdx = path.indexOf(node);
+      return elementIdx === -1 ? undefined : path.slice(0, elementIdx + 1);
+    };
+    PathUtils.nonDynamicParams = function (node) {
+      return node.state.parameters({ inherit: false })
+        .filter(function (param) { return !param.dynamic; });
+    };
+    /** Gets the raw parameter values from a path */
+    PathUtils.paramValues = function (path) {
+      return path.reduce(function (acc, node) { return extend(acc, node.paramValues); }, {});
+    };
+    return PathUtils;
+  }());
+
+  /**
+   * @coreapi
+   * @module resolve
+   */ /** for typedoc */
+// TODO: explicitly make this user configurable
+  var defaultResolvePolicy = {
+      when: "LAZY",
+      async: "WAIT"
+    };
+  /**
+   * The basic building block for the resolve system.
+   *
+   * Resolvables encapsulate a state's resolve's resolveFn, the resolveFn's declared dependencies, the wrapped (.promise),
+   * and the unwrapped-when-complete (.data) result of the resolveFn.
+   *
+   * Resolvable.get() either retrieves the Resolvable's existing promise, or else invokes resolve() (which invokes the
+   * resolveFn) and returns the resulting promise.
+   *
+   * Resolvable.get() and Resolvable.resolve() both execute within a context path, which is passed as the first
+   * parameter to those fns.
+   */
+  var Resolvable = /** @class */ (function () {
+    function Resolvable(arg1, resolveFn, deps, policy, data) {
+      this.resolved = false;
+      this.promise = undefined;
+      if (arg1 instanceof Resolvable) {
+        extend(this, arg1);
+      }
+      else if (isFunction(resolveFn)) {
+        if (isNullOrUndefined(arg1))
+          throw new Error("new Resolvable(): token argument is required");
+        if (!isFunction(resolveFn))
+          throw new Error("new Resolvable(): resolveFn argument must be a function");
+        this.token = arg1;
+        this.policy = policy;
+        this.resolveFn = resolveFn;
+        this.deps = deps || [];
+        this.data = data;
+        this.resolved = data !== undefined;
+        this.promise = this.resolved ? services.$q.when(this.data) : undefined;
+      }
+      else if (isObject(arg1) && arg1.token && isFunction(arg1.resolveFn)) {
+        var literal = arg1;
+        return new Resolvable(literal.token, literal.resolveFn, literal.deps, literal.policy, literal.data);
+      }
     }
+    Resolvable.prototype.getPolicy = function (state) {
+      var thisPolicy = this.policy || {};
+      var statePolicy = state && state.resolvePolicy || {};
+      return {
+        when: thisPolicy.when || statePolicy.when || defaultResolvePolicy.when,
+        async: thisPolicy.async || statePolicy.async || defaultResolvePolicy.async,
+      };
+    };
+    /**
+     * Asynchronously resolve this Resolvable's data
+     *
+     * Given a ResolveContext that this Resolvable is found in:
+     * Wait for this Resolvable's dependencies, then invoke this Resolvable's function
+     * and update the Resolvable's state
+     */
+    Resolvable.prototype.resolve = function (resolveContext, trans) {
+      var _this = this;
+      var $q = services.$q;
+      // Gets all dependencies from ResolveContext and wait for them to be resolved
+      var getResolvableDependencies = function () {
+        return $q.all(resolveContext.getDependencies(_this).map(function (resolvable) {
+          return resolvable.get(resolveContext, trans);
+        }));
+      };
+      // Invokes the resolve function passing the resolved dependencies as arguments
+      var invokeResolveFn = function (resolvedDeps) {
+        return _this.resolveFn.apply(null, resolvedDeps);
+      };
+      /**
+       * For RXWAIT policy:
+       *
+       * Given an observable returned from a resolve function:
+       * - enables .cache() mode (this allows multicast subscribers)
+       * - then calls toPromise() (this triggers subscribe() and thus fetches)
+       * - Waits for the promise, then return the cached observable (not the first emitted value).
+       */
+      var waitForRx = function (observable$) {
+        var cached = observable$.cache(1);
+        return cached.take(1).toPromise().then(function () { return cached; });
+      };
+      // If the resolve policy is RXWAIT, wait for the observable to emit something. otherwise pass through.
+      var node = resolveContext.findNode(this);
+      var state = node && node.state;
+      var maybeWaitForRx = this.getPolicy(state).async === "RXWAIT" ? waitForRx : identity;
+      // After the final value has been resolved, update the state of the Resolvable
+      var applyResolvedValue = function (resolvedValue) {
+        _this.data = resolvedValue;
+        _this.resolved = true;
+        trace.traceResolvableResolved(_this, trans);
+        return _this.data;
+      };
+      // Sets the promise property first, then getsResolvableDependencies in the context of the promise chain. Always waits one tick.
+      return this.promise = $q.when()
+        .then(getResolvableDependencies)
+        .then(invokeResolveFn)
+        .then(maybeWaitForRx)
+        .then(applyResolvedValue);
+    };
+    /**
+     * Gets a promise for this Resolvable's data.
+     *
+     * Fetches the data and returns a promise.
+     * Returns the existing promise if it has already been fetched once.
+     */
+    Resolvable.prototype.get = function (resolveContext, trans) {
+      return this.promise || this.resolve(resolveContext, trans);
+    };
+    Resolvable.prototype.toString = function () {
+      return "Resolvable(token: " + stringify(this.token) + ", requires: [" + this.deps.map(stringify) + "])";
+    };
+    Resolvable.prototype.clone = function () {
+      return new Resolvable(this);
+    };
+    Resolvable.fromData = function (token, data) {
+      return new Resolvable(token, function () { return data; }, null, null, data);
+    };
+    return Resolvable;
+  }());
 
-    this.rule =
-        function (rule) {
-          if (!isFunction(rule)) throw new Error("'rule' must be a function");
-          rules.push(rule);
-          return this;
-        };
-
-    this.otherwise =
-        function (rule) {
-          if (isString(rule)) {
-            var redirect = rule;
-            rule = function () { return redirect; };
-          }
-          else if (!isFunction(rule)) throw new Error("'rule' must be a function");
-          otherwise = rule;
-          return this;
-        };
-
-
-    function handleIfMatch($injector, handler, match) {
-      if (!match) return false;
-      var result = $injector.invoke(handler, handler, { $match: match });
-      return isDefined(result) ? result : true;
+  /** @internalapi */
+  var resolvePolicies = {
+    when: {
+      LAZY: "LAZY",
+      EAGER: "EAGER"
+    },
+    async: {
+      WAIT: "WAIT",
+      NOWAIT: "NOWAIT",
+      RXWAIT: "RXWAIT"
     }
+  };
 
-    this.when =
-        function (what, handler) {
-          var redirect, handlerIsString = isString(handler);
-          if (isString(what)) what = $urlMatcherFactory.compile(what);
-
-          if (!handlerIsString && !isFunction(handler) && !isArray(handler))
-            throw new Error("invalid 'handler' in when()");
-
-          var strategies = {
-            matcher: function (what, handler) {
-              if (handlerIsString) {
-                redirect = $urlMatcherFactory.compile(handler);
-                handler = ['$match', function ($match) { return redirect.format($match); }];
-              }
-              return extend(function ($injector, $location) {
-                return handleIfMatch($injector, handler, what.exec($location.path(), $location.search()));
-              }, {
-                prefix: isString(what.prefix) ? what.prefix : ''
-              });
-            },
-            regex: function (what, handler) {
-              if (what.global || what.sticky) throw new Error("when() RegExp must not be global or sticky");
-
-              if (handlerIsString) {
-                redirect = handler;
-                handler = ['$match', function ($match) { return interpolate(redirect, $match); }];
-              }
-              return extend(function ($injector, $location) {
-                return handleIfMatch($injector, handler, what.exec($location.path()));
-              }, {
-                prefix: regExpPrefix(what)
-              });
-            }
-          };
-
-          var check = { matcher: $urlMatcherFactory.isMatcher(what), regex: what instanceof RegExp };
-
-          for (var n in check) {
-            if (check[n]) {
-              return this.rule(strategies[n](what, handler));
-            }
-          }
-
-          throw new Error("invalid 'what' in when()");
+  /** @module resolve */
+  /** for typedoc */
+  var whens = resolvePolicies.when;
+  var ALL_WHENS = [whens.EAGER, whens.LAZY];
+  var EAGER_WHENS = [whens.EAGER];
+  var NATIVE_INJECTOR_TOKEN = "Native Injector";
+  /**
+   * Encapsulates Dependency Injection for a path of nodes
+   *
+   * UI-Router states are organized as a tree.
+   * A nested state has a path of ancestors to the root of the tree.
+   * When a state is being activated, each element in the path is wrapped as a [[PathNode]].
+   * A `PathNode` is a stateful object that holds things like parameters and resolvables for the state being activated.
+   *
+   * The ResolveContext closes over the [[PathNode]]s, and provides DI for the last node in the path.
+   */
+  var ResolveContext = /** @class */ (function () {
+    function ResolveContext(_path) {
+      this._path = _path;
+    }
+    /** Gets all the tokens found in the resolve context, de-duplicated */
+    ResolveContext.prototype.getTokens = function () {
+      return this._path.reduce(function (acc, node) { return acc.concat(node.resolvables.map(function (r) { return r.token; })); }, []).reduce(uniqR, []);
+    };
+    /**
+     * Gets the Resolvable that matches the token
+     *
+     * Gets the last Resolvable that matches the token in this context, or undefined.
+     * Throws an error if it doesn't exist in the ResolveContext
+     */
+    ResolveContext.prototype.getResolvable = function (token) {
+      var matching = this._path.map(function (node) { return node.resolvables; })
+        .reduce(unnestR, [])
+        .filter(function (r) { return r.token === token; });
+      return tail(matching);
+    };
+    /** Returns the [[ResolvePolicy]] for the given [[Resolvable]] */
+    ResolveContext.prototype.getPolicy = function (resolvable) {
+      var node = this.findNode(resolvable);
+      return resolvable.getPolicy(node.state);
+    };
+    /**
+     * Returns a ResolveContext that includes a portion of this one
+     *
+     * Given a state, this method creates a new ResolveContext from this one.
+     * The new context starts at the first node (root) and stops at the node for the `state` parameter.
+     *
+     * #### Why
+     *
+     * When a transition is created, the nodes in the "To Path" are injected from a ResolveContext.
+     * A ResolveContext closes over a path of [[PathNode]]s and processes the resolvables.
+     * The "To State" can inject values from its own resolvables, as well as those from all its ancestor state's (node's).
+     * This method is used to create a narrower context when injecting ancestor nodes.
+     *
+     * @example
+     * `let ABCD = new ResolveContext([A, B, C, D]);`
+     *
+     * Given a path `[A, B, C, D]`, where `A`, `B`, `C` and `D` are nodes for states `a`, `b`, `c`, `d`:
+     * When injecting `D`, `D` should have access to all resolvables from `A`, `B`, `C`, `D`.
+     * However, `B` should only be able to access resolvables from `A`, `B`.
+     *
+     * When resolving for the `B` node, first take the full "To Path" Context `[A,B,C,D]` and limit to the subpath `[A,B]`.
+     * `let AB = ABCD.subcontext(a)`
+     */
+    ResolveContext.prototype.subContext = function (state) {
+      return new ResolveContext(PathUtils.subPath(this._path, function (node) { return node.state === state; }));
+    };
+    /**
+     * Adds Resolvables to the node that matches the state
+     *
+     * This adds a [[Resolvable]] (generally one created on the fly; not declared on a [[StateDeclaration.resolve]] block).
+     * The resolvable is added to the node matching the `state` parameter.
+     *
+     * These new resolvables are not automatically fetched.
+     * The calling code should either fetch them, fetch something that depends on them,
+     * or rely on [[resolvePath]] being called when some state is being entered.
+     *
+     * Note: each resolvable's [[ResolvePolicy]] is merged with the state's policy, and the global default.
+     *
+     * @param newResolvables the new Resolvables
+     * @param state Used to find the node to put the resolvable on
+     */
+    ResolveContext.prototype.addResolvables = function (newResolvables, state) {
+      var node = find(this._path, propEq('state', state));
+      var keys = newResolvables.map(function (r) { return r.token; });
+      node.resolvables = node.resolvables.filter(function (r) { return keys.indexOf(r.token) === -1; }).concat(newResolvables);
+    };
+    /**
+     * Returns a promise for an array of resolved path Element promises
+     *
+     * @param when
+     * @param trans
+     * @returns {Promise<any>|any}
+     */
+    ResolveContext.prototype.resolvePath = function (when, trans) {
+      var _this = this;
+      if (when === void 0) { when = "LAZY"; }
+      // This option determines which 'when' policy Resolvables we are about to fetch.
+      var whenOption = inArray(ALL_WHENS, when) ? when : "LAZY";
+      // If the caller specified EAGER, only the EAGER Resolvables are fetched.
+      // if the caller specified LAZY, both EAGER and LAZY Resolvables are fetched.`
+      var matchedWhens = whenOption === resolvePolicies.when.EAGER ? EAGER_WHENS : ALL_WHENS;
+      // get the subpath to the state argument, if provided
+      trace.traceResolvePath(this._path, when, trans);
+      var matchesPolicy = function (acceptedVals, whenOrAsync) {
+        return function (resolvable) {
+          return inArray(acceptedVals, _this.getPolicy(resolvable)[whenOrAsync]);
         };
+      };
+      // Trigger all the (matching) Resolvables in the path
+      // Reduce all the "WAIT" Resolvables into an array
+      var promises = this._path.reduce(function (acc, node) {
+        var nodeResolvables = node.resolvables.filter(matchesPolicy(matchedWhens, 'when'));
+        var nowait = nodeResolvables.filter(matchesPolicy(['NOWAIT'], 'async'));
+        var wait = nodeResolvables.filter(not(matchesPolicy(['NOWAIT'], 'async')));
+        // For the matching Resolvables, start their async fetch process.
+        var subContext = _this.subContext(node.state);
+        var getResult = function (r) { return r.get(subContext, trans)
+          .then(function (value) { return ({ token: r.token, value: value }); }); };
+        nowait.forEach(getResult);
+        return acc.concat(wait.map(getResult));
+      }, []);
+      // Wait for all the "WAIT" resolvables
+      return services.$q.all(promises);
+    };
+    ResolveContext.prototype.injector = function () {
+      return this._injector || (this._injector = new UIInjectorImpl(this));
+    };
+    ResolveContext.prototype.findNode = function (resolvable) {
+      return find(this._path, function (node) { return inArray(node.resolvables, resolvable); });
+    };
+    /**
+     * Gets the async dependencies of a Resolvable
+     *
+     * Given a Resolvable, returns its dependencies as a Resolvable[]
+     */
+    ResolveContext.prototype.getDependencies = function (resolvable) {
+      var _this = this;
+      var node = this.findNode(resolvable);
+      // Find which other resolvables are "visible" to the `resolvable` argument
+      // subpath stopping at resolvable's node, or the whole path (if the resolvable isn't in the path)
+      var subPath = PathUtils.subPath(this._path, function (x) { return x === node; }) || this._path;
+      var availableResolvables = subPath
+        .reduce(function (acc, _node) { return acc.concat(_node.resolvables); }, []) //all of subpath's resolvables
+        .filter(function (res) { return res !== resolvable; }); // filter out the `resolvable` argument
+      var getDependency = function (token) {
+        var matching = availableResolvables.filter(function (r) { return r.token === token; });
+        if (matching.length)
+          return tail(matching);
+        var fromInjector = _this.injector().getNative(token);
+        if (isUndefined(fromInjector)) {
+          throw new Error("Could not find Dependency Injection token: " + stringify(token));
+        }
+        return new Resolvable(token, function () { return fromInjector; }, [], fromInjector);
+      };
+      return resolvable.deps.map(getDependency);
+    };
+    return ResolveContext;
+  }());
+  var UIInjectorImpl = /** @class */ (function () {
+    function UIInjectorImpl(context) {
+      this.context = context;
+      this.native = this.get(NATIVE_INJECTOR_TOKEN) || services.$injector;
+    }
+    UIInjectorImpl.prototype.get = function (token) {
+      var resolvable = this.context.getResolvable(token);
+      if (resolvable) {
+        if (this.context.getPolicy(resolvable).async === 'NOWAIT') {
+          return resolvable.get(this.context);
+        }
+        if (!resolvable.resolved) {
+          throw new Error("Resolvable async .get() not complete:" + stringify(resolvable.token));
+        }
+        return resolvable.data;
+      }
+      return this.getNative(token);
+    };
+    UIInjectorImpl.prototype.getAsync = function (token) {
+      var resolvable = this.context.getResolvable(token);
+      if (resolvable)
+        return resolvable.get(this.context);
+      return services.$q.when(this.native.get(token));
+    };
+    UIInjectorImpl.prototype.getNative = function (token) {
+      return this.native && this.native.get(token);
+    };
+    return UIInjectorImpl;
+  }());
 
-    this.$get =
-        [        '$location', '$rootScope', '$injector',
-          function ($location,   $rootScope,   $injector) {
-            // TODO: Optimize groups of rules with non-empty prefix into some sort of decision tree
-            function update(evt) {
-              if (evt && evt.defaultPrevented) return;
-              function check(rule) {
-                var handled = rule($injector, $location);
-                if (handled) {
-                  if (isString(handled)) $location.replace().url(handled);
-                  return true;
-                }
-                return false;
-              }
-              var n=rules.length, i;
-              for (i=0; i<n; i++) {
-                if (check(rules[i])) return;
-              }
-              // always check otherwise last to allow dynamic updates to the set of rules
-              if (otherwise) check(otherwise);
-            }
+  /**
+   * @coreapi
+   * @module transition
+   */
+  /** for typedoc */
+  /** @hidden */
+  var stateSelf = prop("self");
+  /**
+   * Represents a transition between two states.
+   *
+   * When navigating to a state, we are transitioning **from** the current state **to** the new state.
+   *
+   * This object contains all contextual information about the to/from states, parameters, resolves.
+   * It has information about all states being entered and exited as a result of the transition.
+   */
+  var Transition = /** @class */ (function () {
+    /**
+     * Creates a new Transition object.
+     *
+     * If the target state is not valid, an error is thrown.
+     *
+     * @internalapi
+     *
+     * @param fromPath The path of [[PathNode]]s from which the transition is leaving.  The last node in the `fromPath`
+     *        encapsulates the "from state".
+     * @param targetState The target state and parameters being transitioned to (also, the transition options)
+     * @param router The [[UIRouter]] instance
+     */
+    function Transition(fromPath, targetState, router) {
+      var _this = this;
+      /** @hidden */
+      this._deferred = services.$q.defer();
+      /**
+       * This promise is resolved or rejected based on the outcome of the Transition.
+       *
+       * When the transition is successful, the promise is resolved
+       * When the transition is unsuccessful, the promise is rejected with the [[Rejection]] or javascript error
+       */
+      this.promise = this._deferred.promise;
+      /** @hidden Holds the hook registration functions such as those passed to Transition.onStart() */
+      this._registeredHooks = {};
+      /** @hidden */
+      this._hookBuilder = new HookBuilder(this);
+      /** Checks if this transition is currently active/running. */
+      this.isActive = function () {
+        return _this.router.globals.transition === _this;
+      };
+      this.router = router;
+      this._targetState = targetState;
+      if (!targetState.valid()) {
+        throw new Error(targetState.error());
+      }
+      // current() is assumed to come from targetState.options, but provide a naive implementation otherwise.
+      this._options = extend({ current: val(this) }, targetState.options());
+      this.$id = router.transitionService._transitionCount++;
+      var toPath = PathUtils.buildToPath(fromPath, targetState);
+      this._treeChanges = PathUtils.treeChanges(fromPath, toPath, this._options.reloadState);
+      this.createTransitionHookRegFns();
+      var onCreateHooks = this._hookBuilder.buildHooksForPhase(exports.TransitionHookPhase.CREATE);
+      TransitionHook.invokeHooks(onCreateHooks, function () { return null; });
+      this.applyViewConfigs(router);
+    }
+    /** @hidden */
+    Transition.prototype.onBefore = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onStart = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onExit = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onRetain = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onEnter = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onFinish = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onSuccess = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    Transition.prototype.onError = function (criteria, callback, options) { return; };
+    /** @hidden
+     * Creates the transition-level hook registration functions
+     * (which can then be used to register hooks)
+     */
+    Transition.prototype.createTransitionHookRegFns = function () {
+      var _this = this;
+      this.router.transitionService._pluginapi._getEvents()
+        .filter(function (type) { return type.hookPhase !== exports.TransitionHookPhase.CREATE; })
+        .forEach(function (type) { return makeEvent(_this, _this.router.transitionService, type); });
+    };
+    /** @internalapi */
+    Transition.prototype.getHooks = function (hookName) {
+      return this._registeredHooks[hookName];
+    };
+    Transition.prototype.applyViewConfigs = function (router) {
+      var enteringStates = this._treeChanges.entering.map(function (node) { return node.state; });
+      PathUtils.applyViewConfigs(router.transitionService.$view, this._treeChanges.to, enteringStates);
+    };
+    /**
+     * @internalapi
+     *
+     * @returns the internal from [State] object
+     */
+    Transition.prototype.$from = function () {
+      return tail(this._treeChanges.from).state;
+    };
+    /**
+     * @internalapi
+     *
+     * @returns the internal to [State] object
+     */
+    Transition.prototype.$to = function () {
+      return tail(this._treeChanges.to).state;
+    };
+    /**
+     * Returns the "from state"
+     *
+     * Returns the state that the transition is coming *from*.
+     *
+     * @returns The state declaration object for the Transition's ("from state").
+     */
+    Transition.prototype.from = function () {
+      return this.$from().self;
+    };
+    /**
+     * Returns the "to state"
+     *
+     * Returns the state that the transition is going *to*.
+     *
+     * @returns The state declaration object for the Transition's target state ("to state").
+     */
+    Transition.prototype.to = function () {
+      return this.$to().self;
+    };
+    /**
+     * Gets the Target State
+     *
+     * A transition's [[TargetState]] encapsulates the [[to]] state, the [[params]], and the [[options]] as a single object.
+     *
+     * @returns the [[TargetState]] of this Transition
+     */
+    Transition.prototype.targetState = function () {
+      return this._targetState;
+    };
+    /**
+     * Determines whether two transitions are equivalent.
+     * @deprecated
+     */
+    Transition.prototype.is = function (compare) {
+      if (compare instanceof Transition) {
+        // TODO: Also compare parameters
+        return this.is({ to: compare.$to().name, from: compare.$from().name });
+      }
+      return !((compare.to && !matchState(this.$to(), compare.to)) ||
+        (compare.from && !matchState(this.$from(), compare.from)));
+    };
+    Transition.prototype.params = function (pathname) {
+      if (pathname === void 0) { pathname = "to"; }
+      return Object.freeze(this._treeChanges[pathname].map(prop("paramValues")).reduce(mergeR, {}));
+    };
+    /**
+     * Creates a [[UIInjector]] Dependency Injector
+     *
+     * Returns a Dependency Injector for the Transition's target state (to state).
+     * The injector provides resolve values which the target state has access to.
+     *
+     * The `UIInjector` can also provide values from the native root/global injector (ng1/ng2).
+     *
+     * #### Example:
+     * ```js
+     * .onEnter({ entering: 'myState' }, trans => {
+     *   var myResolveValue = trans.injector().get('myResolve');
+     *   // Inject a global service from the global/native injector (if it exists)
+     *   var MyService = trans.injector().get('MyService');
+     * })
+     * ```
+     *
+     * In some cases (such as `onBefore`), you may need access to some resolve data but it has not yet been fetched.
+     * You can use [[UIInjector.getAsync]] to get a promise for the data.
+     * #### Example:
+     * ```js
+     * .onBefore({}, trans => {
+     *   return trans.injector().getAsync('myResolve').then(myResolveValue =>
+     *     return myResolveValue !== 'ABORT';
+     *   });
+     * });
+     * ```
+     *
+     * If a `state` is provided, the injector that is returned will be limited to resolve values that the provided state has access to.
+     * This can be useful if both a parent state `foo` and a child state `foo.bar` have both defined a resolve such as `data`.
+     * #### Example:
+     * ```js
+     * .onEnter({ to: 'foo.bar' }, trans => {
+     *   // returns result of `foo` state's `data` resolve
+     *   // even though `foo.bar` also has a `data` resolve
+     *   var fooData = trans.injector('foo').get('data');
+     * });
+     * ```
+     *
+     * If you need resolve data from the exiting states, pass `'from'` as `pathName`.
+     * The resolve data from the `from` path will be returned.
+     * #### Example:
+     * ```js
+     * .onExit({ exiting: 'foo.bar' }, trans => {
+     *   // Gets the resolve value of `data` from the exiting state.
+     *   var fooData = trans.injector(null, 'foo.bar').get('data');
+     * });
+     * ```
+     *
+     *
+     * @param state Limits the resolves provided to only the resolves the provided state has access to.
+     * @param pathName Default: `'to'`: Chooses the path for which to create the injector. Use this to access resolves for `exiting` states.
+     *
+     * @returns a [[UIInjector]]
+     */
+    Transition.prototype.injector = function (state, pathName) {
+      if (pathName === void 0) { pathName = "to"; }
+      var path = this._treeChanges[pathName];
+      if (state)
+        path = PathUtils.subPath(path, function (node) { return node.state === state || node.state.name === state; });
+      return new ResolveContext(path).injector();
+    };
+    /**
+     * Gets all available resolve tokens (keys)
+     *
+     * This method can be used in conjunction with [[injector]] to inspect the resolve values
+     * available to the Transition.
+     *
+     * This returns all the tokens defined on [[StateDeclaration.resolve]] blocks, for the states
+     * in the Transition's [[TreeChanges.to]] path.
+     *
+     * #### Example:
+     * This example logs all resolve values
+     * ```js
+     * let tokens = trans.getResolveTokens();
+     * tokens.forEach(token => console.log(token + " = " + trans.injector().get(token)));
+     * ```
+     *
+     * #### Example:
+     * This example creates promises for each resolve value.
+     * This triggers fetches of resolves (if any have not yet been fetched).
+     * When all promises have all settled, it logs the resolve values.
+     * ```js
+     * let tokens = trans.getResolveTokens();
+     * let promise = tokens.map(token => trans.injector().getAsync(token));
+     * Promise.all(promises).then(values => console.log("Resolved values: " + values));
+     * ```
+     *
+     * Note: Angular 1 users whould use `$q.all()`
+     *
+     * @param pathname resolve context's path name (e.g., `to` or `from`)
+     *
+     * @returns an array of resolve tokens (keys)
+     */
+    Transition.prototype.getResolveTokens = function (pathname) {
+      if (pathname === void 0) { pathname = "to"; }
+      return new ResolveContext(this._treeChanges[pathname]).getTokens();
+    };
+    /**
+     * Dynamically adds a new [[Resolvable]] (i.e., [[StateDeclaration.resolve]]) to this transition.
+     *
+     * #### Example:
+     * ```js
+     * transitionService.onBefore({}, transition => {
+     *   transition.addResolvable({
+     *     token: 'myResolve',
+     *     deps: ['MyService'],
+     *     resolveFn: myService => myService.getData()
+     *   });
+     * });
+     * ```
+     *
+     * @param resolvable a [[ResolvableLiteral]] object (or a [[Resolvable]])
+     * @param state the state in the "to path" which should receive the new resolve (otherwise, the root state)
+     */
+    Transition.prototype.addResolvable = function (resolvable, state) {
+      if (state === void 0) { state = ""; }
+      resolvable = is(Resolvable)(resolvable) ? resolvable : new Resolvable(resolvable);
+      var stateName = (typeof state === "string") ? state : state.name;
+      var topath = this._treeChanges.to;
+      var targetNode = find(topath, function (node) { return node.state.name === stateName; });
+      var resolveContext = new ResolveContext(topath);
+      resolveContext.addResolvables([resolvable], targetNode.state);
+    };
+    /**
+     * Gets the transition from which this transition was redirected.
+     *
+     * If the current transition is a redirect, this method returns the transition that was redirected.
+     *
+     * #### Example:
+     * ```js
+     * let transitionA = $state.go('A').transition
+     * transitionA.onStart({}, () => $state.target('B'));
+     * $transitions.onSuccess({ to: 'B' }, (trans) => {
+     *   trans.to().name === 'B'; // true
+     *   trans.redirectedFrom() === transitionA; // true
+     * });
+     * ```
+     *
+     * @returns The previous Transition, or null if this Transition is not the result of a redirection
+     */
+    Transition.prototype.redirectedFrom = function () {
+      return this._options.redirectedFrom || null;
+    };
+    /**
+     * Gets the original transition in a redirect chain
+     *
+     * A transition might belong to a long chain of multiple redirects.
+     * This method walks the [[redirectedFrom]] chain back to the original (first) transition in the chain.
+     *
+     * #### Example:
+     * ```js
+     * // states
+     * registry.register({ name: 'A', redirectTo: 'B' });
+     * registry.register({ name: 'B', redirectTo: 'C' });
+     * registry.register({ name: 'C', redirectTo: 'D' });
+     * registry.register({ name: 'D' });
+     *
+     * let transitionA = $state.go('A').transition
+     *
+     * $transitions.onSuccess({ to: 'D' }, (trans) => {
+     *   trans.to().name === 'D'; // true
+     *   trans.redirectedFrom().to().name === 'C'; // true
+     *   trans.originalTransition() === transitionA; // true
+     *   trans.originalTransition().to().name === 'A'; // true
+     * });
+     * ```
+     *
+     * @returns The original Transition that started a redirect chain
+     */
+    Transition.prototype.originalTransition = function () {
+      var rf = this.redirectedFrom();
+      return (rf && rf.originalTransition()) || this;
+    };
+    /**
+     * Get the transition options
+     *
+     * @returns the options for this Transition.
+     */
+    Transition.prototype.options = function () {
+      return this._options;
+    };
+    /**
+     * Gets the states being entered.
+     *
+     * @returns an array of states that will be entered during this transition.
+     */
+    Transition.prototype.entering = function () {
+      return map(this._treeChanges.entering, prop('state')).map(stateSelf);
+    };
+    /**
+     * Gets the states being exited.
+     *
+     * @returns an array of states that will be exited during this transition.
+     */
+    Transition.prototype.exiting = function () {
+      return map(this._treeChanges.exiting, prop('state')).map(stateSelf).reverse();
+    };
+    /**
+     * Gets the states being retained.
+     *
+     * @returns an array of states that are already entered from a previous Transition, that will not be
+     *    exited during this Transition
+     */
+    Transition.prototype.retained = function () {
+      return map(this._treeChanges.retained, prop('state')).map(stateSelf);
+    };
+    /**
+     * Get the [[ViewConfig]]s associated with this Transition
+     *
+     * Each state can define one or more views (template/controller), which are encapsulated as `ViewConfig` objects.
+     * This method fetches the `ViewConfigs` for a given path in the Transition (e.g., "to" or "entering").
+     *
+     * @param pathname the name of the path to fetch views for:
+     *   (`'to'`, `'from'`, `'entering'`, `'exiting'`, `'retained'`)
+     * @param state If provided, only returns the `ViewConfig`s for a single state in the path
+     *
+     * @returns a list of ViewConfig objects for the given path.
+     */
+    Transition.prototype.views = function (pathname, state) {
+      if (pathname === void 0) { pathname = "entering"; }
+      var path = this._treeChanges[pathname];
+      path = !state ? path : path.filter(propEq('state', state));
+      return path.map(prop("views")).filter(identity).reduce(unnestR, []);
+    };
+    Transition.prototype.treeChanges = function (pathname) {
+      return pathname ? this._treeChanges[pathname] : this._treeChanges;
+    };
+    /**
+     * Creates a new transition that is a redirection of the current one.
+     *
+     * This transition can be returned from a [[TransitionService]] hook to
+     * redirect a transition to a new state and/or set of parameters.
+     *
+     * @internalapi
+     *
+     * @returns Returns a new [[Transition]] instance.
+     */
+    Transition.prototype.redirect = function (targetState) {
+      var redirects = 1, trans = this;
+      while ((trans = trans.redirectedFrom()) != null) {
+        if (++redirects > 20)
+          throw new Error("Too many consecutive Transition redirects (20+)");
+      }
+      var redirectOpts = { redirectedFrom: this, source: "redirect" };
+      // If the original transition was caused by URL sync, then use { location: 'replace' }
+      // on the new transition (unless the target state explicitly specifies location: false).
+      // This causes the original url to be replaced with the url for the redirect target
+      // so the original url disappears from the browser history.
+      if (this.options().source === 'url' && targetState.options().location !== false) {
+        redirectOpts.location = 'replace';
+      }
+      var newOptions = extend({}, this.options(), targetState.options(), redirectOpts);
+      targetState = targetState.withOptions(newOptions, true);
+      var newTransition = this.router.transitionService.create(this._treeChanges.from, targetState);
+      var originalEnteringNodes = this._treeChanges.entering;
+      var redirectEnteringNodes = newTransition._treeChanges.entering;
+      // --- Re-use resolve data from original transition ---
+      // When redirecting from a parent state to a child state where the parent parameter values haven't changed
+      // (because of the redirect), the resolves fetched by the original transition are still valid in the
+      // redirected transition.
+      //
+      // This allows you to define a redirect on a parent state which depends on an async resolve value.
+      // You can wait for the resolve, then redirect to a child state based on the result.
+      // The redirected transition does not have to re-fetch the resolve.
+      // ---------------------------------------------------------
+      var nodeIsReloading = function (reloadState) { return function (node) {
+        return reloadState && node.state.includes[reloadState.name];
+      }; };
+      // Find any "entering" nodes in the redirect path that match the original path and aren't being reloaded
+      var matchingEnteringNodes = PathUtils.matching(redirectEnteringNodes, originalEnteringNodes, PathUtils.nonDynamicParams)
+        .filter(not(nodeIsReloading(targetState.options().reloadState)));
+      // Use the existing (possibly pre-resolved) resolvables for the matching entering nodes.
+      matchingEnteringNodes.forEach(function (node, idx) {
+        node.resolvables = originalEnteringNodes[idx].resolvables;
+      });
+      return newTransition;
+    };
+    /** @hidden If a transition doesn't exit/enter any states, returns any [[Param]] whose value changed */
+    Transition.prototype._changedParams = function () {
+      var tc = this._treeChanges;
+      /** Return undefined if it's not a "dynamic" transition, for the following reasons */
+      // If user explicitly wants a reload
+      if (this._options.reload)
+        return undefined;
+      // If any states are exiting or entering
+      if (tc.exiting.length || tc.entering.length)
+        return undefined;
+      // If to/from path lengths differ
+      if (tc.to.length !== tc.from.length)
+        return undefined;
+      // If the to/from paths are different
+      var pathsDiffer = arrayTuples(tc.to, tc.from)
+        .map(function (tuple) { return tuple[0].state !== tuple[1].state; })
+        .reduce(anyTrueR, false);
+      if (pathsDiffer)
+        return undefined;
+      // Find any parameter values that differ
+      var nodeSchemas = tc.to.map(function (node) { return node.paramSchema; });
+      var _a = [tc.to, tc.from].map(function (path) { return path.map(function (x) { return x.paramValues; }); }), toValues = _a[0], fromValues = _a[1];
+      var tuples = arrayTuples(nodeSchemas, toValues, fromValues);
+      return tuples.map(function (_a) {
+        var schema = _a[0], toVals = _a[1], fromVals = _a[2];
+        return Param.changed(schema, toVals, fromVals);
+      }).reduce(unnestR, []);
+    };
+    /**
+     * Returns true if the transition is dynamic.
+     *
+     * A transition is dynamic if no states are entered nor exited, but at least one dynamic parameter has changed.
+     *
+     * @returns true if the Transition is dynamic
+     */
+    Transition.prototype.dynamic = function () {
+      var changes = this._changedParams();
+      return !changes ? false : changes.map(function (x) { return x.dynamic; }).reduce(anyTrueR, false);
+    };
+    /**
+     * Returns true if the transition is ignored.
+     *
+     * A transition is ignored if no states are entered nor exited, and no parameter values have changed.
+     *
+     * @returns true if the Transition is ignored.
+     */
+    Transition.prototype.ignored = function () {
+      return !!this._ignoredReason();
+    };
+    /** @hidden */
+    Transition.prototype._ignoredReason = function () {
+      var pending = this.router.globals.transition;
+      var reloadState = this._options.reloadState;
+      var same = function (pathA, pathB) {
+        if (pathA.length !== pathB.length)
+          return false;
+        var matching = PathUtils.matching(pathA, pathB);
+        return pathA.length === matching.filter(function (node) { return !reloadState || !node.state.includes[reloadState.name]; }).length;
+      };
+      var newTC = this.treeChanges();
+      var pendTC = pending && pending.treeChanges();
+      if (pendTC && same(pendTC.to, newTC.to) && same(pendTC.exiting, newTC.exiting))
+        return "SameAsPending";
+      if (newTC.exiting.length === 0 && newTC.entering.length === 0 && same(newTC.from, newTC.to))
+        return "SameAsCurrent";
+    };
+    /**
+     * Runs the transition
+     *
+     * This method is generally called from the [[StateService.transitionTo]]
+     *
+     * @internalapi
+     *
+     * @returns a promise for a successful transition.
+     */
+    Transition.prototype.run = function () {
+      var _this = this;
+      var runAllHooks = TransitionHook.runAllHooks;
+      // Gets transition hooks array for the given phase
+      var getHooksFor = function (phase) {
+        return _this._hookBuilder.buildHooksForPhase(phase);
+      };
+      // When the chain is complete, then resolve or reject the deferred
+      var transitionSuccess = function () {
+        trace.traceSuccess(_this.$to(), _this);
+        _this.success = true;
+        _this._deferred.resolve(_this.to());
+        runAllHooks(getHooksFor(exports.TransitionHookPhase.SUCCESS));
+      };
+      var transitionError = function (reason) {
+        trace.traceError(reason, _this);
+        _this.success = false;
+        _this._deferred.reject(reason);
+        _this._error = reason;
+        runAllHooks(getHooksFor(exports.TransitionHookPhase.ERROR));
+      };
+      var runTransition = function () {
+        // Wait to build the RUN hook chain until the BEFORE hooks are done
+        // This allows a BEFORE hook to dynamically add additional RUN hooks via the Transition object.
+        var allRunHooks = getHooksFor(exports.TransitionHookPhase.RUN);
+        var done = function () { return services.$q.when(undefined); };
+        return TransitionHook.invokeHooks(allRunHooks, done);
+      };
+      var startTransition = function () {
+        var globals = _this.router.globals;
+        globals.lastStartedTransitionId = _this.$id;
+        globals.transition = _this;
+        globals.transitionHistory.enqueue(_this);
+        trace.traceTransitionStart(_this);
+        return services.$q.when(undefined);
+      };
+      var allBeforeHooks = getHooksFor(exports.TransitionHookPhase.BEFORE);
+      TransitionHook.invokeHooks(allBeforeHooks, startTransition)
+        .then(runTransition)
+        .then(transitionSuccess, transitionError);
+      return this.promise;
+    };
+    /**
+     * Checks if the Transition is valid
+     *
+     * @returns true if the Transition is valid
+     */
+    Transition.prototype.valid = function () {
+      return !this.error() || this.success !== undefined;
+    };
+    /**
+     * Aborts this transition
+     *
+     * Imperative API to abort a Transition.
+     * This only applies to Transitions that are not yet complete.
+     */
+    Transition.prototype.abort = function () {
+      // Do not set flag if the transition is already complete
+      if (isUndefined(this.success)) {
+        this._aborted = true;
+      }
+    };
+    /**
+     * The Transition error reason.
+     *
+     * If the transition is invalid (and could not be run), returns the reason the transition is invalid.
+     * If the transition was valid and ran, but was not successful, returns the reason the transition failed.
+     *
+     * @returns an error message explaining why the transition is invalid, or the reason the transition failed.
+     */
+    Transition.prototype.error = function () {
+      var state = this.$to();
+      if (state.self.abstract)
+        return "Cannot transition to abstract state '" + state.name + "'";
+      var paramDefs = state.parameters(), values$$1 = this.params();
+      var invalidParams = paramDefs.filter(function (param) { return !param.validates(values$$1[param.id]); });
+      if (invalidParams.length) {
+        return "Param values not valid for state '" + state.name + "'. Invalid params: [ " + invalidParams.map(function (param) { return param.id; }).join(', ') + " ]";
+      }
+      if (this.success === false)
+        return this._error;
+    };
+    /**
+     * A string representation of the Transition
+     *
+     * @returns A string representation of the Transition
+     */
+    Transition.prototype.toString = function () {
+      var fromStateOrName = this.from();
+      var toStateOrName = this.to();
+      var avoidEmptyHash = function (params) {
+        return (params["#"] !== null && params["#"] !== undefined) ? params : omit(params, ["#"]);
+      };
+      // (X) means the to state is invalid.
+      var id = this.$id, from = isObject(fromStateOrName) ? fromStateOrName.name : fromStateOrName, fromParams = stringify(avoidEmptyHash(this._treeChanges.from.map(prop('paramValues')).reduce(mergeR, {}))), toValid = this.valid() ? "" : "(X) ", to = isObject(toStateOrName) ? toStateOrName.name : toStateOrName, toParams = stringify(avoidEmptyHash(this.params()));
+      return "Transition#" + id + "( '" + from + "'" + fromParams + " -> " + toValid + "'" + to + "'" + toParams + " )";
+    };
+    /** @hidden */
+    Transition.diToken = Transition;
+    return Transition;
+  }());
 
-            $rootScope.$on('$locationChangeSuccess', update);
-
-            return {
-              sync: function () {
-                update();
-              }
-            };
-          }];
+  /**
+   * Functions that manipulate strings
+   *
+   * Although these functions are exported, they are subject to change without notice.
+   *
+   * @module common_strings
+   */ /** */
+  /**
+   * Returns a string shortened to a maximum length
+   *
+   * If the string is already less than the `max` length, return the string.
+   * Else return the string, shortened to `max - 3` and append three dots ("...").
+   *
+   * @param max the maximum length of the string to return
+   * @param str the input string
+   */
+  function maxLength(max, str) {
+    if (str.length <= max)
+      return str;
+    return str.substr(0, max - 3) + "...";
+  }
+  /**
+   * Returns a string, with spaces added to the end, up to a desired str length
+   *
+   * If the string is already longer than the desired length, return the string.
+   * Else returns the string, with extra spaces on the end, such that it reaches `length` characters.
+   *
+   * @param length the desired length of the string to return
+   * @param str the input string
+   */
+  function padString(length, str) {
+    while (str.length < length)
+      str += " ";
+    return str;
+  }
+  function kebobString(camelCase) {
+    return camelCase
+      .replace(/^([A-Z])/, function ($1) { return $1.toLowerCase(); }) // replace first char
+      .replace(/([A-Z])/g, function ($1) { return "-" + $1.toLowerCase(); }); // replace rest
+  }
+  function functionToString(fn) {
+    var fnStr = fnToString(fn);
+    var namedFunctionMatch = fnStr.match(/^(function [^ ]+\([^)]*\))/);
+    var toStr = namedFunctionMatch ? namedFunctionMatch[1] : fnStr;
+    var fnName = fn['name'] || "";
+    if (fnName && toStr.match(/function \(/)) {
+      return 'function ' + fnName + toStr.substr(9);
+    }
+    return toStr;
+  }
+  function fnToString(fn) {
+    var _fn = isArray(fn) ? fn.slice(-1)[0] : fn;
+    return _fn && _fn.toString() || "undefined";
+  }
+  var stringifyPatternFn = null;
+  var stringifyPattern = function (value) {
+    var isRejection = Rejection.isRejectionPromise;
+    stringifyPatternFn = stringifyPatternFn || pattern([
+      [not(isDefined), val("undefined")],
+      [isNull, val("null")],
+      [isPromise, val("[Promise]")],
+      [isRejection, function (x) { return x._transitionRejection.toString(); }],
+      [is(Rejection), invoke("toString")],
+      [is(Transition), invoke("toString")],
+      [is(Resolvable), invoke("toString")],
+      [isInjectable, functionToString],
+      [val(true), identity]
+    ]);
+    return stringifyPatternFn(value);
+  };
+  function stringify(o) {
+    var seen = [];
+    function format(val$$1) {
+      if (isObject(val$$1)) {
+        if (seen.indexOf(val$$1) !== -1)
+          return '[circular ref]';
+        seen.push(val$$1);
+      }
+      return stringifyPattern(val$$1);
+    }
+    return JSON.stringify(o, function (key, val$$1) { return format(val$$1); }).replace(/\\"/g, '"');
+  }
+  /** Returns a function that splits a string on a character or substring */
+  var beforeAfterSubstr = function (char) { return function (str) {
+    if (!str)
+      return ["", ""];
+    var idx = str.indexOf(char);
+    if (idx === -1)
+      return [str, ""];
+    return [str.substr(0, idx), str.substr(idx + 1)];
+  }; };
+  var hostRegex = new RegExp('^(?:[a-z]+:)?//[^/]+/');
+  var stripFile = function (str) { return str.replace(/\/[^/]*$/, ''); };
+  var splitHash = beforeAfterSubstr("#");
+  var splitQuery = beforeAfterSubstr("?");
+  var splitEqual = beforeAfterSubstr("=");
+  var trimHashVal = function (str) { return str ? str.replace(/^#/, "") : ""; };
+  /**
+   * Splits on a delimiter, but returns the delimiters in the array
+   *
+   * #### Example:
+   * ```js
+   * var splitOnSlashes = splitOnDelim('/');
+   * splitOnSlashes("/foo"); // ["/", "foo"]
+   * splitOnSlashes("/foo/"); // ["/", "foo", "/"]
+   * ```
+   */
+  function splitOnDelim(delim) {
+    var re = new RegExp("(" + delim + ")", "g");
+    return function (str) {
+      return str.split(re).filter(identity);
+    };
   }
 
-  angular.module('ui.router.router').provider('$urlRouter', $UrlRouterProvider);
+  /**
+   * Reduce fn that joins neighboring strings
+   *
+   * Given an array of strings, returns a new array
+   * where all neighboring strings have been joined.
+   *
+   * #### Example:
+   * ```js
+   * let arr = ["foo", "bar", 1, "baz", "", "qux" ];
+   * arr.reduce(joinNeighborsR, []) // ["foobar", 1, "bazqux" ]
+   * ```
+   */
+  function joinNeighborsR(acc, x) {
+    if (isString(tail(acc)) && isString(x))
+      return acc.slice(0, -1).concat(tail(acc) + x);
+    return pushR(acc, x);
+  }
 
-  $StateProvider.$inject = ['$urlRouterProvider', '$urlMatcherFactoryProvider', '$locationProvider'];
-  function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $locationProvider) {
+  /** @module common */ /** for typedoc */
 
-    var root, states = {}, $state, queue = {}, abstractKey = 'abstract';
+  /**
+   * @coreapi
+   * @module params
+   */
+  /** */
+  /**
+   * A registry for parameter types.
+   *
+   * This registry manages the built-in (and custom) parameter types.
+   *
+   * The built-in parameter types are:
+   *
+   * - [[string]]
+   * - [[path]]
+   * - [[query]]
+   * - [[hash]]
+   * - [[int]]
+   * - [[bool]]
+   * - [[date]]
+   * - [[json]]
+   * - [[any]]
+   */
+  var ParamTypes = /** @class */ (function () {
+    /** @internalapi */
+    function ParamTypes() {
+      /** @hidden */
+      this.enqueue = true;
+      /** @hidden */
+      this.typeQueue = [];
+      /** @internalapi */
+      this.defaultTypes = pick(ParamTypes.prototype, ["hash", "string", "query", "path", "int", "bool", "date", "json", "any"]);
+      // Register default types. Store them in the prototype of this.types.
+      var makeType = function (definition, name) {
+        return new ParamType(extend({ name: name }, definition));
+      };
+      this.types = inherit(map(this.defaultTypes, makeType), {});
+    }
+    /** @internalapi */
+    ParamTypes.prototype.dispose = function () {
+      this.types = {};
+    };
+    /**
+     * Registers a parameter type
+     *
+     * End users should call [[UrlMatcherFactory.type]], which delegates to this method.
+     */
+    ParamTypes.prototype.type = function (name, definition, definitionFn) {
+      if (!isDefined(definition))
+        return this.types[name];
+      if (this.types.hasOwnProperty(name))
+        throw new Error("A type named '" + name + "' has already been defined.");
+      this.types[name] = new ParamType(extend({ name: name }, definition));
+      if (definitionFn) {
+        this.typeQueue.push({ name: name, def: definitionFn });
+        if (!this.enqueue)
+          this._flushTypeQueue();
+      }
+      return this;
+    };
+    /** @internalapi */
+    ParamTypes.prototype._flushTypeQueue = function () {
+      while (this.typeQueue.length) {
+        var type = this.typeQueue.shift();
+        if (type.pattern)
+          throw new Error("You cannot override a type's .pattern at runtime.");
+        extend(this.types[type.name], services.$injector.invoke(type.def));
+      }
+    };
+    return ParamTypes;
+  }());
+  /** @hidden */
+  function initDefaultTypes() {
+    var makeDefaultType = function (def) {
+      var valToString = function (val$$1) {
+        return val$$1 != null ? val$$1.toString() : val$$1;
+      };
+      var defaultTypeBase = {
+        encode: valToString,
+        decode: valToString,
+        is: is(String),
+        pattern: /.*/,
+        equals: function (a, b) { return a == b; },
+      };
+      return extend({}, defaultTypeBase, def);
+    };
+    // Default Parameter Type Definitions
+    extend(ParamTypes.prototype, {
+      string: makeDefaultType({}),
+      path: makeDefaultType({
+        pattern: /[^/]*/,
+      }),
+      query: makeDefaultType({}),
+      hash: makeDefaultType({
+        inherit: false,
+      }),
+      int: makeDefaultType({
+        decode: function (val$$1) { return parseInt(val$$1, 10); },
+        is: function (val$$1) {
+          return !isNullOrUndefined(val$$1) && this.decode(val$$1.toString()) === val$$1;
+        },
+        pattern: /-?\d+/,
+      }),
+      bool: makeDefaultType({
+        encode: function (val$$1) { return val$$1 && 1 || 0; },
+        decode: function (val$$1) { return parseInt(val$$1, 10) !== 0; },
+        is: is(Boolean),
+        pattern: /0|1/,
+      }),
+      date: makeDefaultType({
+        encode: function (val$$1) {
+          return !this.is(val$$1) ? undefined : [
+            val$$1.getFullYear(),
+            ('0' + (val$$1.getMonth() + 1)).slice(-2),
+            ('0' + val$$1.getDate()).slice(-2),
+          ].join("-");
+        },
+        decode: function (val$$1) {
+          if (this.is(val$$1))
+            return val$$1;
+          var match = this.capture.exec(val$$1);
+          return match ? new Date(match[1], match[2] - 1, match[3]) : undefined;
+        },
+        is: function (val$$1) { return val$$1 instanceof Date && !isNaN(val$$1.valueOf()); },
+        equals: function (l, r) {
+          return ['getFullYear', 'getMonth', 'getDate']
+            .reduce(function (acc, fn) { return acc && l[fn]() === r[fn](); }, true);
+        },
+        pattern: /[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,
+        capture: /([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/,
+      }),
+      json: makeDefaultType({
+        encode: toJson,
+        decode: fromJson,
+        is: is(Object),
+        equals: equals,
+        pattern: /[^/]*/,
+      }),
+      // does not encode/decode
+      any: makeDefaultType({
+        encode: identity,
+        decode: identity,
+        is: function () { return true; },
+        equals: equals,
+      }),
+    });
+  }
+  initDefaultTypes();
 
-    // Builds state properties from definition passed to registerState()
-    var stateBuilder = {
-
-      // Derive parent state from a hierarchical name only if 'parent' is not explicitly defined.
-      // state.children = [];
-      // if (parent) parent.children.push(state);
-      parent: function(state) {
-        if (isDefined(state.parent) && state.parent) return findState(state.parent);
-        // regex matches any valid composite state name
-        // would match "contact.list" but not "contacts"
-        var compositeName = /^(.+)\.[^.]+$/.exec(state.name);
-        return compositeName ? findState(compositeName[1]) : root;
-      },
-
-      // inherit 'data' from parent and override by own values (if any)
-      data: function(state) {
-        if (state.parent && state.parent.data) {
-          state.data = state.self.data = extend({}, state.parent.data, state.data);
+  /**
+   * @coreapi
+   * @module params
+   */
+  /** */
+  /** @internalapi */
+  var StateParams = /** @class */ (function () {
+    function StateParams(params) {
+      if (params === void 0) { params = {}; }
+      extend(this, params);
+    }
+    /**
+     * Merges a set of parameters with all parameters inherited between the common parents of the
+     * current state and a given destination state.
+     *
+     * @param {Object} newParams The set of parameters which will be composited with inherited params.
+     * @param {Object} $current Internal definition of object representing the current state.
+     * @param {Object} $to Internal definition of object representing state to transition to.
+     */
+    StateParams.prototype.$inherit = function (newParams, $current, $to) {
+      var parents = ancestors($current, $to), parentParams, inherited = {}, inheritList = [];
+      for (var i in parents) {
+        if (!parents[i] || !parents[i].params)
+          continue;
+        parentParams = Object.keys(parents[i].params);
+        if (!parentParams.length)
+          continue;
+        for (var j in parentParams) {
+          if (inheritList.indexOf(parentParams[j]) >= 0)
+            continue;
+          inheritList.push(parentParams[j]);
+          inherited[parentParams[j]] = this[parentParams[j]];
         }
-        return state.data;
-      },
-
-      // Build a URLMatcher if necessary, either via a relative or absolute URL
-      url: function(state) {
-        var url = state.url;
-
-        if (isString(url)) {
-          if (url.charAt(0) == '^') {
-            return $urlMatcherFactory.compile(url.substring(1));
-          }
-          return (state.parent.navigable || root).url.concat(url);
-        }
-
-        if ($urlMatcherFactory.isMatcher(url) || url == null) {
-          return url;
-        }
-        throw new Error("Invalid url '" + url + "' in state '" + state + "'");
-      },
-
-      // Keep track of the closest ancestor state that has a URL (i.e. is navigable)
-      navigable: function(state) {
-        return state.url ? state : (state.parent ? state.parent.navigable : null);
-      },
-
-      // Derive parameters for this state and ensure they're a super-set of parent's parameters
-      params: function(state) {
-        if (!state.params) {
-          return state.url ? state.url.parameters() : state.parent.params;
-        }
-        if (!isArray(state.params)) throw new Error("Invalid params in state '" + state + "'");
-        if (state.url) throw new Error("Both params and url specicified in state '" + state + "'");
-        return state.params;
-      },
-
-      // If there is no explicit multi-view configuration, make one up so we don't have
-      // to handle both cases in the view directive later. Note that having an explicit
-      // 'views' property will mean the default unnamed view properties are ignored. This
-      // is also a good time to resolve view names to absolute names, so everything is a
-      // straight lookup at link time.
-      views: function(state) {
-        var views = {};
-
-        forEach(isDefined(state.views) ? state.views : { '': state }, function (view, name) {
-          if (name.indexOf('@') < 0) name += '@' + state.parent.name;
-          views[name] = view;
-        });
-        return views;
-      },
-
-      ownParams: function(state) {
-        if (!state.parent) {
-          return state.params;
-        }
-        var paramNames = {}; forEach(state.params, function (p) { paramNames[p] = true; });
-
-        forEach(state.parent.params, function (p) {
-          if (!paramNames[p]) {
-            throw new Error("Missing required parameter '" + p + "' in state '" + state.name + "'");
-          }
-          paramNames[p] = false;
-        });
-        var ownParams = [];
-
-        forEach(paramNames, function (own, p) {
-          if (own) ownParams.push(p);
-        });
-        return ownParams;
-      },
-
-      // Keep a full path from the root down to this state as this is needed for state activation.
-      path: function(state) {
-        return state.parent ? state.parent.path.concat(state) : []; // exclude root from path
-      },
-
-      // Speed up $state.contains() as it's used a lot
-      includes: function(state) {
-        var includes = state.parent ? extend({}, state.parent.includes) : {};
-        includes[state.name] = true;
-        return includes;
-      },
-
-      $delegates: {}
+      }
+      return extend({}, inherited, newParams);
     };
 
-    function isRelative(stateName) {
-      return stateName.indexOf(".") === 0 || stateName.indexOf("^") === 0;
+    return StateParams;
+  }());
+
+  /** @module path */ /** for typedoc */
+
+  /** @module resolve */ /** for typedoc */
+
+  /** @module state */ /** for typedoc */
+  var parseUrl = function (url) {
+      if (!isString(url))
+        return false;
+      var root$$1 = url.charAt(0) === '^';
+      return { val: root$$1 ? url.substring(1) : url, root: root$$1 };
+    };
+  function nameBuilder(state) {
+    return state.name;
+  }
+  function selfBuilder(state) {
+    state.self.$$state = function () { return state; };
+    return state.self;
+  }
+  function dataBuilder(state) {
+    if (state.parent && state.parent.data) {
+      state.data = state.self.data = inherit(state.parent.data, state.data);
     }
+    return state.data;
+  }
+  var getUrlBuilder = function ($urlMatcherFactoryProvider, root$$1) {
+    return function urlBuilder(state) {
+      var stateDec = state;
+      // For future states, i.e., states whose name ends with `.**`,
+      // match anything that starts with the url prefix
+      if (stateDec && stateDec.url && stateDec.name && stateDec.name.match(/\.\*\*$/)) {
+        stateDec.url += "{remainder:any}"; // match any path (.*)
+      }
+      var parsed = parseUrl(stateDec.url), parent = state.parent;
+      var url = !parsed ? stateDec.url : $urlMatcherFactoryProvider.compile(parsed.val, {
+        params: state.params || {},
+        paramMap: function (paramConfig, isSearch) {
+          if (stateDec.reloadOnSearch === false && isSearch)
+            paramConfig = extend(paramConfig || {}, { dynamic: true });
+          return paramConfig;
+        }
+      });
+      if (!url)
+        return null;
+      if (!$urlMatcherFactoryProvider.isMatcher(url))
+        throw new Error("Invalid url '" + url + "' in state '" + state + "'");
+      return (parsed && parsed.root) ? url : ((parent && parent.navigable) || root$$1()).url.append(url);
+    };
+  };
+  var getNavigableBuilder = function (isRoot) {
+    return function navigableBuilder(state) {
+      return !isRoot(state) && state.url ? state : (state.parent ? state.parent.navigable : null);
+    };
+  };
+  var getParamsBuilder = function (paramFactory) {
+    return function paramsBuilder(state) {
+      var makeConfigParam = function (config, id) { return paramFactory.fromConfig(id, null, config); };
+      var urlParams = (state.url && state.url.parameters({ inherit: false })) || [];
+      var nonUrlParams = values(mapObj(omit(state.params || {}, urlParams.map(prop('id'))), makeConfigParam));
+      return urlParams.concat(nonUrlParams).map(function (p) { return [p.id, p]; }).reduce(applyPairs, {});
+    };
+  };
+  function pathBuilder(state) {
+    return state.parent ? state.parent.path.concat(state) : /*root*/ [state];
+  }
+  function includesBuilder(state) {
+    var includes = state.parent ? extend({}, state.parent.includes) : {};
+    includes[state.name] = true;
+    return includes;
+  }
+  /**
+   * This is a [[StateBuilder.builder]] function for the `resolve:` block on a [[StateDeclaration]].
+   *
+   * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder
+   * validates the `resolve` property and converts it to a [[Resolvable]] array.
+   *
+   * resolve: input value can be:
+   *
+   * {
+ *   // analyzed but not injected
+ *   myFooResolve: function() { return "myFooData"; },
+ *
+ *   // function.toString() parsed, "DependencyName" dep as string (not min-safe)
+ *   myBarResolve: function(DependencyName) { return DependencyName.fetchSomethingAsPromise() },
+ *
+ *   // Array split; "DependencyName" dep as string
+ *   myBazResolve: [ "DependencyName", function(dep) { return dep.fetchSomethingAsPromise() },
+ *
+ *   // Array split; DependencyType dep as token (compared using ===)
+ *   myQuxResolve: [ DependencyType, function(dep) { return dep.fetchSometingAsPromise() },
+ *
+ *   // val.$inject used as deps
+ *   // where:
+ *   //     corgeResolve.$inject = ["DependencyName"];
+ *   //     function corgeResolve(dep) { dep.fetchSometingAsPromise() }
+ *   // then "DependencyName" dep as string
+ *   myCorgeResolve: corgeResolve,
+ *
+ *  // inject service by name
+ *  // When a string is found, desugar creating a resolve that injects the named service
+ *   myGraultResolve: "SomeService"
+ * }
+   *
+   * or:
+   *
+   * [
+   *   new Resolvable("myFooResolve", function() { return "myFooData" }),
+   *   new Resolvable("myBarResolve", function(dep) { return dep.fetchSomethingAsPromise() }, [ "DependencyName" ]),
+   *   { provide: "myBazResolve", useFactory: function(dep) { dep.fetchSomethingAsPromise() }, deps: [ "DependencyName" ] }
+   * ]
+   */
+  function resolvablesBuilder(state) {
+    /** convert resolve: {} and resolvePolicy: {} objects to an array of tuples */
+    var objects2Tuples = function (resolveObj, resolvePolicies) {
+      return Object.keys(resolveObj || {}).map(function (token) { return ({ token: token, val: resolveObj[token], deps: undefined, policy: resolvePolicies[token] }); });
+    };
+    /** fetch DI annotations from a function or ng1-style array */
+    var annotate = function (fn) {
+      var $injector = services.$injector;
+      // ng1 doesn't have an $injector until runtime.
+      // If the $injector doesn't exist, use "deferred" literal as a
+      // marker indicating they should be annotated when runtime starts
+      return fn['$inject'] || ($injector && $injector.annotate(fn, $injector.strictDi)) || "deferred";
+    };
+    /** true if the object has both `token` and `resolveFn`, and is probably a [[ResolveLiteral]] */
+    var isResolveLiteral = function (obj) { return !!(obj.token && obj.resolveFn); };
+    /** true if the object looks like a provide literal, or a ng2 Provider */
+    var isLikeNg2Provider = function (obj) { return !!((obj.provide || obj.token) && (obj.useValue || obj.useFactory || obj.useExisting || obj.useClass)); };
+    /** true if the object looks like a tuple from obj2Tuples */
+    var isTupleFromObj = function (obj) { return !!(obj && obj.val && (isString(obj.val) || isArray(obj.val) || isFunction(obj.val))); };
+    /** extracts the token from a Provider or provide literal */
+    var token = function (p) { return p.provide || p.token; };
+    /** Given a literal resolve or provider object, returns a Resolvable */
+    var literal2Resolvable = pattern([
+      [prop('resolveFn'), function (p) { return new Resolvable(token(p), p.resolveFn, p.deps, p.policy); }],
+      [prop('useFactory'), function (p) { return new Resolvable(token(p), p.useFactory, (p.deps || p.dependencies), p.policy); }],
+      [prop('useClass'), function (p) { return new Resolvable(token(p), function () { return new p.useClass(); }, [], p.policy); }],
+      [prop('useValue'), function (p) { return new Resolvable(token(p), function () { return p.useValue; }, [], p.policy, p.useValue); }],
+      [prop('useExisting'), function (p) { return new Resolvable(token(p), identity, [p.useExisting], p.policy); }],
+    ]);
+    var tuple2Resolvable = pattern([
+      [pipe(prop("val"), isString), function (tuple) { return new Resolvable(tuple.token, identity, [tuple.val], tuple.policy); }],
+      [pipe(prop("val"), isArray), function (tuple) { return new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy); }],
+      [pipe(prop("val"), isFunction), function (tuple) { return new Resolvable(tuple.token, tuple.val, annotate(tuple.val), tuple.policy); }],
+    ]);
+    var item2Resolvable = pattern([
+      [is(Resolvable), function (r) { return r; }],
+      [isResolveLiteral, literal2Resolvable],
+      [isLikeNg2Provider, literal2Resolvable],
+      [isTupleFromObj, tuple2Resolvable],
+      [val(true), function (obj) { throw new Error("Invalid resolve value: " + stringify(obj)); }]
+    ]);
+    // If resolveBlock is already an array, use it as-is.
+    // Otherwise, assume it's an object and convert to an Array of tuples
+    var decl = state.resolve;
+    var items = isArray(decl) ? decl : objects2Tuples(decl, state.resolvePolicy || {});
+    return items.map(item2Resolvable);
+  }
+  /**
+   * @internalapi A internal global service
+   *
+   * StateBuilder is a factory for the internal [[StateObject]] objects.
+   *
+   * When you register a state with the [[StateRegistry]], you register a plain old javascript object which
+   * conforms to the [[StateDeclaration]] interface.  This factory takes that object and builds the corresponding
+   * [[StateObject]] object, which has an API and is used internally.
+   *
+   * Custom properties or API may be added to the internal [[StateObject]] object by registering a decorator function
+   * using the [[builder]] method.
+   */
+  var StateBuilder = /** @class */ (function () {
+    function StateBuilder(matcher, urlMatcherFactory) {
+      this.matcher = matcher;
+      var self = this;
+      var root$$1 = function () { return matcher.find(""); };
+      var isRoot = function (state) { return state.name === ""; };
+      function parentBuilder(state) {
+        if (isRoot(state))
+          return null;
+        return matcher.find(self.parentName(state)) || root$$1();
+      }
+      this.builders = {
+        name: [nameBuilder],
+        self: [selfBuilder],
+        parent: [parentBuilder],
+        data: [dataBuilder],
+        // Build a URLMatcher if necessary, either via a relative or absolute URL
+        url: [getUrlBuilder(urlMatcherFactory, root$$1)],
+        // Keep track of the closest ancestor state that has a URL (i.e. is navigable)
+        navigable: [getNavigableBuilder(isRoot)],
+        params: [getParamsBuilder(urlMatcherFactory.paramFactory)],
+        // Each framework-specific ui-router implementation should define its own `views` builder
+        // e.g., src/ng1/statebuilders/views.ts
+        views: [],
+        // Keep a full path from the root down to this state as this is needed for state activation.
+        path: [pathBuilder],
+        // Speed up $state.includes() as it's used a lot
+        includes: [includesBuilder],
+        resolvables: [resolvablesBuilder]
+      };
+    }
+    /**
+     * Registers a [[BuilderFunction]] for a specific [[StateObject]] property (e.g., `parent`, `url`, or `path`).
+     * More than one BuilderFunction can be registered for a given property.
+     *
+     * The BuilderFunction(s) will be used to define the property on any subsequently built [[StateObject]] objects.
+     *
+     * @param name The name of the State property being registered for.
+     * @param fn The BuilderFunction which will be used to build the State property
+     * @returns a function which deregisters the BuilderFunction
+     */
+    StateBuilder.prototype.builder = function (name, fn) {
+      var builders = this.builders;
+      var array = builders[name] || [];
+      // Backwards compat: if only one builder exists, return it, else return whole arary.
+      if (isString(name) && !isDefined(fn))
+        return array.length > 1 ? array : array[0];
+      if (!isString(name) || !isFunction(fn))
+        return;
+      builders[name] = array;
+      builders[name].push(fn);
+      return function () { return builders[name].splice(builders[name].indexOf(fn, 1)) && null; };
+    };
+    /**
+     * Builds all of the properties on an essentially blank State object, returning a State object which has all its
+     * properties and API built.
+     *
+     * @param state an uninitialized State object
+     * @returns the built State object
+     */
+    StateBuilder.prototype.build = function (state) {
+      var _a = this, matcher = _a.matcher, builders = _a.builders;
+      var parent = this.parentName(state);
+      if (parent && !matcher.find(parent, undefined, false)) {
+        return null;
+      }
+      for (var key in builders) {
+        if (!builders.hasOwnProperty(key))
+          continue;
+        var chain = builders[key].reduce(function (parentFn, step) { return function (_state) { return step(_state, parentFn); }; }, noop$1);
+        state[key] = chain(state);
+      }
+      return state;
+    };
+    StateBuilder.prototype.parentName = function (state) {
+      // name = 'foo.bar.baz.**'
+      var name = state.name || "";
+      // segments = ['foo', 'bar', 'baz', '.**']
+      var segments = name.split('.');
+      // segments = ['foo', 'bar', 'baz']
+      var lastSegment = segments.pop();
+      // segments = ['foo', 'bar'] (ignore .** segment for future states)
+      if (lastSegment === '**')
+        segments.pop();
+      if (segments.length) {
+        if (state.parent) {
+          throw new Error("States that specify the 'parent:' property should not have a '.' in their name (" + name + ")");
+        }
+        // 'foo.bar'
+        return segments.join(".");
+      }
+      if (!state.parent)
+        return "";
+      return isString(state.parent) ? state.parent : state.parent.name;
+    };
+    StateBuilder.prototype.name = function (state) {
+      var name = state.name;
+      if (name.indexOf('.') !== -1 || !state.parent)
+        return name;
+      var parentName = isString(state.parent) ? state.parent : state.parent.name;
+      return parentName ? parentName + "." + name : name;
+    };
+    return StateBuilder;
+  }());
 
-    function findState(stateOrName, base) {
-      var isStr = isString(stateOrName),
-          name  = isStr ? stateOrName : stateOrName.name,
-          path  = isRelative(name);
-
-      if (path) {
-        if (!base) throw new Error("No reference point given for path '"  + name + "'");
-        var rel = name.split("."), i = 0, pathLength = rel.length, current = base;
-
+  /** @module state */ /** for typedoc */
+  var StateMatcher = /** @class */ (function () {
+      function StateMatcher(_states) {
+        this._states = _states;
+      }
+      StateMatcher.prototype.isRelative = function (stateName) {
+        stateName = stateName || "";
+        return stateName.indexOf(".") === 0 || stateName.indexOf("^") === 0;
+      };
+      StateMatcher.prototype.find = function (stateOrName, base, matchGlob) {
+        if (matchGlob === void 0) { matchGlob = true; }
+        if (!stateOrName && stateOrName !== "")
+          return undefined;
+        var isStr = isString(stateOrName);
+        var name = isStr ? stateOrName : stateOrName.name;
+        if (this.isRelative(name))
+          name = this.resolvePath(name, base);
+        var state = this._states[name];
+        if (state && (isStr || (!isStr && (state === stateOrName || state.self === stateOrName)))) {
+          return state;
+        }
+        else if (isStr && matchGlob) {
+          var _states = values(this._states);
+          var matches = _states.filter(function (state) {
+            return state.__stateObjectCache.nameGlob &&
+              state.__stateObjectCache.nameGlob.matches(name);
+          });
+          if (matches.length > 1) {
+            console.log("stateMatcher.find: Found multiple matches for " + name + " using glob: ", matches.map(function (match) { return match.name; }));
+          }
+          return matches[0];
+        }
+        return undefined;
+      };
+      StateMatcher.prototype.resolvePath = function (name, base) {
+        if (!base)
+          throw new Error("No reference point given for path '" + name + "'");
+        var baseState = this.find(base);
+        var splitName = name.split("."), i = 0, pathLength = splitName.length, current = baseState;
         for (; i < pathLength; i++) {
-          if (rel[i] === "" && i === 0) {
-            current = base;
+          if (splitName[i] === "" && i === 0) {
+            current = baseState;
             continue;
           }
-          if (rel[i] === "^") {
-            if (!current.parent) throw new Error("Path '" + name + "' not valid for state '" + base.name + "'");
+          if (splitName[i] === "^") {
+            if (!current.parent)
+              throw new Error("Path '" + name + "' not valid for state '" + baseState.name + "'");
             current = current.parent;
             continue;
           }
           break;
         }
-        rel = rel.slice(i).join(".");
-        name = current.name + (current.name && rel ? "." : "") + rel;
-      }
-      var state = states[name];
+        var relName = splitName.slice(i).join(".");
+        return current.name + (current.name && relName ? "." : "") + relName;
+      };
+      return StateMatcher;
+    }());
 
-      if (state && (isStr || (!isStr && (state === stateOrName || state.self === stateOrName)))) {
-        return state;
-      }
-      return undefined;
+  /** @module state */ /** for typedoc */
+  /** @internalapi */
+  var StateQueueManager = /** @class */ (function () {
+    function StateQueueManager($registry, $urlRouter, states, builder, listeners) {
+      this.$registry = $registry;
+      this.$urlRouter = $urlRouter;
+      this.states = states;
+      this.builder = builder;
+      this.listeners = listeners;
+      this.queue = [];
+      this.matcher = $registry.matcher;
     }
-
-    function queueState(parentName, state) {
-      if (!queue[parentName]) {
-        queue[parentName] = [];
-      }
-      queue[parentName].push(state);
-    }
-
-    function registerState(state) {
-      // Wrap a new object around the state so we can store our private details easily.
-      state = inherit(state, {
-        self: state,
-        resolve: state.resolve || {},
-        toString: function() { return this.name; }
-      });
-
+    /** @internalapi */
+    StateQueueManager.prototype.dispose = function () {
+      this.queue = [];
+    };
+    StateQueueManager.prototype.register = function (stateDecl) {
+      var queue = this.queue;
+      var state = StateObject.create(stateDecl);
       var name = state.name;
-      if (!isString(name) || name.indexOf('@') >= 0) throw new Error("State must have a valid name");
-      if (states.hasOwnProperty(name)) throw new Error("State '" + name + "'' is already defined");
-
-      // Get parent name
-      var parentName = (name.indexOf('.') !== -1) ? name.substring(0, name.lastIndexOf('.'))
-          : (isString(state.parent)) ? state.parent
-          : '';
-
-      // If parent is not registered yet, add state to queue and register later
-      if (parentName && !states[parentName]) {
-        return queueState(parentName, state.self);
-      }
-
-      for (var key in stateBuilder) {
-        if (isFunction(stateBuilder[key])) state[key] = stateBuilder[key](state, stateBuilder.$delegates[key]);
-      }
-      states[name] = state;
-
-      // Register the state in the global state list and with $urlRouter if necessary.
-      if (!state[abstractKey] && state.url) {
-        $urlRouterProvider.when(state.url, ['$match', '$stateParams', function ($match, $stateParams) {
-          if ($state.$current.navigable != state || !equalForKeys($match, $stateParams)) {
-            $state.transitionTo(state, $match, { location: false });
-          }
-        }]);
-      }
-
-      // Register any queued children
-      if (queue[name]) {
-        for (var i = 0; i < queue[name].length; i++) {
-          registerState(queue[name][i]);
-        }
-      }
-
+      if (!isString(name))
+        throw new Error("State must have a valid name");
+      if (this.states.hasOwnProperty(name) || inArray(queue.map(prop('name')), name))
+        throw new Error("State '" + name + "' is already defined");
+      queue.push(state);
+      this.flush();
       return state;
-    }
-
-
-    // Implicit root state that is always active
-    root = registerState({
-      name: '',
-      url: '^',
-      views: null,
-      'abstract': true
-    });
-    root.navigable = null;
-
-
-    // .decorator()
-    // .decorator(name)
-    // .decorator(name, function)
-    this.decorator = decorator;
-    function decorator(name, func) {
-      /*jshint validthis: true */
-      if (isString(name) && !isDefined(func)) {
-        return stateBuilder[name];
-      }
-      if (!isFunction(func) || !isString(name)) {
-        return this;
-      }
-      if (stateBuilder[name] && !stateBuilder.$delegates[name]) {
-        stateBuilder.$delegates[name] = stateBuilder[name];
-      }
-      stateBuilder[name] = func;
-      return this;
-    }
-
-    // .state(state)
-    // .state(name, state)
-    this.state = state;
-    function state(name, definition) {
-      /*jshint validthis: true */
-      if (isObject(name)) definition = name;
-      else definition.name = name;
-      registerState(definition);
-      return this;
-    }
-
-    // $urlRouter is injected just to ensure it gets instantiated
-    this.$get = $get;
-    $get.$inject = ['$rootScope', '$q', '$view', '$injector', '$resolve', '$stateParams', '$location', '$urlRouter'];
-    function $get(   $rootScope,   $q,   $view,   $injector,   $resolve,   $stateParams,   $location,   $urlRouter) {
-
-      var TransitionSuperseded = $q.reject(new Error('transition superseded'));
-      var TransitionPrevented = $q.reject(new Error('transition prevented'));
-      var TransitionAborted = $q.reject(new Error('transition aborted'));
-      var TransitionFailed = $q.reject(new Error('transition failed'));
-      var currentLocation = $location.url();
-
-      function syncUrl() {
-        if ($location.url() !== currentLocation) {
-          $location.url(currentLocation);
-          $location.replace();
+    };
+    StateQueueManager.prototype.flush = function () {
+      var _this = this;
+      var _a = this, queue = _a.queue, states = _a.states, builder = _a.builder;
+      var registered = [], // states that got registered
+        orphans = [], // states that don't yet have a parent registered
+        previousQueueLength = {}; // keep track of how long the queue when an orphan was first encountered
+      var getState = function (name) {
+        return _this.states.hasOwnProperty(name) && _this.states[name];
+      };
+      while (queue.length > 0) {
+        var state = queue.shift();
+        var name_1 = state.name;
+        var result = builder.build(state);
+        var orphanIdx = orphans.indexOf(state);
+        if (result) {
+          var existingState = getState(name_1);
+          if (existingState && existingState.name === name_1) {
+            throw new Error("State '" + name_1 + "' is already defined");
+          }
+          var existingFutureState = getState(name_1 + ".**");
+          if (existingFutureState) {
+            // Remove future state of the same name
+            this.$registry.deregister(existingFutureState);
+          }
+          states[name_1] = state;
+          this.attachRoute(state);
+          if (orphanIdx >= 0)
+            orphans.splice(orphanIdx, 1);
+          registered.push(state);
+          continue;
         }
+        var prev = previousQueueLength[name_1];
+        previousQueueLength[name_1] = queue.length;
+        if (orphanIdx >= 0 && prev === queue.length) {
+          // Wait until two consecutive iterations where no additional states were dequeued successfully.
+          // throw new Error(`Cannot register orphaned state '${name}'`);
+          queue.push(state);
+          return states;
+        }
+        else if (orphanIdx < 0) {
+          orphans.push(state);
+        }
+        queue.push(state);
       }
+      if (registered.length) {
+        this.listeners.forEach(function (listener) { return listener("registered", registered.map(function (s) { return s.self; })); });
+      }
+      return states;
+    };
+    StateQueueManager.prototype.attachRoute = function (state) {
+      if (state.abstract || !state.url)
+        return;
+      this.$urlRouter.rule(this.$urlRouter.urlRuleFactory.create(state));
+    };
+    return StateQueueManager;
+  }());
 
-      root.locals = { resolve: null, globals: { $stateParams: {} } };
-      $state = {
+  /**
+   * @coreapi
+   * @module state
+   */ /** for typedoc */
+  var StateRegistry = /** @class */ (function () {
+      /** @internalapi */
+      function StateRegistry(_router) {
+        this._router = _router;
+        this.states = {};
+        this.listeners = [];
+        this.matcher = new StateMatcher(this.states);
+        this.builder = new StateBuilder(this.matcher, _router.urlMatcherFactory);
+        this.stateQueue = new StateQueueManager(this, _router.urlRouter, this.states, this.builder, this.listeners);
+        this._registerRoot();
+      }
+      /** @internalapi */
+      StateRegistry.prototype._registerRoot = function () {
+        var rootStateDef = {
+          name: '',
+          url: '^',
+          views: null,
+          params: {
+            '#': { value: null, type: 'hash', dynamic: true }
+          },
+          abstract: true
+        };
+        var _root = this._root = this.stateQueue.register(rootStateDef);
+        _root.navigable = null;
+      };
+      /** @internalapi */
+      StateRegistry.prototype.dispose = function () {
+        var _this = this;
+        this.stateQueue.dispose();
+        this.listeners = [];
+        this.get().forEach(function (state) { return _this.get(state) && _this.deregister(state); });
+      };
+      /**
+       * Listen for a State Registry events
+       *
+       * Adds a callback that is invoked when states are registered or deregistered with the StateRegistry.
+       *
+       * #### Example:
+       * ```js
+       * let allStates = registry.get();
+       *
+       * // Later, invoke deregisterFn() to remove the listener
+       * let deregisterFn = registry.onStatesChanged((event, states) => {
+     *   switch(event) {
+     *     case: 'registered':
+     *       states.forEach(state => allStates.push(state));
+     *       break;
+     *     case: 'deregistered':
+     *       states.forEach(state => {
+     *         let idx = allStates.indexOf(state);
+     *         if (idx !== -1) allStates.splice(idx, 1);
+     *       });
+     *       break;
+     *   }
+     * });
+       * ```
+       *
+       * @param listener a callback function invoked when the registered states changes.
+       *        The function receives two parameters, `event` and `state`.
+       *        See [[StateRegistryListener]]
+       * @return a function that deregisters the listener
+       */
+      StateRegistry.prototype.onStatesChanged = function (listener) {
+        this.listeners.push(listener);
+        return function deregisterListener() {
+          removeFrom(this.listeners)(listener);
+        }.bind(this);
+      };
+      /**
+       * Gets the implicit root state
+       *
+       * Gets the root of the state tree.
+       * The root state is implicitly created by UI-Router.
+       * Note: this returns the internal [[StateObject]] representation, not a [[StateDeclaration]]
+       *
+       * @return the root [[StateObject]]
+       */
+      StateRegistry.prototype.root = function () {
+        return this._root;
+      };
+      /**
+       * Adds a state to the registry
+       *
+       * Registers a [[StateDeclaration]] or queues it for registration.
+       *
+       * Note: a state will be queued if the state's parent isn't yet registered.
+       *
+       * @param stateDefinition the definition of the state to register.
+       * @returns the internal [[StateObject]] object.
+       *          If the state was successfully registered, then the object is fully built (See: [[StateBuilder]]).
+       *          If the state was only queued, then the object is not fully built.
+       */
+      StateRegistry.prototype.register = function (stateDefinition) {
+        return this.stateQueue.register(stateDefinition);
+      };
+      /** @hidden */
+      StateRegistry.prototype._deregisterTree = function (state) {
+        var _this = this;
+        var all$$1 = this.get().map(function (s) { return s.$$state(); });
+        var getChildren = function (states) {
+          var children = all$$1.filter(function (s) { return states.indexOf(s.parent) !== -1; });
+          return children.length === 0 ? children : children.concat(getChildren(children));
+        };
+        var children = getChildren([state]);
+        var deregistered = [state].concat(children).reverse();
+        deregistered.forEach(function (state) {
+          var $ur = _this._router.urlRouter;
+          // Remove URL rule
+          $ur.rules().filter(propEq("state", state)).forEach($ur.removeRule.bind($ur));
+          // Remove state from registry
+          delete _this.states[state.name];
+        });
+        return deregistered;
+      };
+      /**
+       * Removes a state from the registry
+       *
+       * This removes a state from the registry.
+       * If the state has children, they are are also removed from the registry.
+       *
+       * @param stateOrName the state's name or object representation
+       * @returns {StateObject[]} a list of removed states
+       */
+      StateRegistry.prototype.deregister = function (stateOrName) {
+        var _state = this.get(stateOrName);
+        if (!_state)
+          throw new Error("Can't deregister state; not found: " + stateOrName);
+        var deregisteredStates = this._deregisterTree(_state.$$state());
+        this.listeners.forEach(function (listener) { return listener("deregistered", deregisteredStates.map(function (s) { return s.self; })); });
+        return deregisteredStates;
+      };
+      StateRegistry.prototype.get = function (stateOrName, base) {
+        var _this = this;
+        if (arguments.length === 0)
+          return Object.keys(this.states).map(function (name) { return _this.states[name].self; });
+        var found = this.matcher.find(stateOrName, base);
+        return found && found.self || null;
+      };
+      StateRegistry.prototype.decorator = function (name, func) {
+        return this.builder.builder(name, func);
+      };
+      return StateRegistry;
+    }());
+
+  /**
+   * @coreapi
+   * @module url
+   */
+  /** for typedoc */
+  /** @hidden */
+  function quoteRegExp(string, param) {
+    var surroundPattern = ['', ''], result = string.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&");
+    if (!param)
+      return result;
+    switch (param.squash) {
+      case false:
+        surroundPattern = ['(', ')' + (param.isOptional ? '?' : '')];
+        break;
+      case true:
+        result = result.replace(/\/$/, '');
+        surroundPattern = ['(?:\/(', ')|\/)?'];
+        break;
+      default:
+        surroundPattern = ["(" + param.squash + "|", ')?'];
+        break;
+    }
+    return result + surroundPattern[0] + param.type.pattern.source + surroundPattern[1];
+  }
+  /** @hidden */
+  var memoizeTo = function (obj, prop$$1, fn) {
+    return obj[prop$$1] = obj[prop$$1] || fn();
+  };
+  /** @hidden */
+  var splitOnSlash = splitOnDelim('/');
+  /**
+   * Matches URLs against patterns.
+   *
+   * Matches URLs against patterns and extracts named parameters from the path or the search
+   * part of the URL.
+   *
+   * A URL pattern consists of a path pattern, optionally followed by '?' and a list of search (query)
+   * parameters. Multiple search parameter names are separated by '&'. Search parameters
+   * do not influence whether or not a URL is matched, but their values are passed through into
+   * the matched parameters returned by [[UrlMatcher.exec]].
+   *
+   * - *Path parameters* are defined using curly brace placeholders (`/somepath/{param}`)
+   * or colon placeholders (`/somePath/:param`).
+   *
+   * - *A parameter RegExp* may be defined for a param after a colon
+   * (`/somePath/{param:[a-zA-Z0-9]+}`) in a curly brace placeholder.
+   * The regexp must match for the url to be matched.
+   * Should the regexp itself contain curly braces, they must be in matched pairs or escaped with a backslash.
+   *
+   * Note: a RegExp parameter will encode its value using either [[ParamTypes.path]] or [[ParamTypes.query]].
+   *
+   * - *Custom parameter types* may also be specified after a colon (`/somePath/{param:int}`) in curly brace parameters.
+   *   See [[UrlMatcherFactory.type]] for more information.
+   *
+   * - *Catch-all parameters* are defined using an asterisk placeholder (`/somepath/*catchallparam`).
+   *   A catch-all * parameter value will contain the remainder of the URL.
+   *
+   * ---
+   *
+   * Parameter names may contain only word characters (latin letters, digits, and underscore) and
+   * must be unique within the pattern (across both path and search parameters).
+   * A path parameter matches any number of characters other than '/'. For catch-all
+   * placeholders the path parameter matches any number of characters.
+   *
+   * Examples:
+   *
+   * * `'/hello/'` - Matches only if the path is exactly '/hello/'. There is no special treatment for
+   *   trailing slashes, and patterns have to match the entire path, not just a prefix.
+   * * `'/user/:id'` - Matches '/user/bob' or '/user/1234!!!' or even '/user/' but not '/user' or
+   *   '/user/bob/details'. The second path segment will be captured as the parameter 'id'.
+   * * `'/user/{id}'` - Same as the previous example, but using curly brace syntax.
+   * * `'/user/{id:[^/]*}'` - Same as the previous example.
+   * * `'/user/{id:[0-9a-fA-F]{1,8}}'` - Similar to the previous example, but only matches if the id
+   *   parameter consists of 1 to 8 hex digits.
+   * * `'/files/{path:.*}'` - Matches any URL starting with '/files/' and captures the rest of the
+   *   path into the parameter 'path'.
+   * * `'/files/*path'` - ditto.
+   * * `'/calendar/{start:date}'` - Matches "/calendar/2014-11-12" (because the pattern defined
+   *   in the built-in  `date` ParamType matches `2014-11-12`) and provides a Date object in $stateParams.start
+   *
+   */
+  var UrlMatcher = /** @class */ (function () {
+    /**
+     * @param pattern The pattern to compile into a matcher.
+     * @param paramTypes The [[ParamTypes]] registry
+     * @param config  A configuration object
+     * - `caseInsensitive` - `true` if URL matching should be case insensitive, otherwise `false`, the default value (for backward compatibility) is `false`.
+     * - `strict` - `false` if matching against a URL with a trailing slash should be treated as equivalent to a URL without a trailing slash, the default value is `true`.
+     */
+    function UrlMatcher(pattern$$1, paramTypes, paramFactory, config) {
+      var _this = this;
+      this.config = config;
+      /** @hidden */
+      this._cache = { path: [this] };
+      /** @hidden */
+      this._children = [];
+      /** @hidden */
+      this._params = [];
+      /** @hidden */
+      this._segments = [];
+      /** @hidden */
+      this._compiled = [];
+      this.pattern = pattern$$1;
+      this.config = defaults(this.config, {
         params: {},
-        current: root.self,
-        $current: root,
-        transition: null
+        strict: true,
+        caseInsensitive: false,
+        paramMap: identity
+      });
+      // Find all placeholders and create a compiled pattern, using either classic or curly syntax:
+      //   '*' name
+      //   ':' name
+      //   '{' name '}'
+      //   '{' name ':' regexp '}'
+      // The regular expression is somewhat complicated due to the need to allow curly braces
+      // inside the regular expression. The placeholder regexp breaks down as follows:
+      //    ([:*])([\w\[\]]+)              - classic placeholder ($1 / $2) (search version has - for snake-case)
+      //    \{([\w\[\]]+)(?:\:\s*( ... ))?\}  - curly brace placeholder ($3) with optional regexp/type ... ($4) (search version has - for snake-case
+      //    (?: ... | ... | ... )+         - the regexp consists of any number of atoms, an atom being either
+      //    [^{}\\]+                       - anything other than curly braces or backslash
+      //    \\.                            - a backslash escape
+      //    \{(?:[^{}\\]+|\\.)*\}          - a matched set of curly braces containing other atoms
+      var placeholder = /([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, searchPlaceholder = /([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, last = 0, m, patterns = [];
+      var checkParamErrors = function (id) {
+        if (!UrlMatcher.nameValidator.test(id))
+          throw new Error("Invalid parameter name '" + id + "' in pattern '" + pattern$$1 + "'");
+        if (find(_this._params, propEq('id', id)))
+          throw new Error("Duplicate parameter name '" + id + "' in pattern '" + pattern$$1 + "'");
       };
-
-      $state.reload = function reload() {
-        $state.transitionTo($state.current, $stateParams, { reload: true, inherit: false, notify: false });
-      };
-
-      $state.go = function go(to, params, options) {
-        return this.transitionTo(to, params, extend({ inherit: true, relative: $state.$current }, options));
-      };
-
-      $state.transitionTo = function transitionTo(to, toParams, options) {
-        toParams = toParams || {};
-        options = extend({
-          location: true, inherit: false, relative: null, notify: true, reload: false, $retry: false
-        }, options || {});
-
-        var from = $state.$current, fromParams = $state.params, fromPath = from.path;
-        var evt, toState = findState(to, options.relative);
-
-        if (!isDefined(toState)) {
-          // Broadcast not found event and abort the transition if prevented
-          var redirect = { to: to, toParams: toParams, options: options };
-          evt = $rootScope.$broadcast('$stateNotFound', redirect, from.self, fromParams);
-          if (evt.defaultPrevented) {
-            syncUrl();
-            return TransitionAborted;
-          }
-
-          // Allow the handler to return a promise to defer state lookup retry
-          if (evt.retry) {
-            if (options.$retry) {
-              syncUrl();
-              return TransitionFailed;
-            }
-            var retryTransition = $state.transition = $q.when(evt.retry);
-            retryTransition.then(function() {
-              if (retryTransition !== $state.transition) return TransitionSuperseded;
-              redirect.options.$retry = true;
-              return $state.transitionTo(redirect.to, redirect.toParams, redirect.options);
-            }, function() {
-              return TransitionAborted;
-            });
-            syncUrl();
-            return retryTransition;
-          }
-
-          // Always retry once if the $stateNotFound was not prevented
-          // (handles either redirect changed or state lazy-definition)
-          to = redirect.to;
-          toParams = redirect.toParams;
-          options = redirect.options;
-          toState = findState(to, options.relative);
-          if (!isDefined(toState)) {
-            if (options.relative) throw new Error("Could not resolve '" + to + "' from state '" + options.relative + "'");
-            throw new Error("No such state '" + to + "'");
-          }
-        }
-        if (toState[abstractKey]) throw new Error("Cannot transition to abstract state '" + to + "'");
-        if (options.inherit) toParams = inheritParams($stateParams, toParams || {}, $state.$current, toState);
-        to = toState;
-
-        var toPath = to.path;
-
-        // Starting from the root of the path, keep all levels that haven't changed
-        var keep, state, locals = root.locals, toLocals = [];
-        for (keep = 0, state = toPath[keep];
-             state && state === fromPath[keep] && equalForKeys(toParams, fromParams, state.ownParams) && !options.reload;
-             keep++, state = toPath[keep]) {
-          locals = toLocals[keep] = state.locals;
-        }
-
-        // If we're going to the same state and all locals are kept, we've got nothing to do.
-        // But clear 'transition', as we still want to cancel any other pending transitions.
-        // TODO: We may not want to bump 'transition' if we're called from a location change that we've initiated ourselves,
-        // because we might accidentally abort a legitimate transition initiated from code?
-        if (shouldTriggerReload(to, from, locals, options) ) {
-          if ( to.self.reloadOnSearch !== false )
-            syncUrl();
-          $state.transition = null;
-          return $q.when($state.current);
-        }
-
-        // Normalize/filter parameters before we pass them to event handlers etc.
-        toParams = normalize(to.params, toParams || {});
-
-        // Broadcast start event and cancel the transition if requested
-        if (options.notify) {
-          evt = $rootScope.$broadcast('$stateChangeStart', to.self, toParams, from.self, fromParams);
-          if (evt.defaultPrevented) {
-            syncUrl();
-            return TransitionPrevented;
-          }
-        }
-
-        // Resolve locals for the remaining states, but don't update any global state just
-        // yet -- if anything fails to resolve the current state needs to remain untouched.
-        // We also set up an inheritance chain for the locals here. This allows the view directive
-        // to quickly look up the correct definition for each view in the current state. Even
-        // though we create the locals object itself outside resolveState(), it is initially
-        // empty and gets filled asynchronously. We need to keep track of the promise for the
-        // (fully resolved) current locals, and pass this down the chain.
-        var resolved = $q.when(locals);
-        for (var l=keep; l<toPath.length; l++, state=toPath[l]) {
-          locals = toLocals[l] = inherit(locals);
-          resolved = resolveState(state, toParams, state===to, resolved, locals);
-        }
-
-        // Once everything is resolved, we are ready to perform the actual transition
-        // and return a promise for the new state. We also keep track of what the
-        // current promise is, so that we can detect overlapping transitions and
-        // keep only the outcome of the last transition.
-        var transition = $state.transition = resolved.then(function () {
-          var l, entering, exiting;
-
-          if ($state.transition !== transition) return TransitionSuperseded;
-
-          // Exit 'from' states not kept
-          for (l=fromPath.length-1; l>=keep; l--) {
-            exiting = fromPath[l];
-            if (exiting.self.onExit) {
-              $injector.invoke(exiting.self.onExit, exiting.self, exiting.locals.globals);
-            }
-            exiting.locals = null;
-          }
-
-          // Enter 'to' states not kept
-          for (l=keep; l<toPath.length; l++) {
-            entering = toPath[l];
-            entering.locals = toLocals[l];
-            if (entering.self.onEnter) {
-              $injector.invoke(entering.self.onEnter, entering.self, entering.locals.globals);
-            }
-          }
-
-          // Run it again, to catch any transitions in callbacks
-          if ($state.transition !== transition) return TransitionSuperseded;
-
-          // Update globals in $state
-          $state.$current = to;
-          $state.current = to.self;
-          $state.params = toParams;
-          copy($state.params, $stateParams);
-          $state.transition = null;
-
-          // Update $location
-          var toNav = to.navigable;
-          if (options.location && toNav) {
-            $location.url(toNav.url.format(toNav.locals.globals.$stateParams));
-
-            if (options.location === 'replace') {
-              $location.replace();
-            }
-          }
-
-          if (options.notify) {
-            $rootScope.$broadcast('$stateChangeSuccess', to.self, toParams, from.self, fromParams);
-          }
-          currentLocation = $location.url();
-
-          return $state.current;
-        }, function (error) {
-          if ($state.transition !== transition) return TransitionSuperseded;
-
-          $state.transition = null;
-          $rootScope.$broadcast('$stateChangeError', to.self, toParams, from.self, fromParams, error);
-          syncUrl();
-
-          return $q.reject(error);
-        });
-
-        return transition;
-      };
-
-      $state.is = function is(stateOrName, params) {
-        var state = findState(stateOrName);
-
-        if (!isDefined(state)) {
-          return undefined;
-        }
-
-        if ($state.$current !== state) {
-          return false;
-        }
-
-        return isDefined(params) ? angular.equals($stateParams, params) : true;
-      };
-
-      $state.includes = function includes(stateOrName, params) {
-        var state = findState(stateOrName);
-        if (!isDefined(state)) {
-          return undefined;
-        }
-
-        if (!isDefined($state.$current.includes[state.name])) {
-          return false;
-        }
-
-        var validParams = true;
-        angular.forEach(params, function(value, key) {
-          if (!isDefined($stateParams[key]) || $stateParams[key] !== value) {
-            validParams = false;
-          }
-        });
-        return validParams;
-      };
-
-      $state.href = function href(stateOrName, params, options) {
-        options = extend({ lossy: true, inherit: false, absolute: false, relative: $state.$current }, options || {});
-        var state = findState(stateOrName, options.relative);
-        if (!isDefined(state)) return null;
-
-        params = inheritParams($stateParams, params || {}, $state.$current, state);
-        var nav = (state && options.lossy) ? state.navigable : state;
-        var url = (nav && nav.url) ? nav.url.format(normalize(state.params, params || {})) : null;
-        if (!$locationProvider.html5Mode() && url) {
-          url = "#" + $locationProvider.hashPrefix() + url;
-        }
-        if (options.absolute && url) {
-          url = $location.protocol() + '://' +
-              $location.host() +
-              ($location.port() == 80 || $location.port() == 443 ? '' : ':' + $location.port()) +
-              (!$locationProvider.html5Mode() && url ? '/' : '') +
-              url;
-        }
-        return url;
-      };
-
-      $state.get = function (stateOrName, context) {
-        if (!isDefined(stateOrName)) {
-          var list = [];
-          forEach(states, function(state) { list.push(state.self); });
-          return list;
-        }
-        var state = findState(stateOrName, context);
-        return (state && state.self) ? state.self : null;
-      };
-
-      function resolveState(state, params, paramsAreFiltered, inherited, dst) {
-        // Make a restricted $stateParams with only the parameters that apply to this state if
-        // necessary. In addition to being available to the controller and onEnter/onExit callbacks,
-        // we also need $stateParams to be available for any $injector calls we make during the
-        // dependency resolution process.
-        var $stateParams = (paramsAreFiltered) ? params : filterByKeys(state.params, params);
-        var locals = { $stateParams: $stateParams };
-
-        // Resolve 'global' dependencies for the state, i.e. those not specific to a view.
-        // We're also including $stateParams in this; that way the parameters are restricted
-        // to the set that should be visible to the state, and are independent of when we update
-        // the global $state and $stateParams values.
-        dst.resolve = $resolve.resolve(state.resolve, locals, dst.resolve, state);
-        var promises = [ dst.resolve.then(function (globals) {
-          dst.globals = globals;
-        }) ];
-        if (inherited) promises.push(inherited);
-
-        // Resolve template and dependencies for all views.
-        forEach(state.views, function (view, name) {
-          var injectables = (view.resolve && view.resolve !== state.resolve ? view.resolve : {});
-          injectables.$template = [ function () {
-            return $view.load(name, { view: view, locals: locals, params: $stateParams, notify: false }) || '';
-          }];
-
-          promises.push($resolve.resolve(injectables, locals, dst.resolve, state).then(function (result) {
-            // References to the controller (only instantiated at link time)
-            if (isFunction(view.controllerProvider) || isArray(view.controllerProvider)) {
-              var injectLocals = angular.extend({}, injectables, locals);
-              result.$$controller = $injector.invoke(view.controllerProvider, null, injectLocals);
-            } else {
-              result.$$controller = view.controller;
-            }
-            // Provide access to the state itself for internal use
-            result.$$state = state;
-            dst[name] = result;
-          }));
-        });
-
-        // Wait for all the promises and then return the activation object
-        return $q.all(promises).then(function (values) {
-          return dst;
-        });
-      }
-
-      return $state;
-    }
-
-    function shouldTriggerReload(to, from, locals, options) {
-      if ( to === from && ((locals === from.locals && !options.reload) || (to.self.reloadOnSearch === false)) ) {
-        return true;
-      }
-    }
-  }
-
-  angular.module('ui.router.state')
-      .value('$stateParams', {})
-      .provider('$state', $StateProvider);
-
-
-  $ViewProvider.$inject = [];
-  function $ViewProvider() {
-
-    this.$get = $get;
-    $get.$inject = ['$rootScope', '$templateFactory'];
-    function $get(   $rootScope,   $templateFactory) {
-      return {
-        // $view.load('full.viewName', { template: ..., controller: ..., resolve: ..., async: false, params: ... })
-        load: function load(name, options) {
-          var result, defaults = {
-            template: null, controller: null, view: null, locals: null, notify: true, async: true, params: {}
-          };
-          options = extend(defaults, options);
-
-          if (options.view) {
-            result = $templateFactory.fromConfig(options.view, options.params, options.locals);
-          }
-          if (result && options.notify) {
-            $rootScope.$broadcast('$viewContentLoading', options);
-          }
-          return result;
-        }
-      };
-    }
-  }
-
-  angular.module('ui.router.state').provider('$view', $ViewProvider);
-
-
-  $ViewDirective.$inject = ['$state', '$compile', '$controller', '$injector', '$anchorScroll'];
-  function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $anchorScroll) {
-    var $animator = $injector.has('$animator') ? $injector.get('$animator') : false;
-    var viewIsUpdating = false;
-
-    var directive = {
-      restrict: 'ECA',
-      terminal: true,
-      priority: 1000,
-      transclude: true,
-      compile: function (element, attr, transclude) {
-        return function(scope, element, attr) {
-          var viewScope, viewLocals,
-              name = attr[directive.name] || attr.name || '',
-              onloadExp = attr.onload || '',
-              animate = $animator && $animator(scope, attr),
-              initialView = transclude(scope);
-
-          // Returns a set of DOM manipulation functions based on whether animation
-          // should be performed
-          var renderer = function(doAnimate) {
-            return ({
-              "true": {
-                remove: function(element) { animate.leave(element.contents(), element); },
-                restore: function(compiled, element) { animate.enter(compiled, element); },
-                populate: function(template, element) {
-                  var contents = angular.element('<div></div>').html(template).contents();
-                  animate.enter(contents, element);
-                  return contents;
-                }
-              },
-              "false": {
-                remove: function(element) { element.html(''); },
-                restore: function(compiled, element) { element.append(compiled); },
-                populate: function(template, element) {
-                  element.html(template);
-                  return element.contents();
-                }
-              }
-            })[doAnimate.toString()];
-          };
-
-          // Put back the compiled initial view
-          element.append(initialView);
-
-          // Find the details of the parent view directive (if any) and use it
-          // to derive our own qualified view name, then hang our own details
-          // off the DOM so child directives can find it.
-          var parent = element.parent().inheritedData('$uiView');
-          if (name.indexOf('@') < 0) name  = name + '@' + (parent ? parent.state.name : '');
-          var view = { name: name, state: null };
-          element.data('$uiView', view);
-
-          var eventHook = function() {
-            if (viewIsUpdating) return;
-            viewIsUpdating = true;
-
-            try { updateView(true); } catch (e) {
-              viewIsUpdating = false;
-              throw e;
-            }
-            viewIsUpdating = false;
-          };
-
-          scope.$on('$stateChangeSuccess', eventHook);
-          scope.$on('$viewContentLoading', eventHook);
-          updateView(false);
-
-          function updateView(doAnimate) {
-            var locals = $state.$current && $state.$current.locals[name];
-            if (locals === viewLocals) return; // nothing to do
-            var render = renderer(animate && doAnimate);
-
-            // Remove existing content
-            render.remove(element);
-
-            // Destroy previous view scope
-            if (viewScope) {
-              viewScope.$destroy();
-              viewScope = null;
-            }
-
-            if (!locals) {
-              viewLocals = null;
-              view.state = null;
-
-              // Restore the initial view
-              return render.restore(initialView, element);
-            }
-
-            viewLocals = locals;
-            view.state = locals.$$state;
-
-            var link = $compile(render.populate(locals.$template, element));
-            viewScope = scope.$new();
-
-            if (locals.$$controller) {
-              locals.$scope = viewScope;
-              var controller = $controller(locals.$$controller, locals);
-              element.children().data('$ngControllerController', controller);
-            }
-            link(viewScope);
-            viewScope.$emit('$viewContentLoaded');
-            if (onloadExp) viewScope.$eval(onloadExp);
-
-            // TODO: This seems strange, shouldn't $anchorScroll listen for $viewContentLoaded if necessary?
-            // $anchorScroll might listen on event...
-            $anchorScroll();
-          }
+      // Split into static segments separated by path parameter placeholders.
+      // The number of segments is always 1 more than the number of parameters.
+      var matchDetails = function (m, isSearch) {
+        // IE[78] returns '' for unmatched groups instead of null
+        var id = m[2] || m[3];
+        var regexp = isSearch ? m[4] : m[4] || (m[1] === '*' ? '[\\s\\S]*' : null);
+        var makeRegexpType = function (regexp) { return inherit(paramTypes.type(isSearch ? "query" : "path"), {
+          pattern: new RegExp(regexp, _this.config.caseInsensitive ? 'i' : undefined)
+        }); };
+        return {
+          id: id,
+          regexp: regexp,
+          cfg: _this.config.params[id],
+          segment: pattern$$1.substring(last, m.index),
+          type: !regexp ? null : paramTypes.type(regexp) || makeRegexpType(regexp)
         };
+      };
+      var p, segment;
+      while ((m = placeholder.exec(pattern$$1))) {
+        p = matchDetails(m, false);
+        if (p.segment.indexOf('?') >= 0)
+          break; // we're into the search part
+        checkParamErrors(p.id);
+        this._params.push(paramFactory.fromPath(p.id, p.type, this.config.paramMap(p.cfg, false)));
+        this._segments.push(p.segment);
+        patterns.push([p.segment, tail(this._params)]);
+        last = placeholder.lastIndex;
       }
-    };
-    return directive;
-  }
-
-  angular.module('ui.router.state').directive('uiView', $ViewDirective);
-
-  function parseStateRef(ref) {
-    var parsed = ref.replace(/\n/g, " ").match(/^([^(]+?)\s*(\((.*)\))?$/);
-    if (!parsed || parsed.length !== 4) throw new Error("Invalid state ref '" + ref + "'");
-    return { state: parsed[1], paramExpr: parsed[3] || null };
-  }
-
-  function stateContext(el) {
-    var stateData = el.parent().inheritedData('$uiView');
-
-    if (stateData && stateData.state && stateData.state.name) {
-      return stateData.state;
+      segment = pattern$$1.substring(last);
+      // Find any search parameter names and remove them from the last segment
+      var i = segment.indexOf('?');
+      if (i >= 0) {
+        var search = segment.substring(i);
+        segment = segment.substring(0, i);
+        if (search.length > 0) {
+          last = 0;
+          while ((m = searchPlaceholder.exec(search))) {
+            p = matchDetails(m, true);
+            checkParamErrors(p.id);
+            this._params.push(paramFactory.fromSearch(p.id, p.type, this.config.paramMap(p.cfg, true)));
+            last = placeholder.lastIndex;
+            // check if ?&
+          }
+        }
+      }
+      this._segments.push(segment);
+      this._compiled = patterns.map(function (pattern$$1) { return quoteRegExp.apply(null, pattern$$1); }).concat(quoteRegExp(segment));
     }
-  }
-
-  $StateRefDirective.$inject = ['$state', '$timeout'];
-  function $StateRefDirective($state, $timeout) {
-    return {
-      restrict: 'A',
-      require: '?^uiSrefActive',
-      link: function(scope, element, attrs, uiSrefActive) {
-        var ref = parseStateRef(attrs.uiSref);
-        var params = null, url = null, base = stateContext(element) || $state.$current;
-        var isForm = element[0].nodeName === "FORM";
-        var attr = isForm ? "action" : "href", nav = true;
-
-        var update = function(newVal) {
-          if (newVal) params = newVal;
-          if (!nav) return;
-
-          var newHref = $state.href(ref.state, params, { relative: base });
-
-          if (!newHref) {
-            nav = false;
-            return false;
-          }
-          element[0][attr] = newHref;
-          if (uiSrefActive) {
-            uiSrefActive.$$setStateInfo(ref.state, params);
-          }
-        };
-
-        if (ref.paramExpr) {
-          scope.$watch(ref.paramExpr, function(newVal, oldVal) {
-            if (newVal !== params) update(newVal);
-          }, true);
-          params = scope.$eval(ref.paramExpr);
-        }
-        update();
-
-        if (isForm) return;
-
-        element.bind("click", function(e) {
-          var button = e.which || e.button;
-
-          if ((button === 0 || button == 1) && !e.ctrlKey && !e.metaKey && !e.shiftKey) {
-            // HACK: This is to allow ng-clicks to be processed before the transition is initiated:
-            $timeout(function() {
-              scope.$apply(function() {
-                $state.go(ref.state, params, { relative: base });
-              });
-            });
-            e.preventDefault();
-          }
-        });
-      }
+    /**
+     * Creates a new concatenated UrlMatcher
+     *
+     * Builds a new UrlMatcher by appending another UrlMatcher to this one.
+     *
+     * @param url A `UrlMatcher` instance to append as a child of the current `UrlMatcher`.
+     */
+    UrlMatcher.prototype.append = function (url) {
+      this._children.push(url);
+      url._cache = {
+        path: this._cache.path.concat(url),
+        parent: this,
+        pattern: null,
+      };
+      return url;
     };
-  }
-
-  $StateActiveDirective.$inject = ['$state', '$stateParams', '$interpolate'];
-  function $StateActiveDirective($state, $stateParams, $interpolate) {
-    return {
-      restrict: "A",
-      controller: function($scope, $element, $attrs) {
-        var state, params, activeClass;
-
-        // There probably isn't much point in $observing this
-        activeClass = $interpolate($attrs.uiSrefActive || '', false)($scope);
-
-        // Allow uiSref to communicate with uiSrefActive
-        this.$$setStateInfo = function(newState, newParams) {
-          state = $state.get(newState, stateContext($element));
-          params = newParams;
-          update();
-        };
-
-        $scope.$on('$stateChangeSuccess', update);
-
-        // Update route state
-        function update() {
-          if ($state.$current.self === state && matchesParams()) {
-            $element.addClass(activeClass);
-          } else {
-            $element.removeClass(activeClass);
-          }
-        }
-
-        function matchesParams() {
-          return !params || equalForKeys(params, $stateParams);
-        }
-      }
+    /** @hidden */
+    UrlMatcher.prototype.isRoot = function () {
+      return this._cache.path[0] === this;
     };
-  }
-
-  angular.module('ui.router.state')
-      .directive('uiSref', $StateRefDirective)
-      .directive('uiSrefActive', $StateActiveDirective);
-
-  $RouteProvider.$inject = ['$stateProvider', '$urlRouterProvider'];
-  function $RouteProvider(  $stateProvider,    $urlRouterProvider) {
-
-    var routes = [];
-
-    onEnterRoute.$inject = ['$$state'];
-    function onEnterRoute(   $$state) {
-      /*jshint validthis: true */
-      this.locals = $$state.locals.globals;
-      this.params = this.locals.$stateParams;
-    }
-
-    function onExitRoute() {
-      /*jshint validthis: true */
-      this.locals = null;
-      this.params = null;
-    }
-
-    this.when = when;
-    function when(url, route) {
-      /*jshint validthis: true */
-      if (route.redirectTo != null) {
-        // Redirect, configure directly on $urlRouterProvider
-        var redirect = route.redirectTo, handler;
-        if (isString(redirect)) {
-          handler = redirect; // leave $urlRouterProvider to handle
-        } else if (isFunction(redirect)) {
-          // Adapt to $urlRouterProvider API
-          handler = function (params, $location) {
-            return redirect(params, $location.path(), $location.search());
-          };
-        } else {
-          throw new Error("Invalid 'redirectTo' in when()");
-        }
-        $urlRouterProvider.when(url, handler);
-      } else {
-        // Regular route, configure as state
-        $stateProvider.state(inherit(route, {
-          parent: null,
-          name: 'route:' + encodeURIComponent(url),
-          url: url,
-          onEnter: onEnterRoute,
-          onExit: onExitRoute
-        }));
+    /** Returns the input pattern string */
+    UrlMatcher.prototype.toString = function () {
+      return this.pattern;
+    };
+    /**
+     * Tests the specified url/path against this matcher.
+     *
+     * Tests if the given url matches this matcher's pattern, and returns an object containing the captured
+     * parameter values.  Returns null if the path does not match.
+     *
+     * The returned object contains the values
+     * of any search parameters that are mentioned in the pattern, but their value may be null if
+     * they are not present in `search`. This means that search parameters are always treated
+     * as optional.
+     *
+     * #### Example:
+     * ```js
+     * new UrlMatcher('/user/{id}?q&r').exec('/user/bob', {
+     *   x: '1', q: 'hello'
+     * });
+     * // returns { id: 'bob', q: 'hello', r: null }
+     * ```
+     *
+     * @param path    The URL path to match, e.g. `$location.path()`.
+     * @param search  URL search parameters, e.g. `$location.search()`.
+     * @param hash    URL hash e.g. `$location.hash()`.
+     * @param options
+     *
+     * @returns The captured parameter values.
+     */
+    UrlMatcher.prototype.exec = function (path, search, hash, options) {
+      var _this = this;
+      if (search === void 0) { search = {}; }
+      if (options === void 0) { options = {}; }
+      var match = memoizeTo(this._cache, 'pattern', function () {
+        return new RegExp([
+          '^',
+          unnest(_this._cache.path.map(prop('_compiled'))).join(''),
+          _this.config.strict === false ? '\/?' : '',
+          '$'
+        ].join(''), _this.config.caseInsensitive ? 'i' : undefined);
+      }).exec(path);
+      if (!match)
+        return null;
+      //options = defaults(options, { isolate: false });
+      var allParams = this.parameters(), pathParams = allParams.filter(function (param) { return !param.isSearch(); }), searchParams = allParams.filter(function (param) { return param.isSearch(); }), nPathSegments = this._cache.path.map(function (urlm) { return urlm._segments.length - 1; }).reduce(function (a, x) { return a + x; }), values$$1 = {};
+      if (nPathSegments !== match.length - 1)
+        throw new Error("Unbalanced capture group in route '" + this.pattern + "'");
+      function decodePathArray(string) {
+        var reverseString = function (str) { return str.split("").reverse().join(""); };
+        var unquoteDashes = function (str) { return str.replace(/\\-/g, "-"); };
+        var split = reverseString(string).split(/-(?!\\)/);
+        var allReversed = map(split, reverseString);
+        return map(allReversed, unquoteDashes).reverse();
       }
-      routes.push(route);
+      for (var i = 0; i < nPathSegments; i++) {
+        var param = pathParams[i];
+        var value = match[i + 1];
+        // if the param value matches a pre-replace pair, replace the value before decoding.
+        for (var j = 0; j < param.replace.length; j++) {
+          if (param.replace[j].from === value)
+            value = param.replace[j].to;
+        }
+        if (value && param.array === true)
+          value = decodePathArray(value);
+        if (isDefined(value))
+          value = param.type.decode(value);
+        values$$1[param.id] = param.value(value);
+      }
+      searchParams.forEach(function (param) {
+        var value = search[param.id];
+        for (var j = 0; j < param.replace.length; j++) {
+          if (param.replace[j].from === value)
+            value = param.replace[j].to;
+        }
+        if (isDefined(value))
+          value = param.type.decode(value);
+        values$$1[param.id] = param.value(value);
+      });
+      if (hash)
+        values$$1["#"] = hash;
+      return values$$1;
+    };
+    /**
+     * @hidden
+     * Returns all the [[Param]] objects of all path and search parameters of this pattern in order of appearance.
+     *
+     * @returns {Array.<Param>}  An array of [[Param]] objects. Must be treated as read-only. If the
+     *    pattern has no parameters, an empty array is returned.
+     */
+    UrlMatcher.prototype.parameters = function (opts) {
+      if (opts === void 0) { opts = {}; }
+      if (opts.inherit === false)
+        return this._params;
+      return unnest(this._cache.path.map(function (matcher) { return matcher._params; }));
+    };
+    /**
+     * @hidden
+     * Returns a single parameter from this UrlMatcher by id
+     *
+     * @param id
+     * @param opts
+     * @returns {T|Param|any|boolean|UrlMatcher|null}
+     */
+    UrlMatcher.prototype.parameter = function (id, opts) {
+      var _this = this;
+      if (opts === void 0) { opts = {}; }
+      var findParam = function () {
+        for (var _i = 0, _a = _this._params; _i < _a.length; _i++) {
+          var param = _a[_i];
+          if (param.id === id)
+            return param;
+        }
+      };
+      var parent = this._cache.parent;
+      return findParam() || (opts.inherit !== false && parent && parent.parameter(id, opts)) || null;
+    };
+    /**
+     * Validates the input parameter values against this UrlMatcher
+     *
+     * Checks an object hash of parameters to validate their correctness according to the parameter
+     * types of this `UrlMatcher`.
+     *
+     * @param params The object hash of parameters to validate.
+     * @returns Returns `true` if `params` validates, otherwise `false`.
+     */
+    UrlMatcher.prototype.validates = function (params) {
+      var validParamVal = function (param, val$$1) {
+        return !param || param.validates(val$$1);
+      };
+      params = params || {};
+      // I'm not sure why this checks only the param keys passed in, and not all the params known to the matcher
+      var paramSchema = this.parameters().filter(function (paramDef) { return params.hasOwnProperty(paramDef.id); });
+      return paramSchema.map(function (paramDef) { return validParamVal(paramDef, params[paramDef.id]); }).reduce(allTrueR, true);
+    };
+    /**
+     * Given a set of parameter values, creates a URL from this UrlMatcher.
+     *
+     * Creates a URL that matches this pattern by substituting the specified values
+     * for the path and search parameters.
+     *
+     * #### Example:
+     * ```js
+     * new UrlMatcher('/user/{id}?q').format({ id:'bob', q:'yes' });
+     * // returns '/user/bob?q=yes'
+     * ```
+     *
+     * @param values  the values to substitute for the parameters in this pattern.
+     * @returns the formatted URL (path and optionally search part).
+     */
+    UrlMatcher.prototype.format = function (values$$1) {
+      if (values$$1 === void 0) { values$$1 = {}; }
+      // Build the full path of UrlMatchers (including all parent UrlMatchers)
+      var urlMatchers = this._cache.path;
+      // Extract all the static segments and Params (processed as ParamDetails)
+      // into an ordered array
+      var pathSegmentsAndParams = urlMatchers.map(UrlMatcher.pathSegmentsAndParams)
+        .reduce(unnestR, [])
+        .map(function (x) { return isString(x) ? x : getDetails(x); });
+      // Extract the query params into a separate array
+      var queryParams = urlMatchers.map(UrlMatcher.queryParams)
+        .reduce(unnestR, [])
+        .map(getDetails);
+      var isInvalid = function (param) { return param.isValid === false; };
+      if (pathSegmentsAndParams.concat(queryParams).filter(isInvalid).length) {
+        return null;
+      }
+      /**
+       * Given a Param, applies the parameter value, then returns detailed information about it
+       */
+      function getDetails(param) {
+        // Normalize to typed value
+        var value = param.value(values$$1[param.id]);
+        var isValid = param.validates(value);
+        var isDefaultValue = param.isDefaultValue(value);
+        // Check if we're in squash mode for the parameter
+        var squash = isDefaultValue ? param.squash : false;
+        // Allow the Parameter's Type to encode the value
+        var encoded = param.type.encode(value);
+        return { param: param, value: value, isValid: isValid, isDefaultValue: isDefaultValue, squash: squash, encoded: encoded };
+      }
+      // Build up the path-portion from the list of static segments and parameters
+      var pathString = pathSegmentsAndParams.reduce(function (acc, x) {
+        // The element is a static segment (a raw string); just append it
+        if (isString(x))
+          return acc + x;
+        // Otherwise, it's a ParamDetails.
+        var squash = x.squash, encoded = x.encoded, param = x.param;
+        // If squash is === true, try to remove a slash from the path
+        if (squash === true)
+          return (acc.match(/\/$/)) ? acc.slice(0, -1) : acc;
+        // If squash is a string, use the string for the param value
+        if (isString(squash))
+          return acc + squash;
+        if (squash !== false)
+          return acc; // ?
+        if (encoded == null)
+          return acc;
+        // If this parameter value is an array, encode the value using encodeDashes
+        if (isArray(encoded))
+          return acc + map(encoded, UrlMatcher.encodeDashes).join("-");
+        // If the parameter type is "raw", then do not encodeURIComponent
+        if (param.raw)
+          return acc + encoded;
+        // Encode the value
+        return acc + encodeURIComponent(encoded);
+      }, "");
+      // Build the query string by applying parameter values (array or regular)
+      // then mapping to key=value, then flattening and joining using "&"
+      var queryString = queryParams.map(function (paramDetails) {
+        var param = paramDetails.param, squash = paramDetails.squash, encoded = paramDetails.encoded, isDefaultValue = paramDetails.isDefaultValue;
+        if (encoded == null || (isDefaultValue && squash !== false))
+          return;
+        if (!isArray(encoded))
+          encoded = [encoded];
+        if (encoded.length === 0)
+          return;
+        if (!param.raw)
+          encoded = map(encoded, encodeURIComponent);
+        return encoded.map(function (val$$1) { return param.id + "=" + val$$1; });
+      }).filter(identity).reduce(unnestR, []).join("&");
+      // Concat the pathstring with the queryString (if exists) and the hashString (if exists)
+      return pathString + (queryString ? "?" + queryString : "") + (values$$1["#"] ? "#" + values$$1["#"] : "");
+    };
+    /** @hidden */
+    UrlMatcher.encodeDashes = function (str) {
+      return encodeURIComponent(str).replace(/-/g, function (c) { return "%5C%" + c.charCodeAt(0).toString(16).toUpperCase(); });
+    };
+    /** @hidden Given a matcher, return an array with the matcher's path segments and path params, in order */
+    UrlMatcher.pathSegmentsAndParams = function (matcher) {
+      var staticSegments = matcher._segments;
+      var pathParams = matcher._params.filter(function (p) { return p.location === exports.DefType.PATH; });
+      return arrayTuples(staticSegments, pathParams.concat(undefined))
+        .reduce(unnestR, [])
+        .filter(function (x) { return x !== "" && isDefined(x); });
+    };
+    /** @hidden Given a matcher, return an array with the matcher's query params */
+    UrlMatcher.queryParams = function (matcher) {
+      return matcher._params.filter(function (p) { return p.location === exports.DefType.SEARCH; });
+    };
+    /**
+     * Compare two UrlMatchers
+     *
+     * This comparison function converts a UrlMatcher into static and dynamic path segments.
+     * Each static path segment is a static string between a path separator (slash character).
+     * Each dynamic segment is a path parameter.
+     *
+     * The comparison function sorts static segments before dynamic ones.
+     */
+    UrlMatcher.compare = function (a, b) {
+      /**
+       * Turn a UrlMatcher and all its parent matchers into an array
+       * of slash literals '/', string literals, and Param objects
+       *
+       * This example matcher matches strings like "/foo/:param/tail":
+       * var matcher = $umf.compile("/foo").append($umf.compile("/:param")).append($umf.compile("/")).append($umf.compile("tail"));
+       * var result = segments(matcher); // [ '/', 'foo', '/', Param, '/', 'tail' ]
+       *
+       * Caches the result as `matcher._cache.segments`
+       */
+      var segments = function (matcher) {
+        return matcher._cache.segments = matcher._cache.segments ||
+          matcher._cache.path.map(UrlMatcher.pathSegmentsAndParams)
+            .reduce(unnestR, [])
+            .reduce(joinNeighborsR, [])
+            .map(function (x) { return isString(x) ? splitOnSlash(x) : x; })
+            .reduce(unnestR, []);
+      };
+      /**
+       * Gets the sort weight for each segment of a UrlMatcher
+       *
+       * Caches the result as `matcher._cache.weights`
+       */
+      var weights = function (matcher) {
+        return matcher._cache.weights = matcher._cache.weights ||
+          segments(matcher).map(function (segment) {
+            // Sort slashes first, then static strings, the Params
+            if (segment === '/')
+              return 1;
+            if (isString(segment))
+              return 2;
+            if (segment instanceof Param)
+              return 3;
+          });
+      };
+      /**
+       * Pads shorter array in-place (mutates)
+       */
+      var padArrays = function (l, r, padVal) {
+        var len = Math.max(l.length, r.length);
+        while (l.length < len)
+          l.push(padVal);
+        while (r.length < len)
+          r.push(padVal);
+      };
+      var weightsA = weights(a), weightsB = weights(b);
+      padArrays(weightsA, weightsB, 0);
+      var cmp, i, pairs$$1 = arrayTuples(weightsA, weightsB);
+      for (i = 0; i < pairs$$1.length; i++) {
+        cmp = pairs$$1[i][0] - pairs$$1[i][1];
+        if (cmp !== 0)
+          return cmp;
+      }
+      return 0;
+    };
+    /** @hidden */
+    UrlMatcher.nameValidator = /^\w+([-.]+\w+)*(?:\[\])?$/;
+    return UrlMatcher;
+  }());
+
+  /**
+   * @internalapi
+   * @module url
+   */ /** for typedoc */
+  /**
+   * Factory for [[UrlMatcher]] instances.
+   *
+   * The factory is available to ng1 services as
+   * `$urlMatcherFactory` or ng1 providers as `$urlMatcherFactoryProvider`.
+   */
+  var UrlMatcherFactory = /** @class */ (function () {
+    function UrlMatcherFactory() {
+      var _this = this;
+      /** @hidden */ this.paramTypes = new ParamTypes();
+      /** @hidden */ this._isCaseInsensitive = false;
+      /** @hidden */ this._isStrictMode = true;
+      /** @hidden */ this._defaultSquashPolicy = false;
+      /** @hidden */
+      this._getConfig = function (config) {
+        return extend({ strict: _this._isStrictMode, caseInsensitive: _this._isCaseInsensitive }, config);
+      };
+      /** @internalapi Creates a new [[Param]] for a given location (DefType) */
+      this.paramFactory = {
+        /** Creates a new [[Param]] from a CONFIG block */
+        fromConfig: function (id, type, config) {
+          return new Param(id, type, config, exports.DefType.CONFIG, _this);
+        },
+        /** Creates a new [[Param]] from a url PATH */
+        fromPath: function (id, type, config) {
+          return new Param(id, type, config, exports.DefType.PATH, _this);
+        },
+        /** Creates a new [[Param]] from a url SEARCH */
+        fromSearch: function (id, type, config) {
+          return new Param(id, type, config, exports.DefType.SEARCH, _this);
+        },
+      };
+      extend(this, { UrlMatcher: UrlMatcher, Param: Param });
+    }
+    /** @inheritdoc */
+    UrlMatcherFactory.prototype.caseInsensitive = function (value) {
+      return this._isCaseInsensitive = isDefined(value) ? value : this._isCaseInsensitive;
+    };
+    /** @inheritdoc */
+    UrlMatcherFactory.prototype.strictMode = function (value) {
+      return this._isStrictMode = isDefined(value) ? value : this._isStrictMode;
+    };
+    /** @inheritdoc */
+    UrlMatcherFactory.prototype.defaultSquashPolicy = function (value) {
+      if (isDefined(value) && value !== true && value !== false && !isString(value))
+        throw new Error("Invalid squash policy: " + value + ". Valid policies: false, true, arbitrary-string");
+      return this._defaultSquashPolicy = isDefined(value) ? value : this._defaultSquashPolicy;
+    };
+    /**
+     * Creates a [[UrlMatcher]] for the specified pattern.
+     *
+     * @param pattern  The URL pattern.
+     * @param config  The config object hash.
+     * @returns The UrlMatcher.
+     */
+    UrlMatcherFactory.prototype.compile = function (pattern, config) {
+      return new UrlMatcher(pattern, this.paramTypes, this.paramFactory, this._getConfig(config));
+    };
+    /**
+     * Returns true if the specified object is a [[UrlMatcher]], or false otherwise.
+     *
+     * @param object  The object to perform the type check against.
+     * @returns `true` if the object matches the `UrlMatcher` interface, by
+     *          implementing all the same methods.
+     */
+    UrlMatcherFactory.prototype.isMatcher = function (object) {
+      // TODO: typeof?
+      if (!isObject(object))
+        return false;
+      var result = true;
+      forEach(UrlMatcher.prototype, function (val, name) {
+        if (isFunction(val))
+          result = result && (isDefined(object[name]) && isFunction(object[name]));
+      });
+      return result;
+    };
+
+    /**
+     * Creates and registers a custom [[ParamType]] object
+     *
+     * A [[ParamType]] can be used to generate URLs with typed parameters.
+     *
+     * @param name  The type name.
+     * @param definition The type definition. See [[ParamTypeDefinition]] for information on the values accepted.
+     * @param definitionFn A function that is injected before the app runtime starts.
+     *        The result of this function should be a [[ParamTypeDefinition]].
+     *        The result is merged into the existing `definition`.
+     *        See [[ParamType]] for information on the values accepted.
+     *
+     * @returns - if a type was registered: the [[UrlMatcherFactory]]
+     *   - if only the `name` parameter was specified: the currently registered [[ParamType]] object, or undefined
+     *
+     * Note: Register custom types *before using them* in a state definition.
+     *
+     * See [[ParamTypeDefinition]] for examples
+     */
+    UrlMatcherFactory.prototype.type = function (name, definition, definitionFn) {
+      var type = this.paramTypes.type(name, definition, definitionFn);
+      return !isDefined(definition) ? type : this;
+    };
+
+    /** @hidden */
+    UrlMatcherFactory.prototype.$get = function () {
+      this.paramTypes.enqueue = false;
+      this.paramTypes._flushTypeQueue();
       return this;
+    };
+
+    /** @internalapi */
+    UrlMatcherFactory.prototype.dispose = function () {
+      this.paramTypes.dispose();
+    };
+    return UrlMatcherFactory;
+  }());
+
+  /**
+   * @coreapi
+   * @module url
+   */ /** */
+  /**
+   * Creates a [[UrlRule]]
+   *
+   * Creates a [[UrlRule]] from a:
+   *
+   * - `string`
+   * - [[UrlMatcher]]
+   * - `RegExp`
+   * - [[StateObject]]
+   * @internalapi
+   */
+  var UrlRuleFactory = /** @class */ (function () {
+    function UrlRuleFactory(router) {
+      this.router = router;
     }
-
-    this.$get = $get;
-    $get.$inject = ['$state', '$rootScope', '$routeParams'];
-    function $get(   $state,   $rootScope,   $routeParams) {
-
-      var $route = {
-        routes: routes,
-        params: $routeParams,
-        current: undefined
-      };
-
-      function stateAsRoute(state) {
-        return (state.name !== '') ? state : undefined;
+    UrlRuleFactory.prototype.compile = function (str) {
+      return this.router.urlMatcherFactory.compile(str);
+    };
+    UrlRuleFactory.prototype.create = function (what, handler) {
+      var _this = this;
+      var makeRule = pattern([
+        [isString, function (_what) { return makeRule(_this.compile(_what)); }],
+        [is(UrlMatcher), function (_what) { return _this.fromUrlMatcher(_what, handler); }],
+        [isState, function (_what) { return _this.fromState(_what, _this.router); }],
+        [is(RegExp), function (_what) { return _this.fromRegExp(_what, handler); }],
+        [isFunction, function (_what) { return new BaseUrlRule(_what, handler); }],
+      ]);
+      var rule = makeRule(what);
+      if (!rule)
+        throw new Error("invalid 'what' in when()");
+      return rule;
+    };
+    /**
+     * A UrlRule which matches based on a UrlMatcher
+     *
+     * The `handler` may be either a `string`, a [[UrlRuleHandlerFn]] or another [[UrlMatcher]]
+     *
+     * ## Handler as a function
+     *
+     * If `handler` is a function, the function is invoked with:
+     *
+     * - matched parameter values ([[RawParams]] from [[UrlMatcher.exec]])
+     * - url: the current Url ([[UrlParts]])
+     * - router: the router object ([[UIRouter]])
+     *
+     * #### Example:
+     * ```js
+     * var urlMatcher = $umf.compile("/foo/:fooId/:barId");
+     * var rule = factory.fromUrlMatcher(urlMatcher, match => "/home/" + match.fooId + "/" + match.barId);
+     * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' }
+     * var result = rule.handler(match); // '/home/123/456'
+     * ```
+     *
+     * ## Handler as UrlMatcher
+     *
+     * If `handler` is a UrlMatcher, the handler matcher is used to create the new url.
+     * The `handler` UrlMatcher is formatted using the matched param from the first matcher.
+     * The url is replaced with the result.
+     *
+     * #### Example:
+     * ```js
+     * var urlMatcher = $umf.compile("/foo/:fooId/:barId");
+     * var handler = $umf.compile("/home/:fooId/:barId");
+     * var rule = factory.fromUrlMatcher(urlMatcher, handler);
+     * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' }
+     * var result = rule.handler(match); // '/home/123/456'
+     * ```
+     */
+    UrlRuleFactory.prototype.fromUrlMatcher = function (urlMatcher, handler) {
+      var _handler = handler;
+      if (isString(handler))
+        handler = this.router.urlMatcherFactory.compile(handler);
+      if (is(UrlMatcher)(handler))
+        _handler = function (match) { return handler.format(match); };
+      function match(url) {
+        var match = urlMatcher.exec(url.path, url.search, url.hash);
+        return urlMatcher.validates(match) && match;
       }
-
-      $rootScope.$on('$stateChangeStart', function (ev, to, toParams, from, fromParams) {
-        $rootScope.$broadcast('$routeChangeStart', stateAsRoute(to), stateAsRoute(from));
-      });
-
-      $rootScope.$on('$stateChangeSuccess', function (ev, to, toParams, from, fromParams) {
-        $route.current = stateAsRoute(to);
-        $rootScope.$broadcast('$routeChangeSuccess', stateAsRoute(to), stateAsRoute(from));
-        copy(toParams, $route.params);
-      });
-
-      $rootScope.$on('$stateChangeError', function (ev, to, toParams, from, fromParams, error) {
-        $rootScope.$broadcast('$routeChangeError', stateAsRoute(to), stateAsRoute(from), error);
-      });
-
-      return $route;
+      // Prioritize URLs, lowest to highest:
+      // - Some optional URL parameters, but none matched
+      // - No optional parameters in URL
+      // - Some optional parameters, some matched
+      // - Some optional parameters, all matched
+      function matchPriority(params) {
+        var optional = urlMatcher.parameters().filter(function (param) { return param.isOptional; });
+        if (!optional.length)
+          return 0.000001;
+        var matched = optional.filter(function (param) { return params[param.id]; });
+        return matched.length / optional.length;
+      }
+      var details = { urlMatcher: urlMatcher, matchPriority: matchPriority, type: "URLMATCHER" };
+      return extend(new BaseUrlRule(match, _handler), details);
+    };
+    /**
+     * A UrlRule which matches a state by its url
+     *
+     * #### Example:
+     * ```js
+     * var rule = factory.fromState($state.get('foo'), router);
+     * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' }
+     * var result = rule.handler(match);
+     * // Starts a transition to 'foo' with params: { fooId: '123', barId: '456' }
+     * ```
+     */
+    UrlRuleFactory.prototype.fromState = function (state, router) {
+      /**
+       * Handles match by transitioning to matched state
+       *
+       * First checks if the router should start a new transition.
+       * A new transition is not required if the current state's URL
+       * and the new URL are already identical
+       */
+      var handler = function (match) {
+        var $state = router.stateService;
+        var globals = router.globals;
+        if ($state.href(state, match) !== $state.href(globals.current, globals.params)) {
+          $state.transitionTo(state, match, { inherit: true, source: "url" });
+        }
+      };
+      var details = { state: state, type: "STATE" };
+      return extend(this.fromUrlMatcher(state.url, handler), details);
+    };
+    /**
+     * A UrlRule which matches based on a regular expression
+     *
+     * The `handler` may be either a [[UrlRuleHandlerFn]] or a string.
+     *
+     * ## Handler as a function
+     *
+     * If `handler` is a function, the function is invoked with:
+     *
+     * - regexp match array (from `regexp`)
+     * - url: the current Url ([[UrlParts]])
+     * - router: the router object ([[UIRouter]])
+     *
+     * #### Example:
+     * ```js
+     * var rule = factory.fromRegExp(/^\/foo\/(bar|baz)$/, match => "/home/" + match[1])
+     * var match = rule.match('/foo/bar'); // results in [ '/foo/bar', 'bar' ]
+     * var result = rule.handler(match); // '/home/bar'
+     * ```
+     *
+     * ## Handler as string
+     *
+     * If `handler` is a string, the url is *replaced by the string* when the Rule is invoked.
+     * The string is first interpolated using `string.replace()` style pattern.
+     *
+     * #### Example:
+     * ```js
+     * var rule = factory.fromRegExp(/^\/foo\/(bar|baz)$/, "/home/$1")
+     * var match = rule.match('/foo/bar'); // results in [ '/foo/bar', 'bar' ]
+     * var result = rule.handler(match); // '/home/bar'
+     * ```
+     */
+    UrlRuleFactory.prototype.fromRegExp = function (regexp, handler) {
+      if (regexp.global || regexp.sticky)
+        throw new Error("Rule RegExp must not be global or sticky");
+      /**
+       * If handler is a string, the url will be replaced by the string.
+       * If the string has any String.replace() style variables in it (like `$2`),
+       * they will be replaced by the captures from [[match]]
+       */
+      var redirectUrlTo = function (match) {
+        // Interpolates matched values into $1 $2, etc using a String.replace()-style pattern
+        return handler.replace(/\$(\$|\d{1,2})/, function (m, what) {
+          return match[what === '$' ? 0 : Number(what)];
+        });
+      };
+      var _handler = isString(handler) ? redirectUrlTo : handler;
+      var match = function (url) {
+        return regexp.exec(url.path);
+      };
+      var details = { regexp: regexp, type: "REGEXP" };
+      return extend(new BaseUrlRule(match, _handler), details);
+    };
+    UrlRuleFactory.isUrlRule = function (obj) {
+      return obj && ['type', 'match', 'handler'].every(function (key) { return isDefined(obj[key]); });
+    };
+    return UrlRuleFactory;
+  }());
+  /**
+   * A base rule which calls `match`
+   *
+   * The value from the `match` function is passed through to the `handler`.
+   * @internalapi
+   */
+  var BaseUrlRule = /** @class */ (function () {
+    function BaseUrlRule(match, handler) {
+      var _this = this;
+      this.match = match;
+      this.type = "RAW";
+      this.matchPriority = function (match) { return 0 - _this.$id; };
+      this.handler = handler || identity;
     }
+    return BaseUrlRule;
+  }());
+
+  /**
+   * @internalapi
+   * @module url
+   */
+  /** for typedoc */
+  /** @hidden */
+  function appendBasePath(url, isHtml5, absolute, baseHref) {
+    if (baseHref === '/')
+      return url;
+    if (isHtml5)
+      return stripFile(baseHref) + url;
+    if (absolute)
+      return baseHref.slice(1) + url;
+    return url;
+  }
+  /** @hidden */
+  var prioritySort = function (a, b) {
+    return (b.priority || 0) - (a.priority || 0);
+  };
+  /** @hidden */
+  var typeSort = function (a, b) {
+    var weights = { "STATE": 4, "URLMATCHER": 4, "REGEXP": 3, "RAW": 2, "OTHER": 1 };
+    return (weights[a.type] || 0) - (weights[b.type] || 0);
+  };
+  /** @hidden */
+  var urlMatcherSort = function (a, b) {
+    return !a.urlMatcher || !b.urlMatcher ? 0 : UrlMatcher.compare(a.urlMatcher, b.urlMatcher);
+  };
+  /** @hidden */
+  var idSort = function (a, b) {
+    // Identically sorted STATE and URLMATCHER best rule will be chosen by `matchPriority` after each rule matches the URL
+    var useMatchPriority = { STATE: true, URLMATCHER: true };
+    var equal = useMatchPriority[a.type] && useMatchPriority[b.type];
+    return equal ? 0 : (a.$id || 0) - (b.$id || 0);
+  };
+  /**
+   * Default rule priority sorting function.
+   *
+   * Sorts rules by:
+   *
+   * - Explicit priority (set rule priority using [[UrlRulesApi.when]])
+   * - Rule type (STATE: 4, URLMATCHER: 4, REGEXP: 3, RAW: 2, OTHER: 1)
+   * - `UrlMatcher` specificity ([[UrlMatcher.compare]]): works for STATE and URLMATCHER types to pick the most specific rule.
+   * - Rule registration order (for rule types other than STATE and URLMATCHER)
+   *   - Equally sorted State and UrlMatcher rules will each match the URL.
+   *     Then, the *best* match is chosen based on how many parameter values were matched.
+   *
+   * @coreapi
+   */
+  var defaultRuleSortFn;
+  defaultRuleSortFn = function (a, b) {
+    var cmp = prioritySort(a, b);
+    if (cmp !== 0)
+      return cmp;
+    cmp = typeSort(a, b);
+    if (cmp !== 0)
+      return cmp;
+    cmp = urlMatcherSort(a, b);
+    if (cmp !== 0)
+      return cmp;
+    return idSort(a, b);
+  };
+  /**
+   * Updates URL and responds to URL changes
+   *
+   * ### Deprecation warning:
+   * This class is now considered to be an internal API
+   * Use the [[UrlService]] instead.
+   * For configuring URL rules, use the [[UrlRulesApi]] which can be found as [[UrlService.rules]].
+   *
+   * This class updates the URL when the state changes.
+   * It also responds to changes in the URL.
+   */
+  var UrlRouter = /** @class */ (function () {
+    /** @hidden */
+    function UrlRouter(router) {
+      /** @hidden */ this._sortFn = defaultRuleSortFn;
+      /** @hidden */ this._rules = [];
+      /** @hidden */ this.interceptDeferred = false;
+      /** @hidden */ this._id = 0;
+      /** @hidden */ this._sorted = false;
+      this._router = router;
+      this.urlRuleFactory = new UrlRuleFactory(router);
+      createProxyFunctions(val(UrlRouter.prototype), this, val(this));
+    }
+    /** @internalapi */
+    UrlRouter.prototype.dispose = function () {
+      this.listen(false);
+      this._rules = [];
+      delete this._otherwiseFn;
+    };
+    /** @inheritdoc */
+    UrlRouter.prototype.sort = function (compareFn) {
+      this._rules = this.stableSort(this._rules, this._sortFn = compareFn || this._sortFn);
+      this._sorted = true;
+    };
+    UrlRouter.prototype.ensureSorted = function () {
+      this._sorted || this.sort();
+    };
+    UrlRouter.prototype.stableSort = function (arr, compareFn) {
+      var arrOfWrapper = arr.map(function (elem, idx) { return ({ elem: elem, idx: idx }); });
+      arrOfWrapper.sort(function (wrapperA, wrapperB) {
+        var cmpDiff = compareFn(wrapperA.elem, wrapperB.elem);
+        return cmpDiff === 0
+          ? wrapperA.idx - wrapperB.idx
+          : cmpDiff;
+      });
+      return arrOfWrapper.map(function (wrapper) { return wrapper.elem; });
+    };
+    /**
+     * Given a URL, check all rules and return the best [[MatchResult]]
+     * @param url
+     * @returns {MatchResult}
+     */
+    UrlRouter.prototype.match = function (url) {
+      var _this = this;
+      this.ensureSorted();
+      url = extend({ path: '', search: {}, hash: '' }, url);
+      var rules = this.rules();
+      if (this._otherwiseFn)
+        rules.push(this._otherwiseFn);
+      // Checks a single rule. Returns { rule: rule, match: match, weight: weight } if it matched, or undefined
+      var checkRule = function (rule) {
+        var match = rule.match(url, _this._router);
+        return match && { match: match, rule: rule, weight: rule.matchPriority(match) };
+      };
+      // The rules are pre-sorted.
+      // - Find the first matching rule.
+      // - Find any other matching rule that sorted *exactly the same*, according to `.sort()`.
+      // - Choose the rule with the highest match weight.
+      var best;
+      for (var i = 0; i < rules.length; i++) {
+        // Stop when there is a 'best' rule and the next rule sorts differently than it.
+        if (best && this._sortFn(rules[i], best.rule) !== 0)
+          break;
+        var current = checkRule(rules[i]);
+        // Pick the best MatchResult
+        best = (!best || current && current.weight > best.weight) ? current : best;
+      }
+      return best;
+    };
+    /** @inheritdoc */
+    UrlRouter.prototype.sync = function (evt) {
+      if (evt && evt.defaultPrevented)
+        return;
+      var router = this._router, $url = router.urlService, $state = router.stateService;
+      var url = {
+        path: $url.path(), search: $url.search(), hash: $url.hash(),
+      };
+      var best = this.match(url);
+      var applyResult = pattern([
+        [isString, function (newurl) { return $url.url(newurl, true); }],
+        [TargetState.isDef, function (def) { return $state.go(def.state, def.params, def.options); }],
+        [is(TargetState), function (target) { return $state.go(target.state(), target.params(), target.options()); }],
+      ]);
+      applyResult(best && best.rule.handler(best.match, url, router));
+    };
+    /** @inheritdoc */
+    UrlRouter.prototype.listen = function (enabled) {
+      var _this = this;
+      if (enabled === false) {
+        this._stopFn && this._stopFn();
+        delete this._stopFn;
+      }
+      else {
+        return this._stopFn = this._stopFn || this._router.urlService.onChange(function (evt) { return _this.sync(evt); });
+      }
+    };
+    /**
+     * Internal API.
+     * @internalapi
+     */
+    UrlRouter.prototype.update = function (read) {
+      var $url = this._router.locationService;
+      if (read) {
+        this.location = $url.path();
+        return;
+      }
+      if ($url.path() === this.location)
+        return;
+      $url.url(this.location, true);
+    };
+    /**
+     * Internal API.
+     *
+     * Pushes a new location to the browser history.
+     *
+     * @internalapi
+     * @param urlMatcher
+     * @param params
+     * @param options
+     */
+    UrlRouter.prototype.push = function (urlMatcher, params, options) {
+      var replace = options && !!options.replace;
+      this._router.urlService.url(urlMatcher.format(params || {}), replace);
+    };
+    /**
+     * Builds and returns a URL with interpolated parameters
+     *
+     * #### Example:
+     * ```js
+     * matcher = $umf.compile("/about/:person");
+     * params = { person: "bob" };
+     * $bob = $urlRouter.href(matcher, params);
+     * // $bob == "/about/bob";
+     * ```
+     *
+     * @param urlMatcher The [[UrlMatcher]] object which is used as the template of the URL to generate.
+     * @param params An object of parameter values to fill the matcher's required parameters.
+     * @param options Options object. The options are:
+     *
+     * - **`absolute`** - {boolean=false},  If true will generate an absolute url, e.g. "http://www.example.com/fullurl".
+     *
+     * @returns Returns the fully compiled URL, or `null` if `params` fail validation against `urlMatcher`
+     */
+    UrlRouter.prototype.href = function (urlMatcher, params, options) {
+      var url = urlMatcher.format(params);
+      if (url == null)
+        return null;
+      options = options || { absolute: false };
+      var cfg = this._router.urlService.config;
+      var isHtml5 = cfg.html5Mode();
+      if (!isHtml5 && url !== null) {
+        url = "#" + cfg.hashPrefix() + url;
+      }
+      url = appendBasePath(url, isHtml5, options.absolute, cfg.baseHref());
+      if (!options.absolute || !url) {
+        return url;
+      }
+      var slash = (!isHtml5 && url ? '/' : ''), port = cfg.port();
+      port = (port === 80 || port === 443 ? '' : ':' + port);
+      return [cfg.protocol(), '://', cfg.host(), port, slash, url].join('');
+    };
+    /**
+     * Manually adds a URL Rule.
+     *
+     * Usually, a url rule is added using [[StateDeclaration.url]] or [[when]].
+     * This api can be used directly for more control (to register a [[BaseUrlRule]], for example).
+     * Rules can be created using [[UrlRouter.urlRuleFactory]], or create manually as simple objects.
+     *
+     * A rule should have a `match` function which returns truthy if the rule matched.
+     * It should also have a `handler` function which is invoked if the rule is the best match.
+     *
+     * @return a function that deregisters the rule
+     */
+    UrlRouter.prototype.rule = function (rule) {
+      var _this = this;
+      if (!UrlRuleFactory.isUrlRule(rule))
+        throw new Error("invalid rule");
+      rule.$id = this._id++;
+      rule.priority = rule.priority || 0;
+      this._rules.push(rule);
+      this._sorted = false;
+      return function () { return _this.removeRule(rule); };
+    };
+    /** @inheritdoc */
+    UrlRouter.prototype.removeRule = function (rule) {
+      removeFrom(this._rules, rule);
+    };
+    /** @inheritdoc */
+    UrlRouter.prototype.rules = function () {
+      this.ensureSorted();
+      return this._rules.slice();
+    };
+    /** @inheritdoc */
+    UrlRouter.prototype.otherwise = function (handler) {
+      var handlerFn = getHandlerFn(handler);
+      this._otherwiseFn = this.urlRuleFactory.create(val(true), handlerFn);
+      this._sorted = false;
+    };
+
+    /** @inheritdoc */
+    UrlRouter.prototype.initial = function (handler) {
+      var handlerFn = getHandlerFn(handler);
+      var matchFn = function (urlParts, router) {
+        return router.globals.transitionHistory.size() === 0 && !!/^\/?$/.exec(urlParts.path);
+      };
+      this.rule(this.urlRuleFactory.create(matchFn, handlerFn));
+    };
+
+    /** @inheritdoc */
+    UrlRouter.prototype.when = function (matcher, handler, options) {
+      var rule = this.urlRuleFactory.create(matcher, handler);
+      if (isDefined(options && options.priority))
+        rule.priority = options.priority;
+      this.rule(rule);
+      return rule;
+    };
+
+    /** @inheritdoc */
+    UrlRouter.prototype.deferIntercept = function (defer) {
+      if (defer === undefined)
+        defer = true;
+      this.interceptDeferred = defer;
+    };
+
+    return UrlRouter;
+  }());
+  function getHandlerFn(handler) {
+    if (!isFunction(handler) && !isString(handler) && !is(TargetState)(handler) && !TargetState.isDef(handler)) {
+      throw new Error("'handler' must be a string, function, TargetState, or have a state: 'newtarget' property");
+    }
+    return isFunction(handler) ? handler : val(handler);
   }
 
-  angular.module('ui.router.compat')
-      .provider('$route', $RouteProvider)
-      .directive('ngView', $ViewDirective);
-})(window, window.angular);
\ No newline at end of file
+  /**
+   * @coreapi
+   * @module view
+   */ /** for typedoc */
+  /**
+   * The View service
+   *
+   * This service pairs existing `ui-view` components (which live in the DOM)
+   * with view configs (from the state declaration objects: [[StateDeclaration.views]]).
+   *
+   * - After a successful Transition, the views from the newly entered states are activated via [[activateViewConfig]].
+   *   The views from exited states are deactivated via [[deactivateViewConfig]].
+   *   (See: the [[registerActivateViews]] Transition Hook)
+   *
+   * - As `ui-view` components pop in and out of existence, they register themselves using [[registerUIView]].
+   *
+   * - When the [[sync]] function is called, the registered `ui-view`(s) ([[ActiveUIView]])
+   * are configured with the matching [[ViewConfig]](s)
+   *
+   */
+  var ViewService = /** @class */ (function () {
+    function ViewService() {
+      var _this = this;
+      this._uiViews = [];
+      this._viewConfigs = [];
+      this._viewConfigFactories = {};
+      this._pluginapi = {
+        _rootViewContext: this._rootViewContext.bind(this),
+        _viewConfigFactory: this._viewConfigFactory.bind(this),
+        _registeredUIViews: function () { return _this._uiViews; },
+        _activeViewConfigs: function () { return _this._viewConfigs; },
+      };
+    }
+    ViewService.prototype._rootViewContext = function (context) {
+      return this._rootContext = context || this._rootContext;
+    };
+
+    ViewService.prototype._viewConfigFactory = function (viewType, factory) {
+      this._viewConfigFactories[viewType] = factory;
+    };
+    ViewService.prototype.createViewConfig = function (path, decl) {
+      var cfgFactory = this._viewConfigFactories[decl.$type];
+      if (!cfgFactory)
+        throw new Error("ViewService: No view config factory registered for type " + decl.$type);
+      var cfgs = cfgFactory(path, decl);
+      return isArray(cfgs) ? cfgs : [cfgs];
+    };
+    /**
+     * Deactivates a ViewConfig.
+     *
+     * This function deactivates a `ViewConfig`.
+     * After calling [[sync]], it will un-pair from any `ui-view` with which it is currently paired.
+     *
+     * @param viewConfig The ViewConfig view to deregister.
+     */
+    ViewService.prototype.deactivateViewConfig = function (viewConfig) {
+      trace.traceViewServiceEvent("<- Removing", viewConfig);
+      removeFrom(this._viewConfigs, viewConfig);
+    };
+    ViewService.prototype.activateViewConfig = function (viewConfig) {
+      trace.traceViewServiceEvent("-> Registering", viewConfig);
+      this._viewConfigs.push(viewConfig);
+    };
+    ViewService.prototype.sync = function () {
+      var _this = this;
+      var uiViewsByFqn = this._uiViews.map(function (uiv) { return [uiv.fqn, uiv]; }).reduce(applyPairs, {});
+      // Return a weighted depth value for a uiView.
+      // The depth is the nesting depth of ui-views (based on FQN; times 10,000)
+      // plus the depth of the state that is populating the uiView
+      function uiViewDepth(uiView) {
+        var stateDepth = function (context) {
+          return context && context.parent ? stateDepth(context.parent) + 1 : 1;
+        };
+        return (uiView.fqn.split(".").length * 10000) + stateDepth(uiView.creationContext);
+      }
+      // Return the ViewConfig's context's depth in the context tree.
+      function viewConfigDepth(config) {
+        var context = config.viewDecl.$context, count = 0;
+        while (++count && context.parent)
+          context = context.parent;
+        return count;
+      }
+      // Given a depth function, returns a compare function which can return either ascending or descending order
+      var depthCompare = curry(function (depthFn, posNeg, left, right) { return posNeg * (depthFn(left) - depthFn(right)); });
+      var matchingConfigPair = function (uiView) {
+        var matchingConfigs = _this._viewConfigs.filter(ViewService.matches(uiViewsByFqn, uiView));
+        if (matchingConfigs.length > 1) {
+          // This is OK.  Child states can target a ui-view that the parent state also targets (the child wins)
+          // Sort by depth and return the match from the deepest child
+          // console.log(`Multiple matching view configs for ${uiView.fqn}`, matchingConfigs);
+          matchingConfigs.sort(depthCompare(viewConfigDepth, -1)); // descending
+        }
+        return [uiView, matchingConfigs[0]];
+      };
+      var configureUIView = function (_a) {
+        var uiView = _a[0], viewConfig = _a[1];
+        // If a parent ui-view is reconfigured, it could destroy child ui-views.
+        // Before configuring a child ui-view, make sure it's still in the active uiViews array.
+        if (_this._uiViews.indexOf(uiView) !== -1)
+          uiView.configUpdated(viewConfig);
+      };
+      // Sort views by FQN and state depth. Process uiviews nearest the root first.
+      var pairs$$1 = this._uiViews.sort(depthCompare(uiViewDepth, 1)).map(matchingConfigPair);
+      trace.traceViewSync(pairs$$1);
+      pairs$$1.forEach(configureUIView);
+    };
+
+    /**
+     * Registers a `ui-view` component
+     *
+     * When a `ui-view` component is created, it uses this method to register itself.
+     * After registration the [[sync]] method is used to ensure all `ui-view` are configured with the proper [[ViewConfig]].
+     *
+     * Note: the `ui-view` component uses the `ViewConfig` to determine what view should be loaded inside the `ui-view`,
+     * and what the view's state context is.
+     *
+     * Note: There is no corresponding `deregisterUIView`.
+     *       A `ui-view` should hang on to the return value of `registerUIView` and invoke it to deregister itself.
+     *
+     * @param uiView The metadata for a UIView
+     * @return a de-registration function used when the view is destroyed.
+     */
+    ViewService.prototype.registerUIView = function (uiView) {
+      trace.traceViewServiceUIViewEvent("-> Registering", uiView);
+      var uiViews = this._uiViews;
+      var fqnAndTypeMatches = function (uiv) { return uiv.fqn === uiView.fqn && uiv.$type === uiView.$type; };
+      if (uiViews.filter(fqnAndTypeMatches).length)
+        trace.traceViewServiceUIViewEvent("!!!! duplicate uiView named:", uiView);
+      uiViews.push(uiView);
+      this.sync();
+      return function () {
+        var idx = uiViews.indexOf(uiView);
+        if (idx === -1) {
+          trace.traceViewServiceUIViewEvent("Tried removing non-registered uiView", uiView);
+          return;
+        }
+        trace.traceViewServiceUIViewEvent("<- Deregistering", uiView);
+        removeFrom(uiViews)(uiView);
+      };
+    };
+
+    /**
+     * Returns the list of views currently available on the page, by fully-qualified name.
+     *
+     * @return {Array} Returns an array of fully-qualified view names.
+     */
+    ViewService.prototype.available = function () {
+      return this._uiViews.map(prop("fqn"));
+    };
+    /**
+     * Returns the list of views on the page containing loaded content.
+     *
+     * @return {Array} Returns an array of fully-qualified view names.
+     */
+    ViewService.prototype.active = function () {
+      return this._uiViews.filter(prop("$config")).map(prop("name"));
+    };
+    /**
+     * Normalizes a view's name from a state.views configuration block.
+     *
+     * This should be used by a framework implementation to calculate the values for
+     * [[_ViewDeclaration.$uiViewName]] and [[_ViewDeclaration.$uiViewContextAnchor]].
+     *
+     * @param context the context object (state declaration) that the view belongs to
+     * @param rawViewName the name of the view, as declared in the [[StateDeclaration.views]]
+     *
+     * @returns the normalized uiViewName and uiViewContextAnchor that the view targets
+     */
+    ViewService.normalizeUIViewTarget = function (context, rawViewName) {
+      if (rawViewName === void 0) { rawViewName = ""; }
+      // TODO: Validate incoming view name with a regexp to allow:
+      // ex: "view.name@foo.bar" , "^.^.view.name" , "view.name@^.^" , "" ,
+      // "@" , "$default@^" , "!$default.$default" , "!foo.bar"
+      var viewAtContext = rawViewName.split("@");
+      var uiViewName = viewAtContext[0] || "$default"; // default to unnamed view
+      var uiViewContextAnchor = isString(viewAtContext[1]) ? viewAtContext[1] : "^"; // default to parent context
+      // Handle relative view-name sugar syntax.
+      // Matches rawViewName "^.^.^.foo.bar" into array: ["^.^.^.foo.bar", "^.^.^", "foo.bar"],
+      var relativeViewNameSugar = /^(\^(?:\.\^)*)\.(.*$)/.exec(uiViewName);
+      if (relativeViewNameSugar) {
+        // Clobbers existing contextAnchor (rawViewName validation will fix this)
+        uiViewContextAnchor = relativeViewNameSugar[1]; // set anchor to "^.^.^"
+        uiViewName = relativeViewNameSugar[2]; // set view-name to "foo.bar"
+      }
+      if (uiViewName.charAt(0) === '!') {
+        uiViewName = uiViewName.substr(1);
+        uiViewContextAnchor = ""; // target absolutely from root
+      }
+      // handle parent relative targeting "^.^.^"
+      var relativeMatch = /^(\^(?:\.\^)*)$/;
+      if (relativeMatch.exec(uiViewContextAnchor)) {
+        var anchor = uiViewContextAnchor.split(".").reduce((function (anchor, x) { return anchor.parent; }), context);
+        uiViewContextAnchor = anchor.name;
+      }
+      else if (uiViewContextAnchor === '.') {
+        uiViewContextAnchor = context.name;
+      }
+      return { uiViewName: uiViewName, uiViewContextAnchor: uiViewContextAnchor };
+    };
+    /**
+     * Given a ui-view and a ViewConfig, determines if they "match".
+     *
+     * A ui-view has a fully qualified name (fqn) and a context object.  The fqn is built from its overall location in
+     * the DOM, describing its nesting relationship to any parent ui-view tags it is nested inside of.
+     *
+     * A ViewConfig has a target ui-view name and a context anchor.  The ui-view name can be a simple name, or
+     * can be a segmented ui-view path, describing a portion of a ui-view fqn.
+     *
+     * In order for a ui-view to match ViewConfig, ui-view's $type must match the ViewConfig's $type
+     *
+     * If the ViewConfig's target ui-view name is a simple name (no dots), then a ui-view matches if:
+     * - the ui-view's name matches the ViewConfig's target name
+     * - the ui-view's context matches the ViewConfig's anchor
+     *
+     * If the ViewConfig's target ui-view name is a segmented name (with dots), then a ui-view matches if:
+     * - There exists a parent ui-view where:
+     *    - the parent ui-view's name matches the first segment (index 0) of the ViewConfig's target name
+     *    - the parent ui-view's context matches the ViewConfig's anchor
+     * - And the remaining segments (index 1..n) of the ViewConfig's target name match the tail of the ui-view's fqn
+     *
+     * Example:
+     *
+     * DOM:
+     * <ui-view>                        <!-- created in the root context (name: "") -->
+     *   <ui-view name="foo">                <!-- created in the context named: "A"      -->
+     *     <ui-view>                    <!-- created in the context named: "A.B"    -->
+     *       <ui-view name="bar">            <!-- created in the context named: "A.B.C"  -->
+     *       </ui-view>
+     *     </ui-view>
+     *   </ui-view>
+     * </ui-view>
+     *
+     * uiViews: [
+     *  { fqn: "$default",                  creationContext: { name: "" } },
+     *  { fqn: "$default.foo",              creationContext: { name: "A" } },
+     *  { fqn: "$default.foo.$default",     creationContext: { name: "A.B" } }
+     *  { fqn: "$default.foo.$default.bar", creationContext: { name: "A.B.C" } }
+     * ]
+     *
+     * These four view configs all match the ui-view with the fqn: "$default.foo.$default.bar":
+     *
+     * - ViewConfig1: { uiViewName: "bar",                       uiViewContextAnchor: "A.B.C" }
+     * - ViewConfig2: { uiViewName: "$default.bar",              uiViewContextAnchor: "A.B" }
+     * - ViewConfig3: { uiViewName: "foo.$default.bar",          uiViewContextAnchor: "A" }
+     * - ViewConfig4: { uiViewName: "$default.foo.$default.bar", uiViewContextAnchor: "" }
+     *
+     * Using ViewConfig3 as an example, it matches the ui-view with fqn "$default.foo.$default.bar" because:
+     * - The ViewConfig's segmented target name is: [ "foo", "$default", "bar" ]
+     * - There exists a parent ui-view (which has fqn: "$default.foo") where:
+     *    - the parent ui-view's name "foo" matches the first segment "foo" of the ViewConfig's target name
+     *    - the parent ui-view's context "A" matches the ViewConfig's anchor context "A"
+     * - And the remaining segments [ "$default", "bar" ].join("."_ of the ViewConfig's target name match
+     *   the tail of the ui-view's fqn "default.bar"
+     *
+     * @internalapi
+     */
+    ViewService.matches = function (uiViewsByFqn, uiView) { return function (viewConfig) {
+      // Don't supply an ng1 ui-view with an ng2 ViewConfig, etc
+      if (uiView.$type !== viewConfig.viewDecl.$type)
+        return false;
+      // Split names apart from both viewConfig and uiView into segments
+      var vc = viewConfig.viewDecl;
+      var vcSegments = vc.$uiViewName.split(".");
+      var uivSegments = uiView.fqn.split(".");
+      // Check if the tails of the segment arrays match. ex, these arrays' tails match:
+      // vc: ["foo", "bar"], uiv fqn: ["$default", "foo", "bar"]
+      if (!equals(vcSegments, uivSegments.slice(0 - vcSegments.length)))
+        return false;
+      // Now check if the fqn ending at the first segment of the viewConfig matches the context:
+      // ["$default", "foo"].join(".") == "$default.foo", does the ui-view $default.foo context match?
+      var negOffset = (1 - vcSegments.length) || undefined;
+      var fqnToFirstSegment = uivSegments.slice(0, negOffset).join(".");
+      var uiViewContext = uiViewsByFqn[fqnToFirstSegment].creationContext;
+      return vc.$uiViewContextAnchor === (uiViewContext && uiViewContext.name);
+    }; };
+    return ViewService;
+  }());
+
+  /**
+   * @coreapi
+   * @module core
+   */ /** */
+  /**
+   * Global router state
+   *
+   * This is where we hold the global mutable state such as current state, current
+   * params, current transition, etc.
+   */
+  var UIRouterGlobals = /** @class */ (function () {
+    function UIRouterGlobals() {
+      /**
+       * Current parameter values
+       *
+       * The parameter values from the latest successful transition
+       */
+      this.params = new StateParams();
+      /** @internalapi */
+      this.lastStartedTransitionId = -1;
+      /** @internalapi */
+      this.transitionHistory = new Queue([], 1);
+      /** @internalapi */
+      this.successfulTransitions = new Queue([], 1);
+    }
+    UIRouterGlobals.prototype.dispose = function () {
+      this.transitionHistory.clear();
+      this.successfulTransitions.clear();
+      this.transition = null;
+    };
+    return UIRouterGlobals;
+  }());
+
+  /**
+   * @coreapi
+   * @module url
+   */ /** */
+  /** @hidden */
+  var makeStub = function (keys) {
+    return keys.reduce(function (acc, key) { return (acc[key] = notImplemented(key), acc); }, { dispose: noop$1 });
+  };
+  /** @hidden */ var locationServicesFns = ["url", "path", "search", "hash", "onChange"];
+  /** @hidden */ var locationConfigFns = ["port", "protocol", "host", "baseHref", "html5Mode", "hashPrefix"];
+  /** @hidden */ var umfFns = ["type", "caseInsensitive", "strictMode", "defaultSquashPolicy"];
+  /** @hidden */ var rulesFns = ["sort", "when", "initial", "otherwise", "rules", "rule", "removeRule"];
+  /** @hidden */ var syncFns = ["deferIntercept", "listen", "sync", "match"];
+  /**
+   * API for URL management
+   */
+  var UrlService = /** @class */ (function () {
+    /** @hidden */
+    function UrlService(router, lateBind) {
+      if (lateBind === void 0) { lateBind = true; }
+      this.router = router;
+      this.rules = {};
+      this.config = {};
+      // proxy function calls from UrlService to the LocationService/LocationConfig
+      var locationServices = function () { return router.locationService; };
+      createProxyFunctions(locationServices, this, locationServices, locationServicesFns, lateBind);
+      var locationConfig = function () { return router.locationConfig; };
+      createProxyFunctions(locationConfig, this.config, locationConfig, locationConfigFns, lateBind);
+      var umf = function () { return router.urlMatcherFactory; };
+      createProxyFunctions(umf, this.config, umf, umfFns);
+      var urlRouter = function () { return router.urlRouter; };
+      createProxyFunctions(urlRouter, this.rules, urlRouter, rulesFns);
+      createProxyFunctions(urlRouter, this, urlRouter, syncFns);
+    }
+    UrlService.prototype.url = function (newurl, replace, state) { return; };
+
+    /** @inheritdoc */
+    UrlService.prototype.path = function () { return; };
+
+    /** @inheritdoc */
+    UrlService.prototype.search = function () { return; };
+
+    /** @inheritdoc */
+    UrlService.prototype.hash = function () { return; };
+
+    /** @inheritdoc */
+    UrlService.prototype.onChange = function (callback) { return; };
+
+    /**
+     * Returns the current URL parts
+     *
+     * This method returns the current URL components as a [[UrlParts]] object.
+     *
+     * @returns the current url parts
+     */
+    UrlService.prototype.parts = function () {
+      return { path: this.path(), search: this.search(), hash: this.hash() };
+    };
+    UrlService.prototype.dispose = function () { };
+    /** @inheritdoc */
+    UrlService.prototype.sync = function (evt) { return; };
+    /** @inheritdoc */
+    UrlService.prototype.listen = function (enabled) { return; };
+
+    /** @inheritdoc */
+    UrlService.prototype.deferIntercept = function (defer) { return; };
+    /** @inheritdoc */
+    UrlService.prototype.match = function (urlParts) { return; };
+    /** @hidden */
+    UrlService.locationServiceStub = makeStub(locationServicesFns);
+    /** @hidden */
+    UrlService.locationConfigStub = makeStub(locationConfigFns);
+    return UrlService;
+  }());
+
+  /**
+   * @coreapi
+   * @module core
+   */ /** */
+  /** @hidden */
+  var _routerInstance = 0;
+  /**
+   * The master class used to instantiate an instance of UI-Router.
+   *
+   * UI-Router (for each specific framework) will create an instance of this class during bootstrap.
+   * This class instantiates and wires the UI-Router services together.
+   *
+   * After a new instance of the UIRouter class is created, it should be configured for your app.
+   * For instance, app states should be registered with the [[UIRouter.stateRegistry]].
+   *
+   * ---
+   *
+   * Normally the framework code will bootstrap UI-Router.
+   * If you are bootstrapping UIRouter manually, tell it to monitor the URL by calling
+   * [[UrlService.listen]] then [[UrlService.sync]].
+   */
+  var UIRouter = /** @class */ (function () {
+    /**
+     * Creates a new `UIRouter` object
+     *
+     * @param locationService a [[LocationServices]] implementation
+     * @param locationConfig a [[LocationConfig]] implementation
+     * @internalapi
+     */
+    function UIRouter(locationService, locationConfig) {
+      if (locationService === void 0) { locationService = UrlService.locationServiceStub; }
+      if (locationConfig === void 0) { locationConfig = UrlService.locationConfigStub; }
+      this.locationService = locationService;
+      this.locationConfig = locationConfig;
+      /** @hidden */ this.$id = _routerInstance++;
+      /** @hidden */ this._disposed = false;
+      /** @hidden */ this._disposables = [];
+      /** Provides trace information to the console */
+      this.trace = trace;
+      /** Provides services related to ui-view synchronization */
+      this.viewService = new ViewService();
+      /** Provides services related to Transitions */
+      this.transitionService = new TransitionService(this);
+      /** Global router state */
+      this.globals = new UIRouterGlobals();
+      /**
+       * Deprecated for public use. Use [[urlService]] instead.
+       * @deprecated Use [[urlService]] instead
+       */
+      this.urlMatcherFactory = new UrlMatcherFactory();
+      /**
+       * Deprecated for public use. Use [[urlService]] instead.
+       * @deprecated Use [[urlService]] instead
+       */
+      this.urlRouter = new UrlRouter(this);
+      /** Provides a registry for states, and related registration services */
+      this.stateRegistry = new StateRegistry(this);
+      /** Provides services related to states */
+      this.stateService = new StateService(this);
+      /** Provides services related to the URL */
+      this.urlService = new UrlService(this);
+      /** @hidden */
+      this._plugins = {};
+      this.viewService._pluginapi._rootViewContext(this.stateRegistry.root());
+      this.globals.$current = this.stateRegistry.root();
+      this.globals.current = this.globals.$current.self;
+      this.disposable(this.globals);
+      this.disposable(this.stateService);
+      this.disposable(this.stateRegistry);
+      this.disposable(this.transitionService);
+      this.disposable(this.urlRouter);
+      this.disposable(locationService);
+      this.disposable(locationConfig);
+    }
+    /** Registers an object to be notified when the router is disposed */
+    UIRouter.prototype.disposable = function (disposable) {
+      this._disposables.push(disposable);
+    };
+    /**
+     * Disposes this router instance
+     *
+     * When called, clears resources retained by the router by calling `dispose(this)` on all
+     * registered [[disposable]] objects.
+     *
+     * Or, if a `disposable` object is provided, calls `dispose(this)` on that object only.
+     *
+     * @param disposable (optional) the disposable to dispose
+     */
+    UIRouter.prototype.dispose = function (disposable) {
+      var _this = this;
+      if (disposable && isFunction(disposable.dispose)) {
+        disposable.dispose(this);
+        return undefined;
+      }
+      this._disposed = true;
+      this._disposables.slice().forEach(function (d) {
+        try {
+          typeof d.dispose === 'function' && d.dispose(_this);
+          removeFrom(_this._disposables, d);
+        }
+        catch (ignored) { }
+      });
+    };
+    /**
+     * Adds a plugin to UI-Router
+     *
+     * This method adds a UI-Router Plugin.
+     * A plugin can enhance or change UI-Router behavior using any public API.
+     *
+     * #### Example:
+     * ```js
+     * import { MyCoolPlugin } from "ui-router-cool-plugin";
+     *
+     * var plugin = router.addPlugin(MyCoolPlugin);
+     * ```
+     *
+     * ### Plugin authoring
+     *
+     * A plugin is simply a class (or constructor function) which accepts a [[UIRouter]] instance and (optionally) an options object.
+     *
+     * The plugin can implement its functionality using any of the public APIs of [[UIRouter]].
+     * For example, it may configure router options or add a Transition Hook.
+     *
+     * The plugin can then be published as a separate module.
+     *
+     * #### Example:
+     * ```js
+     * export class MyAuthPlugin implements UIRouterPlugin {
+     *   constructor(router: UIRouter, options: any) {
+     *     this.name = "MyAuthPlugin";
+     *     let $transitions = router.transitionService;
+     *     let $state = router.stateService;
+     *
+     *     let authCriteria = {
+     *       to: (state) => state.data && state.data.requiresAuth
+     *     };
+     *
+     *     function authHook(transition: Transition) {
+     *       let authService = transition.injector().get('AuthService');
+     *       if (!authService.isAuthenticated()) {
+     *         return $state.target('login');
+     *       }
+     *     }
+     *
+     *     $transitions.onStart(authCriteria, authHook);
+     *   }
+     * }
+     * ```
+     *
+     * @param plugin one of:
+     *        - a plugin class which implements [[UIRouterPlugin]]
+     *        - a constructor function for a [[UIRouterPlugin]] which accepts a [[UIRouter]] instance
+     *        - a factory function which accepts a [[UIRouter]] instance and returns a [[UIRouterPlugin]] instance
+     * @param options options to pass to the plugin class/factory
+     * @returns the registered plugin instance
+     */
+    UIRouter.prototype.plugin = function (plugin, options) {
+      if (options === void 0) { options = {}; }
+      var pluginInstance = new plugin(this, options);
+      if (!pluginInstance.name)
+        throw new Error("Required property `name` missing on plugin: " + pluginInstance);
+      this._disposables.push(pluginInstance);
+      return this._plugins[pluginInstance.name] = pluginInstance;
+    };
+    UIRouter.prototype.getPlugin = function (pluginName) {
+      return pluginName ? this._plugins[pluginName] : values(this._plugins);
+    };
+    return UIRouter;
+  }());
+
+  /** @module hooks */ /** */
+  function addCoreResolvables(trans) {
+    trans.addResolvable({ token: UIRouter, deps: [], resolveFn: function () { return trans.router; }, data: trans.router }, "");
+    trans.addResolvable({ token: Transition, deps: [], resolveFn: function () { return trans; }, data: trans }, "");
+    trans.addResolvable({ token: '$transition$', deps: [], resolveFn: function () { return trans; }, data: trans }, "");
+    trans.addResolvable({ token: '$stateParams', deps: [], resolveFn: function () { return trans.params(); }, data: trans.params() }, "");
+    trans.entering().forEach(function (state) {
+      trans.addResolvable({ token: '$state$', deps: [], resolveFn: function () { return state; }, data: state }, state);
+    });
+  }
+  var registerAddCoreResolvables = function (transitionService) {
+    return transitionService.onCreate({}, addCoreResolvables);
+  };
+
+  /** @module hooks */ /** */
+  /**
+   * A [[TransitionHookFn]] that redirects to a different state or params
+   *
+   * Registered using `transitionService.onStart({ to: (state) => !!state.redirectTo }, redirectHook);`
+   *
+   * See [[StateDeclaration.redirectTo]]
+   */
+  var redirectToHook = function (trans) {
+    var redirect = trans.to().redirectTo;
+    if (!redirect)
+      return;
+    var $state = trans.router.stateService;
+    function handleResult(result) {
+      if (!result)
+        return;
+      if (result instanceof TargetState)
+        return result;
+      if (isString(result))
+        return $state.target(result, trans.params(), trans.options());
+      if (result['state'] || result['params'])
+        return $state.target(result['state'] || trans.to(), result['params'] || trans.params(), trans.options());
+    }
+    if (isFunction(redirect)) {
+      return services.$q.when(redirect(trans)).then(handleResult);
+    }
+    return handleResult(redirect);
+  };
+  var registerRedirectToHook = function (transitionService) {
+    return transitionService.onStart({ to: function (state) { return !!state.redirectTo; } }, redirectToHook);
+  };
+
+  /**
+   * A factory which creates an onEnter, onExit or onRetain transition hook function
+   *
+   * The returned function invokes the (for instance) state.onEnter hook when the
+   * state is being entered.
+   *
+   * @hidden
+   */
+  function makeEnterExitRetainHook(hookName) {
+    return function (transition, state) {
+      var _state = state.$$state();
+      var hookFn = _state[hookName];
+      return hookFn(transition, state);
+    };
+  }
+  /**
+   * The [[TransitionStateHookFn]] for onExit
+   *
+   * When the state is being exited, the state's .onExit function is invoked.
+   *
+   * Registered using `transitionService.onExit({ exiting: (state) => !!state.onExit }, onExitHook);`
+   *
+   * See: [[IHookRegistry.onExit]]
+   */
+  var onExitHook = makeEnterExitRetainHook('onExit');
+  var registerOnExitHook = function (transitionService) {
+    return transitionService.onExit({ exiting: function (state) { return !!state.onExit; } }, onExitHook);
+  };
+  /**
+   * The [[TransitionStateHookFn]] for onRetain
+   *
+   * When the state was already entered, and is not being exited or re-entered, the state's .onRetain function is invoked.
+   *
+   * Registered using `transitionService.onRetain({ retained: (state) => !!state.onRetain }, onRetainHook);`
+   *
+   * See: [[IHookRegistry.onRetain]]
+   */
+  var onRetainHook = makeEnterExitRetainHook('onRetain');
+  var registerOnRetainHook = function (transitionService) {
+    return transitionService.onRetain({ retained: function (state) { return !!state.onRetain; } }, onRetainHook);
+  };
+  /**
+   * The [[TransitionStateHookFn]] for onEnter
+   *
+   * When the state is being entered, the state's .onEnter function is invoked.
+   *
+   * Registered using `transitionService.onEnter({ entering: (state) => !!state.onEnter }, onEnterHook);`
+   *
+   * See: [[IHookRegistry.onEnter]]
+   */
+  var onEnterHook = makeEnterExitRetainHook('onEnter');
+  var registerOnEnterHook = function (transitionService) {
+    return transitionService.onEnter({ entering: function (state) { return !!state.onEnter; } }, onEnterHook);
+  };
+
+  /** @module hooks */
+  /** for typedoc */
+  /**
+   * A [[TransitionHookFn]] which resolves all EAGER Resolvables in the To Path
+   *
+   * Registered using `transitionService.onStart({}, eagerResolvePath);`
+   *
+   * When a Transition starts, this hook resolves all the EAGER Resolvables, which the transition then waits for.
+   *
+   * See [[StateDeclaration.resolve]]
+   */
+  var eagerResolvePath = function (trans) {
+    return new ResolveContext(trans.treeChanges().to)
+      .resolvePath("EAGER", trans)
+      .then(noop$1);
+  };
+  var registerEagerResolvePath = function (transitionService) {
+    return transitionService.onStart({}, eagerResolvePath, { priority: 1000 });
+  };
+  /**
+   * A [[TransitionHookFn]] which resolves all LAZY Resolvables for the state (and all its ancestors) in the To Path
+   *
+   * Registered using `transitionService.onEnter({ entering: () => true }, lazyResolveState);`
+   *
+   * When a State is being entered, this hook resolves all the Resolvables for this state, which the transition then waits for.
+   *
+   * See [[StateDeclaration.resolve]]
+   */
+  var lazyResolveState = function (trans, state) {
+    return new ResolveContext(trans.treeChanges().to)
+      .subContext(state.$$state())
+      .resolvePath("LAZY", trans)
+      .then(noop$1);
+  };
+  var registerLazyResolveState = function (transitionService) {
+    return transitionService.onEnter({ entering: val(true) }, lazyResolveState, { priority: 1000 });
+  };
+
+  /** @module hooks */ /** for typedoc */
+  /**
+   * A [[TransitionHookFn]] which waits for the views to load
+   *
+   * Registered using `transitionService.onStart({}, loadEnteringViews);`
+   *
+   * Allows the views to do async work in [[ViewConfig.load]] before the transition continues.
+   * In angular 1, this includes loading the templates.
+   */
+  var loadEnteringViews = function (transition) {
+    var $q = services.$q;
+    var enteringViews = transition.views("entering");
+    if (!enteringViews.length)
+      return;
+    return $q.all(enteringViews.map(function (view) { return $q.when(view.load()); })).then(noop$1);
+  };
+  var registerLoadEnteringViews = function (transitionService) {
+    return transitionService.onFinish({}, loadEnteringViews);
+  };
+  /**
+   * A [[TransitionHookFn]] which activates the new views when a transition is successful.
+   *
+   * Registered using `transitionService.onSuccess({}, activateViews);`
+   *
+   * After a transition is complete, this hook deactivates the old views from the previous state,
+   * and activates the new views from the destination state.
+   *
+   * See [[ViewService]]
+   */
+  var activateViews = function (transition) {
+    var enteringViews = transition.views("entering");
+    var exitingViews = transition.views("exiting");
+    if (!enteringViews.length && !exitingViews.length)
+      return;
+    var $view = transition.router.viewService;
+    exitingViews.forEach(function (vc) { return $view.deactivateViewConfig(vc); });
+    enteringViews.forEach(function (vc) { return $view.activateViewConfig(vc); });
+    $view.sync();
+  };
+  var registerActivateViews = function (transitionService) {
+    return transitionService.onSuccess({}, activateViews);
+  };
+
+  /**
+   * A [[TransitionHookFn]] which updates global UI-Router state
+   *
+   * Registered using `transitionService.onBefore({}, updateGlobalState);`
+   *
+   * Before a [[Transition]] starts, updates the global value of "the current transition" ([[Globals.transition]]).
+   * After a successful [[Transition]], updates the global values of "the current state"
+   * ([[Globals.current]] and [[Globals.$current]]) and "the current param values" ([[Globals.params]]).
+   *
+   * See also the deprecated properties:
+   * [[StateService.transition]], [[StateService.current]], [[StateService.params]]
+   */
+  var updateGlobalState = function (trans) {
+    var globals = trans.router.globals;
+    var transitionSuccessful = function () {
+      globals.successfulTransitions.enqueue(trans);
+      globals.$current = trans.$to();
+      globals.current = globals.$current.self;
+      copy(trans.params(), globals.params);
+    };
+    var clearCurrentTransition = function () {
+      // Do not clear globals.transition if a different transition has started in the meantime
+      if (globals.transition === trans)
+        globals.transition = null;
+    };
+    trans.onSuccess({}, transitionSuccessful, { priority: 10000 });
+    trans.promise.then(clearCurrentTransition, clearCurrentTransition);
+  };
+  var registerUpdateGlobalState = function (transitionService) {
+    return transitionService.onCreate({}, updateGlobalState);
+  };
+
+  /**
+   * A [[TransitionHookFn]] which updates the URL after a successful transition
+   *
+   * Registered using `transitionService.onSuccess({}, updateUrl);`
+   */
+  var updateUrl = function (transition) {
+    var options = transition.options();
+    var $state = transition.router.stateService;
+    var $urlRouter = transition.router.urlRouter;
+    // Dont update the url in these situations:
+    // The transition was triggered by a URL sync (options.source === 'url')
+    // The user doesn't want the url to update (options.location === false)
+    // The destination state, and all parents have no navigable url
+    if (options.source !== 'url' && options.location && $state.$current.navigable) {
+      var urlOptions = { replace: options.location === 'replace' };
+      $urlRouter.push($state.$current.navigable.url, $state.params, urlOptions);
+    }
+    $urlRouter.update(true);
+  };
+  var registerUpdateUrl = function (transitionService) {
+    return transitionService.onSuccess({}, updateUrl, { priority: 9999 });
+  };
+
+  /**
+   * A [[TransitionHookFn]] that performs lazy loading
+   *
+   * When entering a state "abc" which has a `lazyLoad` function defined:
+   * - Invoke the `lazyLoad` function (unless it is already in process)
+   *   - Flag the hook function as "in process"
+   *   - The function should return a promise (that resolves when lazy loading is complete)
+   * - Wait for the promise to settle
+   *   - If the promise resolves to a [[LazyLoadResult]], then register those states
+   *   - Flag the hook function as "not in process"
+   * - If the hook was successful
+   *   - Remove the `lazyLoad` function from the state declaration
+   * - If all the hooks were successful
+   *   - Retry the transition (by returning a TargetState)
+   *
+   * ```
+   * .state('abc', {
+ *   component: 'fooComponent',
+ *   lazyLoad: () => System.import('./fooComponent')
+ *   });
+   * ```
+   *
+   * See [[StateDeclaration.lazyLoad]]
+   */
+  var lazyLoadHook = function (transition) {
+    var router = transition.router;
+    function retryTransition() {
+      if (transition.originalTransition().options().source !== 'url') {
+        // The original transition was not triggered via url sync
+        // The lazy state should be loaded now, so re-try the original transition
+        var orig = transition.targetState();
+        return router.stateService.target(orig.identifier(), orig.params(), orig.options());
+      }
+      // The original transition was triggered via url sync
+      // Run the URL rules and find the best match
+      var $url = router.urlService;
+      var result = $url.match($url.parts());
+      var rule = result && result.rule;
+      // If the best match is a state, redirect the transition (instead
+      // of calling sync() which supersedes the current transition)
+      if (rule && rule.type === "STATE") {
+        var state = rule.state;
+        var params = result.match;
+        return router.stateService.target(state, params, transition.options());
+      }
+      // No matching state found, so let .sync() choose the best non-state match/otherwise
+      router.urlService.sync();
+    }
+    var promises = transition.entering()
+      .filter(function (state) { return !!state.$$state().lazyLoad; })
+      .map(function (state) { return lazyLoadState(transition, state); });
+    return services.$q.all(promises).then(retryTransition);
+  };
+  var registerLazyLoadHook = function (transitionService) {
+    return transitionService.onBefore({ entering: function (state) { return !!state.lazyLoad; } }, lazyLoadHook);
+  };
+  /**
+   * Invokes a state's lazy load function
+   *
+   * @param transition a Transition context
+   * @param state the state to lazy load
+   * @returns A promise for the lazy load result
+   */
+  function lazyLoadState(transition, state) {
+    var lazyLoadFn = state.$$state().lazyLoad;
+    // Store/get the lazy load promise on/from the hookfn so it doesn't get re-invoked
+    var promise = lazyLoadFn['_promise'];
+    if (!promise) {
+      var success = function (result) {
+        delete state.lazyLoad;
+        delete state.$$state().lazyLoad;
+        delete lazyLoadFn['_promise'];
+        return result;
+      };
+      var error = function (err) {
+        delete lazyLoadFn['_promise'];
+        return services.$q.reject(err);
+      };
+      promise = lazyLoadFn['_promise'] =
+        services.$q.when(lazyLoadFn(transition, state))
+          .then(updateStateRegistry)
+          .then(success, error);
+    }
+    /** Register any lazy loaded state definitions */
+    function updateStateRegistry(result) {
+      if (result && Array.isArray(result.states)) {
+        result.states.forEach(function (state) { return transition.router.stateRegistry.register(state); });
+      }
+      return result;
+    }
+    return promise;
+  }
+
+  /**
+   * This class defines a type of hook, such as `onBefore` or `onEnter`.
+   * Plugins can define custom hook types, such as sticky states does for `onInactive`.
+   *
+   * @interalapi
+   */
+  var TransitionEventType = /** @class */ (function () {
+    function TransitionEventType(name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous) {
+      if (reverseSort === void 0) { reverseSort = false; }
+      if (getResultHandler === void 0) { getResultHandler = TransitionHook.HANDLE_RESULT; }
+      if (getErrorHandler === void 0) { getErrorHandler = TransitionHook.REJECT_ERROR; }
+      if (synchronous === void 0) { synchronous = false; }
+      this.name = name;
+      this.hookPhase = hookPhase;
+      this.hookOrder = hookOrder;
+      this.criteriaMatchPath = criteriaMatchPath;
+      this.reverseSort = reverseSort;
+      this.getResultHandler = getResultHandler;
+      this.getErrorHandler = getErrorHandler;
+      this.synchronous = synchronous;
+    }
+    return TransitionEventType;
+  }());
+
+  /** @module hooks */ /** */
+  /**
+   * A [[TransitionHookFn]] that skips a transition if it should be ignored
+   *
+   * This hook is invoked at the end of the onBefore phase.
+   *
+   * If the transition should be ignored (because no parameter or states changed)
+   * then the transition is ignored and not processed.
+   */
+  function ignoredHook(trans) {
+    var ignoredReason = trans._ignoredReason();
+    if (!ignoredReason)
+      return;
+    trace.traceTransitionIgnored(trans);
+    var pending = trans.router.globals.transition;
+    // The user clicked a link going back to the *current state* ('A')
+    // However, there is also a pending transition in flight (to 'B')
+    // Abort the transition to 'B' because the user now wants to be back at 'A'.
+    if (ignoredReason === 'SameAsCurrent' && pending) {
+      pending.abort();
+    }
+    return Rejection.ignored().toPromise();
+  }
+  var registerIgnoredTransitionHook = function (transitionService) {
+    return transitionService.onBefore({}, ignoredHook, { priority: -9999 });
+  };
+
+  /** @module hooks */ /** */
+  /**
+   * A [[TransitionHookFn]] that rejects the Transition if it is invalid
+   *
+   * This hook is invoked at the end of the onBefore phase.
+   * If the transition is invalid (for example, param values do not validate)
+   * then the transition is rejected.
+   */
+  function invalidTransitionHook(trans) {
+    if (!trans.valid()) {
+      throw new Error(trans.error());
+    }
+  }
+  var registerInvalidTransitionHook = function (transitionService) {
+    return transitionService.onBefore({}, invalidTransitionHook, { priority: -10000 });
+  };
+
+  /**
+   * @coreapi
+   * @module transition
+   */
+  /** for typedoc */
+  /**
+   * The default [[Transition]] options.
+   *
+   * Include this object when applying custom defaults:
+   * let reloadOpts = { reload: true, notify: true }
+   * let options = defaults(theirOpts, customDefaults, defaultOptions);
+   */
+  var defaultTransOpts = {
+    location: true,
+    relative: null,
+    inherit: false,
+    notify: true,
+    reload: false,
+    custom: {},
+    current: function () { return null; },
+    source: "unknown"
+  };
+  /**
+   * This class provides services related to Transitions.
+   *
+   * - Most importantly, it allows global Transition Hooks to be registered.
+   * - It allows the default transition error handler to be set.
+   * - It also has a factory function for creating new [[Transition]] objects, (used internally by the [[StateService]]).
+   *
+   * At bootstrap, [[UIRouter]] creates a single instance (singleton) of this class.
+   */
+  var TransitionService = /** @class */ (function () {
+    /** @hidden */
+    function TransitionService(_router) {
+      /** @hidden */
+      this._transitionCount = 0;
+      /** @hidden The transition hook types, such as `onEnter`, `onStart`, etc */
+      this._eventTypes = [];
+      /** @hidden The registered transition hooks */
+      this._registeredHooks = {};
+      /** @hidden The  paths on a criteria object */
+      this._criteriaPaths = {};
+      this._router = _router;
+      this.$view = _router.viewService;
+      this._deregisterHookFns = {};
+      this._pluginapi = createProxyFunctions(val(this), {}, val(this), [
+        '_definePathType',
+        '_defineEvent',
+        '_getPathTypes',
+        '_getEvents',
+        'getHooks',
+      ]);
+      this._defineCorePaths();
+      this._defineCoreEvents();
+      this._registerCoreTransitionHooks();
+    }
+    /**
+     * Registers a [[TransitionHookFn]], called *while a transition is being constructed*.
+     *
+     * Registers a transition lifecycle hook, which is invoked during transition construction.
+     *
+     * This low level hook should only be used by plugins.
+     * This can be a useful time for plugins to add resolves or mutate the transition as needed.
+     * The Sticky States plugin uses this hook to modify the treechanges.
+     *
+     * ### Lifecycle
+     *
+     * `onCreate` hooks are invoked *while a transition is being constructed*.
+     *
+     * ### Return value
+     *
+     * The hook's return value is ignored
+     *
+     * @internalapi
+     * @param criteria defines which Transitions the Hook should be invoked for.
+     * @param callback the hook function which will be invoked.
+     * @param options the registration options
+     * @returns a function which deregisters the hook.
+     */
+    TransitionService.prototype.onCreate = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onBefore = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onStart = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onExit = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onRetain = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onEnter = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onFinish = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onSuccess = function (criteria, callback, options) { return; };
+    /** @inheritdoc */
+    TransitionService.prototype.onError = function (criteria, callback, options) { return; };
+    /**
+     * dispose
+     * @internalapi
+     */
+    TransitionService.prototype.dispose = function (router) {
+      values(this._registeredHooks).forEach(function (hooksArray) { return hooksArray.forEach(function (hook) {
+        hook._deregistered = true;
+        removeFrom(hooksArray, hook);
+      }); });
+    };
+    /**
+     * Creates a new [[Transition]] object
+     *
+     * This is a factory function for creating new Transition objects.
+     * It is used internally by the [[StateService]] and should generally not be called by application code.
+     *
+     * @param fromPath the path to the current state (the from state)
+     * @param targetState the target state (destination)
+     * @returns a Transition
+     */
+    TransitionService.prototype.create = function (fromPath, targetState) {
+      return new Transition(fromPath, targetState, this._router);
+    };
+    /** @hidden */
+    TransitionService.prototype._defineCoreEvents = function () {
+      var Phase = exports.TransitionHookPhase;
+      var TH = TransitionHook;
+      var paths = this._criteriaPaths;
+      var NORMAL_SORT = false, REVERSE_SORT = true;
+      var ASYNCHRONOUS = false, SYNCHRONOUS = true;
+      this._defineEvent("onCreate", Phase.CREATE, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.THROW_ERROR, SYNCHRONOUS);
+      this._defineEvent("onBefore", Phase.BEFORE, 0, paths.to);
+      this._defineEvent("onStart", Phase.RUN, 0, paths.to);
+      this._defineEvent("onExit", Phase.RUN, 100, paths.exiting, REVERSE_SORT);
+      this._defineEvent("onRetain", Phase.RUN, 200, paths.retained);
+      this._defineEvent("onEnter", Phase.RUN, 300, paths.entering);
+      this._defineEvent("onFinish", Phase.RUN, 400, paths.to);
+      this._defineEvent("onSuccess", Phase.SUCCESS, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.LOG_ERROR, SYNCHRONOUS);
+      this._defineEvent("onError", Phase.ERROR, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.LOG_ERROR, SYNCHRONOUS);
+    };
+    /** @hidden */
+    TransitionService.prototype._defineCorePaths = function () {
+      var STATE = exports.TransitionHookScope.STATE, TRANSITION = exports.TransitionHookScope.TRANSITION;
+      this._definePathType("to", TRANSITION);
+      this._definePathType("from", TRANSITION);
+      this._definePathType("exiting", STATE);
+      this._definePathType("retained", STATE);
+      this._definePathType("entering", STATE);
+    };
+    /** @hidden */
+    TransitionService.prototype._defineEvent = function (name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous) {
+      if (reverseSort === void 0) { reverseSort = false; }
+      if (getResultHandler === void 0) { getResultHandler = TransitionHook.HANDLE_RESULT; }
+      if (getErrorHandler === void 0) { getErrorHandler = TransitionHook.REJECT_ERROR; }
+      if (synchronous === void 0) { synchronous = false; }
+      var eventType = new TransitionEventType(name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous);
+      this._eventTypes.push(eventType);
+      makeEvent(this, this, eventType);
+    };
+
+    /** @hidden */
+    TransitionService.prototype._getEvents = function (phase) {
+      var transitionHookTypes = isDefined(phase) ?
+        this._eventTypes.filter(function (type) { return type.hookPhase === phase; }) :
+        this._eventTypes.slice();
+      return transitionHookTypes.sort(function (l, r) {
+        var cmpByPhase = l.hookPhase - r.hookPhase;
+        return cmpByPhase === 0 ? l.hookOrder - r.hookOrder : cmpByPhase;
+      });
+    };
+    /**
+     * Adds a Path to be used as a criterion against a TreeChanges path
+     *
+     * For example: the `exiting` path in [[HookMatchCriteria]] is a STATE scoped path.
+     * It was defined by calling `defineTreeChangesCriterion('exiting', TransitionHookScope.STATE)`
+     * Each state in the exiting path is checked against the criteria and returned as part of the match.
+     *
+     * Another example: the `to` path in [[HookMatchCriteria]] is a TRANSITION scoped path.
+     * It was defined by calling `defineTreeChangesCriterion('to', TransitionHookScope.TRANSITION)`
+     * Only the tail of the `to` path is checked against the criteria and returned as part of the match.
+     *
+     * @hidden
+     */
+    TransitionService.prototype._definePathType = function (name, hookScope) {
+      this._criteriaPaths[name] = { name: name, scope: hookScope };
+    };
+    /** * @hidden */
+    TransitionService.prototype._getPathTypes = function () {
+      return this._criteriaPaths;
+    };
+    /** @hidden */
+    TransitionService.prototype.getHooks = function (hookName) {
+      return this._registeredHooks[hookName];
+    };
+    /** @hidden */
+    TransitionService.prototype._registerCoreTransitionHooks = function () {
+      var fns = this._deregisterHookFns;
+      fns.addCoreResolves = registerAddCoreResolvables(this);
+      fns.ignored = registerIgnoredTransitionHook(this);
+      fns.invalid = registerInvalidTransitionHook(this);
+      // Wire up redirectTo hook
+      fns.redirectTo = registerRedirectToHook(this);
+      // Wire up onExit/Retain/Enter state hooks
+      fns.onExit = registerOnExitHook(this);
+      fns.onRetain = registerOnRetainHook(this);
+      fns.onEnter = registerOnEnterHook(this);
+      // Wire up Resolve hooks
+      fns.eagerResolve = registerEagerResolvePath(this);
+      fns.lazyResolve = registerLazyResolveState(this);
+      // Wire up the View management hooks
+      fns.loadViews = registerLoadEnteringViews(this);
+      fns.activateViews = registerActivateViews(this);
+      // Updates global state after a transition
+      fns.updateGlobals = registerUpdateGlobalState(this);
+      // After globals.current is updated at priority: 10000
+      fns.updateUrl = registerUpdateUrl(this);
+      // Lazy load state trees
+      fns.lazyLoad = registerLazyLoadHook(this);
+    };
+    return TransitionService;
+  }());
+
+  /**
+   * @coreapi
+   * @module state
+   */
+  /** */
+  /**
+   * Provides state related service functions
+   *
+   * This class provides services related to ui-router states.
+   * An instance of this class is located on the global [[UIRouter]] object.
+   */
+  var StateService = /** @class */ (function () {
+    /** @internalapi */
+    function StateService(router) {
+      this.router = router;
+      /** @internalapi */
+      this.invalidCallbacks = [];
+      /** @hidden */
+      this._defaultErrorHandler = function $defaultErrorHandler($error$) {
+        if ($error$ instanceof Error && $error$.stack) {
+          console.error($error$);
+          console.error($error$.stack);
+        }
+        else if ($error$ instanceof Rejection) {
+          console.error($error$.toString());
+          if ($error$.detail && $error$.detail.stack)
+            console.error($error$.detail.stack);
+        }
+        else {
+          console.error($error$);
+        }
+      };
+      var getters = ['current', '$current', 'params', 'transition'];
+      var boundFns = Object.keys(StateService.prototype).filter(not(inArray(getters)));
+      createProxyFunctions(val(StateService.prototype), this, val(this), boundFns);
+    }
+    Object.defineProperty(StateService.prototype, "transition", {
+      /**
+       * The [[Transition]] currently in progress (or null)
+       *
+       * This is a passthrough through to [[UIRouterGlobals.transition]]
+       */
+      get: function () { return this.router.globals.transition; },
+      enumerable: true,
+      configurable: true
+    });
+    Object.defineProperty(StateService.prototype, "params", {
+      /**
+       * The latest successful state parameters
+       *
+       * This is a passthrough through to [[UIRouterGlobals.params]]
+       */
+      get: function () { return this.router.globals.params; },
+      enumerable: true,
+      configurable: true
+    });
+    Object.defineProperty(StateService.prototype, "current", {
+      /**
+       * The current [[StateDeclaration]]
+       *
+       * This is a passthrough through to [[UIRouterGlobals.current]]
+       */
+      get: function () { return this.router.globals.current; },
+      enumerable: true,
+      configurable: true
+    });
+    Object.defineProperty(StateService.prototype, "$current", {
+      /**
+       * The current [[StateObject]]
+       *
+       * This is a passthrough through to [[UIRouterGlobals.$current]]
+       */
+      get: function () { return this.router.globals.$current; },
+      enumerable: true,
+      configurable: true
+    });
+    /** @internalapi */
+    StateService.prototype.dispose = function () {
+      this.defaultErrorHandler(noop$1);
+      this.invalidCallbacks = [];
+    };
+    /**
+     * Handler for when [[transitionTo]] is called with an invalid state.
+     *
+     * Invokes the [[onInvalid]] callbacks, in natural order.
+     * Each callback's return value is checked in sequence until one of them returns an instance of TargetState.
+     * The results of the callbacks are wrapped in $q.when(), so the callbacks may return promises.
+     *
+     * If a callback returns an TargetState, then it is used as arguments to $state.transitionTo() and the result returned.
+     *
+     * @internalapi
+     */
+    StateService.prototype._handleInvalidTargetState = function (fromPath, toState) {
+      var _this = this;
+      var fromState = PathUtils.makeTargetState(this.router.stateRegistry, fromPath);
+      var globals = this.router.globals;
+      var latestThing = function () { return globals.transitionHistory.peekTail(); };
+      var latest = latestThing();
+      var callbackQueue = new Queue(this.invalidCallbacks.slice());
+      var injector = new ResolveContext(fromPath).injector();
+      var checkForRedirect = function (result) {
+        if (!(result instanceof TargetState)) {
+          return;
+        }
+        var target = result;
+        // Recreate the TargetState, in case the state is now defined.
+        target = _this.target(target.identifier(), target.params(), target.options());
+        if (!target.valid()) {
+          return Rejection.invalid(target.error()).toPromise();
+        }
+        if (latestThing() !== latest) {
+          return Rejection.superseded().toPromise();
+        }
+        return _this.transitionTo(target.identifier(), target.params(), target.options());
+      };
+      function invokeNextCallback() {
+        var nextCallback = callbackQueue.dequeue();
+        if (nextCallback === undefined)
+          return Rejection.invalid(toState.error()).toPromise();
+        var callbackResult = services.$q.when(nextCallback(toState, fromState, injector));
+        return callbackResult.then(checkForRedirect).then(function (result) { return result || invokeNextCallback(); });
+      }
+      return invokeNextCallback();
+    };
+    /**
+     * Registers an Invalid State handler
+     *
+     * Registers a [[OnInvalidCallback]] function to be invoked when [[StateService.transitionTo]]
+     * has been called with an invalid state reference parameter
+     *
+     * Example:
+     * ```js
+     * stateService.onInvalid(function(to, from, injector) {
+     *   if (to.name() === 'foo') {
+     *     let lazyLoader = injector.get('LazyLoadService');
+     *     return lazyLoader.load('foo')
+     *         .then(() => stateService.target('foo'));
+     *   }
+     * });
+     * ```
+     *
+     * @param {function} callback invoked when the toState is invalid
+     *   This function receives the (invalid) toState, the fromState, and an injector.
+     *   The function may optionally return a [[TargetState]] or a Promise for a TargetState.
+     *   If one is returned, it is treated as a redirect.
+     *
+     * @returns a function which deregisters the callback
+     */
+    StateService.prototype.onInvalid = function (callback) {
+      this.invalidCallbacks.push(callback);
+      return function deregisterListener() {
+        removeFrom(this.invalidCallbacks)(callback);
+      }.bind(this);
+    };
+    /**
+     * Reloads the current state
+     *
+     * A method that force reloads the current state, or a partial state hierarchy.
+     * All resolves are re-resolved, and components reinstantiated.
+     *
+     * #### Example:
+     * ```js
+     * let app angular.module('app', ['ui.router']);
+     *
+     * app.controller('ctrl', function ($scope, $state) {
+     *   $scope.reload = function(){
+     *     $state.reload();
+     *   }
+     * });
+     * ```
+     *
+     * Note: `reload()` is just an alias for:
+     *
+     * ```js
+     * $state.transitionTo($state.current, $state.params, {
+     *   reload: true, inherit: false
+     * });
+     * ```
+     *
+     * @param reloadState A state name or a state object.
+     *    If present, this state and all its children will be reloaded, but ancestors will not reload.
+     *
+     * #### Example:
+     * ```js
+     * //assuming app application consists of 3 states: 'contacts', 'contacts.detail', 'contacts.detail.item'
+     * //and current state is 'contacts.detail.item'
+     * let app angular.module('app', ['ui.router']);
+     *
+     * app.controller('ctrl', function ($scope, $state) {
+     *   $scope.reload = function(){
+     *     //will reload 'contact.detail' and nested 'contact.detail.item' states
+     *     $state.reload('contact.detail');
+     *   }
+     * });
+     * ```
+     *
+     * @returns A promise representing the state of the new transition. See [[StateService.go]]
+     */
+    StateService.prototype.reload = function (reloadState) {
+      return this.transitionTo(this.current, this.params, {
+        reload: isDefined(reloadState) ? reloadState : true,
+        inherit: false,
+        notify: false,
+      });
+    };
+
+    /**
+     * Transition to a different state and/or parameters
+     *
+     * Convenience method for transitioning to a new state.
+     *
+     * `$state.go` calls `$state.transitionTo` internally but automatically sets options to
+     * `{ location: true, inherit: true, relative: router.globals.$current, notify: true }`.
+     * This allows you to use either an absolute or relative `to` argument (because of `relative: router.globals.$current`).
+     * It also allows you to specify * only the parameters you'd like to update, while letting unspecified parameters
+     * inherit from the current parameter values (because of `inherit: true`).
+     *
+     * #### Example:
+     * ```js
+     * let app = angular.module('app', ['ui.router']);
+     *
+     * app.controller('ctrl', function ($scope, $state) {
+     *   $scope.changeState = function () {
+     *     $state.go('contact.detail');
+     *   };
+     * });
+     * ```
+     *
+     * @param to Absolute state name, state object, or relative state path (relative to current state).
+     *
+     * Some examples:
+     *
+     * - `$state.go('contact.detail')` - will go to the `contact.detail` state
+     * - `$state.go('^')` - will go to the parent state
+     * - `$state.go('^.sibling')` - if current state is `home.child`, will go to the `home.sibling` state
+     * - `$state.go('.child.grandchild')` - if current state is home, will go to the `home.child.grandchild` state
+     *
+     * @param params A map of the parameters that will be sent to the state, will populate $stateParams.
+     *
+     *    Any parameters that are not specified will be inherited from current parameter values (because of `inherit: true`).
+     *    This allows, for example, going to a sibling state that shares parameters defined by a parent state.
+     *
+     * @param options Transition options
+     *
+     * @returns {promise} A promise representing the state of the new transition.
+     */
+    StateService.prototype.go = function (to, params, options) {
+      var defautGoOpts = { relative: this.$current, inherit: true };
+      var transOpts = defaults(options, defautGoOpts, defaultTransOpts);
+      return this.transitionTo(to, params, transOpts);
+    };
+
+    /**
+     * Creates a [[TargetState]]
+     *
+     * This is a factory method for creating a TargetState
+     *
+     * This may be returned from a Transition Hook to redirect a transition, for example.
+     */
+    StateService.prototype.target = function (identifier, params, options) {
+      if (options === void 0) { options = {}; }
+      // If we're reloading, find the state object to reload from
+      if (isObject(options.reload) && !options.reload.name)
+        throw new Error('Invalid reload state object');
+      var reg = this.router.stateRegistry;
+      options.reloadState = options.reload === true ? reg.root() : reg.matcher.find(options.reload, options.relative);
+      if (options.reload && !options.reloadState)
+        throw new Error("No such reload state '" + (isString(options.reload) ? options.reload : options.reload.name) + "'");
+      return new TargetState(this.router.stateRegistry, identifier, params, options);
+    };
+
+    StateService.prototype.getCurrentPath = function () {
+      var _this = this;
+      var globals = this.router.globals;
+      var latestSuccess = globals.successfulTransitions.peekTail();
+      var rootPath = function () { return [new PathNode(_this.router.stateRegistry.root())]; };
+      return latestSuccess ? latestSuccess.treeChanges().to : rootPath();
+    };
+    /**
+     * Low-level method for transitioning to a new state.
+     *
+     * The [[go]] method (which uses `transitionTo` internally) is recommended in most situations.
+     *
+     * #### Example:
+     * ```js
+     * let app = angular.module('app', ['ui.router']);
+     *
+     * app.controller('ctrl', function ($scope, $state) {
+     *   $scope.changeState = function () {
+     *     $state.transitionTo('contact.detail');
+     *   };
+     * });
+     * ```
+     *
+     * @param to State name or state object.
+     * @param toParams A map of the parameters that will be sent to the state,
+     *      will populate $stateParams.
+     * @param options Transition options
+     *
+     * @returns A promise representing the state of the new transition. See [[go]]
+     */
+    StateService.prototype.transitionTo = function (to, toParams, options) {
+      var _this = this;
+      if (toParams === void 0) { toParams = {}; }
+      if (options === void 0) { options = {}; }
+      var router = this.router;
+      var globals = router.globals;
+      options = defaults(options, defaultTransOpts);
+      var getCurrent = function () {
+        return globals.transition;
+      };
+      options = extend(options, { current: getCurrent });
+      var ref = this.target(to, toParams, options);
+      var currentPath = this.getCurrentPath();
+      if (!ref.exists())
+        return this._handleInvalidTargetState(currentPath, ref);
+      if (!ref.valid())
+        return silentRejection(ref.error());
+      /**
+       * Special handling for Ignored, Aborted, and Redirected transitions
+       *
+       * The semantics for the transition.run() promise and the StateService.transitionTo()
+       * promise differ. For instance, the run() promise may be rejected because it was
+       * IGNORED, but the transitionTo() promise is resolved because from the user perspective
+       * no error occurred.  Likewise, the transition.run() promise may be rejected because of
+       * a Redirect, but the transitionTo() promise is chained to the new Transition's promise.
+       */
+      var rejectedTransitionHandler = function (transition) { return function (error) {
+        if (error instanceof Rejection) {
+          var isLatest = router.globals.lastStartedTransitionId === transition.$id;
+          if (error.type === exports.RejectType.IGNORED) {
+            isLatest && router.urlRouter.update();
+            // Consider ignored `Transition.run()` as a successful `transitionTo`
+            return services.$q.when(globals.current);
+          }
+          var detail = error.detail;
+          if (error.type === exports.RejectType.SUPERSEDED && error.redirected && detail instanceof TargetState) {
+            // If `Transition.run()` was redirected, allow the `transitionTo()` promise to resolve successfully
+            // by returning the promise for the new (redirect) `Transition.run()`.
+            var redirect = transition.redirect(detail);
+            return redirect.run().catch(rejectedTransitionHandler(redirect));
+          }
+          if (error.type === exports.RejectType.ABORTED) {
+            isLatest && router.urlRouter.update();
+            return services.$q.reject(error);
+          }
+        }
+        var errorHandler = _this.defaultErrorHandler();
+        errorHandler(error);
+        return services.$q.reject(error);
+      }; };
+      var transition = this.router.transitionService.create(currentPath, ref);
+      var transitionToPromise = transition.run().catch(rejectedTransitionHandler(transition));
+      silenceUncaughtInPromise(transitionToPromise); // issue #2676
+      // Return a promise for the transition, which also has the transition object on it.
+      return extend(transitionToPromise, { transition: transition });
+    };
+
+    /**
+     * Checks if the current state *is* the provided state
+     *
+     * Similar to [[includes]] but only checks for the full state name.
+     * If params is supplied then it will be tested for strict equality against the current
+     * active params object, so all params must match with none missing and no extras.
+     *
+     * #### Example:
+     * ```js
+     * $state.$current.name = 'contacts.details.item';
+     *
+     * // absolute name
+     * $state.is('contact.details.item'); // returns true
+     * $state.is(contactDetailItemStateObject); // returns true
+     * ```
+     *
+     * // relative name (. and ^), typically from a template
+     * // E.g. from the 'contacts.details' template
+     * ```html
+     * <div ng-class="{highlighted: $state.is('.item')}">Item</div>
+     * ```
+     *
+     * @param stateOrName The state name (absolute or relative) or state object you'd like to check.
+     * @param params A param object, e.g. `{sectionId: section.id}`, that you'd like
+     * to test against the current active state.
+     * @param options An options object. The options are:
+     *   - `relative`: If `stateOrName` is a relative state name and `options.relative` is set, .is will
+     *     test relative to `options.relative` state (or name).
+     *
+     * @returns Returns true if it is the state.
+     */
+    StateService.prototype.is = function (stateOrName, params, options) {
+      options = defaults(options, { relative: this.$current });
+      var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative);
+      if (!isDefined(state))
+        return undefined;
+      if (this.$current !== state)
+        return false;
+      if (!params)
+        return true;
+      var schema = state.parameters({ inherit: true, matchingKeys: params });
+      return Param.equals(schema, Param.values(schema, params), this.params);
+    };
+
+    /**
+     * Checks if the current state *includes* the provided state
+     *
+     * A method to determine if the current active state is equal to or is the child of the
+     * state stateName. If any params are passed then they will be tested for a match as well.
+     * Not all the parameters need to be passed, just the ones you'd like to test for equality.
+     *
+     * #### Example when `$state.$current.name === 'contacts.details.item'`
+     * ```js
+     * // Using partial names
+     * $state.includes("contacts"); // returns true
+     * $state.includes("contacts.details"); // returns true
+     * $state.includes("contacts.details.item"); // returns true
+     * $state.includes("contacts.list"); // returns false
+     * $state.includes("about"); // returns false
+     * ```
+     *
+     * #### Glob Examples when `* $state.$current.name === 'contacts.details.item.url'`:
+     * ```js
+     * $state.includes("*.details.*.*"); // returns true
+     * $state.includes("*.details.**"); // returns true
+     * $state.includes("**.item.**"); // returns true
+     * $state.includes("*.details.item.url"); // returns true
+     * $state.includes("*.details.*.url"); // returns true
+     * $state.includes("*.details.*"); // returns false
+     * $state.includes("item.**"); // returns false
+     * ```
+     *
+     * @param stateOrName A partial name, relative name, glob pattern,
+     *   or state object to be searched for within the current state name.
+     * @param params A param object, e.g. `{sectionId: section.id}`,
+     *   that you'd like to test against the current active state.
+     * @param options An options object. The options are:
+     *   - `relative`: If `stateOrName` is a relative state name and `options.relative` is set, .is will
+     *     test relative to `options.relative` state (or name).
+     *
+     * @returns {boolean} Returns true if it does include the state
+     */
+    StateService.prototype.includes = function (stateOrName, params, options) {
+      options = defaults(options, { relative: this.$current });
+      var glob = isString(stateOrName) && Glob.fromString(stateOrName);
+      if (glob) {
+        if (!glob.matches(this.$current.name))
+          return false;
+        stateOrName = this.$current.name;
+      }
+      var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative), include = this.$current.includes;
+      if (!isDefined(state))
+        return undefined;
+      if (!isDefined(include[state.name]))
+        return false;
+      if (!params)
+        return true;
+      var schema = state.parameters({ inherit: true, matchingKeys: params });
+      return Param.equals(schema, Param.values(schema, params), this.params);
+    };
+
+    /**
+     * Generates a URL for a state and parameters
+     *
+     * Returns the url for the given state populated with the given params.
+     *
+     * #### Example:
+     * ```js
+     * expect($state.href("about.person", { person: "bob" })).toEqual("/about/bob");
+     * ```
+     *
+     * @param stateOrName The state name or state object you'd like to generate a url from.
+     * @param params An object of parameter values to fill the state's required parameters.
+     * @param options Options object. The options are:
+     *
+     * @returns {string} compiled state url
+     */
+    StateService.prototype.href = function (stateOrName, params, options) {
+      var defaultHrefOpts = {
+        lossy: true,
+        inherit: true,
+        absolute: false,
+        relative: this.$current,
+      };
+      options = defaults(options, defaultHrefOpts);
+      params = params || {};
+      var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative);
+      if (!isDefined(state))
+        return null;
+      if (options.inherit)
+        params = this.params.$inherit(params, this.$current, state);
+      var nav = (state && options.lossy) ? state.navigable : state;
+      if (!nav || nav.url === undefined || nav.url === null) {
+        return null;
+      }
+      return this.router.urlRouter.href(nav.url, params, {
+        absolute: options.absolute,
+      });
+    };
+
+    /**
+     * Sets or gets the default [[transitionTo]] error handler.
+     *
+     * The error handler is called when a [[Transition]] is rejected or when any error occurred during the Transition.
+     * This includes errors caused by resolves and transition hooks.
+     *
+     * Note:
+     * This handler does not receive certain Transition rejections.
+     * Redirected and Ignored Transitions are not considered to be errors by [[StateService.transitionTo]].
+     *
+     * The built-in default error handler logs the error to the console.
+     *
+     * You can provide your own custom handler.
+     *
+     * #### Example:
+     * ```js
+     * stateService.defaultErrorHandler(function() {
+     *   // Do not log transitionTo errors
+     * });
+     * ```
+     *
+     * @param handler a global error handler function
+     * @returns the current global error handler
+     */
+    StateService.prototype.defaultErrorHandler = function (handler) {
+      return this._defaultErrorHandler = handler || this._defaultErrorHandler;
+    };
+    StateService.prototype.get = function (stateOrName, base) {
+      var reg = this.router.stateRegistry;
+      if (arguments.length === 0)
+        return reg.get();
+      return reg.get(stateOrName, base || this.$current);
+    };
+    /**
+     * Lazy loads a state
+     *
+     * Explicitly runs a state's [[StateDeclaration.lazyLoad]] function.
+     *
+     * @param stateOrName the state that should be lazy loaded
+     * @param transition the optional Transition context to use (if the lazyLoad function requires an injector, etc)
+     * Note: If no transition is provided, a noop transition is created using the from the current state to the current state.
+     * This noop transition is not actually run.
+     *
+     * @returns a promise to lazy load
+     */
+    StateService.prototype.lazyLoad = function (stateOrName, transition) {
+      var state = this.get(stateOrName);
+      if (!state || !state.lazyLoad)
+        throw new Error("Can not lazy load " + stateOrName);
+      var currentPath = this.getCurrentPath();
+      var target = PathUtils.makeTargetState(this.router.stateRegistry, currentPath);
+      transition = transition || this.router.transitionService.create(currentPath, target);
+      return lazyLoadState(transition, state);
+    };
+    return StateService;
+  }());
+
+  /**
+   * # Transition subsystem
+   *
+   * This module contains APIs related to a Transition.
+   *
+   * See:
+   * - [[TransitionService]]
+   * - [[Transition]]
+   * - [[HookFn]], [[TransitionHookFn]], [[TransitionStateHookFn]], [[HookMatchCriteria]], [[HookResult]]
+   *
+   * @coreapi
+   * @preferred
+   * @module transition
+   */ /** for typedoc */
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+  /**
+   * An angular1-like promise api
+   *
+   * This object implements four methods similar to the
+   * [angular 1 promise api](https://docs.angularjs.org/api/ng/service/$q)
+   *
+   * UI-Router evolved from an angular 1 library to a framework agnostic library.
+   * However, some of the `@uirouter/core` code uses these ng1 style APIs to support ng1 style dependency injection.
+   *
+   * This API provides native ES6 promise support wrapped as a $q-like API.
+   * Internally, UI-Router uses this $q object to perform promise operations.
+   * The `angular-ui-router` (ui-router for angular 1) uses the $q API provided by angular.
+   *
+   * $q-like promise api
+   */
+  var $q = {
+    /** Normalizes a value as a promise */
+    when: function (val) { return new Promise(function (resolve, reject) { return resolve(val); }); },
+    /** Normalizes a value as a promise rejection */
+    reject: function (val) { return new Promise(function (resolve, reject) { reject(val); }); },
+    /** @returns a deferred object, which has `resolve` and `reject` functions */
+    defer: function () {
+      var deferred = {};
+      deferred.promise = new Promise(function (resolve, reject) {
+        deferred.resolve = resolve;
+        deferred.reject = reject;
+      });
+      return deferred;
+    },
+    /** Like Promise.all(), but also supports object key/promise notation like $q */
+    all: function (promises) {
+      if (isArray(promises)) {
+        return Promise.all(promises);
+      }
+      if (isObject(promises)) {
+        // Convert promises map to promises array.
+        // When each promise resolves, map it to a tuple { key: key, val: val }
+        var chain = Object.keys(promises)
+          .map(function (key) { return promises[key].then(function (val) { return ({ key: key, val: val }); }); });
+        // Then wait for all promises to resolve, and convert them back to an object
+        return $q.all(chain).then(function (values) {
+          return values.reduce(function (acc, tuple) { acc[tuple.key] = tuple.val; return acc; }, {});
+        });
+      }
+    }
+  };
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+// globally available injectables
+  var globals = {};
+  var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
+  var ARGUMENT_NAMES = /([^\s,]+)/g;
+  /**
+   * A basic angular1-like injector api
+   *
+   * This object implements four methods similar to the
+   * [angular 1 dependency injector](https://docs.angularjs.org/api/auto/service/$injector)
+   *
+   * UI-Router evolved from an angular 1 library to a framework agnostic library.
+   * However, some of the `@uirouter/core` code uses these ng1 style APIs to support ng1 style dependency injection.
+   *
+   * This object provides a naive implementation of a globally scoped dependency injection system.
+   * It supports the following DI approaches:
+   *
+   * ### Function parameter names
+   *
+   * A function's `.toString()` is called, and the parameter names are parsed.
+   * This only works when the parameter names aren't "mangled" by a minifier such as UglifyJS.
+   *
+   * ```js
+   * function injectedFunction(FooService, BarService) {
+ *   // FooService and BarService are injected
+ * }
+   * ```
+   *
+   * ### Function annotation
+   *
+   * A function may be annotated with an array of dependency names as the `$inject` property.
+   *
+   * ```js
+   * injectedFunction.$inject = [ 'FooService', 'BarService' ];
+   * function injectedFunction(fs, bs) {
+ *   // FooService and BarService are injected as fs and bs parameters
+ * }
+   * ```
+   *
+   * ### Array notation
+   *
+   * An array provides the names of the dependencies to inject (as strings).
+   * The function is the last element of the array.
+   *
+   * ```js
+   * [ 'FooService', 'BarService', function (fs, bs) {
+ *   // FooService and BarService are injected as fs and bs parameters
+ * }]
+   * ```
+   *
+   * @type {$InjectorLike}
+   */
+  var $injector = {
+    /** Gets an object from DI based on a string token */
+    get: function (name) { return globals[name]; },
+    /** Returns true if an object named `name` exists in global DI */
+    has: function (name) { return $injector.get(name) != null; },
+    /**
+     * Injects a function
+     *
+     * @param fn the function to inject
+     * @param context the function's `this` binding
+     * @param locals An object with additional DI tokens and values, such as `{ someToken: { foo: 1 } }`
+     */
+    invoke: function (fn, context, locals) {
+      var all = extend({}, globals, locals || {});
+      var params = $injector.annotate(fn);
+      var ensureExist = assertPredicate(function (key) { return all.hasOwnProperty(key); }, function (key) { return "DI can't find injectable: '" + key + "'"; });
+      var args = params.filter(ensureExist).map(function (x) { return all[x]; });
+      if (isFunction(fn))
+        return fn.apply(context, args);
+      else
+        return fn.slice(-1)[0].apply(context, args);
+    },
+    /**
+     * Returns a function's dependencies
+     *
+     * Analyzes a function (or array) and returns an array of DI tokens that the function requires.
+     * @return an array of `string`s
+     */
+    annotate: function (fn) {
+      if (!isInjectable(fn))
+        throw new Error("Not an injectable function: " + fn);
+      if (fn && fn.$inject)
+        return fn.$inject;
+      if (isArray(fn))
+        return fn.slice(0, -1);
+      var fnStr = fn.toString().replace(STRIP_COMMENTS, '');
+      var result = fnStr.slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')')).match(ARGUMENT_NAMES);
+      return result || [];
+    }
+  };
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+  var keyValsToObjectR = function (accum, _a) {
+    var key = _a[0], val = _a[1];
+    if (!accum.hasOwnProperty(key)) {
+      accum[key] = val;
+    }
+    else if (isArray(accum[key])) {
+      accum[key].push(val);
+    }
+    else {
+      accum[key] = [accum[key], val];
+    }
+    return accum;
+  };
+  var getParams = function (queryString) {
+    return queryString.split("&").filter(identity).map(splitEqual).reduce(keyValsToObjectR, {});
+  };
+  function parseUrl$1(url) {
+    var orEmptyString = function (x) { return x || ""; };
+    var _a = splitHash(url).map(orEmptyString), beforehash = _a[0], hash = _a[1];
+    var _b = splitQuery(beforehash).map(orEmptyString), path = _b[0], search = _b[1];
+    return { path: path, search: search, hash: hash, url: url };
+  }
+  var buildUrl = function (loc) {
+    var path = loc.path();
+    var searchObject = loc.search();
+    var hash = loc.hash();
+    var search = Object.keys(searchObject).map(function (key) {
+      var param = searchObject[key];
+      var vals = isArray(param) ? param : [param];
+      return vals.map(function (val) { return key + "=" + val; });
+    }).reduce(unnestR, []).join("&");
+    return path + (search ? "?" + search : "") + (hash ? "#" + hash : "");
+  };
+  function locationPluginFactory(name, isHtml5, serviceClass, configurationClass) {
+    return function (router) {
+      var service = router.locationService = new serviceClass(router);
+      var configuration = router.locationConfig = new configurationClass(router, isHtml5);
+      function dispose(router) {
+        router.dispose(service);
+        router.dispose(configuration);
+      }
+      return { name: name, service: service, configuration: configuration, dispose: dispose };
+    };
+  }
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */ /** */
+  /** A base `LocationServices` */
+  var BaseLocationServices = /** @class */ (function () {
+    function BaseLocationServices(router, fireAfterUpdate) {
+      var _this = this;
+      this.fireAfterUpdate = fireAfterUpdate;
+      this._listener = function (evt) { return _this._listeners.forEach(function (cb) { return cb(evt); }); };
+      this._listeners = [];
+      this.hash = function () { return parseUrl$1(_this._get()).hash; };
+      this.path = function () { return parseUrl$1(_this._get()).path; };
+      this.search = function () { return getParams(parseUrl$1(_this._get()).search); };
+      this._location = root.location;
+      this._history = root.history;
+    }
+    BaseLocationServices.prototype.url = function (url, replace) {
+      if (replace === void 0) { replace = true; }
+      if (isDefined(url) && url !== this._get()) {
+        this._set(null, null, url, replace);
+        if (this.fireAfterUpdate) {
+          this._listeners.forEach(function (cb) { return cb({ url: url }); });
+        }
+      }
+      return buildUrl(this);
+    };
+    BaseLocationServices.prototype.onChange = function (cb) {
+      var _this = this;
+      this._listeners.push(cb);
+      return function () { return removeFrom(_this._listeners, cb); };
+    };
+    BaseLocationServices.prototype.dispose = function (router) {
+      deregAll(this._listeners);
+    };
+    return BaseLocationServices;
+  }());
+
+  var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+      function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+      extendStatics(d, b);
+      function __() { this.constructor = d; }
+      d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+  })();
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+  /** A `LocationServices` that uses the browser hash "#" to get/set the current location */
+  var HashLocationService = /** @class */ (function (_super) {
+    __extends(HashLocationService, _super);
+    function HashLocationService(router) {
+      var _this = _super.call(this, router, false) || this;
+      root.addEventListener('hashchange', _this._listener, false);
+      return _this;
+    }
+    HashLocationService.prototype._get = function () {
+      return trimHashVal(this._location.hash);
+    };
+    HashLocationService.prototype._set = function (state, title, url, replace) {
+      this._location.hash = url;
+    };
+    HashLocationService.prototype.dispose = function (router) {
+      _super.prototype.dispose.call(this, router);
+      root.removeEventListener('hashchange', this._listener);
+    };
+    return HashLocationService;
+  }(BaseLocationServices));
+
+  var __extends$1 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+      function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+      extendStatics(d, b);
+      function __() { this.constructor = d; }
+      d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+  })();
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+  /** A `LocationServices` that gets/sets the current location from an in-memory object */
+  var MemoryLocationService = /** @class */ (function (_super) {
+    __extends$1(MemoryLocationService, _super);
+    function MemoryLocationService(router) {
+      return _super.call(this, router, true) || this;
+    }
+    MemoryLocationService.prototype._get = function () {
+      return this._url;
+    };
+    MemoryLocationService.prototype._set = function (state, title, url, replace) {
+      this._url = url;
+    };
+    return MemoryLocationService;
+  }(BaseLocationServices));
+
+  var __extends$2 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+      function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+      extendStatics(d, b);
+      function __() { this.constructor = d; }
+      d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+  })();
+  /**
+   * A `LocationServices` that gets/sets the current location using the browser's `location` and `history` apis
+   *
+   * Uses `history.pushState` and `history.replaceState`
+   */
+  var PushStateLocationService = /** @class */ (function (_super) {
+    __extends$2(PushStateLocationService, _super);
+    function PushStateLocationService(router) {
+      var _this = _super.call(this, router, true) || this;
+      _this._config = router.urlService.config;
+      root.addEventListener('popstate', _this._listener, false);
+      return _this;
+    }
+
+    /**
+     * Gets the base prefix without:
+     * - trailing slash
+     * - trailing filename
+     * - protocol and hostname
+     *
+     * If <base href='/base/index.html'>, this returns '/base'.
+     * If <base href='http://localhost:8080/base/index.html'>, this returns '/base'.
+     *
+     * See: https://html.spec.whatwg.org/dev/semantics.html#the-base-element
+     */
+    PushStateLocationService.prototype._getBasePrefix = function () {
+      return stripFile(this._config.baseHref());
+    };
+    PushStateLocationService.prototype._get = function () {
+      var _a = this._location, pathname = _a.pathname, hash = _a.hash, search = _a.search;
+      search = splitQuery(search)[1]; // strip ? if found
+      hash = splitHash(hash)[1]; // strip # if found
+      var basePrefix = this._getBasePrefix();
+      var exactMatch = pathname === this._config.baseHref();
+      var startsWith = pathname.startsWith(basePrefix);
+      pathname = exactMatch ? '/' : startsWith ? pathname.substring(basePrefix.length) : pathname;
+      return pathname + (search ? '?' + search : '') + (hash ? '#' + hash : '');
+    };
+    PushStateLocationService.prototype._set = function (state, title, url, replace) {
+      var fullUrl = this._getBasePrefix() + url;
+      if (replace) {
+        this._history.replaceState(state, title, fullUrl);
+      }
+      else {
+        this._history.pushState(state, title, fullUrl);
+      }
+    };
+    PushStateLocationService.prototype.dispose = function (router) {
+      _super.prototype.dispose.call(this, router);
+      root.removeEventListener('popstate', this._listener);
+    };
+    return PushStateLocationService;
+  }(BaseLocationServices));
+
+  /** A `LocationConfig` mock that gets/sets all config from an in-memory object */
+  var MemoryLocationConfig = /** @class */ (function () {
+    function MemoryLocationConfig() {
+      var _this = this;
+      this._baseHref = '';
+      this._port = 80;
+      this._protocol = "http";
+      this._host = "localhost";
+      this._hashPrefix = "";
+      this.port = function () { return _this._port; };
+      this.protocol = function () { return _this._protocol; };
+      this.host = function () { return _this._host; };
+      this.baseHref = function () { return _this._baseHref; };
+      this.html5Mode = function () { return false; };
+      this.hashPrefix = function (newval) { return isDefined(newval) ? _this._hashPrefix = newval : _this._hashPrefix; };
+      this.dispose = noop$1;
+    }
+    return MemoryLocationConfig;
+  }());
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+  /** A `LocationConfig` that delegates to the browser's `location` object */
+  var BrowserLocationConfig = /** @class */ (function () {
+    function BrowserLocationConfig(router, _isHtml5) {
+      if (_isHtml5 === void 0) { _isHtml5 = false; }
+      this._isHtml5 = _isHtml5;
+      this._baseHref = undefined;
+      this._hashPrefix = "";
+    }
+    BrowserLocationConfig.prototype.port = function () {
+      if (location.port) {
+        return Number(location.port);
+      }
+      return this.protocol() === 'https' ? 443 : 80;
+    };
+    BrowserLocationConfig.prototype.protocol = function () {
+      return location.protocol.replace(/:/g, '');
+    };
+    BrowserLocationConfig.prototype.host = function () {
+      return location.hostname;
+    };
+    BrowserLocationConfig.prototype.html5Mode = function () {
+      return this._isHtml5;
+    };
+    BrowserLocationConfig.prototype.hashPrefix = function (newprefix) {
+      return isDefined(newprefix) ? this._hashPrefix = newprefix : this._hashPrefix;
+    };
+
+    BrowserLocationConfig.prototype.baseHref = function (href) {
+      return isDefined(href) ? this._baseHref = href :
+        isDefined(this._baseHref) ? this._baseHref : this.applyDocumentBaseHref();
+    };
+    BrowserLocationConfig.prototype.applyDocumentBaseHref = function () {
+      var baseTag = document.getElementsByTagName("base")[0];
+      return this._baseHref = baseTag ? baseTag.href.substr(location.origin.length) : "";
+    };
+    BrowserLocationConfig.prototype.dispose = function () { };
+    return BrowserLocationConfig;
+  }());
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+  function servicesPlugin(router) {
+    services.$injector = $injector;
+    services.$q = $q;
+    return { name: "vanilla.services", $q: $q, $injector: $injector, dispose: function () { return null; } };
+  }
+  /** A `UIRouterPlugin` uses the browser hash to get/set the current location */
+  var hashLocationPlugin = locationPluginFactory('vanilla.hashBangLocation', false, HashLocationService, BrowserLocationConfig);
+  /** A `UIRouterPlugin` that gets/sets the current location using the browser's `location` and `history` apis */
+  var pushStateLocationPlugin = locationPluginFactory("vanilla.pushStateLocation", true, PushStateLocationService, BrowserLocationConfig);
+  /** A `UIRouterPlugin` that gets/sets the current location from an in-memory object */
+  var memoryLocationPlugin = locationPluginFactory("vanilla.memoryLocation", false, MemoryLocationService, MemoryLocationConfig);
+
+  /**
+   * @internalapi
+   * @module vanilla
+   */
+  /** */
+
+  /**
+   * # Core classes and interfaces
+   *
+   * The classes and interfaces that are core to ui-router and do not belong
+   * to a more specific subsystem (such as resolve).
+   *
+   * @coreapi
+   * @preferred
+   * @module core
+   */ /** for typedoc */
+  /** @internalapi */
+  var UIRouterPluginBase = /** @class */ (function () {
+    function UIRouterPluginBase() {
+    }
+    UIRouterPluginBase.prototype.dispose = function (router) { };
+    return UIRouterPluginBase;
+  }());
+
+  /**
+   * @coreapi
+   * @module common
+   */ /** */
+
+
+
+  var index$1 = Object.freeze({
+      root: root,
+      fromJson: fromJson,
+      toJson: toJson,
+      forEach: forEach,
+      extend: extend,
+      equals: equals,
+      identity: identity,
+      noop: noop$1,
+      createProxyFunctions: createProxyFunctions,
+      inherit: inherit,
+      inArray: inArray,
+      _inArray: _inArray,
+      removeFrom: removeFrom,
+      _removeFrom: _removeFrom,
+      pushTo: pushTo,
+      _pushTo: _pushTo,
+      deregAll: deregAll,
+      defaults: defaults,
+      mergeR: mergeR,
+      ancestors: ancestors,
+      pick: pick,
+      omit: omit,
+      pluck: pluck,
+      filter: filter,
+      find: find,
+      mapObj: mapObj,
+      map: map,
+      values: values,
+      allTrueR: allTrueR,
+      anyTrueR: anyTrueR,
+      unnestR: unnestR,
+      flattenR: flattenR,
+      pushR: pushR,
+      uniqR: uniqR,
+      unnest: unnest,
+      flatten: flatten,
+      assertPredicate: assertPredicate,
+      assertMap: assertMap,
+      assertFn: assertFn,
+      pairs: pairs,
+      arrayTuples: arrayTuples,
+      applyPairs: applyPairs,
+      tail: tail,
+      copy: copy,
+      _extend: _extend,
+      silenceUncaughtInPromise: silenceUncaughtInPromise,
+      silentRejection: silentRejection,
+      notImplemented: notImplemented,
+      services: services,
+      Glob: Glob,
+      curry: curry,
+      compose: compose,
+      pipe: pipe,
+      prop: prop,
+      propEq: propEq,
+      parse: parse,
+      not: not,
+      and: and,
+      or: or,
+      all: all,
+      any: any,
+      is: is,
+      eq: eq,
+      val: val,
+      invoke: invoke,
+      pattern: pattern,
+      isUndefined: isUndefined,
+      isDefined: isDefined,
+      isNull: isNull,
+      isNullOrUndefined: isNullOrUndefined,
+      isFunction: isFunction,
+      isNumber: isNumber,
+      isString: isString,
+      isObject: isObject,
+      isArray: isArray,
+      isDate: isDate,
+      isRegExp: isRegExp,
+      isState: isState,
+      isInjectable: isInjectable,
+      isPromise: isPromise,
+      Queue: Queue,
+      maxLength: maxLength,
+      padString: padString,
+      kebobString: kebobString,
+      functionToString: functionToString,
+      fnToString: fnToString,
+      stringify: stringify,
+      beforeAfterSubstr: beforeAfterSubstr,
+      hostRegex: hostRegex,
+      stripFile: stripFile,
+      splitHash: splitHash,
+      splitQuery: splitQuery,
+      splitEqual: splitEqual,
+      trimHashVal: trimHashVal,
+      splitOnDelim: splitOnDelim,
+      joinNeighborsR: joinNeighborsR,
+      get Category () { return exports.Category; },
+      Trace: Trace,
+      trace: trace,
+      get DefType () { return exports.DefType; },
+      Param: Param,
+      ParamTypes: ParamTypes,
+      StateParams: StateParams,
+      ParamType: ParamType,
+      PathNode: PathNode,
+      PathUtils: PathUtils,
+      resolvePolicies: resolvePolicies,
+      defaultResolvePolicy: defaultResolvePolicy,
+      Resolvable: Resolvable,
+      NATIVE_INJECTOR_TOKEN: NATIVE_INJECTOR_TOKEN,
+      ResolveContext: ResolveContext,
+      resolvablesBuilder: resolvablesBuilder,
+      StateBuilder: StateBuilder,
+      StateObject: StateObject,
+      StateMatcher: StateMatcher,
+      StateQueueManager: StateQueueManager,
+      StateRegistry: StateRegistry,
+      StateService: StateService,
+      TargetState: TargetState,
+      get TransitionHookPhase () { return exports.TransitionHookPhase; },
+      get TransitionHookScope () { return exports.TransitionHookScope; },
+      HookBuilder: HookBuilder,
+      matchState: matchState,
+      RegisteredHook: RegisteredHook,
+      makeEvent: makeEvent,
+      get RejectType () { return exports.RejectType; },
+      Rejection: Rejection,
+      Transition: Transition,
+      TransitionHook: TransitionHook,
+      TransitionEventType: TransitionEventType,
+      defaultTransOpts: defaultTransOpts,
+      TransitionService: TransitionService,
+      UrlMatcher: UrlMatcher,
+      UrlMatcherFactory: UrlMatcherFactory,
+      UrlRouter: UrlRouter,
+      UrlRuleFactory: UrlRuleFactory,
+      BaseUrlRule: BaseUrlRule,
+      UrlService: UrlService,
+      ViewService: ViewService,
+      UIRouterGlobals: UIRouterGlobals,
+      UIRouter: UIRouter,
+      $q: $q,
+      $injector: $injector,
+      BaseLocationServices: BaseLocationServices,
+      HashLocationService: HashLocationService,
+      MemoryLocationService: MemoryLocationService,
+      PushStateLocationService: PushStateLocationService,
+      MemoryLocationConfig: MemoryLocationConfig,
+      BrowserLocationConfig: BrowserLocationConfig,
+      keyValsToObjectR: keyValsToObjectR,
+      getParams: getParams,
+      parseUrl: parseUrl$1,
+      buildUrl: buildUrl,
+      locationPluginFactory: locationPluginFactory,
+      servicesPlugin: servicesPlugin,
+      hashLocationPlugin: hashLocationPlugin,
+      pushStateLocationPlugin: pushStateLocationPlugin,
+      memoryLocationPlugin: memoryLocationPlugin,
+      UIRouterPluginBase: UIRouterPluginBase
+    });
+
+  function getNg1ViewConfigFactory() {
+    var templateFactory = null;
+    return function (path, view) {
+      templateFactory = templateFactory || services.$injector.get("$templateFactory");
+      return [new Ng1ViewConfig(path, view, templateFactory)];
+    };
+  }
+  var hasAnyKey = function (keys, obj) {
+    return keys.reduce(function (acc, key) { return acc || isDefined(obj[key]); }, false);
+  };
+  /**
+   * This is a [[StateBuilder.builder]] function for angular1 `views`.
+   *
+   * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder
+   * handles the `views` property with logic specific to @uirouter/angularjs (ng1).
+   *
+   * If no `views: {}` property exists on the [[StateDeclaration]], then it creates the `views` object
+   * and applies the state-level configuration to a view named `$default`.
+   */
+  function ng1ViewsBuilder(state) {
+    // Do not process root state
+    if (!state.parent)
+      return {};
+    var tplKeys = ['templateProvider', 'templateUrl', 'template', 'notify', 'async'], ctrlKeys = ['controller', 'controllerProvider', 'controllerAs', 'resolveAs'], compKeys = ['component', 'bindings', 'componentProvider'], nonCompKeys = tplKeys.concat(ctrlKeys), allViewKeys = compKeys.concat(nonCompKeys);
+    // Do not allow a state to have both state-level props and also a `views: {}` property.
+    // A state without a `views: {}` property can declare properties for the `$default` view as properties of the state.
+    // However, the `$default` approach should not be mixed with a separate `views: ` block.
+    if (isDefined(state.views) && hasAnyKey(allViewKeys, state)) {
+      throw new Error("State '" + state.name + "' has a 'views' object. " +
+        "It cannot also have \"view properties\" at the state level.  " +
+        "Move the following properties into a view (in the 'views' object): " +
+        (" " + allViewKeys.filter(function (key) { return isDefined(state[key]); }).join(", ")));
+    }
+    var views = {}, viewsObject = state.views || { "$default": pick(state, allViewKeys) };
+    forEach(viewsObject, function (config, name) {
+      // Account for views: { "": { template... } }
+      name = name || "$default";
+      // Account for views: { header: "headerComponent" }
+      if (isString(config))
+        config = { component: config };
+      // Make a shallow copy of the config object
+      config = extend({}, config);
+      // Do not allow a view to mix props for component-style view with props for template/controller-style view
+      if (hasAnyKey(compKeys, config) && hasAnyKey(nonCompKeys, config)) {
+        throw new Error("Cannot combine: " + compKeys.join("|") + " with: " + nonCompKeys.join("|") + " in stateview: '" + name + "@" + state.name + "'");
+      }
+      config.resolveAs = config.resolveAs || '$resolve';
+      config.$type = "ng1";
+      config.$context = state;
+      config.$name = name;
+      var normalized = ViewService.normalizeUIViewTarget(config.$context, config.$name);
+      config.$uiViewName = normalized.uiViewName;
+      config.$uiViewContextAnchor = normalized.uiViewContextAnchor;
+      views[name] = config;
+    });
+    return views;
+  }
+  var id$1 = 0;
+  var Ng1ViewConfig = /** @class */ (function () {
+    function Ng1ViewConfig(path, viewDecl, factory) {
+      var _this = this;
+      this.path = path;
+      this.viewDecl = viewDecl;
+      this.factory = factory;
+      this.$id = id$1++;
+      this.loaded = false;
+      this.getTemplate = function (uiView, context) {
+        return _this.component ? _this.factory.makeComponentTemplate(uiView, context, _this.component, _this.viewDecl.bindings) : _this.template;
+      };
+    }
+    Ng1ViewConfig.prototype.load = function () {
+      var _this = this;
+      var $q = services.$q;
+      var context = new ResolveContext(this.path);
+      var params = this.path.reduce(function (acc, node) { return extend(acc, node.paramValues); }, {});
+      var promises = {
+        template: $q.when(this.factory.fromConfig(this.viewDecl, params, context)),
+        controller: $q.when(this.getController(context))
+      };
+      return $q.all(promises).then(function (results) {
+        trace.traceViewServiceEvent("Loaded", _this);
+        _this.controller = results.controller;
+        extend(_this, results.template); // Either { template: "tpl" } or { component: "cmpName" }
+        return _this;
+      });
+    };
+    /**
+     * Gets the controller for a view configuration.
+     *
+     * @returns {Function|Promise.<Function>} Returns a controller, or a promise that resolves to a controller.
+     */
+    Ng1ViewConfig.prototype.getController = function (context) {
+      var provider = this.viewDecl.controllerProvider;
+      if (!isInjectable(provider))
+        return this.viewDecl.controller;
+      var deps = services.$injector.annotate(provider);
+      var providerFn = isArray(provider) ? tail(provider) : provider;
+      var resolvable = new Resolvable("", providerFn, deps);
+      return resolvable.get(context);
+    };
+    return Ng1ViewConfig;
+  }());
+
+  /** @module view */
+  /** for typedoc */
+  /**
+   * Service which manages loading of templates from a ViewConfig.
+   */
+  var TemplateFactory = /** @class */ (function () {
+    function TemplateFactory() {
+      var _this = this;
+      /** @hidden */ this._useHttp = ng.version.minor < 3;
+      /** @hidden */ this.$get = ['$http', '$templateCache', '$injector', function ($http, $templateCache, $injector) {
+        _this.$templateRequest = $injector.has && $injector.has('$templateRequest') && $injector.get('$templateRequest');
+        _this.$http = $http;
+        _this.$templateCache = $templateCache;
+        return _this;
+      }];
+    }
+    /** @hidden */
+    TemplateFactory.prototype.useHttpService = function (value) {
+      this._useHttp = value;
+    };
+
+    /**
+     * Creates a template from a configuration object.
+     *
+     * @param config Configuration object for which to load a template.
+     * The following properties are search in the specified order, and the first one
+     * that is defined is used to create the template:
+     *
+     * @param params  Parameters to pass to the template function.
+     * @param context The resolve context associated with the template's view
+     *
+     * @return {string|object}  The template html as a string, or a promise for
+     * that string,or `null` if no template is configured.
+     */
+    TemplateFactory.prototype.fromConfig = function (config, params, context) {
+      var defaultTemplate = "<ui-view></ui-view>";
+      var asTemplate = function (result) { return services.$q.when(result).then(function (str) { return ({ template: str }); }); };
+      var asComponent = function (result) { return services.$q.when(result).then(function (str) { return ({ component: str }); }); };
+      return (isDefined(config.template) ? asTemplate(this.fromString(config.template, params)) :
+        isDefined(config.templateUrl) ? asTemplate(this.fromUrl(config.templateUrl, params)) :
+          isDefined(config.templateProvider) ? asTemplate(this.fromProvider(config.templateProvider, params, context)) :
+            isDefined(config.component) ? asComponent(config.component) :
+              isDefined(config.componentProvider) ? asComponent(this.fromComponentProvider(config.componentProvider, params, context)) :
+                asTemplate(defaultTemplate));
+    };
+
+    /**
+     * Creates a template from a string or a function returning a string.
+     *
+     * @param template html template as a string or function that returns an html template as a string.
+     * @param params Parameters to pass to the template function.
+     *
+     * @return {string|object} The template html as a string, or a promise for that
+     * string.
+     */
+    TemplateFactory.prototype.fromString = function (template, params) {
+      return isFunction(template) ? template(params) : template;
+    };
+
+    /**
+     * Loads a template from the a URL via `$http` and `$templateCache`.
+     *
+     * @param {string|Function} url url of the template to load, or a function
+     * that returns a url.
+     * @param {Object} params Parameters to pass to the url function.
+     * @return {string|Promise.<string>} The template html as a string, or a promise
+     * for that string.
+     */
+    TemplateFactory.prototype.fromUrl = function (url, params) {
+      if (isFunction(url))
+        url = url(params);
+      if (url == null)
+        return null;
+      if (this._useHttp) {
+        return this.$http.get(url, { cache: this.$templateCache, headers: { Accept: 'text/html' } })
+          .then(function (response) {
+            return response.data;
+          });
+      }
+      return this.$templateRequest(url);
+    };
+
+    /**
+     * Creates a template by invoking an injectable provider function.
+     *
+     * @param provider Function to invoke via `locals`
+     * @param {Function} injectFn a function used to invoke the template provider
+     * @return {string|Promise.<string>} The template html as a string, or a promise
+     * for that string.
+     */
+    TemplateFactory.prototype.fromProvider = function (provider, params, context) {
+      var deps = services.$injector.annotate(provider);
+      var providerFn = isArray(provider) ? tail(provider) : provider;
+      var resolvable = new Resolvable("", providerFn, deps);
+      return resolvable.get(context);
+    };
+
+    /**
+     * Creates a component's template by invoking an injectable provider function.
+     *
+     * @param provider Function to invoke via `locals`
+     * @param {Function} injectFn a function used to invoke the template provider
+     * @return {string} The template html as a string: "<component-name input1='::$resolve.foo'></component-name>".
+     */
+    TemplateFactory.prototype.fromComponentProvider = function (provider, params, context) {
+      var deps = services.$injector.annotate(provider);
+      var providerFn = isArray(provider) ? tail(provider) : provider;
+      var resolvable = new Resolvable("", providerFn, deps);
+      return resolvable.get(context);
+    };
+
+    /**
+     * Creates a template from a component's name
+     *
+     * This implements route-to-component.
+     * It works by retrieving the component (directive) metadata from the injector.
+     * It analyses the component's bindings, then constructs a template that instantiates the component.
+     * The template wires input and output bindings to resolves or from the parent component.
+     *
+     * @param uiView {object} The parent ui-view (for binding outputs to callbacks)
+     * @param context The ResolveContext (for binding outputs to callbacks returned from resolves)
+     * @param component {string} Component's name in camel case.
+     * @param bindings An object defining the component's bindings: {foo: '<'}
+     * @return {string} The template as a string: "<component-name input1='::$resolve.foo'></component-name>".
+     */
+    TemplateFactory.prototype.makeComponentTemplate = function (uiView, context, component, bindings) {
+      bindings = bindings || {};
+      // Bind once prefix
+      var prefix = ng.version.minor >= 3 ? "::" : "";
+      // Convert to kebob name. Add x- prefix if the string starts with `x-` or `data-`
+      var kebob = function (camelCase) {
+        var kebobed = kebobString(camelCase);
+        return /^(x|data)-/.exec(kebobed) ? "x-" + kebobed : kebobed;
+      };
+      var attributeTpl = function (input) {
+        var name = input.name, type = input.type;
+        var attrName = kebob(name);
+        // If the ui-view has an attribute which matches a binding on the routed component
+        // then pass that attribute through to the routed component template.
+        // Prefer ui-view wired mappings to resolve data, unless the resolve was explicitly bound using `bindings:`
+        if (uiView.attr(attrName) && !bindings[name])
+          return attrName + "='" + uiView.attr(attrName) + "'";
+        var resolveName = bindings[name] || name;
+        // Pre-evaluate the expression for "@" bindings by enclosing in {{ }}
+        // some-attr="{{ ::$resolve.someResolveName }}"
+        if (type === '@')
+          return attrName + "='{{" + prefix + "$resolve." + resolveName + "}}'";
+        // Wire "&" callbacks to resolves that return a callback function
+        // Get the result of the resolve (should be a function) and annotate it to get its arguments.
+        // some-attr="$resolve.someResolveResultName(foo, bar)"
+        if (type === '&') {
+          var res = context.getResolvable(resolveName);
+          var fn = res && res.data;
+          var args = fn && services.$injector.annotate(fn) || [];
+          // account for array style injection, i.e., ['foo', function(foo) {}]
+          var arrayIdxStr = isArray(fn) ? "[" + (fn.length - 1) + "]" : '';
+          return attrName + "='$resolve." + resolveName + arrayIdxStr + "(" + args.join(",") + ")'";
+        }
+        // some-attr="::$resolve.someResolveName"
+        return attrName + "='" + prefix + "$resolve." + resolveName + "'";
+      };
+      var attrs = getComponentBindings(component).map(attributeTpl).join(" ");
+      var kebobName = kebob(component);
+      return "<" + kebobName + " " + attrs + "></" + kebobName + ">";
+    };
+
+    return TemplateFactory;
+  }());
+// Gets all the directive(s)' inputs ('@', '=', and '<') and outputs ('&')
+  function getComponentBindings(name) {
+    var cmpDefs = services.$injector.get(name + "Directive"); // could be multiple
+    if (!cmpDefs || !cmpDefs.length)
+      throw new Error("Unable to find component named '" + name + "'");
+    return cmpDefs.map(getBindings).reduce(unnestR, []);
+  }
+// Given a directive definition, find its object input attributes
+// Use different properties, depending on the type of directive (component, bindToController, normal)
+  var getBindings = function (def) {
+    if (isObject(def.bindToController))
+      return scopeBindings(def.bindToController);
+    return scopeBindings(def.scope);
+  };
+// for ng 1.2 style, process the scope: { input: "=foo" }
+// for ng 1.3 through ng 1.5, process the component's bindToController: { input: "=foo" } object
+  var scopeBindings = function (bindingsObj) { return Object.keys(bindingsObj || {})
+    .map(function (key) { return [key, /^([=<@&])[?]?(.*)/.exec(bindingsObj[key])]; })
+    .filter(function (tuple) { return isDefined(tuple) && isArray(tuple[1]); })
+    .map(function (tuple) { return ({ name: tuple[1][2] || tuple[0], type: tuple[1][1] }); }); };
+
+  /** @module ng1 */ /** for typedoc */
+  /**
+   * The Angular 1 `StateProvider`
+   *
+   * The `$stateProvider` works similar to Angular's v1 router, but it focuses purely
+   * on state.
+   *
+   * A state corresponds to a "place" in the application in terms of the overall UI and
+   * navigation. A state describes (via the controller / template / view properties) what
+   * the UI looks like and does at that place.
+   *
+   * States often have things in common, and the primary way of factoring out these
+   * commonalities in this model is via the state hierarchy, i.e. parent/child states aka
+   * nested states.
+   *
+   * The `$stateProvider` provides interfaces to declare these states for your app.
+   */
+  var StateProvider = /** @class */ (function () {
+    function StateProvider(stateRegistry, stateService) {
+      this.stateRegistry = stateRegistry;
+      this.stateService = stateService;
+      createProxyFunctions(val(StateProvider.prototype), this, val(this));
+    }
+    /**
+     * Decorates states when they are registered
+     *
+     * Allows you to extend (carefully) or override (at your own peril) the
+     * `stateBuilder` object used internally by [[StateRegistry]].
+     * This can be used to add custom functionality to ui-router,
+     * for example inferring templateUrl based on the state name.
+     *
+     * When passing only a name, it returns the current (original or decorated) builder
+     * function that matches `name`.
+     *
+     * The builder functions that can be decorated are listed below. Though not all
+     * necessarily have a good use case for decoration, that is up to you to decide.
+     *
+     * In addition, users can attach custom decorators, which will generate new
+     * properties within the state's internal definition. There is currently no clear
+     * use-case for this beyond accessing internal states (i.e. $state.$current),
+     * however, expect this to become increasingly relevant as we introduce additional
+     * meta-programming features.
+     *
+     * **Warning**: Decorators should not be interdependent because the order of
+     * execution of the builder functions in non-deterministic. Builder functions
+     * should only be dependent on the state definition object and super function.
+     *
+     *
+     * Existing builder functions and current return values:
+     *
+     * - **parent** `{object}` - returns the parent state object.
+     * - **data** `{object}` - returns state data, including any inherited data that is not
+     *   overridden by own values (if any).
+     * - **url** `{object}` - returns a {@link ui.router.util.type:UrlMatcher UrlMatcher}
+     *   or `null`.
+     * - **navigable** `{object}` - returns closest ancestor state that has a URL (aka is
+     *   navigable).
+     * - **params** `{object}` - returns an array of state params that are ensured to
+     *   be a super-set of parent's params.
+     * - **views** `{object}` - returns a views object where each key is an absolute view
+     *   name (i.e. "viewName@stateName") and each value is the config object
+     *   (template, controller) for the view. Even when you don't use the views object
+     *   explicitly on a state config, one is still created for you internally.
+     *   So by decorating this builder function you have access to decorating template
+     *   and controller properties.
+     * - **ownParams** `{object}` - returns an array of params that belong to the state,
+     *   not including any params defined by ancestor states.
+     * - **path** `{string}` - returns the full path from the root down to this state.
+     *   Needed for state activation.
+     * - **includes** `{object}` - returns an object that includes every state that
+     *   would pass a `$state.includes()` test.
+     *
+     * #### Example:
+     * Override the internal 'views' builder with a function that takes the state
+     * definition, and a reference to the internal function being overridden:
+     * ```js
+     * $stateProvider.decorator('views', function (state, parent) {
+     *   let result = {},
+     *       views = parent(state);
+     *
+     *   angular.forEach(views, function (config, name) {
+     *     let autoName = (state.name + '.' + name).replace('.', '/');
+     *     config.templateUrl = config.templateUrl || '/partials/' + autoName + '.html';
+     *     result[name] = config;
+     *   });
+     *   return result;
+     * });
+     *
+     * $stateProvider.state('home', {
+     *   views: {
+     *     'contact.list': { controller: 'ListController' },
+     *     'contact.item': { controller: 'ItemController' }
+     *   }
+     * });
+     * ```
+     *
+     *
+     * ```js
+     * // Auto-populates list and item views with /partials/home/contact/list.html,
+     * // and /partials/home/contact/item.html, respectively.
+     * $state.go('home');
+     * ```
+     *
+     * @param {string} name The name of the builder function to decorate.
+     * @param {object} func A function that is responsible for decorating the original
+     * builder function. The function receives two parameters:
+     *
+     *   - `{object}` - state - The state config object.
+     *   - `{object}` - super - The original builder function.
+     *
+     * @return {object} $stateProvider - $stateProvider instance
+     */
+    StateProvider.prototype.decorator = function (name, func) {
+      return this.stateRegistry.decorator(name, func) || this;
+    };
+    StateProvider.prototype.state = function (name, definition) {
+      if (isObject(name)) {
+        definition = name;
+      }
+      else {
+        definition.name = name;
+      }
+      this.stateRegistry.register(definition);
+      return this;
+    };
+    /**
+     * Registers an invalid state handler
+     *
+     * This is a passthrough to [[StateService.onInvalid]] for ng1.
+     */
+    StateProvider.prototype.onInvalid = function (callback) {
+      return this.stateService.onInvalid(callback);
+    };
+    return StateProvider;
+  }());
+
+  /** @module ng1 */ /** */
+  /**
+   * This is a [[StateBuilder.builder]] function for angular1 `onEnter`, `onExit`,
+   * `onRetain` callback hooks on a [[Ng1StateDeclaration]].
+   *
+   * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder
+   * ensures that those hooks are injectable for @uirouter/angularjs (ng1).
+   */
+  var getStateHookBuilder = function (hookName) {
+    return function stateHookBuilder(state, parentFn) {
+      var hook = state[hookName];
+      var pathname = hookName === 'onExit' ? 'from' : 'to';
+      function decoratedNg1Hook(trans, state) {
+        var resolveContext = new ResolveContext(trans.treeChanges(pathname));
+        var locals = extend(getLocals(resolveContext), { $state$: state, $transition$: trans });
+        return services.$injector.invoke(hook, this, locals);
+      }
+      return hook ? decoratedNg1Hook : undefined;
+    };
+  };
+
+  /**
+   * Implements UI-Router LocationServices and LocationConfig using Angular 1's $location service
+   */
+  var Ng1LocationServices = /** @class */ (function () {
+    function Ng1LocationServices($locationProvider) {
+      // .onChange() registry
+      this._urlListeners = [];
+      this.$locationProvider = $locationProvider;
+      var _lp = val($locationProvider);
+      createProxyFunctions(_lp, this, _lp, ['hashPrefix']);
+    }
+    Ng1LocationServices.prototype.dispose = function () { };
+    Ng1LocationServices.prototype.onChange = function (callback) {
+      var _this = this;
+      this._urlListeners.push(callback);
+      return function () { return removeFrom(_this._urlListeners)(callback); };
+    };
+    Ng1LocationServices.prototype.html5Mode = function () {
+      var html5Mode = this.$locationProvider.html5Mode();
+      html5Mode = isObject(html5Mode) ? html5Mode.enabled : html5Mode;
+      return html5Mode && this.$sniffer.history;
+    };
+    Ng1LocationServices.prototype.url = function (newUrl, replace, state) {
+      if (replace === void 0) { replace = false; }
+      if (newUrl)
+        this.$location.url(newUrl);
+      if (replace)
+        this.$location.replace();
+      if (state)
+        this.$location.state(state);
+      return this.$location.url();
+    };
+    Ng1LocationServices.prototype._runtimeServices = function ($rootScope, $location, $sniffer, $browser) {
+      var _this = this;
+      this.$location = $location;
+      this.$sniffer = $sniffer;
+      // Bind $locationChangeSuccess to the listeners registered in LocationService.onChange
+      $rootScope.$on("$locationChangeSuccess", function (evt) { return _this._urlListeners.forEach(function (fn) { return fn(evt); }); });
+      var _loc = val($location);
+      var _browser = val($browser);
+      // Bind these LocationService functions to $location
+      createProxyFunctions(_loc, this, _loc, ["replace", "path", "search", "hash"]);
+      // Bind these LocationConfig functions to $location
+      createProxyFunctions(_loc, this, _loc, ['port', 'protocol', 'host']);
+      // Bind these LocationConfig functions to $browser
+      createProxyFunctions(_browser, this, _browser, ['baseHref']);
+    };
+    /**
+     * Applys ng1-specific path parameter encoding
+     *
+     * The Angular 1 `$location` service is a bit weird.
+     * It doesn't allow slashes to be encoded/decoded bi-directionally.
+     *
+     * See the writeup at https://github.com/angular-ui/ui-router/issues/2598
+     *
+     * This code patches the `path` parameter type so it encoded/decodes slashes as ~2F
+     *
+     * @param router
+     */
+    Ng1LocationServices.monkeyPatchPathParameterType = function (router) {
+      var pathType = router.urlMatcherFactory.type('path');
+      pathType.encode = function (val) {
+        return val != null ? val.toString().replace(/(~|\/)/g, function (m) { return ({ '~': '~~', '/': '~2F' }[m]); }) : val;
+      };
+      pathType.decode = function (val) {
+        return val != null ? val.toString().replace(/(~~|~2F)/g, function (m) { return ({ '~~': '~', '~2F': '/' }[m]); }) : val;
+      };
+    };
+    return Ng1LocationServices;
+  }());
+
+  /** @module url */ /** */
+  /**
+   * Manages rules for client-side URL
+   *
+   * ### Deprecation warning:
+   * This class is now considered to be an internal API
+   * Use the [[UrlService]] instead.
+   * For configuring URL rules, use the [[UrlRulesApi]] which can be found as [[UrlService.rules]].
+   *
+   * This class manages the router rules for what to do when the URL changes.
+   *
+   * This provider remains for backwards compatibility.
+   *
+   * @deprecated
+   */
+  var UrlRouterProvider = /** @class */ (function () {
+    /** @hidden */
+    function UrlRouterProvider(router) {
+      this._router = router;
+      this._urlRouter = router.urlRouter;
+    }
+    /** @hidden */
+    UrlRouterProvider.prototype.$get = function () {
+      var urlRouter = this._urlRouter;
+      urlRouter.update(true);
+      if (!urlRouter.interceptDeferred)
+        urlRouter.listen();
+      return urlRouter;
+    };
+    /**
+     * Registers a url handler function.
+     *
+     * Registers a low level url handler (a `rule`).
+     * A rule detects specific URL patterns and returns a redirect, or performs some action.
+     *
+     * If a rule returns a string, the URL is replaced with the string, and all rules are fired again.
+     *
+     * #### Example:
+     * ```js
+     * var app = angular.module('app', ['ui.router.router']);
+     *
+     * app.config(function ($urlRouterProvider) {
+     *   // Here's an example of how you might allow case insensitive urls
+     *   $urlRouterProvider.rule(function ($injector, $location) {
+     *     var path = $location.path(),
+     *         normalized = path.toLowerCase();
+     *
+     *     if (path !== normalized) {
+     *       return normalized;
+     *     }
+     *   });
+     * });
+     * ```
+     *
+     * @param ruleFn
+     * Handler function that takes `$injector` and `$location` services as arguments.
+     * You can use them to detect a url and return a different url as a string.
+     *
+     * @return [[UrlRouterProvider]] (`this`)
+     */
+    UrlRouterProvider.prototype.rule = function (ruleFn) {
+      var _this = this;
+      if (!isFunction(ruleFn))
+        throw new Error("'rule' must be a function");
+      var match = function () {
+        return ruleFn(services.$injector, _this._router.locationService);
+      };
+      var rule = new BaseUrlRule(match, identity);
+      this._urlRouter.rule(rule);
+      return this;
+    };
+
+    /**
+     * Defines the path or behavior to use when no url can be matched.
+     *
+     * #### Example:
+     * ```js
+     * var app = angular.module('app', ['ui.router.router']);
+     *
+     * app.config(function ($urlRouterProvider) {
+     *   // if the path doesn't match any of the urls you configured
+     *   // otherwise will take care of routing the user to the
+     *   // specified url
+     *   $urlRouterProvider.otherwise('/index');
+     *
+     *   // Example of using function rule as param
+     *   $urlRouterProvider.otherwise(function ($injector, $location) {
+     *     return '/a/valid/url';
+     *   });
+     * });
+     * ```
+     *
+     * @param rule
+     * The url path you want to redirect to or a function rule that returns the url path or performs a `$state.go()`.
+     * The function version is passed two params: `$injector` and `$location` services, and should return a url string.
+     *
+     * @return {object} `$urlRouterProvider` - `$urlRouterProvider` instance
+     */
+    UrlRouterProvider.prototype.otherwise = function (rule) {
+      var _this = this;
+      var urlRouter = this._urlRouter;
+      if (isString(rule)) {
+        urlRouter.otherwise(rule);
+      }
+      else if (isFunction(rule)) {
+        urlRouter.otherwise(function () { return rule(services.$injector, _this._router.locationService); });
+      }
+      else {
+        throw new Error("'rule' must be a string or function");
+      }
+      return this;
+    };
+
+    /**
+     * Registers a handler for a given url matching.
+     *
+     * If the handler is a string, it is
+     * treated as a redirect, and is interpolated according to the syntax of match
+     * (i.e. like `String.replace()` for `RegExp`, or like a `UrlMatcher` pattern otherwise).
+     *
+     * If the handler is a function, it is injectable.
+     * It gets invoked if `$location` matches.
+     * You have the option of inject the match object as `$match`.
+     *
+     * The handler can return
+     *
+     * - **falsy** to indicate that the rule didn't match after all, then `$urlRouter`
+     *   will continue trying to find another one that matches.
+     * - **string** which is treated as a redirect and passed to `$location.url()`
+     * - **void** or any **truthy** value tells `$urlRouter` that the url was handled.
+     *
+     * #### Example:
+     * ```js
+     * var app = angular.module('app', ['ui.router.router']);
+     *
+     * app.config(function ($urlRouterProvider) {
+     *   $urlRouterProvider.when($state.url, function ($match, $stateParams) {
+     *     if ($state.$current.navigable !== state ||
+     *         !equalForKeys($match, $stateParams) {
+     *      $state.transitionTo(state, $match, false);
+     *     }
+     *   });
+     * });
+     * ```
+     *
+     * @param what A pattern string to match, compiled as a [[UrlMatcher]].
+     * @param handler The path (or function that returns a path) that you want to redirect your user to.
+     * @param ruleCallback [optional] A callback that receives the `rule` registered with [[UrlMatcher.rule]]
+     *
+     * Note: the handler may also invoke arbitrary code, such as `$state.go()`
+     */
+    UrlRouterProvider.prototype.when = function (what, handler) {
+      if (isArray(handler) || isFunction(handler)) {
+        handler = UrlRouterProvider.injectableHandler(this._router, handler);
+      }
+      this._urlRouter.when(what, handler);
+      return this;
+    };
+
+    UrlRouterProvider.injectableHandler = function (router, handler) {
+      return function (match) {
+        return services.$injector.invoke(handler, null, { $match: match, $stateParams: router.globals.params });
+      };
+    };
+    /**
+     * Disables monitoring of the URL.
+     *
+     * Call this method before UI-Router has bootstrapped.
+     * It will stop UI-Router from performing the initial url sync.
+     *
+     * This can be useful to perform some asynchronous initialization before the router starts.
+     * Once the initialization is complete, call [[listen]] to tell UI-Router to start watching and synchronizing the URL.
+     *
+     * #### Example:
+     * ```js
+     * var app = angular.module('app', ['ui.router']);
+     *
+     * app.config(function ($urlRouterProvider) {
+     *   // Prevent $urlRouter from automatically intercepting URL changes;
+     *   $urlRouterProvider.deferIntercept();
+     * })
+     *
+     * app.run(function (MyService, $urlRouter, $http) {
+     *   $http.get("/stuff").then(function(resp) {
+     *     MyService.doStuff(resp.data);
+     *     $urlRouter.listen();
+     *     $urlRouter.sync();
+     *   });
+     * });
+     * ```
+     *
+     * @param defer Indicates whether to defer location change interception.
+     *        Passing no parameter is equivalent to `true`.
+     */
+    UrlRouterProvider.prototype.deferIntercept = function (defer) {
+      this._urlRouter.deferIntercept(defer);
+    };
+
+    return UrlRouterProvider;
+  }());
+
+  /**
+   * # Angular 1 types
+   *
+   * UI-Router core provides various Typescript types which you can use for code completion and validating parameter values, etc.
+   * The customizations to the core types for Angular UI-Router are documented here.
+   *
+   * The optional [[$resolve]] service is also documented here.
+   *
+   * @module ng1
+   * @preferred
+   */
+  /** for typedoc */
+  ng.module("ui.router.angular1", []);
+  var mod_init = ng.module('ui.router.init', []);
+  var mod_util = ng.module('ui.router.util', ['ng', 'ui.router.init']);
+  var mod_rtr = ng.module('ui.router.router', ['ui.router.util']);
+  var mod_state = ng.module('ui.router.state', ['ui.router.router', 'ui.router.util', 'ui.router.angular1']);
+  var mod_main = ng.module('ui.router', ['ui.router.init', 'ui.router.state', 'ui.router.angular1']);
+  var mod_cmpt = ng.module('ui.router.compat', ['ui.router']); // tslint:disable-line
+  var router = null;
+  $uiRouter.$inject = ['$locationProvider'];
+  /** This angular 1 provider instantiates a Router and exposes its services via the angular injector */
+  function $uiRouter($locationProvider) {
+    // Create a new instance of the Router when the $uiRouterProvider is initialized
+    router = this.router = new UIRouter();
+    router.stateProvider = new StateProvider(router.stateRegistry, router.stateService);
+    // Apply ng1 specific StateBuilder code for `views`, `resolve`, and `onExit/Retain/Enter` properties
+    router.stateRegistry.decorator("views", ng1ViewsBuilder);
+    router.stateRegistry.decorator("onExit", getStateHookBuilder("onExit"));
+    router.stateRegistry.decorator("onRetain", getStateHookBuilder("onRetain"));
+    router.stateRegistry.decorator("onEnter", getStateHookBuilder("onEnter"));
+    router.viewService._pluginapi._viewConfigFactory('ng1', getNg1ViewConfigFactory());
+    var ng1LocationService = router.locationService = router.locationConfig = new Ng1LocationServices($locationProvider);
+    Ng1LocationServices.monkeyPatchPathParameterType(router);
+    // backwards compat: also expose router instance as $uiRouterProvider.router
+    router['router'] = router;
+    router['$get'] = $get;
+    $get.$inject = ['$location', '$browser', '$sniffer', '$rootScope', '$http', '$templateCache'];
+    function $get($location, $browser, $sniffer, $rootScope, $http, $templateCache) {
+      ng1LocationService._runtimeServices($rootScope, $location, $sniffer, $browser);
+      delete router['router'];
+      delete router['$get'];
+      return router;
+    }
+    return router;
+  }
+  var getProviderFor = function (serviceName) { return ['$uiRouterProvider', function ($urp) {
+    var service = $urp.router[serviceName];
+    service["$get"] = function () { return service; };
+    return service;
+  }]; };
+// This effectively calls $get() on `$uiRouterProvider` to trigger init (when ng enters runtime)
+  runBlock.$inject = ['$injector', '$q', '$uiRouter'];
+  function runBlock($injector, $q, $uiRouter) {
+    services.$injector = $injector;
+    services.$q = $q;
+    // The $injector is now available.
+    // Find any resolvables that had dependency annotation deferred
+    $uiRouter.stateRegistry.get()
+      .map(function (x) { return x.$$state().resolvables; })
+      .reduce(unnestR, [])
+      .filter(function (x) { return x.deps === "deferred"; })
+      .forEach(function (resolvable) { return resolvable.deps = $injector.annotate(resolvable.resolveFn, $injector.strictDi); });
+  }
+// $urlRouter service and $urlRouterProvider
+  var getUrlRouterProvider = function (uiRouter) {
+    return uiRouter.urlRouterProvider = new UrlRouterProvider(uiRouter);
+  };
+// $state service and $stateProvider
+// $urlRouter service and $urlRouterProvider
+  var getStateProvider = function () {
+    return extend(router.stateProvider, { $get: function () { return router.stateService; } });
+  };
+  watchDigests.$inject = ['$rootScope'];
+  function watchDigests($rootScope) {
+    $rootScope.$watch(function () { trace.approximateDigests++; });
+  }
+  mod_init.provider("$uiRouter", $uiRouter);
+  mod_rtr.provider('$urlRouter', ['$uiRouterProvider', getUrlRouterProvider]);
+  mod_util.provider('$urlService', getProviderFor('urlService'));
+  mod_util.provider('$urlMatcherFactory', ['$uiRouterProvider', function () { return router.urlMatcherFactory; }]);
+  mod_util.provider('$templateFactory', function () { return new TemplateFactory(); });
+  mod_state.provider('$stateRegistry', getProviderFor('stateRegistry'));
+  mod_state.provider('$uiRouterGlobals', getProviderFor('globals'));
+  mod_state.provider('$transitions', getProviderFor('transitionService'));
+  mod_state.provider('$state', ['$uiRouterProvider', getStateProvider]);
+  mod_state.factory('$stateParams', ['$uiRouter', function ($uiRouter) { return $uiRouter.globals.params; }]);
+  mod_main.factory('$view', function () { return router.viewService; });
+  mod_main.service("$trace", function () { return trace; });
+  mod_main.run(watchDigests);
+  mod_util.run(['$urlMatcherFactory', function ($urlMatcherFactory) { }]);
+  mod_state.run(['$state', function ($state) { }]);
+  mod_rtr.run(['$urlRouter', function ($urlRouter) { }]);
+  mod_init.run(runBlock);
+  /** @hidden TODO: find a place to move this */
+  var getLocals = function (ctx) {
+    var tokens = ctx.getTokens().filter(isString);
+    var tuples = tokens.map(function (key) {
+      var resolvable = ctx.getResolvable(key);
+      var waitPolicy = ctx.getPolicy(resolvable).async;
+      return [key, waitPolicy === 'NOWAIT' ? resolvable.promise : resolvable.data];
+    });
+    return tuples.reduce(applyPairs, {});
+  };
+
+  /**
+   * # Angular 1 injectable services
+   *
+   * This is a list of the objects which can be injected using angular's injector.
+   *
+   * There are three different kind of injectable objects:
+   *
+   * ## **Provider** objects
+   * #### injectable into a `.config()` block during configtime
+   *
+   * - [[$uiRouterProvider]]: The UI-Router instance
+   * - [[$stateProvider]]: State registration
+   * - [[$transitionsProvider]]: Transition hooks
+   * - [[$urlServiceProvider]]: All URL related public APIs
+   *
+   * - [[$uiViewScrollProvider]]: Disable ui-router view scrolling
+   * - [[$urlRouterProvider]]: (deprecated) Url matching rules
+   * - [[$urlMatcherFactoryProvider]]: (deprecated) Url parsing config
+   *
+   * ## **Service** objects
+   * #### injectable globally during runtime
+   *
+   * - [[$uiRouter]]: The UI-Router instance
+   * - [[$trace]]: Enable transition trace/debug
+   * - [[$transitions]]: Transition hooks
+   * - [[$state]]: Imperative state related APIs
+   * - [[$stateRegistry]]: State registration
+   * - [[$urlService]]: All URL related public APIs
+   * - [[$uiRouterGlobals]]: Global variables
+   * - [[$uiViewScroll]]: Scroll an element into view
+   *
+   * - [[$stateParams]]: (deprecated) Global state param values
+   * - [[$urlRouter]]: (deprecated) URL synchronization
+   * - [[$urlMatcherFactory]]: (deprecated) URL parsing config
+   *
+   * ## **Per-Transition** objects
+   *
+   * - These kind of objects are injectable into:
+   *   - Resolves ([[Ng1StateDeclaration.resolve]]),
+   *   - Transition Hooks ([[TransitionService.onStart]], etc),
+   *   - Routed Controllers ([[Ng1ViewDeclaration.controller]])
+   *
+   * #### Different instances are injected based on the [[Transition]]
+   *
+   * - [[$transition$]]: The current Transition object
+   * - [[$stateParams]]: State param values for pending Transition (deprecated)
+   * - Any resolve data defined using [[Ng1StateDeclaration.resolve]]
+   *
+   * @ng1api
+   * @preferred
+   * @module injectables
+   */ /** */
+  /**
+   * The current (or pending) State Parameters
+   *
+   * An injectable global **Service Object** which holds the state parameters for the latest **SUCCESSFUL** transition.
+   *
+   * The values are not updated until *after* a `Transition` successfully completes.
+   *
+   * **Also:** an injectable **Per-Transition Object** object which holds the pending state parameters for the pending `Transition` currently running.
+   *
+   * ### Deprecation warning:
+   *
+   * The value injected for `$stateParams` is different depending on where it is injected.
+   *
+   * - When injected into an angular service, the object injected is the global **Service Object** with the parameter values for the latest successful `Transition`.
+   * - When injected into transition hooks, resolves, or view controllers, the object is the **Per-Transition Object** with the parameter values for the running `Transition`.
+   *
+   * Because of these confusing details, this service is deprecated.
+   *
+   * ### Instead of using the global `$stateParams` service object,
+   * inject [[$uiRouterGlobals]] and use [[UIRouterGlobals.params]]
+   *
+   * ```js
+   * MyService.$inject = ['$uiRouterGlobals'];
+   * function MyService($uiRouterGlobals) {
+ *   return {
+ *     paramValues: function () {
+ *       return $uiRouterGlobals.params;
+ *     }
+ *   }
+ * }
+   * ```
+   *
+   * ### Instead of using the per-transition `$stateParams` object,
+   * inject the current `Transition` (as [[$transition$]]) and use [[Transition.params]]
+   *
+   * ```js
+   * MyController.$inject = ['$transition$'];
+   * function MyController($transition$) {
+ *   var username = $transition$.params().username;
+ *   // .. do something with username
+ * }
+   * ```
+   *
+   * ---
+   *
+   * This object can be injected into other services.
+   *
+   * #### Deprecated Example:
+   * ```js
+   * SomeService.$inject = ['$http', '$stateParams'];
+   * function SomeService($http, $stateParams) {
+ *   return {
+ *     getUser: function() {
+ *       return $http.get('/api/users/' + $stateParams.username);
+ *     }
+ *   }
+ * };
+   * angular.service('SomeService', SomeService);
+   * ```
+   * @deprecated
+   */
+
+  /**
+   * # Angular 1 Directives
+   *
+   * These are the directives included in UI-Router for Angular 1.
+   * These directives are used in templates to create viewports and link/navigate to states.
+   *
+   * @ng1api
+   * @preferred
+   * @module directives
+   */ /** for typedoc */
+  /** @hidden */
+  function parseStateRef(ref) {
+    var paramsOnly = ref.match(/^\s*({[^}]*})\s*$/), parsed;
+    if (paramsOnly)
+      ref = '(' + paramsOnly[1] + ')';
+    parsed = ref.replace(/\n/g, " ").match(/^\s*([^(]*?)\s*(\((.*)\))?\s*$/);
+    if (!parsed || parsed.length !== 4)
+      throw new Error("Invalid state ref '" + ref + "'");
+    return { state: parsed[1] || null, paramExpr: parsed[3] || null };
+  }
+  /** @hidden */
+  function stateContext(el) {
+    var $uiView = el.parent().inheritedData('$uiView');
+    var path = parse('$cfg.path')($uiView);
+    return path ? tail(path).state.name : undefined;
+  }
+  /** @hidden */
+  function processedDef($state, $element, def) {
+    var uiState = def.uiState || $state.current.name;
+    var uiStateOpts = extend(defaultOpts($element, $state), def.uiStateOpts || {});
+    var href = $state.href(uiState, def.uiStateParams, uiStateOpts);
+    return { uiState: uiState, uiStateParams: def.uiStateParams, uiStateOpts: uiStateOpts, href: href };
+  }
+  /** @hidden */
+  function getTypeInfo(el) {
+    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
+    var isSvg = Object.prototype.toString.call(el.prop('href')) === '[object SVGAnimatedString]';
+    var isForm = el[0].nodeName === "FORM";
+    return {
+      attr: isForm ? "action" : (isSvg ? 'xlink:href' : 'href'),
+      isAnchor: el.prop("tagName").toUpperCase() === "A",
+      clickable: !isForm
+    };
+  }
+  /** @hidden */
+  function clickHook(el, $state, $timeout, type, getDef) {
+    return function (e) {
+      var button = e.which || e.button, target = getDef();
+      if (!(button > 1 || e.ctrlKey || e.metaKey || e.shiftKey || el.attr('target'))) {
+        // HACK: This is to allow ng-clicks to be processed before the transition is initiated:
+        var transition = $timeout(function () {
+          $state.go(target.uiState, target.uiStateParams, target.uiStateOpts);
+        });
+        e.preventDefault();
+        // if the state has no URL, ignore one preventDefault from the <a> directive.
+        var ignorePreventDefaultCount = type.isAnchor && !target.href ? 1 : 0;
+        e.preventDefault = function () {
+          if (ignorePreventDefaultCount-- <= 0)
+            $timeout.cancel(transition);
+        };
+      }
+    };
+  }
+  /** @hidden */
+  function defaultOpts(el, $state) {
+    return {
+      relative: stateContext(el) || $state.$current,
+      inherit: true,
+      source: "sref"
+    };
+  }
+  /** @hidden */
+  function bindEvents(element, scope, hookFn, uiStateOpts) {
+    var events;
+    if (uiStateOpts) {
+      events = uiStateOpts.events;
+    }
+    if (!isArray(events)) {
+      events = ['click'];
+    }
+    var on = element.on ? 'on' : 'bind';
+    for (var _i = 0, events_1 = events; _i < events_1.length; _i++) {
+      var event_1 = events_1[_i];
+      element[on](event_1, hookFn);
+    }
+    scope.$on('$destroy', function () {
+      var off = element.off ? 'off' : 'unbind';
+      for (var _i = 0, events_2 = events; _i < events_2.length; _i++) {
+        var event_2 = events_2[_i];
+        element[off](event_2, hookFn);
+      }
+    });
+  }
+  /**
+   * `ui-sref`: A directive for linking to a state
+   *
+   * A directive which links to a state (and optionally, parameters).
+   * When clicked, this directive activates the linked state with the supplied parameter values.
+   *
+   * ### Linked State
+   * The attribute value of the `ui-sref` is the name of the state to link to.
+   *
+   * #### Example:
+   * This will activate the `home` state when the link is clicked.
+   * ```html
+   * <a ui-sref="home">Home</a>
+   * ```
+   *
+   * ### Relative Links
+   * You can also use relative state paths within `ui-sref`, just like a relative path passed to `$state.go()` ([[StateService.go]]).
+   * You just need to be aware that the path is relative to the state that *created* the link.
+   * This allows a state to create a relative `ui-sref` which always targets the same destination.
+   *
+   * #### Example:
+   * Both these links are relative to the parent state, even when a child state is currently active.
+   * ```html
+   * <a ui-sref=".child1">child 1 state</a>
+   * <a ui-sref=".child2">child 2 state</a>
+   * ```
+   *
+   * This link activates the parent state.
+   * ```html
+   * <a ui-sref="^">Return</a>
+   * ```
+   *
+   * ### hrefs
+   * If the linked state has a URL, the directive will automatically generate and
+   * update the `href` attribute (using the [[StateService.href]]  method).
+   *
+   * #### Example:
+   * Assuming the `users` state has a url of `/users/`
+   * ```html
+   * <a ui-sref="users" href="/users/">Users</a>
+   * ```
+   *
+   * ### Parameter Values
+   * In addition to the state name, a `ui-sref` can include parameter values which are applied when activating the state.
+   * Param values can be provided in the `ui-sref` value after the state name, enclosed by parentheses.
+   * The content inside the parentheses is an expression, evaluated to the parameter values.
+   *
+   * #### Example:
+   * This example renders a list of links to users.
+   * The state's `userId` parameter value comes from each user's `user.id` property.
+   * ```html
+   * <li ng-repeat="user in users">
+   *   <a ui-sref="users.detail({ userId: user.id })">{{ user.displayName }}</a>
+   * </li>
+   * ```
+   *
+   * Note:
+   * The parameter values expression is `$watch`ed for updates.
+   *
+   * ### Transition Options
+   * You can specify [[TransitionOptions]] to pass to [[StateService.go]] by using the `ui-sref-opts` attribute.
+   * Options are restricted to `location`, `inherit`, and `reload`.
+   *
+   * #### Example:
+   * ```html
+   * <a ui-sref="home" ui-sref-opts="{ reload: true }">Home</a>
+   * ```
+   *
+   * ### Other DOM Events
+   *
+   * You can also customize which DOM events to respond to (instead of `click`) by
+   * providing an `events` array in the `ui-sref-opts` attribute.
+   *
+   * #### Example:
+   * ```html
+   * <input type="text" ui-sref="contacts" ui-sref-opts="{ events: ['change', 'blur'] }">
+   * ```
+   *
+   * ### Highlighting the active link
+   * This directive can be used in conjunction with [[uiSrefActive]] to highlight the active link.
+   *
+   * ### Examples
+   * If you have the following template:
+   *
+   * ```html
+   * <a ui-sref="home">Home</a>
+   * <a ui-sref="about">About</a>
+   * <a ui-sref="{page: 2}">Next page</a>
+   *
+   * <ul>
+   *     <li ng-repeat="contact in contacts">
+   *         <a ui-sref="contacts.detail({ id: contact.id })">{{ contact.name }}</a>
+   *     </li>
+   * </ul>
+   * ```
+   *
+   * Then (assuming the current state is `contacts`) the rendered html including hrefs would be:
+   *
+   * ```html
+   * <a href="#/home" ui-sref="home">Home</a>
+   * <a href="#/about" ui-sref="about">About</a>
+   * <a href="#/contacts?page=2" ui-sref="{page: 2}">Next page</a>
+   *
+   * <ul>
+   *     <li ng-repeat="contact in contacts">
+   *         <a href="#/contacts/1" ui-sref="contacts.detail({ id: contact.id })">Joe</a>
+   *     </li>
+   *     <li ng-repeat="contact in contacts">
+   *         <a href="#/contacts/2" ui-sref="contacts.detail({ id: contact.id })">Alice</a>
+   *     </li>
+   *     <li ng-repeat="contact in contacts">
+   *         <a href="#/contacts/3" ui-sref="contacts.detail({ id: contact.id })">Bob</a>
+   *     </li>
+   * </ul>
+   *
+   * <a href="#/home" ui-sref="home" ui-sref-opts="{reload: true}">Home</a>
+   * ```
+   *
+   * ### Notes
+   *
+   * - You can use `ui-sref` to change **only the parameter values** by omitting the state name and parentheses.
+   * #### Example:
+   * Sets the `lang` parameter to `en` and remains on the same state.
+   *
+   * ```html
+   * <a ui-sref="{ lang: 'en' }">English</a>
+   * ```
+   *
+   * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example.
+   *
+   * - Unlike the parameter values expression, the state name is not `$watch`ed (for performance reasons).
+   * If you need to dynamically update the state being linked to, use the fully dynamic [[uiState]] directive.
+   */
+  var uiSref;
+  uiSref = ['$uiRouter', '$timeout',
+    function $StateRefDirective($uiRouter, $timeout) {
+      var $state = $uiRouter.stateService;
+      return {
+        restrict: 'A',
+        require: ['?^uiSrefActive', '?^uiSrefActiveEq'],
+        link: function (scope, element, attrs, uiSrefActive) {
+          var type = getTypeInfo(element);
+          var active = uiSrefActive[1] || uiSrefActive[0];
+          var unlinkInfoFn = null;
+          var hookFn;
+          var rawDef = {};
+          var getDef = function () { return processedDef($state, element, rawDef); };
+          var ref = parseStateRef(attrs.uiSref);
+          rawDef.uiState = ref.state;
+          rawDef.uiStateOpts = attrs.uiSrefOpts ? scope.$eval(attrs.uiSrefOpts) : {};
+          function update() {
+            var def = getDef();
+            if (unlinkInfoFn)
+              unlinkInfoFn();
+            if (active)
+              unlinkInfoFn = active.$$addStateInfo(def.uiState, def.uiStateParams);
+            if (def.href != null)
+              attrs.$set(type.attr, def.href);
+          }
+          if (ref.paramExpr) {
+            scope.$watch(ref.paramExpr, function (val) {
+              rawDef.uiStateParams = extend({}, val);
+              update();
+            }, true);
+            rawDef.uiStateParams = extend({}, scope.$eval(ref.paramExpr));
+          }
+          update();
+          scope.$on('$destroy', $uiRouter.stateRegistry.onStatesChanged(update));
+          scope.$on('$destroy', $uiRouter.transitionService.onSuccess({}, update));
+          if (!type.clickable)
+            return;
+          hookFn = clickHook(element, $state, $timeout, type, getDef);
+          bindEvents(element, scope, hookFn, rawDef.uiStateOpts);
+        }
+      };
+    }];
+  /**
+   * `ui-state`: A fully dynamic directive for linking to a state
+   *
+   * A directive which links to a state (and optionally, parameters).
+   * When clicked, this directive activates the linked state with the supplied parameter values.
+   *
+   * **This directive is very similar to [[uiSref]], but it `$observe`s and `$watch`es/evaluates all its inputs.**
+   *
+   * A directive which links to a state (and optionally, parameters).
+   * When clicked, this directive activates the linked state with the supplied parameter values.
+   *
+   * ### Linked State
+   * The attribute value of `ui-state` is an expression which is `$watch`ed and evaluated as the state to link to.
+   * **This is in contrast with `ui-sref`, which takes a state name as a string literal.**
+   *
+   * #### Example:
+   * Create a list of links.
+   * ```html
+   * <li ng-repeat="link in navlinks">
+   *   <a ui-state="link.state">{{ link.displayName }}</a>
+   * </li>
+   * ```
+   *
+   * ### Relative Links
+   * If the expression evaluates to a relative path, it is processed like [[uiSref]].
+   * You just need to be aware that the path is relative to the state that *created* the link.
+   * This allows a state to create relative `ui-state` which always targets the same destination.
+   *
+   * ### hrefs
+   * If the linked state has a URL, the directive will automatically generate and
+   * update the `href` attribute (using the [[StateService.href]]  method).
+   *
+   * ### Parameter Values
+   * In addition to the state name expression, a `ui-state` can include parameter values which are applied when activating the state.
+   * Param values should be provided using the `ui-state-params` attribute.
+   * The `ui-state-params` attribute value is `$watch`ed and evaluated as an expression.
+   *
+   * #### Example:
+   * This example renders a list of links with param values.
+   * The state's `userId` parameter value comes from each user's `user.id` property.
+   * ```html
+   * <li ng-repeat="link in navlinks">
+   *   <a ui-state="link.state" ui-state-params="link.params">{{ link.displayName }}</a>
+   * </li>
+   * ```
+   *
+   * ### Transition Options
+   * You can specify [[TransitionOptions]] to pass to [[StateService.go]] by using the `ui-state-opts` attribute.
+   * Options are restricted to `location`, `inherit`, and `reload`.
+   * The value of the `ui-state-opts` is `$watch`ed and evaluated as an expression.
+   *
+   * #### Example:
+   * ```html
+   * <a ui-state="returnto.state" ui-state-opts="{ reload: true }">Home</a>
+   * ```
+   *
+   * ### Other DOM Events
+   *
+   * You can also customize which DOM events to respond to (instead of `click`) by
+   * providing an `events` array in the `ui-state-opts` attribute.
+   *
+   * #### Example:
+   * ```html
+   * <input type="text" ui-state="contacts" ui-state-opts="{ events: ['change', 'blur'] }">
+   * ```
+   *
+   * ### Highlighting the active link
+   * This directive can be used in conjunction with [[uiSrefActive]] to highlight the active link.
+   *
+   * ### Notes
+   *
+   * - You can use `ui-params` to change **only the parameter values** by omitting the state name and supplying only `ui-state-params`.
+   *   However, it might be simpler to use [[uiSref]] parameter-only links.
+   *
+   * #### Example:
+   * Sets the `lang` parameter to `en` and remains on the same state.
+   *
+   * ```html
+   * <a ui-state="" ui-state-params="{ lang: 'en' }">English</a>
+   * ```
+   *
+   * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example.
+   * ```
+   */
+  var uiState;
+  uiState = ['$uiRouter', '$timeout',
+    function $StateRefDynamicDirective($uiRouter, $timeout) {
+      var $state = $uiRouter.stateService;
+      return {
+        restrict: 'A',
+        require: ['?^uiSrefActive', '?^uiSrefActiveEq'],
+        link: function (scope, element, attrs, uiSrefActive) {
+          var type = getTypeInfo(element);
+          var active = uiSrefActive[1] || uiSrefActive[0];
+          var unlinkInfoFn = null;
+          var hookFn;
+          var rawDef = {};
+          var getDef = function () { return processedDef($state, element, rawDef); };
+          var inputAttrs = ['uiState', 'uiStateParams', 'uiStateOpts'];
+          var watchDeregFns = inputAttrs.reduce(function (acc, attr) { return (acc[attr] = noop$1, acc); }, {});
+          function update() {
+            var def = getDef();
+            if (unlinkInfoFn)
+              unlinkInfoFn();
+            if (active)
+              unlinkInfoFn = active.$$addStateInfo(def.uiState, def.uiStateParams);
+            if (def.href != null)
+              attrs.$set(type.attr, def.href);
+          }
+          inputAttrs.forEach(function (field) {
+            rawDef[field] = attrs[field] ? scope.$eval(attrs[field]) : null;
+            attrs.$observe(field, function (expr) {
+              watchDeregFns[field]();
+              watchDeregFns[field] = scope.$watch(expr, function (newval) {
+                rawDef[field] = newval;
+                update();
+              }, true);
+            });
+          });
+          update();
+          scope.$on('$destroy', $uiRouter.stateRegistry.onStatesChanged(update));
+          scope.$on('$destroy', $uiRouter.transitionService.onSuccess({}, update));
+          if (!type.clickable)
+            return;
+          hookFn = clickHook(element, $state, $timeout, type, getDef);
+          bindEvents(element, scope, hookFn, rawDef.uiStateOpts);
+        }
+      };
+    }];
+  /**
+   * `ui-sref-active` and `ui-sref-active-eq`: A directive that adds a CSS class when a `ui-sref` is active
+   *
+   * A directive working alongside [[uiSref]] and [[uiState]] to add classes to an element when the
+   * related directive's state is active (and remove them when it is inactive).
+   *
+   * The primary use-case is to highlight the active link in navigation menus,
+   * distinguishing it from the inactive menu items.
+   *
+   * ### Linking to a `ui-sref` or `ui-state`
+   * `ui-sref-active` can live on the same element as `ui-sref`/`ui-state`, or it can be on a parent element.
+   * If a `ui-sref-active` is a parent to more than one `ui-sref`/`ui-state`, it will apply the CSS class when **any of the links are active**.
+   *
+   * ### Matching
+   *
+   * The `ui-sref-active` directive applies the CSS class when the `ui-sref`/`ui-state`'s target state **or any child state is active**.
+   * This is a "fuzzy match" which uses [[StateService.includes]].
+   *
+   * The `ui-sref-active-eq` directive applies the CSS class when the `ui-sref`/`ui-state`'s target state is directly active (not when child states are active).
+   * This is an "exact match" which uses [[StateService.is]].
+   *
+   * ### Parameter values
+   * If the `ui-sref`/`ui-state` includes parameter values, the current parameter values must match the link's values for the link to be highlighted.
+   * This allows a list of links to the same state with different parameters to be rendered, and the correct one highlighted.
+   *
+   * #### Example:
+   * ```html
+   * <li ng-repeat="user in users" ui-sref-active="active">
+   *   <a ui-sref="user.details({ userId: user.id })">{{ user.lastName }}</a>
+   * </li>
+   * ```
+   *
+   * ### Examples
+   *
+   * Given the following template:
+   * #### Example:
+   * ```html
+   * <ul>
+   *   <li ui-sref-active="active" class="item">
+   *     <a href ui-sref="app.user({user: 'bilbobaggins'})">@bilbobaggins</a>
+   *   </li>
+   * </ul>
+   * ```
+   *
+   * When the app state is `app.user` (or any child state),
+   * and contains the state parameter "user" with value "bilbobaggins",
+   * the resulting HTML will appear as (note the 'active' class):
+   *
+   * ```html
+   * <ul>
+   *   <li ui-sref-active="active" class="item active">
+   *     <a ui-sref="app.user({user: 'bilbobaggins'})" href="/users/bilbobaggins">@bilbobaggins</a>
+   *   </li>
+   * </ul>
+   * ```
+   *
+   * ### Glob mode
+   *
+   * It is possible to pass `ui-sref-active` an expression that evaluates to an object.
+   * The objects keys represent active class names and values represent the respective state names/globs.
+   * `ui-sref-active` will match if the current active state **includes** any of
+   * the specified state names/globs, even the abstract ones.
+   *
+   * #### Example:
+   * Given the following template, with "admin" being an abstract state:
+   * ```html
+   * <div ui-sref-active="{'active': 'admin.**'}">
+   *   <a ui-sref-active="active" ui-sref="admin.roles">Roles</a>
+   * </div>
+   * ```
+   *
+   * When the current state is "admin.roles" the "active" class will be applied to both the <div> and <a> elements.
+   * It is important to note that the state names/globs passed to `ui-sref-active` override any state provided by a linked `ui-sref`.
+   *
+   * ### Notes:
+   *
+   * - The class name is interpolated **once** during the directives link time (any further changes to the
+   * interpolated value are ignored).
+   *
+   * - Multiple classes may be specified in a space-separated format: `ui-sref-active='class1 class2 class3'`
+   */
+  var uiSrefActive;
+  uiSrefActive = ['$state', '$stateParams', '$interpolate', '$uiRouter',
+    function $StateRefActiveDirective($state, $stateParams, $interpolate, $uiRouter) {
+      return {
+        restrict: "A",
+        controller: ['$scope', '$element', '$attrs',
+          function ($scope, $element, $attrs) {
+            var states = [], activeEqClass, uiSrefActive;
+            // There probably isn't much point in $observing this
+            // uiSrefActive and uiSrefActiveEq share the same directive object with some
+            // slight difference in logic routing
+            activeEqClass = $interpolate($attrs.uiSrefActiveEq || '', false)($scope);
+            try {
+              uiSrefActive = $scope.$eval($attrs.uiSrefActive);
+            }
+            catch (e) {
+              // Do nothing. uiSrefActive is not a valid expression.
+              // Fall back to using $interpolate below
+            }
+            uiSrefActive = uiSrefActive || $interpolate($attrs.uiSrefActive || '', false)($scope);
+            if (isObject(uiSrefActive)) {
+              forEach(uiSrefActive, function (stateOrName, activeClass) {
+                if (isString(stateOrName)) {
+                  var ref = parseStateRef(stateOrName);
+                  addState(ref.state, $scope.$eval(ref.paramExpr), activeClass);
+                }
+              });
+            }
+            // Allow uiSref to communicate with uiSrefActive[Equals]
+            this.$$addStateInfo = function (newState, newParams) {
+              // we already got an explicit state provided by ui-sref-active, so we
+              // shadow the one that comes from ui-sref
+              if (isObject(uiSrefActive) && states.length > 0) {
+                return;
+              }
+              var deregister = addState(newState, newParams, uiSrefActive);
+              update();
+              return deregister;
+            };
+            function updateAfterTransition(trans) {
+              trans.promise.then(update, noop$1);
+            }
+            $scope.$on('$stateChangeSuccess', update);
+            $scope.$on('$destroy', $uiRouter.transitionService.onStart({}, updateAfterTransition));
+            if ($uiRouter.globals.transition) {
+              updateAfterTransition($uiRouter.globals.transition);
+            }
+            function addState(stateName, stateParams, activeClass) {
+              var state = $state.get(stateName, stateContext($element));
+              var stateInfo = {
+                state: state || { name: stateName },
+                params: stateParams,
+                activeClass: activeClass
+              };
+              states.push(stateInfo);
+              return function removeState() {
+                removeFrom(states)(stateInfo);
+              };
+            }
+            // Update route state
+            function update() {
+              var splitClasses = function (str) {
+                return str.split(/\s/).filter(identity);
+              };
+              var getClasses = function (stateList) {
+                return stateList.map(function (x) { return x.activeClass; }).map(splitClasses).reduce(unnestR, []);
+              };
+              var allClasses = getClasses(states).concat(splitClasses(activeEqClass)).reduce(uniqR, []);
+              var fuzzyClasses = getClasses(states.filter(function (x) { return $state.includes(x.state.name, x.params); }));
+              var exactlyMatchesAny = !!states.filter(function (x) { return $state.is(x.state.name, x.params); }).length;
+              var exactClasses = exactlyMatchesAny ? splitClasses(activeEqClass) : [];
+              var addClasses = fuzzyClasses.concat(exactClasses).reduce(uniqR, []);
+              var removeClasses = allClasses.filter(function (cls) { return !inArray(addClasses, cls); });
+              $scope.$evalAsync(function () {
+                addClasses.forEach(function (className) { return $element.addClass(className); });
+                removeClasses.forEach(function (className) { return $element.removeClass(className); });
+              });
+            }
+            update();
+          }]
+      };
+    }];
+  ng.module('ui.router.state')
+    .directive('uiSref', uiSref)
+    .directive('uiSrefActive', uiSrefActive)
+    .directive('uiSrefActiveEq', uiSrefActive)
+    .directive('uiState', uiState);
+
+  /** @module ng1 */ /** for typedoc */
+  /**
+   * `isState` Filter: truthy if the current state is the parameter
+   *
+   * Translates to [[StateService.is]] `$state.is("stateName")`.
+   *
+   * #### Example:
+   * ```html
+   * <div ng-if="'stateName' | isState">show if state is 'stateName'</div>
+   * ```
+   */
+  $IsStateFilter.$inject = ['$state'];
+  function $IsStateFilter($state) {
+    var isFilter = function (state, params, options) {
+      return $state.is(state, params, options);
+    };
+    isFilter.$stateful = true;
+    return isFilter;
+  }
+  /**
+   * `includedByState` Filter: truthy if the current state includes the parameter
+   *
+   * Translates to [[StateService.includes]]` $state.is("fullOrPartialStateName")`.
+   *
+   * #### Example:
+   * ```html
+   * <div ng-if="'fullOrPartialStateName' | includedByState">show if state includes 'fullOrPartialStateName'</div>
+   * ```
+   */
+  $IncludedByStateFilter.$inject = ['$state'];
+  function $IncludedByStateFilter($state) {
+    var includesFilter = function (state, params, options) {
+      return $state.includes(state, params, options);
+    };
+    includesFilter.$stateful = true;
+    return includesFilter;
+  }
+  ng.module('ui.router.state')
+    .filter('isState', $IsStateFilter)
+    .filter('includedByState', $IncludedByStateFilter);
+
+  /**
+   * @ng1api
+   * @module directives
+   */ /** for typedoc */
+  /**
+   * `ui-view`: A viewport directive which is filled in by a view from the active state.
+   *
+   * ### Attributes
+   *
+   * - `name`: (Optional) A view name.
+   *   The name should be unique amongst the other views in the same state.
+   *   You can have views of the same name that live in different states.
+   *   The ui-view can be targeted in a View using the name ([[Ng1StateDeclaration.views]]).
+   *
+   * - `autoscroll`: an expression. When it evaluates to true, the `ui-view` will be scrolled into view when it is activated.
+   *   Uses [[$uiViewScroll]] to do the scrolling.
+   *
+   * - `onload`: Expression to evaluate whenever the view updates.
+   *
+   * #### Example:
+   * A view can be unnamed or named.
+   * ```html
+   * <!-- Unnamed -->
+   * <div ui-view></div>
+   *
+   * <!-- Named -->
+   * <div ui-view="viewName"></div>
+   *
+   * <!-- Named (different style) -->
+   * <ui-view name="viewName"></ui-view>
+   * ```
+   *
+   * You can only have one unnamed view within any template (or root html). If you are only using a
+   * single view and it is unnamed then you can populate it like so:
+   *
+   * ```html
+   * <div ui-view></div>
+   * $stateProvider.state("home", {
+ *   template: "<h1>HELLO!</h1>"
+ * })
+   * ```
+   *
+   * The above is a convenient shortcut equivalent to specifying your view explicitly with the
+   * [[Ng1StateDeclaration.views]] config property, by name, in this case an empty name:
+   *
+   * ```js
+   * $stateProvider.state("home", {
+ *   views: {
+ *     "": {
+ *       template: "<h1>HELLO!</h1>"
+ *     }
+ *   }
+ * })
+   * ```
+   *
+   * But typically you'll only use the views property if you name your view or have more than one view
+   * in the same template. There's not really a compelling reason to name a view if its the only one,
+   * but you could if you wanted, like so:
+   *
+   * ```html
+   * <div ui-view="main"></div>
+   * ```
+   *
+   * ```js
+   * $stateProvider.state("home", {
+ *   views: {
+ *     "main": {
+ *       template: "<h1>HELLO!</h1>"
+ *     }
+ *   }
+ * })
+   * ```
+   *
+   * Really though, you'll use views to set up multiple views:
+   *
+   * ```html
+   * <div ui-view></div>
+   * <div ui-view="chart"></div>
+   * <div ui-view="data"></div>
+   * ```
+   *
+   * ```js
+   * $stateProvider.state("home", {
+ *   views: {
+ *     "": {
+ *       template: "<h1>HELLO!</h1>"
+ *     },
+ *     "chart": {
+ *       template: "<chart_thing/>"
+ *     },
+ *     "data": {
+ *       template: "<data_thing/>"
+ *     }
+ *   }
+ * })
+   * ```
+   *
+   * #### Examples for `autoscroll`:
+   * ```html
+   * <!-- If autoscroll present with no expression,
+   *      then scroll ui-view into view -->
+   * <ui-view autoscroll/>
+   *
+   * <!-- If autoscroll present with valid expression,
+   *      then scroll ui-view into view if expression evaluates to true -->
+   * <ui-view autoscroll='true'/>
+   * <ui-view autoscroll='false'/>
+   * <ui-view autoscroll='scopeVariable'/>
+   * ```
+   *
+   * Resolve data:
+   *
+   * The resolved data from the state's `resolve` block is placed on the scope as `$resolve` (this
+   * can be customized using [[Ng1ViewDeclaration.resolveAs]]).  This can be then accessed from the template.
+   *
+   * Note that when `controllerAs` is being used, `$resolve` is set on the controller instance *after* the
+   * controller is instantiated.  The `$onInit()` hook can be used to perform initialization code which
+   * depends on `$resolve` data.
+   *
+   * #### Example:
+   * ```js
+   * $stateProvider.state('home', {
+ *   template: '<my-component user="$resolve.user"></my-component>',
+ *   resolve: {
+ *     user: function(UserService) { return UserService.fetchUser(); }
+ *   }
+ * });
+   * ```
+   */
+  var uiView;
+  uiView = ['$view', '$animate', '$uiViewScroll', '$interpolate', '$q',
+    function $ViewDirective($view, $animate, $uiViewScroll, $interpolate, $q) {
+      function getRenderer(attrs, scope) {
+        return {
+          enter: function (element, target, cb) {
+            if (ng.version.minor > 2) {
+              $animate.enter(element, null, target).then(cb);
+            }
+            else {
+              $animate.enter(element, null, target, cb);
+            }
+          },
+          leave: function (element, cb) {
+            if (ng.version.minor > 2) {
+              $animate.leave(element).then(cb);
+            }
+            else {
+              $animate.leave(element, cb);
+            }
+          }
+        };
+      }
+      function configsEqual(config1, config2) {
+        return config1 === config2;
+      }
+      var rootData = {
+        $cfg: { viewDecl: { $context: $view._pluginapi._rootViewContext() } },
+        $uiView: {}
+      };
+      var directive = {
+        count: 0,
+        restrict: 'ECA',
+        terminal: true,
+        priority: 400,
+        transclude: 'element',
+        compile: function (tElement, tAttrs, $transclude) {
+          return function (scope, $element, attrs) {
+            var previousEl, currentEl, currentScope, unregister, onloadExp = attrs['onload'] || '', autoScrollExp = attrs['autoscroll'], renderer = getRenderer(attrs, scope), viewConfig = undefined, inherited = $element.inheritedData('$uiView') || rootData, name = $interpolate(attrs['uiView'] || attrs['name'] || '')(scope) || '$default';
+            var activeUIView = {
+              $type: 'ng1',
+              id: directive.count++,
+              name: name,
+              fqn: inherited.$uiView.fqn ? inherited.$uiView.fqn + "." + name : name,
+              config: null,
+              configUpdated: configUpdatedCallback,
+              get creationContext() {
+                var fromParentTagConfig = parse('$cfg.viewDecl.$context')(inherited);
+                // Allow <ui-view name="foo"><ui-view name="bar"></ui-view></ui-view>
+                // See https://github.com/angular-ui/ui-router/issues/3355
+                var fromParentTag = parse('$uiView.creationContext')(inherited);
+                return fromParentTagConfig || fromParentTag;
+              }
+            };
+            trace.traceUIViewEvent("Linking", activeUIView);
+            function configUpdatedCallback(config) {
+              if (config && !(config instanceof Ng1ViewConfig))
+                return;
+              if (configsEqual(viewConfig, config))
+                return;
+              trace.traceUIViewConfigUpdated(activeUIView, config && config.viewDecl && config.viewDecl.$context);
+              viewConfig = config;
+              updateView(config);
+            }
+            $element.data('$uiView', { $uiView: activeUIView });
+            updateView();
+            unregister = $view.registerUIView(activeUIView);
+            scope.$on("$destroy", function () {
+              trace.traceUIViewEvent("Destroying/Unregistering", activeUIView);
+              unregister();
+            });
+            function cleanupLastView() {
+              if (previousEl) {
+                trace.traceUIViewEvent("Removing (previous) el", previousEl.data('$uiView'));
+                previousEl.remove();
+                previousEl = null;
+              }
+              if (currentScope) {
+                trace.traceUIViewEvent("Destroying scope", activeUIView);
+                currentScope.$destroy();
+                currentScope = null;
+              }
+              if (currentEl) {
+                var _viewData_1 = currentEl.data('$uiViewAnim');
+                trace.traceUIViewEvent("Animate out", _viewData_1);
+                renderer.leave(currentEl, function () {
+                  _viewData_1.$$animLeave.resolve();
+                  previousEl = null;
+                });
+                previousEl = currentEl;
+                currentEl = null;
+              }
+            }
+            function updateView(config) {
+              var newScope = scope.$new();
+              var animEnter = $q.defer(), animLeave = $q.defer();
+              var $uiViewData = {
+                $cfg: config,
+                $uiView: activeUIView,
+              };
+              var $uiViewAnim = {
+                $animEnter: animEnter.promise,
+                $animLeave: animLeave.promise,
+                $$animLeave: animLeave
+              };
+              /**
+               * @ngdoc event
+               * @name ui.router.state.directive:ui-view#$viewContentLoading
+               * @eventOf ui.router.state.directive:ui-view
+               * @eventType emits on ui-view directive scope
+               * @description
+               *
+               * Fired once the view **begins loading**, *before* the DOM is rendered.
+               *
+               * @param {Object} event Event object.
+               * @param {string} viewName Name of the view.
+               */
+              newScope.$emit('$viewContentLoading', name);
+              var cloned = $transclude(newScope, function (clone) {
+                clone.data('$uiViewAnim', $uiViewAnim);
+                clone.data('$uiView', $uiViewData);
+                renderer.enter(clone, $element, function onUIViewEnter() {
+                  animEnter.resolve();
+                  if (currentScope)
+                    currentScope.$emit('$viewContentAnimationEnded');
+                  if (isDefined(autoScrollExp) && !autoScrollExp || scope.$eval(autoScrollExp)) {
+                    $uiViewScroll(clone);
+                  }
+                });
+                cleanupLastView();
+              });
+              currentEl = cloned;
+              currentScope = newScope;
+              /**
+               * @ngdoc event
+               * @name ui.router.state.directive:ui-view#$viewContentLoaded
+               * @eventOf ui.router.state.directive:ui-view
+               * @eventType emits on ui-view directive scope
+               * @description           *
+               * Fired once the view is **loaded**, *after* the DOM is rendered.
+               *
+               * @param {Object} event Event object.
+               */
+              currentScope.$emit('$viewContentLoaded', config || viewConfig);
+              currentScope.$eval(onloadExp);
+            }
+          };
+        }
+      };
+      return directive;
+    }];
+  $ViewDirectiveFill.$inject = ['$compile', '$controller', '$transitions', '$view', '$q', '$timeout'];
+  /** @hidden */
+  function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q, $timeout) {
+    var getControllerAs = parse('viewDecl.controllerAs');
+    var getResolveAs = parse('viewDecl.resolveAs');
+    return {
+      restrict: 'ECA',
+      priority: -400,
+      compile: function (tElement) {
+        var initial = tElement.html();
+        tElement.empty();
+        return function (scope, $element) {
+          var data = $element.data('$uiView');
+          if (!data) {
+            $element.html(initial);
+            $compile($element.contents())(scope);
+            return;
+          }
+          var cfg = data.$cfg || { viewDecl: {}, getTemplate: ng_from_import.noop };
+          var resolveCtx = cfg.path && new ResolveContext(cfg.path);
+          $element.html(cfg.getTemplate($element, resolveCtx) || initial);
+          trace.traceUIViewFill(data.$uiView, $element.html());
+          var link = $compile($element.contents());
+          var controller = cfg.controller;
+          var controllerAs = getControllerAs(cfg);
+          var resolveAs = getResolveAs(cfg);
+          var locals = resolveCtx && getLocals(resolveCtx);
+          scope[resolveAs] = locals;
+          if (controller) {
+            var controllerInstance = $controller(controller, extend({}, locals, { $scope: scope, $element: $element }));
+            if (controllerAs) {
+              scope[controllerAs] = controllerInstance;
+              scope[controllerAs][resolveAs] = locals;
+            }
+            // TODO: Use $view service as a central point for registering component-level hooks
+            // Then, when a component is created, tell the $view service, so it can invoke hooks
+            // $view.componentLoaded(controllerInstance, { $scope: scope, $element: $element });
+            // scope.$on('$destroy', () => $view.componentUnloaded(controllerInstance, { $scope: scope, $element: $element }));
+            $element.data('$ngControllerController', controllerInstance);
+            $element.children().data('$ngControllerController', controllerInstance);
+            registerControllerCallbacks($q, $transitions, controllerInstance, scope, cfg);
+          }
+          // Wait for the component to appear in the DOM
+          if (isString(cfg.viewDecl.component)) {
+            var cmp_1 = cfg.viewDecl.component;
+            var kebobName = kebobString(cmp_1);
+            var tagRegexp_1 = new RegExp("^(x-|data-)?" + kebobName + "$", "i");
+            var getComponentController = function () {
+              var directiveEl = [].slice.call($element[0].children)
+                .filter(function (el) { return el && el.tagName && tagRegexp_1.exec(el.tagName); });
+              return directiveEl && ng.element(directiveEl).data("$" + cmp_1 + "Controller");
+            };
+            var deregisterWatch_1 = scope.$watch(getComponentController, function (ctrlInstance) {
+              if (!ctrlInstance)
+                return;
+              registerControllerCallbacks($q, $transitions, ctrlInstance, scope, cfg);
+              deregisterWatch_1();
+            });
+          }
+          link(scope);
+        };
+      }
+    };
+  }
+  /** @hidden */
+  var hasComponentImpl = typeof ng.module('ui.router')['component'] === 'function';
+  /** @hidden incrementing id */
+  var _uiCanExitId = 0;
+  /** @hidden TODO: move these callbacks to $view and/or `/hooks/components.ts` or something */
+  function registerControllerCallbacks($q, $transitions, controllerInstance, $scope, cfg) {
+    // Call $onInit() ASAP
+    if (isFunction(controllerInstance.$onInit) && !(cfg.viewDecl.component && hasComponentImpl)) {
+      controllerInstance.$onInit();
+    }
+    var viewState = tail(cfg.path).state.self;
+    var hookOptions = { bind: controllerInstance };
+    // Add component-level hook for onParamsChange
+    if (isFunction(controllerInstance.uiOnParamsChanged)) {
+      var resolveContext = new ResolveContext(cfg.path);
+      var viewCreationTrans_1 = resolveContext.getResolvable('$transition$').data;
+      // Fire callback on any successful transition
+      var paramsUpdated = function ($transition$) {
+        // Exit early if the $transition$ is the same as the view was created within.
+        // Exit early if the $transition$ will exit the state the view is for.
+        if ($transition$ === viewCreationTrans_1 || $transition$.exiting().indexOf(viewState) !== -1)
+          return;
+        var toParams = $transition$.params("to");
+        var fromParams = $transition$.params("from");
+        var toSchema = $transition$.treeChanges().to.map(function (node) { return node.paramSchema; }).reduce(unnestR, []);
+        var fromSchema = $transition$.treeChanges().from.map(function (node) { return node.paramSchema; }).reduce(unnestR, []);
+        // Find the to params that have different values than the from params
+        var changedToParams = toSchema.filter(function (param) {
+          var idx = fromSchema.indexOf(param);
+          return idx === -1 || !fromSchema[idx].type.equals(toParams[param.id], fromParams[param.id]);
+        });
+        // Only trigger callback if a to param has changed or is new
+        if (changedToParams.length) {
+          var changedKeys_1 = changedToParams.map(function (x) { return x.id; });
+          // Filter the params to only changed/new to params.  `$transition$.params()` may be used to get all params.
+          var newValues = filter(toParams, function (val, key) { return changedKeys_1.indexOf(key) !== -1; });
+          controllerInstance.uiOnParamsChanged(newValues, $transition$);
+        }
+      };
+      $scope.$on('$destroy', $transitions.onSuccess({}, paramsUpdated, hookOptions));
+    }
+    // Add component-level hook for uiCanExit
+    if (isFunction(controllerInstance.uiCanExit)) {
+      var id_1 = _uiCanExitId++;
+      var cacheProp_1 = '_uiCanExitIds';
+      // Returns true if a redirect transition already answered truthy
+      var prevTruthyAnswer_1 = function (trans) {
+        return !!trans && (trans[cacheProp_1] && trans[cacheProp_1][id_1] === true || prevTruthyAnswer_1(trans.redirectedFrom()));
+      };
+      // If a user answered yes, but the transition was later redirected, don't also ask for the new redirect transition
+      var wrappedHook = function (trans) {
+        var promise, ids = trans[cacheProp_1] = trans[cacheProp_1] || {};
+        if (!prevTruthyAnswer_1(trans)) {
+          promise = $q.when(controllerInstance.uiCanExit(trans));
+          promise.then(function (val) { return ids[id_1] = (val !== false); });
+        }
+        return promise;
+      };
+      var criteria = { exiting: viewState.name };
+      $scope.$on('$destroy', $transitions.onBefore(criteria, wrappedHook, hookOptions));
+    }
+  }
+  ng.module('ui.router.state').directive('uiView', uiView);
+  ng.module('ui.router.state').directive('uiView', $ViewDirectiveFill);
+
+  /** @module ng1 */ /** */
+  /** @hidden */
+  function $ViewScrollProvider() {
+    var useAnchorScroll = false;
+    this.useAnchorScroll = function () {
+      useAnchorScroll = true;
+    };
+    this.$get = ['$anchorScroll', '$timeout', function ($anchorScroll, $timeout) {
+      if (useAnchorScroll) {
+        return $anchorScroll;
+      }
+      return function ($element) {
+        return $timeout(function () {
+          $element[0].scrollIntoView();
+        }, 0, false);
+      };
+    }];
+  }
+  ng.module('ui.router.state').provider('$uiViewScroll', $ViewScrollProvider);
+
+  /**
+   * Main entry point for angular 1.x build
+   * @module ng1
+   */ /** */
+  var index = "ui.router";
+
+  exports['default'] = index;
+  exports.core = index$1;
+  exports.watchDigests = watchDigests;
+  exports.getLocals = getLocals;
+  exports.getNg1ViewConfigFactory = getNg1ViewConfigFactory;
+  exports.ng1ViewsBuilder = ng1ViewsBuilder;
+  exports.Ng1ViewConfig = Ng1ViewConfig;
+  exports.StateProvider = StateProvider;
+  exports.UrlRouterProvider = UrlRouterProvider;
+  exports.root = root;
+  exports.fromJson = fromJson;
+  exports.toJson = toJson;
+  exports.forEach = forEach;
+  exports.extend = extend;
+  exports.equals = equals;
+  exports.identity = identity;
+  exports.noop = noop$1;
+  exports.createProxyFunctions = createProxyFunctions;
+  exports.inherit = inherit;
+  exports.inArray = inArray;
+  exports._inArray = _inArray;
+  exports.removeFrom = removeFrom;
+  exports._removeFrom = _removeFrom;
+  exports.pushTo = pushTo;
+  exports._pushTo = _pushTo;
+  exports.deregAll = deregAll;
+  exports.defaults = defaults;
+  exports.mergeR = mergeR;
+  exports.ancestors = ancestors;
+  exports.pick = pick;
+  exports.omit = omit;
+  exports.pluck = pluck;
+  exports.filter = filter;
+  exports.find = find;
+  exports.mapObj = mapObj;
+  exports.map = map;
+  exports.values = values;
+  exports.allTrueR = allTrueR;
+  exports.anyTrueR = anyTrueR;
+  exports.unnestR = unnestR;
+  exports.flattenR = flattenR;
+  exports.pushR = pushR;
+  exports.uniqR = uniqR;
+  exports.unnest = unnest;
+  exports.flatten = flatten;
+  exports.assertPredicate = assertPredicate;
+  exports.assertMap = assertMap;
+  exports.assertFn = assertFn;
+  exports.pairs = pairs;
+  exports.arrayTuples = arrayTuples;
+  exports.applyPairs = applyPairs;
+  exports.tail = tail;
+  exports.copy = copy;
+  exports._extend = _extend;
+  exports.silenceUncaughtInPromise = silenceUncaughtInPromise;
+  exports.silentRejection = silentRejection;
+  exports.notImplemented = notImplemented;
+  exports.services = services;
+  exports.Glob = Glob;
+  exports.curry = curry;
+  exports.compose = compose;
+  exports.pipe = pipe;
+  exports.prop = prop;
+  exports.propEq = propEq;
+  exports.parse = parse;
+  exports.not = not;
+  exports.and = and;
+  exports.or = or;
+  exports.all = all;
+  exports.any = any;
+  exports.is = is;
+  exports.eq = eq;
+  exports.val = val;
+  exports.invoke = invoke;
+  exports.pattern = pattern;
+  exports.isUndefined = isUndefined;
+  exports.isDefined = isDefined;
+  exports.isNull = isNull;
+  exports.isNullOrUndefined = isNullOrUndefined;
+  exports.isFunction = isFunction;
+  exports.isNumber = isNumber;
+  exports.isString = isString;
+  exports.isObject = isObject;
+  exports.isArray = isArray;
+  exports.isDate = isDate;
+  exports.isRegExp = isRegExp;
+  exports.isState = isState;
+  exports.isInjectable = isInjectable;
+  exports.isPromise = isPromise;
+  exports.Queue = Queue;
+  exports.maxLength = maxLength;
+  exports.padString = padString;
+  exports.kebobString = kebobString;
+  exports.functionToString = functionToString;
+  exports.fnToString = fnToString;
+  exports.stringify = stringify;
+  exports.beforeAfterSubstr = beforeAfterSubstr;
+  exports.hostRegex = hostRegex;
+  exports.stripFile = stripFile;
+  exports.splitHash = splitHash;
+  exports.splitQuery = splitQuery;
+  exports.splitEqual = splitEqual;
+  exports.trimHashVal = trimHashVal;
+  exports.splitOnDelim = splitOnDelim;
+  exports.joinNeighborsR = joinNeighborsR;
+  exports.Trace = Trace;
+  exports.trace = trace;
+  exports.Param = Param;
+  exports.ParamTypes = ParamTypes;
+  exports.StateParams = StateParams;
+  exports.ParamType = ParamType;
+  exports.PathNode = PathNode;
+  exports.PathUtils = PathUtils;
+  exports.resolvePolicies = resolvePolicies;
+  exports.defaultResolvePolicy = defaultResolvePolicy;
+  exports.Resolvable = Resolvable;
+  exports.NATIVE_INJECTOR_TOKEN = NATIVE_INJECTOR_TOKEN;
+  exports.ResolveContext = ResolveContext;
+  exports.resolvablesBuilder = resolvablesBuilder;
+  exports.StateBuilder = StateBuilder;
+  exports.StateObject = StateObject;
+  exports.StateMatcher = StateMatcher;
+  exports.StateQueueManager = StateQueueManager;
+  exports.StateRegistry = StateRegistry;
+  exports.StateService = StateService;
+  exports.TargetState = TargetState;
+  exports.HookBuilder = HookBuilder;
+  exports.matchState = matchState;
+  exports.RegisteredHook = RegisteredHook;
+  exports.makeEvent = makeEvent;
+  exports.Rejection = Rejection;
+  exports.Transition = Transition;
+  exports.TransitionHook = TransitionHook;
+  exports.TransitionEventType = TransitionEventType;
+  exports.defaultTransOpts = defaultTransOpts;
+  exports.TransitionService = TransitionService;
+  exports.UrlMatcher = UrlMatcher;
+  exports.UrlMatcherFactory = UrlMatcherFactory;
+  exports.UrlRouter = UrlRouter;
+  exports.UrlRuleFactory = UrlRuleFactory;
+  exports.BaseUrlRule = BaseUrlRule;
+  exports.UrlService = UrlService;
+  exports.ViewService = ViewService;
+  exports.UIRouterGlobals = UIRouterGlobals;
+  exports.UIRouter = UIRouter;
+  exports.$q = $q;
+  exports.$injector = $injector;
+  exports.BaseLocationServices = BaseLocationServices;
+  exports.HashLocationService = HashLocationService;
+  exports.MemoryLocationService = MemoryLocationService;
+  exports.PushStateLocationService = PushStateLocationService;
+  exports.MemoryLocationConfig = MemoryLocationConfig;
+  exports.BrowserLocationConfig = BrowserLocationConfig;
+  exports.keyValsToObjectR = keyValsToObjectR;
+  exports.getParams = getParams;
+  exports.parseUrl = parseUrl$1;
+  exports.buildUrl = buildUrl;
+  exports.locationPluginFactory = locationPluginFactory;
+  exports.servicesPlugin = servicesPlugin;
+  exports.hashLocationPlugin = hashLocationPlugin;
+  exports.pushStateLocationPlugin = pushStateLocationPlugin;
+  exports.memoryLocationPlugin = memoryLocationPlugin;
+  exports.UIRouterPluginBase = UIRouterPluginBase;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+})));
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.ui-sortable.js b/docs-web/src/main/webapp/src/lib/angular.ui-sortable.js
index 19e7703d..735cc4c9 100644
--- a/docs-web/src/main/webapp/src/lib/angular.ui-sortable.js
+++ b/docs-web/src/main/webapp/src/lib/angular.ui-sortable.js
@@ -1,111 +1,566 @@
 /*
- jQuery UI Sortable plugin wrapper
+ * angular-ui-sortable - This directive allows you to jQueryUI Sortable.
+ * @version v0.17.2 - 2017-08-17
+ * @link http://angular-ui.github.com
+ * @license MIT
+ */
+(function(window, angular, undefined) {
+  'use strict';
+  /*
+   jQuery UI Sortable plugin wrapper
 
- @param [ui-sortable] {object} Options to pass to $.fn.sortable() merged onto ui.config
-*/
-angular.module('ui.sortable', [])
-  .value('uiSortableConfig',{})
-  .directive('uiSortable', [ 'uiSortableConfig',
-        function(uiSortableConfig) {
+   @param [ui-sortable] {object} Options to pass to $.fn.sortable() merged onto ui.config
+   */
+  angular.module('ui.sortable', [])
+    .value('uiSortableConfig',{
+      // the default for jquery-ui sortable is "> *", we need to restrict this to
+      // ng-repeat items
+      // if the user uses
+      items: '> [ng-repeat],> [data-ng-repeat],> [x-ng-repeat]'
+    })
+    .directive('uiSortable', [
+      'uiSortableConfig', '$timeout', '$log',
+      function(uiSortableConfig, $timeout, $log) {
         return {
-          require: '?ngModel',
+          require:'?ngModel',
+          scope: {
+            ngModel:'=',
+            uiSortable:'=',
+            ////Expression bindings from html.
+            create:'&uiSortableCreate',
+            // helper:'&uiSortableHelper',
+            start:'&uiSortableStart',
+            activate:'&uiSortableActivate',
+            // sort:'&uiSortableSort',
+            // change:'&uiSortableChange',
+            // over:'&uiSortableOver',
+            // out:'&uiSortableOut',
+            beforeStop:'&uiSortableBeforeStop',
+            update:'&uiSortableUpdate',
+            remove:'&uiSortableRemove',
+            receive:'&uiSortableReceive',
+            deactivate:'&uiSortableDeactivate',
+            stop:'&uiSortableStop'
+          },
           link: function(scope, element, attrs, ngModel) {
+            var savedNodes;
+            var helper;
 
-              function combineCallbacks(first,second){
-                  if( second && (typeof second === "function") ){
-                      return function(e,ui){
-                          first(e,ui);
-                          second(e,ui);
-                      };
-                  }
-                  return first;
+            function combineCallbacks(first, second){
+              var firstIsFunc = typeof first === 'function';
+              var secondIsFunc = typeof second === 'function';
+              if(firstIsFunc && secondIsFunc) {
+                return function() {
+                  first.apply(this, arguments);
+                  second.apply(this, arguments);
+                };
+              } else if (secondIsFunc) {
+                return second;
               }
+              return first;
+            }
+
+            function getSortableWidgetInstance(element) {
+              // this is a fix to support jquery-ui prior to v1.11.x
+              // otherwise we should be using `element.sortable('instance')`
+              var data = element.data('ui-sortable');
+              if (data && typeof data === 'object' && data.widgetFullName === 'ui-sortable') {
+                return data;
+              }
+              return null;
+            }
+
+            function patchSortableOption(key, value) {
+              if (callbacks[key]) {
+                if( key === 'stop' ){
+                  // call apply after stop
+                  value = combineCallbacks(
+                    value, function() { scope.$apply(); });
+
+                  value = combineCallbacks(value, afterStop);
+                }
+                // wrap the callback
+                value = combineCallbacks(callbacks[key], value);
+              } else if (wrappers[key]) {
+                value = wrappers[key](value);
+              }
+
+              // patch the options that need to have values set
+              if (!value && (key === 'items' || key === 'ui-model-items')) {
+                value = uiSortableConfig.items;
+              }
+
+              return value;
+            }
+
+            function patchUISortableOptions(newVal, oldVal, sortableWidgetInstance) {
+              function addDummyOptionKey(value, key) {
+                if (!(key in opts)) {
+                  // add the key in the opts object so that
+                  // the patch function detects and handles it
+                  opts[key] = null;
+                }
+              }
+              // for this directive to work we have to attach some callbacks
+              angular.forEach(callbacks, addDummyOptionKey);
+
+              // only initialize it in case we have to
+              // update some options of the sortable
+              var optsDiff = null;
+
+              if (oldVal) {
+                // reset deleted options to default
+                var defaultOptions;
+                angular.forEach(oldVal, function(oldValue, key) {
+                  if (!newVal || !(key in newVal)) {
+                    if (key in directiveOpts) {
+                      if (key === 'ui-floating') {
+                        opts[key] = 'auto';
+                      } else {
+                        opts[key] = patchSortableOption(key, undefined);
+                      }
+                      return;
+                    }
+
+                    if (!defaultOptions) {
+                      defaultOptions = angular.element.ui.sortable().options;
+                    }
+                    var defaultValue = defaultOptions[key];
+                    defaultValue = patchSortableOption(key, defaultValue);
+
+                    if (!optsDiff) {
+                      optsDiff = {};
+                    }
+                    optsDiff[key] = defaultValue;
+                    opts[key] = defaultValue;
+                  }
+                });
+              }
+
+              // update changed options
+              angular.forEach(newVal, function(value, key) {
+                // if it's a custom option of the directive,
+                // handle it approprietly
+                if (key in directiveOpts) {
+                  if (key === 'ui-floating' && (value === false || value === true) && sortableWidgetInstance) {
+                    sortableWidgetInstance.floating = value;
+                  }
+
+                  opts[key] = patchSortableOption(key, value);
+                  return;
+                }
+
+                value = patchSortableOption(key, value);
+
+                if (!optsDiff) {
+                  optsDiff = {};
+                }
+                optsDiff[key] = value;
+                opts[key] = value;
+              });
+
+              return optsDiff;
+            }
+
+            function getPlaceholderElement (element) {
+              var placeholder = element.sortable('option','placeholder');
+
+              // placeholder.element will be a function if the placeholder, has
+              // been created (placeholder will be an object).  If it hasn't
+              // been created, either placeholder will be false if no
+              // placeholder class was given or placeholder.element will be
+              // undefined if a class was given (placeholder will be a string)
+              if (placeholder && placeholder.element && typeof placeholder.element === 'function') {
+                var result = placeholder.element();
+                // workaround for jquery ui 1.9.x,
+                // not returning jquery collection
+                result = angular.element(result);
+                return result;
+              }
+              return null;
+            }
+
+            function getPlaceholderExcludesludes (element, placeholder) {
+              // exact match with the placeholder's class attribute to handle
+              // the case that multiple connected sortables exist and
+              // the placeholder option equals the class of sortable items
+              var notCssSelector = opts['ui-model-items'].replace(/[^,]*>/g, '');
+              var excludes = element.find('[class="' + placeholder.attr('class') + '"]:not(' + notCssSelector + ')');
+              return excludes;
+            }
+
+            function hasSortingHelper (element, ui) {
+              var helperOption = element.sortable('option','helper');
+              return helperOption === 'clone' || (typeof helperOption === 'function' && ui.item.sortable.isCustomHelperUsed());
+            }
+
+            function getSortingHelper (element, ui/*, savedNodes*/) {
+              var result = null;
+              if (hasSortingHelper(element, ui) &&
+                element.sortable( 'option', 'appendTo' ) === 'parent') {
+                // The .ui-sortable-helper element (that's the default class name)
+                result = helper;
+              }
+              return result;
+            }
+
+            // thanks jquery-ui
+            function isFloating (item) {
+              return (/left|right/).test(item.css('float')) || (/inline|table-cell/).test(item.css('display'));
+            }
+
+            function getElementContext(elementScopes, element) {
+              for (var i = 0; i < elementScopes.length; i++) {
+                var c = elementScopes[i];
+                if (c.element[0] === element[0]) {
+                  return c;
+                }
+              }
+            }
+
+            function afterStop(e, ui) {
+              ui.item.sortable._destroy();
+            }
+
+            // return the index of ui.item among the items
+            // we can't just do ui.item.index() because there it might have siblings
+            // which are not items
+            function getItemIndex(item) {
+              return item.parent()
+                .find(opts['ui-model-items'])
+                .index(item);
+            }
 
             var opts = {};
 
-            var callbacks = {
-                receive: null,
-                remove:null,
-                start:null,
-                stop:null,
-                update:null
+            // directive specific options
+            var directiveOpts = {
+              'ui-floating': undefined,
+              'ui-model-items': uiSortableConfig.items
             };
 
-            angular.extend(opts, uiSortableConfig);
+            var callbacks = {
+              create: null,
+              start: null,
+              activate: null,
+              // sort: null,
+              // change: null,
+              // over: null,
+              // out: null,
+              beforeStop: null,
+              update: null,
+              remove: null,
+              receive: null,
+              deactivate: null,
+              stop: null
+            };
 
-            if (ngModel) {
+            var wrappers = {
+              helper: null
+            };
 
-              ngModel.$render = function() {
-                element.sortable( "refresh" );
-              };
+            angular.extend(opts, directiveOpts, uiSortableConfig, scope.uiSortable);
+
+            if (!angular.element.fn || !angular.element.fn.jquery) {
+              $log.error('ui.sortable: jQuery should be included before AngularJS!');
+              return;
+            }
+
+            function wireUp () {
+              // When we add or remove elements, we need the sortable to 'refresh'
+              // so it can find the new/removed elements.
+              scope.$watchCollection('ngModel', function() {
+                // Timeout to let ng-repeat modify the DOM
+                $timeout(function() {
+                  // ensure that the jquery-ui-sortable widget instance
+                  // is still bound to the directive's element
+                  if (!!getSortableWidgetInstance(element)) {
+                    element.sortable('refresh');
+                  }
+                }, 0, false);
+              });
 
               callbacks.start = function(e, ui) {
-                // Save position of dragged item
-                ui.item.sortable = { index: ui.item.index() };
+                if (opts['ui-floating'] === 'auto') {
+                  // since the drag has started, the element will be
+                  // absolutely positioned, so we check its siblings
+                  var siblings = ui.item.siblings();
+                  var sortableWidgetInstance = getSortableWidgetInstance(angular.element(e.target));
+                  sortableWidgetInstance.floating = isFloating(siblings);
+                }
+
+                // Save the starting position of dragged item
+                var index = getItemIndex(ui.item);
+                ui.item.sortable = {
+                  model: ngModel.$modelValue[index],
+                  index: index,
+                  source: element,
+                  sourceList: ui.item.parent(),
+                  sourceModel: ngModel.$modelValue,
+                  cancel: function () {
+                    ui.item.sortable._isCanceled = true;
+                  },
+                  isCanceled: function () {
+                    return ui.item.sortable._isCanceled;
+                  },
+                  isCustomHelperUsed: function () {
+                    return !!ui.item.sortable._isCustomHelperUsed;
+                  },
+                  _isCanceled: false,
+                  _isCustomHelperUsed: ui.item.sortable._isCustomHelperUsed,
+                  _destroy: function () {
+                    angular.forEach(ui.item.sortable, function(value, key) {
+                      ui.item.sortable[key] = undefined;
+                    });
+                  },
+                  _connectedSortables: [],
+                  _getElementContext: function (element) {
+                    return getElementContext(this._connectedSortables, element);
+                  }
+                };
+              };
+
+              callbacks.activate = function(e, ui) {
+                var isSourceContext = ui.item.sortable.source === element;
+                var savedNodesOrigin = isSourceContext ?
+                  ui.item.sortable.sourceList :
+                  element;
+                var elementContext = {
+                  element: element,
+                  scope: scope,
+                  isSourceContext: isSourceContext,
+                  savedNodesOrigin: savedNodesOrigin
+                };
+                // save the directive's scope so that it is accessible from ui.item.sortable
+                ui.item.sortable._connectedSortables.push(elementContext);
+
+                // We need to make a copy of the current element's contents so
+                // we can restore it after sortable has messed it up.
+                // This is inside activate (instead of start) in order to save
+                // both lists when dragging between connected lists.
+                savedNodes = savedNodesOrigin.contents();
+                helper = ui.helper;
+
+                // If this list has a placeholder (the connected lists won't),
+                // don't inlcude it in saved nodes.
+                var placeholder = getPlaceholderElement(element);
+                if (placeholder && placeholder.length) {
+                  var excludes = getPlaceholderExcludesludes(element, placeholder);
+                  savedNodes = savedNodes.not(excludes);
+                }
               };
 
               callbacks.update = function(e, ui) {
-                // For some reason the reference to ngModel in stop() is wrong
-                ui.item.sortable.resort = ngModel;
-              };
+                // Save current drop position but only if this is not a second
+                // update that happens when moving between lists because then
+                // the value will be overwritten with the old value
+                if (!ui.item.sortable.received) {
+                  ui.item.sortable.dropindex = getItemIndex(ui.item);
+                  var droptarget = ui.item.parent().closest('[ui-sortable], [data-ui-sortable], [x-ui-sortable]');
+                  ui.item.sortable.droptarget = droptarget;
+                  ui.item.sortable.droptargetList = ui.item.parent();
 
-              callbacks.receive = function(e, ui) {
-                ui.item.sortable.relocate = true;
-                // added item to array into correct position and set up flag
-                ngModel.$modelValue.splice(ui.item.index(), 0, ui.item.sortable.moved);
-              };
+                  var droptargetContext = ui.item.sortable._getElementContext(droptarget);
+                  ui.item.sortable.droptargetModel = droptargetContext.scope.ngModel;
 
-              callbacks.remove = function(e, ui) {
-                // copy data into item
-                if (ngModel.$modelValue.length === 1) {
-                  ui.item.sortable.moved = ngModel.$modelValue.splice(0, 1)[0];
-                } else {
-                  ui.item.sortable.moved =  ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0];
+                  // Cancel the sort (let ng-repeat do the sort for us)
+                  // Don't cancel if this is the received list because it has
+                  // already been canceled in the other list, and trying to cancel
+                  // here will mess up the DOM.
+                  element.sortable('cancel');
+                }
+
+                // Put the nodes back exactly the way they started (this is very
+                // important because ng-repeat uses comment elements to delineate
+                // the start and stop of repeat sections and sortable doesn't
+                // respect their order (even if we cancel, the order of the
+                // comments are still messed up).
+                var sortingHelper = !ui.item.sortable.received && getSortingHelper(element, ui, savedNodes);
+                if (sortingHelper && sortingHelper.length) {
+                  // Restore all the savedNodes except from the sorting helper element.
+                  // That way it will be garbage collected.
+                  savedNodes = savedNodes.not(sortingHelper);
+                }
+                var elementContext = ui.item.sortable._getElementContext(element);
+                savedNodes.appendTo(elementContext.savedNodesOrigin);
+
+                // If this is the target connected list then
+                // it's safe to clear the restored nodes since:
+                // update is currently running and
+                // stop is not called for the target list.
+                if (ui.item.sortable.received) {
+                  savedNodes = null;
+                }
+
+                // If received is true (an item was dropped in from another list)
+                // then we add the new item to this list otherwise wait until the
+                // stop event where we will know if it was a sort or item was
+                // moved here from another list
+                if (ui.item.sortable.received && !ui.item.sortable.isCanceled()) {
+                  scope.$apply(function () {
+                    ngModel.$modelValue.splice(ui.item.sortable.dropindex, 0,
+                      ui.item.sortable.moved);
+                  });
+                  scope.$emit('ui-sortable:moved', ui);
                 }
               };
 
               callbacks.stop = function(e, ui) {
-                // digest all prepared changes
-                if (ui.item.sortable.resort && !ui.item.sortable.relocate) {
+                // If the received flag hasn't be set on the item, this is a
+                // normal sort, if dropindex is set, the item was moved, so move
+                // the items in the list.
+                var wasMoved = ('dropindex' in ui.item.sortable) &&
+                  !ui.item.sortable.isCanceled();
 
-                  // Fetch saved and current position of dropped element
-                  var end, start;
-                  start = ui.item.sortable.index;
-                  end = ui.item.index();
+                if (wasMoved && !ui.item.sortable.received) {
 
-                  // Reorder array and apply change to scope
-                  ui.item.sortable.resort.$modelValue.splice(end, 0, ui.item.sortable.resort.$modelValue.splice(start, 1)[0]);
+                  scope.$apply(function () {
+                    ngModel.$modelValue.splice(
+                      ui.item.sortable.dropindex, 0,
+                      ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0]);
+                  });
+                  scope.$emit('ui-sortable:moved', ui);
+                } else if (!wasMoved &&
+                  !angular.equals(element.contents().toArray(), savedNodes.toArray())) {
+                  // if the item was not moved
+                  // and the DOM element order has changed,
+                  // then restore the elements
+                  // so that the ngRepeat's comment are correct.
 
+                  var sortingHelper = getSortingHelper(element, ui, savedNodes);
+                  if (sortingHelper && sortingHelper.length) {
+                    // Restore all the savedNodes except from the sorting helper element.
+                    // That way it will be garbage collected.
+                    savedNodes = savedNodes.not(sortingHelper);
+                  }
+                  var elementContext = ui.item.sortable._getElementContext(element);
+                  savedNodes.appendTo(elementContext.savedNodesOrigin);
                 }
-                if (ui.item.sortable.resort || ui.item.sortable.relocate) {
-                  scope.$apply();
+
+                // It's now safe to clear the savedNodes and helper
+                // since stop is the last callback.
+                savedNodes = null;
+                helper = null;
+              };
+
+              callbacks.receive = function(e, ui) {
+                // An item was dropped here from another list, set a flag on the
+                // item.
+                ui.item.sortable.received = true;
+              };
+
+              callbacks.remove = function(e, ui) {
+                // Workaround for a problem observed in nested connected lists.
+                // There should be an 'update' event before 'remove' when moving
+                // elements. If the event did not fire, cancel sorting.
+                if (!('dropindex' in ui.item.sortable)) {
+                  element.sortable('cancel');
+                  ui.item.sortable.cancel();
+                }
+
+                // Remove the item from this list's model and copy data into item,
+                // so the next list can retrive it
+                if (!ui.item.sortable.isCanceled()) {
+                  scope.$apply(function () {
+                    ui.item.sortable.moved = ngModel.$modelValue.splice(
+                      ui.item.sortable.index, 1)[0];
+                  });
                 }
               };
 
-            }
-
-
-              scope.$watch(attrs.uiSortable, function(newVal, oldVal){
-                  angular.forEach(newVal, function(value, key){
-
-                      if( callbacks[key] ){
-                          // wrap the callback
-                          value = combineCallbacks( callbacks[key], value );
-                      }
-
-                      element.sortable('option', key, value);
+              // setup attribute handlers
+              angular.forEach(callbacks, function(value, key) {
+                callbacks[key] = combineCallbacks(callbacks[key],
+                  function () {
+                    var attrHandler = scope[key];
+                    var attrHandlerFn;
+                    if (typeof attrHandler === 'function' &&
+                      ('uiSortable' + key.substring(0,1).toUpperCase() + key.substring(1)).length &&
+                      typeof (attrHandlerFn = attrHandler()) === 'function') {
+                      attrHandlerFn.apply(this, arguments);
+                    }
                   });
-              }, true);
-
-              angular.forEach(callbacks, function(value, key ){
-
-                    opts[key] = combineCallbacks(value, opts[key]);
               });
 
-              // Create sortable
 
-            element.sortable(opts);
+              wrappers.helper = function (inner) {
+                if (inner && typeof inner === 'function') {
+                  return function (e, item) {
+                    var oldItemSortable = item.sortable;
+                    var index = getItemIndex(item);
+                    item.sortable = {
+                      model: ngModel.$modelValue[index],
+                      index: index,
+                      source: element,
+                      sourceList: item.parent(),
+                      sourceModel: ngModel.$modelValue,
+                      _restore: function () {
+                        angular.forEach(item.sortable, function(value, key) {
+                          item.sortable[key] = undefined;
+                        });
+
+                        item.sortable = oldItemSortable;
+                      }
+                    };
+
+                    var innerResult = inner.apply(this, arguments);
+                    item.sortable._restore();
+                    item.sortable._isCustomHelperUsed = item !== innerResult;
+                    return innerResult;
+                  };
+                }
+                return inner;
+              };
+
+              scope.$watchCollection('uiSortable', function(newVal, oldVal) {
+                // ensure that the jquery-ui-sortable widget instance
+                // is still bound to the directive's element
+                var sortableWidgetInstance = getSortableWidgetInstance(element);
+                if (!!sortableWidgetInstance) {
+                  var optsDiff = patchUISortableOptions(newVal, oldVal, sortableWidgetInstance);
+
+                  if (optsDiff) {
+                    element.sortable('option', optsDiff);
+                  }
+                }
+              }, true);
+
+              patchUISortableOptions(opts);
+            }
+
+            function init () {
+              if (ngModel) {
+                wireUp();
+              } else {
+                $log.info('ui.sortable: ngModel not provided!', element);
+              }
+
+              // Create sortable
+              element.sortable(opts);
+            }
+
+            function initIfEnabled () {
+              if (scope.uiSortable && scope.uiSortable.disabled) {
+                return false;
+              }
+
+              init();
+
+              // Stop Watcher
+              initIfEnabled.cancelWatcher();
+              initIfEnabled.cancelWatcher = angular.noop;
+
+              return true;
+            }
+
+            initIfEnabled.cancelWatcher = angular.noop;
+
+            if (!initIfEnabled()) {
+              initIfEnabled.cancelWatcher = scope.$watch('uiSortable.disabled', initIfEnabled);
+            }
           }
         };
       }
-]);
\ No newline at end of file
+    ]);
+
+})(window, window.angular);
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.ui-utils.js b/docs-web/src/main/webapp/src/lib/angular.ui-utils.js
deleted file mode 100644
index dab960fd..00000000
--- a/docs-web/src/main/webapp/src/lib/angular.ui-utils.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * angular-ui-utils - Swiss-Army-Knife of AngularJS tools (with no external dependencies!)
- * @version v0.1.0 - 2013-12-30
- * @link http://angular-ui.github.com
- * @license MIT License, http://www.opensource.org/licenses/MIT
- */
-"use strict";angular.module("ui.alias",[]).config(["$compileProvider","uiAliasConfig",function(a,b){b=b||{},angular.forEach(b,function(b,c){angular.isString(b)&&(b={replace:!0,template:b}),a.directive(c,function(){return b})})}]),angular.module("ui.event",[]).directive("uiEvent",["$parse",function(a){return function(b,c,d){var e=b.$eval(d.uiEvent);angular.forEach(e,function(d,e){var f=a(d);c.bind(e,function(a){var c=Array.prototype.slice.call(arguments);c=c.splice(1),f(b,{$event:a,$params:c}),b.$$phase||b.$apply()})})}}]),angular.module("ui.format",[]).filter("format",function(){return function(a,b){var c=a;if(angular.isString(c)&&void 0!==b)if(angular.isArray(b)||angular.isObject(b)||(b=[b]),angular.isArray(b)){var d=b.length,e=function(a,c){return c=parseInt(c,10),c>=0&&d>c?b[c]:a};c=c.replace(/\$([0-9]+)/g,e)}else angular.forEach(b,function(a,b){c=c.split(":"+b).join(a)});return c}}),angular.module("ui.highlight",[]).filter("highlight",function(){return function(a,b,c){return b||angular.isNumber(b)?(a=a.toString(),b=b.toString(),c?a.split(b).join('<span class="ui-match">'+b+"</span>"):a.replace(new RegExp(b,"gi"),'<span class="ui-match">$&</span>')):a}}),angular.module("ui.include",[]).directive("uiInclude",["$http","$templateCache","$anchorScroll","$compile",function(a,b,c,d){return{restrict:"ECA",terminal:!0,compile:function(e,f){var g=f.uiInclude||f.src,h=f.fragment||"",i=f.onload||"",j=f.autoscroll;return function(e,f){function k(){var k=++m,o=e.$eval(g),p=e.$eval(h);o?a.get(o,{cache:b}).success(function(a){if(k===m){l&&l.$destroy(),l=e.$new();var b;b=p?angular.element("<div/>").html(a).find(p):angular.element("<div/>").html(a).contents(),f.html(b),d(b)(l),!angular.isDefined(j)||j&&!e.$eval(j)||c(),l.$emit("$includeContentLoaded"),e.$eval(i)}}).error(function(){k===m&&n()}):n()}var l,m=0,n=function(){l&&(l.$destroy(),l=null),f.html("")};e.$watch(h,k),e.$watch(g,k)}}}}]),angular.module("ui.indeterminate",[]).directive("uiIndeterminate",[function(){return{compile:function(a,b){return b.type&&"checkbox"===b.type.toLowerCase()?function(a,b,c){a.$watch(c.uiIndeterminate,function(a){b[0].indeterminate=!!a})}:angular.noop}}}]),angular.module("ui.inflector",[]).filter("inflector",function(){function a(a){return a.replace(/^([a-z])|\s+([a-z])/g,function(a){return a.toUpperCase()})}function b(a,b){return a.replace(/[A-Z]/g,function(a){return b+a})}var c={humanize:function(c){return a(b(c," ").split("_").join(" "))},underscore:function(a){return a.substr(0,1).toLowerCase()+b(a.substr(1),"_").toLowerCase().split(" ").join("_")},variable:function(b){return b=b.substr(0,1).toLowerCase()+a(b.split("_").join(" ")).substr(1).split(" ").join("")}};return function(a,b){return b!==!1&&angular.isString(a)?(b=b||"humanize",c[b](a)):a}}),angular.module("ui.jq",[]).value("uiJqConfig",{}).directive("uiJq",["uiJqConfig","$timeout",function(a,b){return{restrict:"A",compile:function(c,d){if(!angular.isFunction(c[d.uiJq]))throw new Error('ui-jq: The "'+d.uiJq+'" function does not exist');var e=a&&a[d.uiJq];return function(a,c,d){function f(){b(function(){c[d.uiJq].apply(c,g)},0,!1)}var g=[];d.uiOptions?(g=a.$eval("["+d.uiOptions+"]"),angular.isObject(e)&&angular.isObject(g[0])&&(g[0]=angular.extend({},e,g[0]))):e&&(g=[e]),d.ngModel&&c.is("select,input,textarea")&&c.bind("change",function(){c.trigger("input")}),d.uiRefresh&&a.$watch(d.uiRefresh,function(){f()}),f()}}}}]),angular.module("ui.keypress",[]).factory("keypressHelper",["$parse",function(a){var b={8:"backspace",9:"tab",13:"enter",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"delete"},c=function(a){return a.charAt(0).toUpperCase()+a.slice(1)};return function(d,e,f,g){var h,i=[];h=e.$eval(g["ui"+c(d)]),angular.forEach(h,function(b,c){var d,e;e=a(b),angular.forEach(c.split(" "),function(a){d={expression:e,keys:{}},angular.forEach(a.split("-"),function(a){d.keys[a]=!0}),i.push(d)})}),f.bind(d,function(a){var c=!(!a.metaKey||a.ctrlKey),f=!!a.altKey,g=!!a.ctrlKey,h=!!a.shiftKey,j=a.keyCode;"keypress"===d&&!h&&j>=97&&122>=j&&(j-=32),angular.forEach(i,function(d){var i=d.keys[b[j]]||d.keys[j.toString()],k=!!d.keys.meta,l=!!d.keys.alt,m=!!d.keys.ctrl,n=!!d.keys.shift;i&&k===c&&l===f&&m===g&&n===h&&e.$apply(function(){d.expression(e,{$event:a})})})})}}]),angular.module("ui.keypress").directive("uiKeydown",["keypressHelper",function(a){return{link:function(b,c,d){a("keydown",b,c,d)}}}]),angular.module("ui.keypress").directive("uiKeypress",["keypressHelper",function(a){return{link:function(b,c,d){a("keypress",b,c,d)}}}]),angular.module("ui.keypress").directive("uiKeyup",["keypressHelper",function(a){return{link:function(b,c,d){a("keyup",b,c,d)}}}]),angular.module("ui.mask",[]).value("uiMaskConfig",{maskDefinitions:{9:/\d/,A:/[a-zA-Z]/,"*":/[a-zA-Z0-9]/}}).directive("uiMask",["uiMaskConfig",function(a){return{priority:100,require:"ngModel",restrict:"A",compile:function(){var b=a;return function(a,c,d,e){function f(a){return angular.isDefined(a)?(s(a),N?(k(),l(),!0):j()):j()}function g(a){angular.isDefined(a)&&(D=a,N&&w())}function h(a){return N?(G=o(a||""),I=n(G),e.$setValidity("mask",I),I&&G.length?p(G):void 0):a}function i(a){return N?(G=o(a||""),I=n(G),e.$viewValue=G.length?p(G):"",e.$setValidity("mask",I),""===G&&void 0!==e.$error.required&&e.$setValidity("required",!1),I?G:void 0):a}function j(){return N=!1,m(),angular.isDefined(P)?c.attr("placeholder",P):c.removeAttr("placeholder"),angular.isDefined(Q)?c.attr("maxlength",Q):c.removeAttr("maxlength"),c.val(e.$modelValue),e.$viewValue=e.$modelValue,!1}function k(){G=K=o(e.$modelValue||""),H=J=p(G),I=n(G);var a=I&&G.length?H:"";d.maxlength&&c.attr("maxlength",2*B[B.length-1]),c.attr("placeholder",D),c.val(a),e.$viewValue=a}function l(){O||(c.bind("blur",t),c.bind("mousedown mouseup",u),c.bind("input keyup click focus",w),O=!0)}function m(){O&&(c.unbind("blur",t),c.unbind("mousedown",u),c.unbind("mouseup",u),c.unbind("input",w),c.unbind("keyup",w),c.unbind("click",w),c.unbind("focus",w),O=!1)}function n(a){return a.length?a.length>=F:!0}function o(a){var b="",c=C.slice();return a=a.toString(),angular.forEach(E,function(b){a=a.replace(b,"")}),angular.forEach(a.split(""),function(a){c.length&&c[0].test(a)&&(b+=a,c.shift())}),b}function p(a){var b="",c=B.slice();return angular.forEach(D.split(""),function(d,e){a.length&&e===c[0]?(b+=a.charAt(0)||"_",a=a.substr(1),c.shift()):b+=d}),b}function q(a){var b=d.placeholder;return"undefined"!=typeof b&&b[a]?b[a]:"_"}function r(){return D.replace(/[_]+/g,"_").replace(/([^_]+)([a-zA-Z0-9])([^_])/g,"$1$2_$3").split("_")}function s(a){var b=0;if(B=[],C=[],D="","string"==typeof a){F=0;var c=!1,d=a.split("");angular.forEach(d,function(a,d){R.maskDefinitions[a]?(B.push(b),D+=q(d),C.push(R.maskDefinitions[a]),b++,c||F++):"?"===a?c=!0:(D+=a,b++)})}B.push(B.slice().pop()+1),E=r(),N=B.length>1?!0:!1}function t(){L=0,M=0,I&&0!==G.length||(H="",c.val(""),a.$apply(function(){e.$setViewValue("")}))}function u(a){"mousedown"===a.type?c.bind("mouseout",v):c.unbind("mouseout",v)}function v(){M=A(this),c.unbind("mouseout",v)}function w(b){b=b||{};var d=b.which,f=b.type;if(16!==d&&91!==d){var g,h=c.val(),i=J,j=o(h),k=K,l=!1,m=y(this)||0,n=L||0,q=m-n,r=B[0],s=B[j.length]||B.slice().shift(),t=M||0,u=A(this)>0,v=t>0,w=h.length>i.length||t&&h.length>i.length-t,C=h.length<i.length||t&&h.length===i.length-t,D=d>=37&&40>=d&&b.shiftKey,E=37===d,F=8===d||"keyup"!==f&&C&&-1===q,G=46===d||"keyup"!==f&&C&&0===q&&!v,H=(E||F||"click"===f)&&m>r;if(M=A(this),!D&&(!u||"click"!==f&&"keyup"!==f)){if("input"===f&&C&&!v&&j===k){for(;F&&m>r&&!x(m);)m--;for(;G&&s>m&&-1===B.indexOf(m);)m++;var I=B.indexOf(m);j=j.substring(0,I)+j.substring(I+1),l=!0}for(g=p(j),J=g,K=j,c.val(g),l&&a.$apply(function(){e.$setViewValue(j)}),w&&r>=m&&(m=r+1),H&&m--,m=m>s?s:r>m?r:m;!x(m)&&m>r&&s>m;)m+=H?-1:1;(H&&s>m||w&&!x(n))&&m++,L=m,z(this,m)}}}function x(a){return B.indexOf(a)>-1}function y(a){if(!a)return 0;if(void 0!==a.selectionStart)return a.selectionStart;if(document.selection){a.focus();var b=document.selection.createRange();return b.moveStart("character",-a.value.length),b.text.length}return 0}function z(a,b){if(!a)return 0;if(0!==a.offsetWidth&&0!==a.offsetHeight)if(a.setSelectionRange)a.focus(),a.setSelectionRange(b,b);else if(a.createTextRange){var c=a.createTextRange();c.collapse(!0),c.moveEnd("character",b),c.moveStart("character",b),c.select()}}function A(a){return a?void 0!==a.selectionStart?a.selectionEnd-a.selectionStart:document.selection?document.selection.createRange().text.length:0:0}var B,C,D,E,F,G,H,I,J,K,L,M,N=!1,O=!1,P=d.placeholder,Q=d.maxlength,R={};d.uiOptions?(R=a.$eval("["+d.uiOptions+"]"),angular.isObject(R[0])&&(R=function(a,b){for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&(b[c]?angular.extend(b[c],a[c]):b[c]=angular.copy(a[c]));return b}(b,R[0]))):R=b,d.$observe("uiMask",f),d.$observe("placeholder",g),e.$formatters.push(h),e.$parsers.push(i),c.bind("mousedown mouseup",u),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){if(null===this)throw new TypeError;var b=Object(this),c=b.length>>>0;if(0===c)return-1;var d=0;if(arguments.length>1&&(d=Number(arguments[1]),d!==d?d=0:0!==d&&1/0!==d&&d!==-1/0&&(d=(d>0||-1)*Math.floor(Math.abs(d)))),d>=c)return-1;for(var e=d>=0?d:Math.max(c-Math.abs(d),0);c>e;e++)if(e in b&&b[e]===a)return e;return-1})}}}}]),angular.module("ui.reset",[]).value("uiResetConfig",null).directive("uiReset",["uiResetConfig",function(a){var b=null;return void 0!==a&&(b=a),{require:"ngModel",link:function(a,c,d,e){var f;f=angular.element('<a class="ui-reset" />'),c.wrap('<span class="ui-resetwrap" />').after(f),f.bind("click",function(c){c.preventDefault(),a.$apply(function(){d.uiReset?e.$setViewValue(a.$eval(d.uiReset)):e.$setViewValue(b),e.$render()})})}}}]),angular.module("ui.route",[]).directive("uiRoute",["$location","$parse",function(a,b){return{restrict:"AC",scope:!0,compile:function(c,d){var e;if(d.uiRoute)e="uiRoute";else if(d.ngHref)e="ngHref";else{if(!d.href)throw new Error("uiRoute missing a route or href property on "+c[0]);e="href"}return function(c,d,f){function g(b){var d=b.indexOf("#");d>-1&&(b=b.substr(d+1)),(j=function(){i(c,a.path().indexOf(b)>-1)})()}function h(b){var d=b.indexOf("#");d>-1&&(b=b.substr(d+1)),(j=function(){var d=new RegExp("^"+b+"$",["i"]);i(c,d.test(a.path()))})()}var i=b(f.ngModel||f.routeModel||"$uiRoute").assign,j=angular.noop;switch(e){case"uiRoute":f.uiRoute?h(f.uiRoute):f.$observe("uiRoute",h);break;case"ngHref":f.ngHref?g(f.ngHref):f.$observe("ngHref",g);break;case"href":g(f.href)}c.$on("$routeChangeSuccess",function(){j()}),c.$on("$stateChangeSuccess",function(){j()})}}}}]),angular.module("ui.scroll.jqlite",["ui.scroll"]).service("jqLiteExtras",["$log","$window",function(a,b){return{registerFor:function(a){var c,d,e,f,g,h,i;return d=angular.element.prototype.css,a.prototype.css=function(a,b){var c,e;return e=this,c=e[0],c&&3!==c.nodeType&&8!==c.nodeType&&c.style?d.call(e,a,b):void 0},h=function(a){return a&&a.document&&a.location&&a.alert&&a.setInterval},i=function(a,b,c){var d,e,f,g,i;return d=a[0],i={top:["scrollTop","pageYOffset","scrollLeft"],left:["scrollLeft","pageXOffset","scrollTop"]}[b],e=i[0],g=i[1],f=i[2],h(d)?angular.isDefined(c)?d.scrollTo(a[f].call(a),c):g in d?d[g]:d.document.documentElement[e]:angular.isDefined(c)?d[e]=c:d[e]},b.getComputedStyle?(f=function(a){return b.getComputedStyle(a,null)},c=function(a,b){return parseFloat(b)}):(f=function(a){return a.currentStyle},c=function(a,b){var c,d,e,f,g,h,i;return c=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,f=new RegExp("^("+c+")(?!px)[a-z%]+$","i"),f.test(b)?(i=a.style,d=i.left,g=a.runtimeStyle,h=g&&g.left,g&&(g.left=i.left),i.left=b,e=i.pixelLeft,i.left=d,h&&(g.left=h),e):parseFloat(b)}),e=function(a,b){var d,e,g,i,j,k,l,m,n,o,p,q,r;return h(a)?(d=document.documentElement[{height:"clientHeight",width:"clientWidth"}[b]],{base:d,padding:0,border:0,margin:0}):(r={width:[a.offsetWidth,"Left","Right"],height:[a.offsetHeight,"Top","Bottom"]}[b],d=r[0],l=r[1],m=r[2],k=f(a),p=c(a,k["padding"+l])||0,q=c(a,k["padding"+m])||0,e=c(a,k["border"+l+"Width"])||0,g=c(a,k["border"+m+"Width"])||0,i=k["margin"+l],j=k["margin"+m],n=c(a,i)||0,o=c(a,j)||0,{base:d,padding:p+q,border:e+g,margin:n+o})},g=function(a,b,c){var d,g,h;return g=e(a,b),g.base>0?{base:g.base-g.padding-g.border,outer:g.base,outerfull:g.base+g.margin}[c]:(d=f(a),h=d[b],(0>h||null===h)&&(h=a.style[b]||0),h=parseFloat(h)||0,{base:h-g.padding-g.border,outer:h,outerfull:h+g.padding+g.border+g.margin}[c])},angular.forEach({before:function(a){var b,c,d,e,f,g,h;if(f=this,c=f[0],e=f.parent(),b=e.contents(),b[0]===c)return e.prepend(a);for(d=g=1,h=b.length-1;h>=1?h>=g:g>=h;d=h>=1?++g:--g)if(b[d]===c)return angular.element(b[d-1]).after(a),void 0;throw new Error("invalid DOM structure "+c.outerHTML)},height:function(a){var b;return b=this,angular.isDefined(a)?(angular.isNumber(a)&&(a+="px"),d.call(b,"height",a)):g(this[0],"height","base")},outerHeight:function(a){return g(this[0],"height",a?"outerfull":"outer")},offset:function(a){var b,c,d,e,f,g;return f=this,arguments.length?void 0===a?f:a:(b={top:0,left:0},e=f[0],(c=e&&e.ownerDocument)?(d=c.documentElement,e.getBoundingClientRect&&(b=e.getBoundingClientRect()),g=c.defaultView||c.parentWindow,{top:b.top+(g.pageYOffset||d.scrollTop)-(d.clientTop||0),left:b.left+(g.pageXOffset||d.scrollLeft)-(d.clientLeft||0)}):void 0)},scrollTop:function(a){return i(this,"top",a)},scrollLeft:function(a){return i(this,"left",a)}},function(b,c){return a.prototype[c]?void 0:a.prototype[c]=b})}}}]).run(["$log","$window","jqLiteExtras",function(a,b,c){return b.jQuery?void 0:c.registerFor(angular.element)}]),angular.module("ui.scroll",[]).directive("ngScrollViewport",["$log",function(){return{controller:["$scope","$element",function(a,b){return b}]}}]).directive("ngScroll",["$log","$injector","$rootScope","$timeout",function(a,b,c,d){return{require:["?^ngScrollViewport"],transclude:"element",priority:1e3,terminal:!0,compile:function(e,f,g){return function(f,h,i,j){var k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T;if(H=i.ngScroll.match(/^\s*(\w+)\s+in\s+(\w+)\s*$/),!H)throw new Error('Expected ngScroll in form of "item_ in _datasource_" but got "'+i.ngScroll+'"');if(F=H[1],v=H[2],D=function(a){return angular.isObject(a)&&a.get&&angular.isFunction(a.get)},u=f[v],!D(u)&&(u=b.get(v),!D(u)))throw new Error(v+" is not a valid datasource");return r=Math.max(3,+i.bufferSize||10),q=function(){return T.height()*Math.max(.1,+i.padding||.1)},O=function(a){return a[0].scrollHeight||a[0].document.documentElement.scrollHeight},k=null,g(R=f.$new(),function(a){var b,c,d,f,g,h;if(f=a[0].localName,"dl"===f)throw new Error("ng-scroll directive does not support <"+a[0].localName+"> as a repeating tag: "+a[0].outerHTML);return"li"!==f&&"tr"!==f&&(f="div"),h=j[0]||angular.element(window),h.css({"overflow-y":"auto",display:"block"}),d=function(a){var b,c,d;switch(a){case"tr":return d=angular.element("<table><tr><td><div></div></td></tr></table>"),b=d.find("div"),c=d.find("tr"),c.paddingHeight=function(){return b.height.apply(b,arguments)},c;default:return c=angular.element("<"+a+"></"+a+">"),c.paddingHeight=c.height,c}},c=function(a,b,c){return b[{top:"before",bottom:"after"}[c]](a),{paddingHeight:function(){return a.paddingHeight.apply(a,arguments)},insert:function(b){return a[{top:"after",bottom:"before"}[c]](b)}}},g=c(d(f),e,"top"),b=c(d(f),e,"bottom"),R.$destroy(),k={viewport:h,topPadding:g.paddingHeight,bottomPadding:b.paddingHeight,append:b.insert,prepend:g.insert,bottomDataPos:function(){return O(h)-b.paddingHeight()},topDataPos:function(){return g.paddingHeight()}}}),T=k.viewport,B=1,I=1,p=[],J=[],x=!1,n=!1,G=u.loading||function(){},E=!1,L=function(a,b){var c,d;for(c=d=a;b>=a?b>d:d>b;c=b>=a?++d:--d)p[c].scope.$destroy(),p[c].element.remove();return p.splice(a,b-a)},K=function(){return B=1,I=1,L(0,p.length),k.topPadding(0),k.bottomPadding(0),J=[],x=!1,n=!1,l(!1)},o=function(){return T.scrollTop()+T.height()},S=function(){return T.scrollTop()},P=function(){return!x&&k.bottomDataPos()<o()+q()},s=function(){var b,c,d,e,f,g;for(b=0,e=0,c=f=g=p.length-1;(0>=g?0>=f:f>=0)&&(d=p[c].element.outerHeight(!0),k.bottomDataPos()-b-d>o()+q());c=0>=g?++f:--f)b+=d,e++,x=!1;return e>0?(k.bottomPadding(k.bottomPadding()+b),L(p.length-e,p.length),I-=e,a.log("clipped off bottom "+e+" bottom padding "+k.bottomPadding())):void 0},Q=function(){return!n&&k.topDataPos()>S()-q()},t=function(){var b,c,d,e,f,g;for(e=0,d=0,f=0,g=p.length;g>f&&(b=p[f],c=b.element.outerHeight(!0),k.topDataPos()+e+c<S()-q());f++)e+=c,d++,n=!1;return d>0?(k.topPadding(k.topPadding()+e),L(0,d),B+=d,a.log("clipped off top "+d+" top padding "+k.topPadding())):void 0},w=function(a,b){return E||(E=!0,G(!0)),1===J.push(a)?z(b):void 0},C=function(a,b){var c,d,e;return c=f.$new(),c[F]=b,d=a>B,c.$index=a,d&&c.$index--,e={scope:c},g(c,function(b){return e.element=b,d?a===I?(k.append(b),p.push(e)):(p[a-B].element.after(b),p.splice(a-B+1,0,e)):(k.prepend(b),p.unshift(e))}),{appended:d,wrapper:e}},m=function(a,b){var c;return a?k.bottomPadding(Math.max(0,k.bottomPadding()-b.element.outerHeight(!0))):(c=k.topPadding()-b.element.outerHeight(!0),c>=0?k.topPadding(c):T.scrollTop(T.scrollTop()+b.element.outerHeight(!0)))},l=function(b,c,e){var f;return f=function(){return a.log("top {actual="+k.topDataPos()+" visible from="+S()+" bottom {visible through="+o()+" actual="+k.bottomDataPos()+"}"),P()?w(!0,b):Q()&&w(!1,b),e?e():void 0},c?d(function(){var a,b,d;for(b=0,d=c.length;d>b;b++)a=c[b],m(a.appended,a.wrapper);return f()}):f()},A=function(a,b){return l(a,b,function(){return J.shift(),0===J.length?(E=!1,G(!1)):z(a)})},z=function(b){var c;return c=J[0],c?p.length&&!P()?A(b):u.get(I,r,function(c){var d,e,f,g;if(e=[],0===c.length)x=!0,k.bottomPadding(0),a.log("appended: requested "+r+" records starting from "+I+" recieved: eof");else{for(t(),f=0,g=c.length;g>f;f++)d=c[f],e.push(C(++I,d));a.log("appended: requested "+r+" received "+c.length+" buffer size "+p.length+" first "+B+" next "+I)}return A(b,e)}):p.length&&!Q()?A(b):u.get(B-r,r,function(c){var d,e,f,g;if(e=[],0===c.length)n=!0,k.topPadding(0),a.log("prepended: requested "+r+" records starting from "+(B-r)+" recieved: bof");else{for(s(),d=f=g=c.length-1;0>=g?0>=f:f>=0;d=0>=g?++f:--f)e.unshift(C(--B,c[d]));a.log("prepended: requested "+r+" received "+c.length+" buffer size "+p.length+" first "+B+" next "+I)}return A(b,e)})},M=function(){return c.$$phase||E?void 0:(l(!1),f.$apply())},T.bind("resize",M),N=function(){return c.$$phase||E?void 0:(l(!0),f.$apply())},T.bind("scroll",N),f.$watch(u.revision,function(){return K()}),y=u.scope?u.scope.$new():f.$new(),f.$on("$destroy",function(){return y.$destroy(),T.unbind("resize",M),T.unbind("scroll",N)}),y.$on("update.items",function(a,b,c){var d,e,f,g,h;if(angular.isFunction(b))for(e=function(a){return b(a.scope)},f=0,g=p.length;g>f;f++)d=p[f],e(d);else 0<=(h=b-B-1)&&h<p.length&&(p[b-B-1].scope[F]=c);return null}),y.$on("delete.items",function(a,b){var c,d,e,f,g,h,i,j,k,m,n,o;if(angular.isFunction(b)){for(e=[],h=0,k=p.length;k>h;h++)d=p[h],e.unshift(d);for(g=function(a){return b(a.scope)?(L(e.length-1-c,e.length-c),I--):void 0},c=i=0,m=e.length;m>i;c=++i)f=e[c],g(f)}else 0<=(o=b-B-1)&&o<p.length&&(L(b-B-1,b-B),I--);for(c=j=0,n=p.length;n>j;c=++j)d=p[c],d.scope.$index=B+c;return l(!1)}),y.$on("insert.item",function(a,b,c){var d,e,f,g,h,i,j,k,m,n,o,q;if(e=[],angular.isFunction(b)){for(f=[],i=0,m=p.length;m>i;i++)c=p[i],f.unshift(c);for(h=function(a){var f,g,h,i,j;if(g=b(a.scope)){if(C=function(a,b){return C(a,b),I++},angular.isArray(g)){for(j=[],f=h=0,i=g.length;i>h;f=++h)c=g[f],j.push(e.push(C(d+f,c)));return j}return e.push(C(d,g))}},d=j=0,n=f.length;n>j;d=++j)g=f[d],h(g)}else 0<=(q=b-B-1)&&q<p.length&&(e.push(C(b,c)),I++);for(d=k=0,o=p.length;o>k;d=++k)c=p[d],c.scope.$index=B+d;return l(!1,e)})}}}}]),angular.module("ui.scrollfix",[]).directive("uiScrollfix",["$window",function(a){return{require:"^?uiScrollfixTarget",link:function(b,c,d,e){function f(){var b;if(angular.isDefined(a.pageYOffset))b=a.pageYOffset;else{var e=document.compatMode&&"BackCompat"!==document.compatMode?document.documentElement:document.body;b=e.scrollTop}!c.hasClass("ui-scrollfix")&&b>d.uiScrollfix?c.addClass("ui-scrollfix"):c.hasClass("ui-scrollfix")&&b<d.uiScrollfix&&c.removeClass("ui-scrollfix")}var g=c[0].offsetTop,h=e&&e.$element||angular.element(a);d.uiScrollfix?"string"==typeof d.uiScrollfix&&("-"===d.uiScrollfix.charAt(0)?d.uiScrollfix=g-parseFloat(d.uiScrollfix.substr(1)):"+"===d.uiScrollfix.charAt(0)&&(d.uiScrollfix=g+parseFloat(d.uiScrollfix.substr(1)))):d.uiScrollfix=g,h.on("scroll",f),b.$on("$destroy",function(){h.off("scroll",f)})}}}]).directive("uiScrollfixTarget",[function(){return{controller:["$element",function(a){this.$element=a}]}}]),angular.module("ui.showhide",[]).directive("uiShow",[function(){return function(a,b,c){a.$watch(c.uiShow,function(a){a?b.addClass("ui-show"):b.removeClass("ui-show")})}}]).directive("uiHide",[function(){return function(a,b,c){a.$watch(c.uiHide,function(a){a?b.addClass("ui-hide"):b.removeClass("ui-hide")})}}]).directive("uiToggle",[function(){return function(a,b,c){a.$watch(c.uiToggle,function(a){a?b.removeClass("ui-hide").addClass("ui-show"):b.removeClass("ui-show").addClass("ui-hide")})}}]),angular.module("ui.unique",[]).filter("unique",["$parse",function(a){return function(b,c){if(c===!1)return b;if((c||angular.isUndefined(c))&&angular.isArray(b)){var d=[],e=angular.isString(c)?a(c):function(a){return a},f=function(a){return angular.isObject(a)?e(a):a};angular.forEach(b,function(a){for(var b=!1,c=0;c<d.length;c++)if(angular.equals(f(d[c]),f(a))){b=!0;break}b||d.push(a)}),b=d}return b}}]),angular.module("ui.validate",[]).directive("uiValidate",function(){return{restrict:"A",require:"ngModel",link:function(a,b,c,d){function e(b){return angular.isString(b)?(a.$watch(b,function(){angular.forEach(g,function(a){a(d.$modelValue)})}),void 0):angular.isArray(b)?(angular.forEach(b,function(b){a.$watch(b,function(){angular.forEach(g,function(a){a(d.$modelValue)})})}),void 0):(angular.isObject(b)&&angular.forEach(b,function(b,c){angular.isString(b)&&a.$watch(b,function(){g[c](d.$modelValue)}),angular.isArray(b)&&angular.forEach(b,function(b){a.$watch(b,function(){g[c](d.$modelValue)})})}),void 0)}var f,g={},h=a.$eval(c.uiValidate);h&&(angular.isString(h)&&(h={validator:h}),angular.forEach(h,function(b,c){f=function(e){var f=a.$eval(b,{$value:e});return angular.isObject(f)&&angular.isFunction(f.then)?(f.then(function(){d.$setValidity(c,!0)},function(){d.$setValidity(c,!1)}),e):f?(d.$setValidity(c,!0),e):(d.$setValidity(c,!1),void 0)},g[c]=f,d.$formatters.push(f),d.$parsers.push(f)}),c.uiValidateWatch&&e(a.$eval(c.uiValidateWatch)))}}}),angular.module("ui.utils",["ui.event","ui.format","ui.highlight","ui.include","ui.indeterminate","ui.inflector","ui.jq","ui.keypress","ui.mask","ui.reset","ui.route","ui.scrollfix","ui.scroll","ui.scroll.jqlite","ui.showhide","ui.unique","ui.validate"]);
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/angular.ui-validate.js b/docs-web/src/main/webapp/src/lib/angular.ui-validate.js
new file mode 100644
index 00000000..962d99d7
--- /dev/null
+++ b/docs-web/src/main/webapp/src/lib/angular.ui-validate.js
@@ -0,0 +1,209 @@
+/*!
+ * angular-ui-validate
+ * https://github.com/angular-ui/ui-validate
+ * Version: 1.2.3 - 2017-05-18T08:04:45.422Z
+ * License: MIT
+ */
+
+
+(function () {
+  'use strict';
+  /**
+   * General-purpose validator for ngModel.
+   * angular.js comes with several built-in validation mechanism for input fields (ngRequired, ngPattern etc.) but using
+   * an arbitrary validation function requires creation of custom directives for interact with angular's validation mechanism.
+   * The ui-validate directive makes it easy to use any function(s) defined in scope as a validator function(s).
+   * A validator function will trigger validation on both model and input changes.
+   *
+   * This utility bring 'ui-validate' directives to handle regular validations and 'ui-validate-async' for asynchronous validations.
+   *
+   * @example <input ui-validate=" 'myValidatorFunction($value)' ">
+   * @example <input ui-validate="{ foo : '$value > anotherModel', bar : 'validateFoo($value)' }">
+   * @example <input ui-validate="{ foo : '$value > anotherModel' }" ui-validate-watch=" 'anotherModel' ">
+   * @example <input ui-validate="{ foo : '$value > anotherModel', bar : 'validateFoo($value)' }" ui-validate-watch=" { foo : 'anotherModel' } ">
+   * @example <input ui-validate-async=" 'myAsyncValidatorFunction($value)' ">
+   * @example <input ui-validate-async="{ foo: 'myAsyncValidatorFunction($value, anotherModel)' }" ui-validate-watch=" 'anotherModel' ">
+   *
+   * @param ui-validate {string|object literal} If strings is passed it should be a scope's function to be used as a validator.
+   * If an object literal is passed a key denotes a validation error key while a value should be a validator function.
+   * In both cases validator function should take a value to validate as its argument and should return true/false indicating a validation result.
+   * It is possible for a validator function to return a promise, however promises are better handled by ui-validate-async.
+   *
+   * @param ui-validate-async {string|object literal} If strings is passed it should be a scope's function to be used as a validator.
+   * If an object literal is passed a key denotes a validation error key while a value should be a validator function.
+   * Async validator function should take a value to validate as its argument and should return a promise that resolves if valid and reject if not,
+   * indicating a validation result.
+   * ui-validate-async supports non asyncronous validators. They are wrapped into a promise. Although is recomented to use ui-validate instead, since
+   * all validations declared in ui-validate-async are registered un ngModel.$asyncValidators that runs after ngModel.$validators if and only if
+   * all validators in ngModel.$validators reports as valid.
+   */
+  angular.module('ui.validate',[])
+    .directive('uiValidate', ['$$uiValidateApplyWatch', '$$uiValidateApplyWatchCollection', function ($$uiValidateApplyWatch, $$uiValidateApplyWatchCollection) {
+
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        link: function(scope, elm, attrs, ctrl) {
+          var validateFn, validateExpr = scope.$eval(attrs.uiValidate);
+
+          if (!validateExpr) {
+            return;
+          }
+
+          if (angular.isString(validateExpr)) {
+            validateExpr = {
+              validator: validateExpr
+            };
+          }
+
+          angular.forEach(validateExpr, function(exprssn, key) {
+            validateFn = function(modelValue, viewValue) {
+              // $value is left for retrocompatibility
+              var expression = scope.$eval(exprssn, {
+                '$value': modelValue,
+                '$modelValue': modelValue,
+                '$viewValue': viewValue,
+                '$name': ctrl.$name
+              });
+              // Keep support for promises for retrocompatibility
+              if (angular.isObject(expression) && angular.isFunction(expression.then)) {
+                expression.then(function() {
+                  ctrl.$setValidity(key, true);
+                }, function() {
+                  ctrl.$setValidity(key, false);
+                });
+                // Return as valid for now. Validity is updated when promise resolves.
+                return true;
+              } else {
+                return !!expression; // Transform 'undefined' to false (to avoid corrupting the NgModelController and the FormController)
+              }
+            };
+            ctrl.$validators[key] = validateFn;
+          });
+
+          // Support for ui-validate-watch
+          if (attrs.uiValidateWatch) {
+            $$uiValidateApplyWatch(scope, ctrl, scope.$eval(attrs.uiValidateWatch), attrs.uiValidateWatchObjectEquality);
+          }
+          if (attrs.uiValidateWatchCollection) {
+            $$uiValidateApplyWatchCollection(scope, ctrl, scope.$eval(attrs.uiValidateWatchCollection));
+          }
+        }
+      };
+    }])
+    .directive('uiValidateAsync', ['$$uiValidateApplyWatch', '$$uiValidateApplyWatchCollection', '$timeout', '$q', function ($$uiValidateApplyWatch, $$uiValidateApplyWatchCollection, $timeout, $q) {
+
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        link: function (scope, elm, attrs, ctrl) {
+          var validateFn, validateExpr = scope.$eval(attrs.uiValidateAsync);
+
+          if (!validateExpr){ return;}
+
+          if (angular.isString(validateExpr)) {
+            validateExpr = { validatorAsync: validateExpr };
+          }
+
+          angular.forEach(validateExpr, function (exprssn, key) {
+            validateFn = function(modelValue, viewValue) {
+              // $value is left for ease of use
+              var expression = scope.$eval(exprssn, {
+                '$value': modelValue,
+                '$modelValue': modelValue,
+                '$viewValue': viewValue,
+                '$name': ctrl.$name
+              });
+              // Check if it's a promise
+              if (angular.isObject(expression) && angular.isFunction(expression.then)) {
+                return expression;
+                // Support for validate non-async validators
+              } else {
+                return $q(function(resolve, reject) {
+                  setTimeout(function() {
+                    if (expression) {
+                      resolve();
+                    } else {
+                      reject();
+                    }
+                  }, 0);
+                });
+              }
+            };
+            ctrl.$asyncValidators[key] = validateFn;
+          });
+
+          // Support for ui-validate-watch
+          if (attrs.uiValidateWatch){
+            $$uiValidateApplyWatch( scope, ctrl, scope.$eval(attrs.uiValidateWatch), attrs.uiValidateWatchObjectEquality);
+          }
+          if (attrs.uiValidateWatchCollection) {
+            $$uiValidateApplyWatchCollection(scope, ctrl, scope.$eval(attrs.uiValidateWatchCollection));
+          }
+        }
+      };
+    }])
+    .service('$$uiValidateApplyWatch', function () {
+      return function (scope, ctrl, watch, objectEquality) {
+        var watchCallback = function () {
+          ctrl.$validate();
+        };
+
+        //string - update all validators on expression change
+        if (angular.isString(watch)) {
+          scope.$watch(watch, watchCallback, objectEquality);
+          //array - update all validators on change of any expression
+        } else if (angular.isArray(watch)) {
+          angular.forEach(watch, function (expression) {
+            scope.$watch(expression, watchCallback, objectEquality);
+          });
+          //object - update appropriate validator
+        } else if (angular.isObject(watch)) {
+          angular.forEach(watch, function (expression/*, validatorKey*/) {
+            //value is string - look after one expression
+            if (angular.isString(expression)) {
+              scope.$watch(expression, watchCallback, objectEquality);
+            }
+            //value is array - look after all expressions in array
+            if (angular.isArray(expression)) {
+              angular.forEach(expression, function (intExpression) {
+                scope.$watch(intExpression, watchCallback, objectEquality);
+              });
+            }
+          });
+        }
+      };
+    })
+    .service('$$uiValidateApplyWatchCollection', function () {
+      return function (scope, ctrl, watch) {
+        var watchCallback = function () {
+          ctrl.$validate();
+        };
+
+        //string - update all validators on expression change
+        if (angular.isString(watch)) {
+          scope.$watchCollection(watch, watchCallback);
+          //array - update all validators on change of any expression
+        } else if (angular.isArray(watch)) {
+          angular.forEach(watch, function (expression) {
+            scope.$watchCollection(expression, watchCallback);
+          });
+          //object - update appropriate validator
+        } else if (angular.isObject(watch)) {
+          angular.forEach(watch, function (expression/*, validatorKey*/) {
+            //value is string - look after one expression
+            if (angular.isString(expression)) {
+              scope.$watchCollection(expression, watchCallback);
+            }
+            //value is array - look after all expressions in array
+            if (angular.isArray(expression)) {
+              angular.forEach(expression, function (intExpression) {
+                scope.$watchCollection(intExpression, watchCallback);
+              });
+            }
+          });
+        }
+      };
+    });
+
+}());
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/jquery.js b/docs-web/src/main/webapp/src/lib/jquery.js
index 2c32d17f..854cc4e0 100644
--- a/docs-web/src/main/webapp/src/lib/jquery.js
+++ b/docs-web/src/main/webapp/src/lib/jquery.js
@@ -1,5 +1,10253 @@
-/*! jQuery v2.0.3 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
-*/
-(function(e,undefined){var t,n,r=typeof undefined,i=e.location,o=e.document,s=o.documentElement,a=e.jQuery,u=e.$,l={},c=[],p="2.0.3",f=c.concat,h=c.push,d=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,x=function(e,n){return new x.fn.init(e,n,t)},b=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^-ms-/,N=/-([\da-z])/gi,E=function(e,t){return t.toUpperCase()},S=function(){o.removeEventListener("DOMContentLoaded",S,!1),e.removeEventListener("load",S,!1),x.ready()};x.fn=x.prototype={jquery:p,constructor:x,init:function(e,t,n){var r,i;if(!e)return this;if("string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:T.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:o,!0)),C.test(r[1])&&x.isPlainObject(t))for(r in t)x.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return i=o.getElementById(r[2]),i&&i.parentNode&&(this.length=1,this[0]=i),this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?n.ready(e):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return d.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,t,n,r,i,o,s=arguments[0]||{},a=1,u=arguments.length,l=!1;for("boolean"==typeof s&&(l=s,s=arguments[1]||{},a=2),"object"==typeof s||x.isFunction(s)||(s={}),u===a&&(s=this,--a);u>a;a++)if(null!=(e=arguments[a]))for(t in e)n=s[t],r=e[t],s!==r&&(l&&r&&(x.isPlainObject(r)||(i=x.isArray(r)))?(i?(i=!1,o=n&&x.isArray(n)?n:[]):o=n&&x.isPlainObject(n)?n:{},s[t]=x.extend(l,o,r)):r!==undefined&&(s[t]=r));return s},x.extend({expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=a),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){(e===!0?--x.readyWait:x.isReady)||(x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(o,[x]),x.fn.trigger&&x(o).trigger("ready").off("ready")))},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray,isWindow:function(e){return null!=e&&e===e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if("object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(t){return!1}return!0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:JSON.parse,parseXML:function(e){var t,n;if(!e||"string"!=typeof e)return null;try{n=new DOMParser,t=n.parseFromString(e,"text/xml")}catch(r){t=undefined}return(!t||t.getElementsByTagName("parsererror").length)&&x.error("Invalid XML: "+e),t},noop:function(){},globalEval:function(e){var t,n=eval;e=x.trim(e),e&&(1===e.indexOf("use strict")?(t=o.createElement("script"),t.text=e,o.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(k,"ms-").replace(N,E)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,s=j(e);if(n){if(s){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(s){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:function(e){return null==e?"":v.call(e)},makeArray:function(e,t){var n=t||[];return null!=e&&(j(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:g.call(t,e,n)},merge:function(e,t){var n=t.length,r=e.length,i=0;if("number"==typeof n)for(;n>i;i++)e[r++]=t[i];else while(t[i]!==undefined)e[r++]=t[i++];return e.length=r,e},grep:function(e,t,n){var r,i=[],o=0,s=e.length;for(n=!!n;s>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,s=j(e),a=[];if(s)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(a[a.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(a[a.length]=r);return f.apply([],a)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(n=e[t],t=e,e=n),x.isFunction(e)?(r=d.call(arguments,2),i=function(){return e.apply(t||this,r.concat(d.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):undefined},access:function(e,t,n,r,i,o,s){var a=0,u=e.length,l=null==n;if("object"===x.type(n)){i=!0;for(a in n)x.access(e,t,a,n[a],!0,o,s)}else if(r!==undefined&&(i=!0,x.isFunction(r)||(s=!0),l&&(s?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(x(e),n)})),t))for(;u>a;a++)t(e[a],n,s?r:r.call(e[a],a,t(e[a],n)));return i?e:l?t.call(e):u?t(e[0],n):o},now:Date.now,swap:function(e,t,n,r){var i,o,s={};for(o in t)s[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=s[o];return i}}),x.ready.promise=function(t){return n||(n=x.Deferred(),"complete"===o.readyState?setTimeout(x.ready):(o.addEventListener("DOMContentLoaded",S,!1),e.addEventListener("load",S,!1))),n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function j(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}t=x(o),function(e,undefined){var t,n,r,i,o,s,a,u,l,c,p,f,h,d,g,m,y,v="sizzle"+-new Date,b=e.document,w=0,T=0,C=st(),k=st(),N=st(),E=!1,S=function(e,t){return e===t?(E=!0,0):0},j=typeof undefined,D=1<<31,A={}.hasOwnProperty,L=[],q=L.pop,H=L.push,O=L.push,F=L.slice,P=L.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",W="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",$=W.replace("w","w#"),B="\\["+M+"*("+W+")"+M+"*(?:([*^$|!~]?=)"+M+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+$+")|)|)"+M+"*\\]",I=":("+W+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+B.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=RegExp("^"+M+"*,"+M+"*"),X=RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=RegExp(M+"*[+~]"),Y=RegExp("="+M+"*([^\\]'\"]*)"+M+"*\\]","g"),V=RegExp(I),G=RegExp("^"+$+"$"),J={ID:RegExp("^#("+W+")"),CLASS:RegExp("^\\.("+W+")"),TAG:RegExp("^("+W.replace("w","w*")+")"),ATTR:RegExp("^"+B),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:RegExp("^(?:"+R+")$","i"),needsContext:RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Q=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/^(?:input|select|textarea|button)$/i,et=/^h\d$/i,tt=/'|\\/g,nt=RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),rt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{O.apply(L=F.call(b.childNodes),b.childNodes),L[b.childNodes.length].nodeType}catch(it){O={apply:L.length?function(e,t){H.apply(e,F.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function ot(e,t,r,i){var o,s,a,u,l,f,g,m,x,w;if((t?t.ownerDocument||t:b)!==p&&c(t),t=t||p,r=r||[],!e||"string"!=typeof e)return r;if(1!==(u=t.nodeType)&&9!==u)return[];if(h&&!i){if(o=K.exec(e))if(a=o[1]){if(9===u){if(s=t.getElementById(a),!s||!s.parentNode)return r;if(s.id===a)return r.push(s),r}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(a))&&y(t,s)&&s.id===a)return r.push(s),r}else{if(o[2])return O.apply(r,t.getElementsByTagName(e)),r;if((a=o[3])&&n.getElementsByClassName&&t.getElementsByClassName)return O.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&(!d||!d.test(e))){if(m=g=v,x=t,w=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){f=gt(e),(g=t.getAttribute("id"))?m=g.replace(tt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",l=f.length;while(l--)f[l]=m+mt(f[l]);x=U.test(e)&&t.parentNode||t,w=f.join(",")}if(w)try{return O.apply(r,x.querySelectorAll(w)),r}catch(T){}finally{g||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,r,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>i.cacheLength&&delete t[e.shift()],t[n]=r}return t}function at(e){return e[v]=!0,e}function ut(e){var t=p.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--)i.attrHandle[n[r]]=t}function ct(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return at(function(t){return t=+t,at(function(n,r){var i,o=e([],n.length,t),s=o.length;while(s--)n[i=o[s]]&&(n[i]=!(r[i]=n[i]))})})}s=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},n=ot.support={},c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:b,r=t.defaultView;return t!==p&&9===t.nodeType&&t.documentElement?(p=t,f=t.documentElement,h=!s(t),r&&r.attachEvent&&r!==r.top&&r.attachEvent("onbeforeunload",function(){c()}),n.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ut(function(e){return e.appendChild(t.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),n.getById=ut(function(e){return f.appendChild(e).id=v,!t.getElementsByName||!t.getElementsByName(v).length}),n.getById?(i.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){return e.getAttribute("id")===t}}):(delete i.find.ID,i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=n.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==j?t.getElementsByTagName(e):undefined}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==j&&h?t.getElementsByClassName(e):undefined},g=[],d=[],(n.qsa=Q.test(t.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||d.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ut(function(e){var n=t.createElement("input");n.setAttribute("type","hidden"),e.appendChild(n).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")})),(n.matchesSelector=Q.test(m=f.webkitMatchesSelector||f.mozMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&ut(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",I)}),d=d.length&&RegExp(d.join("|")),g=g.length&&RegExp(g.join("|")),y=Q.test(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},S=f.compareDocumentPosition?function(e,r){if(e===r)return E=!0,0;var i=r.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(r);return i?1&i||!n.sortDetached&&r.compareDocumentPosition(e)===i?e===t||y(b,e)?-1:r===t||y(b,r)?1:l?P.call(l,e)-P.call(l,r):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,o=e.parentNode,s=n.parentNode,a=[e],u=[n];if(e===n)return E=!0,0;if(!o||!s)return e===t?-1:n===t?1:o?-1:s?1:l?P.call(l,e)-P.call(l,n):0;if(o===s)return ct(e,n);r=e;while(r=r.parentNode)a.unshift(r);r=n;while(r=r.parentNode)u.unshift(r);while(a[i]===u[i])i++;return i?ct(a[i],u[i]):a[i]===b?-1:u[i]===b?1:0},t):p},ot.matches=function(e,t){return ot(e,null,null,t)},ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Y,"='$1']"),!(!n.matchesSelector||!h||g&&g.test(t)||d&&d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return ot(t,p,null,[e]).length>0},ot.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},ot.attr=function(e,t){(e.ownerDocument||e)!==p&&c(e);var r=i.attrHandle[t.toLowerCase()],o=r&&A.call(i.attrHandle,t.toLowerCase())?r(e,t,!h):undefined;return o===undefined?n.attributes||!h?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null:o},ot.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},ot.uniqueSort=function(e){var t,r=[],i=0,o=0;if(E=!n.detectDuplicates,l=!n.sortStable&&e.slice(0),e.sort(S),E){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return e},o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=ot.selectors={cacheLength:50,createPseudo:at,match:J,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(nt,rt),e[3]=(e[4]||e[5]||"").replace(nt,rt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ot.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ot.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return J.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&V.test(n)&&(t=gt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(nt,rt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&C(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,h,d,g=o!==s?"nextSibling":"previousSibling",m=t.parentNode,y=a&&t.nodeName.toLowerCase(),x=!u&&!a;if(m){if(o){while(g){p=t;while(p=p[g])if(a?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;d=g="only"===e&&!d&&"nextSibling"}return!0}if(d=[s?m.firstChild:m.lastChild],s&&x){c=m[v]||(m[v]={}),l=c[e]||[],h=l[0]===w&&l[1],f=l[0]===w&&l[2],p=h&&m.childNodes[h];while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[w,h,f];break}}else if(x&&(l=(t[v]||(t[v]={}))[e])&&l[0]===w)f=l[1];else while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if((a?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(x&&((p[v]||(p[v]={}))[e]=[w,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);return r[v]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,o=r(e,t),s=o.length;while(s--)i=P.call(e,o[s]),e[i]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(z,"$1"));return r[v]?at(function(e,t,n,i){var o,s=r(e,null,i,[]),a=e.length;while(a--)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){return G.test(e||"")||ot.error("unsupported lang: "+e),e=e.replace(nt,rt).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return et.test(e.nodeName)},input:function(e){return Z.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},i.pseudos.nth=i.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[t]=pt(t);for(t in{submit:!0,reset:!0})i.pseudos[t]=ft(t);function dt(){}dt.prototype=i.filters=i.pseudos,i.setFilters=new dt;function gt(e,t){var n,r,o,s,a,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);a=e,u=[],l=i.preFilter;while(a){(!n||(r=_.exec(a)))&&(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=X.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(z," ")}),a=a.slice(n.length));for(s in i.filter)!(r=J[s].exec(a))||l[s]&&!(r=l[s](r))||(n=r.shift(),o.push({value:n,type:s,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?ot.error(e):k(e,u).slice(0)}function mt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function yt(e,t,n){var i=t.dir,o=n&&"parentNode"===i,s=T++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,a){var u,l,c,p=w+" "+s;if(a){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,a))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[v]||(t[v]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,a)||r,l[1]===!0)return!0}}function vt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,s=[],a=0,u=e.length,l=null!=t;for(;u>a;a++)(o=e[a])&&(!n||n(o,r,i))&&(s.push(o),l&&t.push(a));return s}function bt(e,t,n,r,i,o){return r&&!r[v]&&(r=bt(r)),i&&!i[v]&&(i=bt(i,o)),at(function(o,s,a,u){var l,c,p,f=[],h=[],d=s.length,g=o||Ct(t||"*",a.nodeType?[a]:a,[]),m=!e||!o&&t?g:xt(g,f,e,a,u),y=n?i||(o?e:d||r)?[]:s:m;if(n&&n(m,y,a,u),r){l=xt(y,h),r(l,[],a,u),c=l.length;while(c--)(p=l[c])&&(y[h[c]]=!(m[h[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?P.call(o,p):f[c])>-1&&(o[l]=!(s[l]=p))}}else y=xt(y===s?y.splice(d,y.length):y),i?i(null,s,y,u):O.apply(s,y)})}function wt(e){var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=yt(function(e){return e===t},a,!0),p=yt(function(e){return P.call(t,e)>-1},a,!0),f=[function(e,n,r){return!s&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>l;l++)if(n=i.relative[e[l].type])f=[yt(vt(f),n)];else{if(n=i.filter[e[l].type].apply(null,e[l].matches),n[v]){for(r=++l;o>r;r++)if(i.relative[e[r].type])break;return bt(l>1&&vt(f),l>1&&mt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&wt(e.slice(l,r)),o>r&&wt(e=e.slice(r)),o>r&&mt(e))}f.push(n)}return vt(f)}function Tt(e,t){var n=0,o=t.length>0,s=e.length>0,a=function(a,l,c,f,h){var d,g,m,y=[],v=0,x="0",b=a&&[],T=null!=h,C=u,k=a||s&&i.find.TAG("*",h&&l.parentNode||l),N=w+=null==C?1:Math.random()||.1;for(T&&(u=l!==p&&l,r=n);null!=(d=k[x]);x++){if(s&&d){g=0;while(m=e[g++])if(m(d,l,c)){f.push(d);break}T&&(w=N,r=++n)}o&&((d=!m&&d)&&v--,a&&b.push(d))}if(v+=x,o&&x!==v){g=0;while(m=t[g++])m(b,y,l,c);if(a){if(v>0)while(x--)b[x]||y[x]||(y[x]=q.call(f));y=xt(y)}O.apply(f,y),T&&!a&&y.length>0&&v+t.length>1&&ot.uniqueSort(f)}return T&&(w=N,u=C),b};return o?at(a):a}a=ot.compile=function(e,t){var n,r=[],i=[],o=N[e+" "];if(!o){t||(t=gt(e)),n=t.length;while(n--)o=wt(t[n]),o[v]?r.push(o):i.push(o);o=N(e,Tt(i,r))}return o};function Ct(e,t,n){var r=0,i=t.length;for(;i>r;r++)ot(e,t[r],n);return n}function kt(e,t,r,o){var s,u,l,c,p,f=gt(e);if(!o&&1===f.length){if(u=f[0]=f[0].slice(0),u.length>2&&"ID"===(l=u[0]).type&&n.getById&&9===t.nodeType&&h&&i.relative[u[1].type]){if(t=(i.find.ID(l.matches[0].replace(nt,rt),t)||[])[0],!t)return r;e=e.slice(u.shift().value.length)}s=J.needsContext.test(e)?0:u.length;while(s--){if(l=u[s],i.relative[c=l.type])break;if((p=i.find[c])&&(o=p(l.matches[0].replace(nt,rt),U.test(u[0].type)&&t.parentNode||t))){if(u.splice(s,1),e=o.length&&mt(u),!e)return O.apply(r,o),r;break}}}return a(e,f)(o,t,!h,r,U.test(e)),r}n.sortStable=v.split("").sort(S).join("")===v,n.detectDuplicates=E,c(),n.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(p.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||lt("type|href|height|width",function(e,t,n){return n?undefined:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||lt("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?undefined:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||lt(R,function(e,t,n){var r;return n?undefined:(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===!0?t.toLowerCase():null}),x.find=ot,x.expr=ot.selectors,x.expr[":"]=x.expr.pseudos,x.unique=ot.uniqueSort,x.text=ot.getText,x.isXMLDoc=ot.isXML,x.contains=ot.contains}(e);var D={};function A(e){var t=D[e]={};return x.each(e.match(w)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?D[e]||A(e):x.extend({},e);var t,n,r,i,o,s,a=[],u=!e.once&&[],l=function(p){for(t=e.memory&&p,n=!0,s=i||0,i=0,o=a.length,r=!0;a&&o>s;s++)if(a[s].apply(p[0],p[1])===!1&&e.stopOnFalse){t=!1;break}r=!1,a&&(u?u.length&&l(u.shift()):t?a=[]:c.disable())},c={add:function(){if(a){var n=a.length;(function s(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==r&&s(n)})})(arguments),r?o=a.length:t&&(i=n,l(t))}return this},remove:function(){return a&&x.each(arguments,function(e,t){var n;while((n=x.inArray(t,a,n))>-1)a.splice(n,1),r&&(o>=n&&o--,s>=n&&s--)}),this},has:function(e){return e?x.inArray(e,a)>-1:!(!a||!a.length)},empty:function(){return a=[],o=0,this},disable:function(){return a=u=t=undefined,this},disabled:function(){return!a},lock:function(){return u=undefined,t||c.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!a||n&&!u||(t=t||[],t=[e,t.slice?t.slice():t],r?u.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!n}};return c},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var s=o[0],a=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var s=o[2],a=o[3];r[o[1]]=s.add,a&&s.add(function(){n=a},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=s.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=d.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),s=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?d.call(arguments):r,n===a?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},a,u,l;if(r>1)for(a=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(s(t,l,n)).fail(o.reject).progress(s(t,u,a)):--i;return i||o.resolveWith(l,n),o.promise()}}),x.support=function(t){var n=o.createElement("input"),r=o.createDocumentFragment(),i=o.createElement("div"),s=o.createElement("select"),a=s.appendChild(o.createElement("option"));return n.type?(n.type="checkbox",t.checkOn=""!==n.value,t.optSelected=a.selected,t.reliableMarginRight=!0,t.boxSizingReliable=!0,t.pixelPosition=!1,n.checked=!0,t.noCloneChecked=n.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!a.disabled,n=o.createElement("input"),n.value="t",n.type="radio",t.radioValue="t"===n.value,n.setAttribute("checked","t"),n.setAttribute("name","t"),r.appendChild(n),t.checkClone=r.cloneNode(!0).cloneNode(!0).lastChild.checked,t.focusinBubbles="onfocusin"in e,i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===i.style.backgroundClip,x(function(){var n,r,s="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",a=o.getElementsByTagName("body")[0];a&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",a.appendChild(n).appendChild(i),i.innerHTML="",i.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",x.swap(a,null!=a.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===i.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(i,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(i,null)||{width:"4px"}).width,r=i.appendChild(o.createElement("div")),r.style.cssText=i.style.cssText=s,r.style.marginRight=r.style.width="0",i.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),a.removeChild(n))}),t):t}({});var L,q,H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,O=/([A-Z])/g;function F(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=x.expando+Math.random()}F.uid=1,F.accepts=function(e){return e.nodeType?1===e.nodeType||9===e.nodeType:!0},F.prototype={key:function(e){if(!F.accepts(e))return 0;var t={},n=e[this.expando];if(!n){n=F.uid++;try{t[this.expando]={value:n},Object.defineProperties(e,t)}catch(r){t[this.expando]=n,x.extend(e,t)}}return this.cache[n]||(this.cache[n]={}),n},set:function(e,t,n){var r,i=this.key(e),o=this.cache[i];if("string"==typeof t)o[t]=n;else if(x.isEmptyObject(o))x.extend(this.cache[i],t);else for(r in t)o[r]=t[r];return o},get:function(e,t){var n=this.cache[this.key(e)];return t===undefined?n:n[t]},access:function(e,t,n){var r;return t===undefined||t&&"string"==typeof t&&n===undefined?(r=this.get(e,t),r!==undefined?r:this.get(e,x.camelCase(t))):(this.set(e,t,n),n!==undefined?n:t)},remove:function(e,t){var n,r,i,o=this.key(e),s=this.cache[o];if(t===undefined)this.cache[o]={};else{x.isArray(t)?r=t.concat(t.map(x.camelCase)):(i=x.camelCase(t),t in s?r=[t,i]:(r=i,r=r in s?[r]:r.match(w)||[])),n=r.length;while(n--)delete s[r[n]]}},hasData:function(e){return!x.isEmptyObject(this.cache[e[this.expando]]||{})},discard:function(e){e[this.expando]&&delete this.cache[e[this.expando]]}},L=new F,q=new F,x.extend({acceptData:F.accepts,hasData:function(e){return L.hasData(e)||q.hasData(e)},data:function(e,t,n){return L.access(e,t,n)},removeData:function(e,t){L.remove(e,t)},_data:function(e,t,n){return q.access(e,t,n)},_removeData:function(e,t){q.remove(e,t)}}),x.fn.extend({data:function(e,t){var n,r,i=this[0],o=0,s=null;if(e===undefined){if(this.length&&(s=L.get(i),1===i.nodeType&&!q.get(i,"hasDataAttrs"))){for(n=i.attributes;n.length>o;o++)r=n[o].name,0===r.indexOf("data-")&&(r=x.camelCase(r.slice(5)),P(i,r,s[r]));q.set(i,"hasDataAttrs",!0)}return s}return"object"==typeof e?this.each(function(){L.set(this,e)}):x.access(this,function(t){var n,r=x.camelCase(e);if(i&&t===undefined){if(n=L.get(i,e),n!==undefined)return n;if(n=L.get(i,r),n!==undefined)return n;if(n=P(i,r,undefined),n!==undefined)return n}else this.each(function(){var n=L.get(this,r);L.set(this,r,t),-1!==e.indexOf("-")&&n!==undefined&&L.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){L.remove(this,e)})}});function P(e,t,n){var r;if(n===undefined&&1===e.nodeType)if(r="data-"+t.replace(O,"-$1").toLowerCase(),n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:H.test(n)?JSON.parse(n):n}catch(i){}L.set(e,t,n)}else n=undefined;return n}x.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=q.get(e,t),n&&(!r||x.isArray(n)?r=q.access(e,t,x.makeArray(n)):r.push(n)),r||[]):undefined},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),s=function(){x.dequeue(e,t)
-};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,s,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return q.get(e,n)||q.access(e,n,{empty:x.Callbacks("once memory").add(function(){q.remove(e,[t+"queue",n])})})}}),x.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),n>arguments.length?x.queue(this[0],e):t===undefined?this:this.each(function(){var n=x.queue(this,e,t);x._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=x.Deferred(),o=this,s=this.length,a=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=undefined),e=e||"fx";while(s--)n=q.get(o[s],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(a));return a(),i.promise(t)}});var R,M,W=/[\t\r\n\f]/g,$=/\r/g,B=/^(?:input|select|textarea|button)$/i;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})},addClass:function(e){var t,n,r,i,o,s=0,a=this.length,u="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,s=0,a=this.length,u=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,i=0,o=x(this),s=e.match(w)||[];while(t=s[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===r||"boolean"===n)&&(this.className&&q.set(this,"__className__",this.className),this.className=this.className||e===!1?"":q.get(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(W," ").indexOf(t)>=0)return!0;return!1},val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=x.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,x(this).val()):e,null==i?i="":"number"==typeof i?i+="":x.isArray(i)&&(i=x.map(i,function(e){return null==e?"":e+""})),t=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&t.set(this,i,"value")!==undefined||(this.value=i))});if(i)return t=x.valHooks[i.type]||x.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,"string"==typeof n?n.replace($,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,s=o?null:[],a=o?i+1:r.length,u=0>i?a:o?i:0;for(;a>u;u++)if(n=r[u],!(!n.selected&&u!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),s=i.length;while(s--)r=i[s],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,t,n){var i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===r?x.prop(e,t,n):(1===s&&x.isXMLDoc(e)||(t=t.toLowerCase(),i=x.attrHooks[t]||(x.expr.match.bool.test(t)?M:R)),n===undefined?i&&"get"in i&&null!==(o=i.get(e,t))?o:(o=x.find.attr(e,t),null==o?undefined:o):null!==n?i&&"set"in i&&(o=i.set(e,n,t))!==undefined?o:(e.setAttribute(t,n+""),n):(x.removeAttr(e,t),undefined))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return o=1!==s||!x.isXMLDoc(e),o&&(t=x.propFix[t]||t,i=x.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){return e.hasAttribute("tabindex")||B.test(e.nodeName)||e.href?e.tabIndex:-1}}}}),M={set:function(e,t,n){return t===!1?x.removeAttr(e,n):e.setAttribute(n,n),n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,t){var n=x.expr.attrHandle[t]||x.find.attr;x.expr.attrHandle[t]=function(e,t,r){var i=x.expr.attrHandle[t],o=r?undefined:(x.expr.attrHandle[t]=undefined)!=n(e,t,r)?t.toLowerCase():null;return x.expr.attrHandle[t]=i,o}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,t){return x.isArray(t)?e.checked=x.inArray(x(e).val(),t)>=0:undefined}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var I=/^key/,z=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,X=/^([^.]*)(?:\.(.+)|)$/;function U(){return!0}function Y(){return!1}function V(){try{return o.activeElement}catch(e){}}x.event={global:{},add:function(e,t,n,i,o){var s,a,u,l,c,p,f,h,d,g,m,y=q.get(e);if(y){n.handler&&(s=n,n=s.handler,o=s.selector),n.guid||(n.guid=x.guid++),(l=y.events)||(l=y.events={}),(a=y.handle)||(a=y.handle=function(e){return typeof x===r||e&&x.event.triggered===e.type?undefined:x.event.dispatch.apply(a.elem,arguments)},a.elem=e),t=(t||"").match(w)||[""],c=t.length;while(c--)u=X.exec(t[c])||[],d=m=u[1],g=(u[2]||"").split(".").sort(),d&&(f=x.event.special[d]||{},d=(o?f.delegateType:f.bindType)||d,f=x.event.special[d]||{},p=x.extend({type:d,origType:m,data:i,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:g.join(".")},s),(h=l[d])||(h=l[d]=[],h.delegateCount=0,f.setup&&f.setup.call(e,i,g,a)!==!1||e.addEventListener&&e.addEventListener(d,a,!1)),f.add&&(f.add.call(e,p),p.handler.guid||(p.handler.guid=n.guid)),o?h.splice(h.delegateCount++,0,p):h.push(p),x.event.global[d]=!0);e=null}},remove:function(e,t,n,r,i){var o,s,a,u,l,c,p,f,h,d,g,m=q.hasData(e)&&q.get(e);if(m&&(u=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(a=X.exec(t[l])||[],h=g=a[1],d=(a[2]||"").split(".").sort(),h){p=x.event.special[h]||{},h=(r?p.delegateType:p.bindType)||h,f=u[h]||[],a=a[2]&&RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;while(o--)c=f[o],!i&&g!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,p.remove&&p.remove.call(e,c));s&&!f.length&&(p.teardown&&p.teardown.call(e,d,m.handle)!==!1||x.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)x.event.remove(e,h+t[l],n,r,!0);x.isEmptyObject(u)&&(delete m.handle,q.remove(e,"events"))}},trigger:function(t,n,r,i){var s,a,u,l,c,p,f,h=[r||o],d=y.call(t,"type")?t.type:t,g=y.call(t,"namespace")?t.namespace.split("."):[];if(a=u=r=r||o,3!==r.nodeType&&8!==r.nodeType&&!_.test(d+x.event.triggered)&&(d.indexOf(".")>=0&&(g=d.split("."),d=g.shift(),g.sort()),c=0>d.indexOf(":")&&"on"+d,t=t[x.expando]?t:new x.Event(d,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=g.join("."),t.namespace_re=t.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=null==n?[t]:x.makeArray(n,[t]),f=x.event.special[d]||{},i||!f.trigger||f.trigger.apply(r,n)!==!1)){if(!i&&!f.noBubble&&!x.isWindow(r)){for(l=f.delegateType||d,_.test(l+d)||(a=a.parentNode);a;a=a.parentNode)h.push(a),u=a;u===(r.ownerDocument||o)&&h.push(u.defaultView||u.parentWindow||e)}s=0;while((a=h[s++])&&!t.isPropagationStopped())t.type=s>1?l:f.bindType||d,p=(q.get(a,"events")||{})[t.type]&&q.get(a,"handle"),p&&p.apply(a,n),p=c&&a[c],p&&x.acceptData(a)&&p.apply&&p.apply(a,n)===!1&&t.preventDefault();return t.type=d,i||t.isDefaultPrevented()||f._default&&f._default.apply(h.pop(),n)!==!1||!x.acceptData(r)||c&&x.isFunction(r[d])&&!x.isWindow(r)&&(u=r[c],u&&(r[c]=null),x.event.triggered=d,r[d](),x.event.triggered=undefined,u&&(r[c]=u)),t.result}},dispatch:function(e){e=x.event.fix(e);var t,n,r,i,o,s=[],a=d.call(arguments),u=(q.get(this,"events")||{})[e.type]||[],l=x.event.special[e.type]||{};if(a[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),t=0;while((i=s[t++])&&!e.isPropagationStopped()){e.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(o.namespace))&&(e.handleObj=o,e.data=o.data,r=((x.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,a),r!==undefined&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,s=[],a=t.delegateCount,u=e.target;if(a&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!==this;u=u.parentNode||this)if(u.disabled!==!0||"click"!==e.type){for(r=[],n=0;a>n;n++)o=t[n],i=o.selector+" ",r[i]===undefined&&(r[i]=o.needsContext?x(i,this).index(u)>=0:x.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&s.push({elem:u,handlers:r})}return t.length>a&&s.push({elem:this,handlers:t.slice(a)}),s},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button;return null==e.pageX&&null!=t.clientX&&(n=e.target.ownerDocument||o,r=n.documentElement,i=n.body,e.pageX=t.clientX+(r&&r.scrollLeft||i&&i.scrollLeft||0)-(r&&r.clientLeft||i&&i.clientLeft||0),e.pageY=t.clientY+(r&&r.scrollTop||i&&i.scrollTop||0)-(r&&r.clientTop||i&&i.clientTop||0)),e.which||s===undefined||(e.which=1&s?1:2&s?3:4&s?2:0),e}},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,s=e,a=this.fixHooks[i];a||(this.fixHooks[i]=a=z.test(i)?this.mouseHooks:I.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new x.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=o),3===e.target.nodeType&&(e.target=e.target.parentNode),a.filter?a.filter(e,s):e},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==V()&&this.focus?(this.focus(),!1):undefined},delegateType:"focusin"},blur:{trigger:function(){return this===V()&&this.blur?(this.blur(),!1):undefined},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&x.nodeName(this,"input")?(this.click(),!1):undefined},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)},x.Event=function(e,t){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.getPreventDefault&&e.getPreventDefault()?U:Y):this.type=e,t&&x.extend(this,t),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,undefined):new x.Event(e,t)},x.Event.prototype={isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=U,e&&e.preventDefault&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=U,e&&e.stopPropagation&&e.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=U,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,t,n,r,i){var o,s;if("object"==typeof e){"string"!=typeof t&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}if(null==n&&null==r?(r=t,n=t=undefined):null==r&&("string"==typeof t?(r=n,n=undefined):(r=n,n=t,t=undefined)),r===!1)r=Y;else if(!r)return this;return 1===i&&(o=r,r=function(e){return x().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=x.guid++)),this.each(function(){x.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,x(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return(t===!1||"function"==typeof t)&&(n=t,t=undefined),n===!1&&(n=Y),this.each(function(){x.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];return n?x.event.trigger(e,t,n,!0):undefined}});var G=/^.[^:#\[\.,]*$/,J=/^(?:parents|prev(?:Until|All))/,Q=x.expr.match.needsContext,K={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){var e=0;for(;n>e;e++)if(x.contains(this,t[e]))return!0})},not:function(e){return this.pushStack(et(this,e||[],!0))},filter:function(e){return this.pushStack(et(this,e||[],!1))},is:function(e){return!!et(this,"string"==typeof e&&Q.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],s=Q.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(s?s.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?g.call(x(e),this[0]):g.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function Z(e,t){while((e=e[t])&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return Z(e,"nextSibling")},prev:function(e){return Z(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return e.contentDocument||x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(K[e]||x.unique(i),J.test(e)&&i.reverse()),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,t,n){var r=[],i=n!==undefined;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&x(e).is(n))break;r.push(e)}return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function et(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(G.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return g.call(t,e)>=0!==n})}var tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,nt=/<([\w:]+)/,rt=/<|&#?\w+;/,it=/<(?:script|style|link)/i,ot=/^(?:checkbox|radio)$/i,st=/checked\s*(?:[^=]|=\s*.checked.)/i,at=/^$|\/(?:java|ecma)script/i,ut=/^true\/(.*)/,lt=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ct={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ct.optgroup=ct.option,ct.tbody=ct.tfoot=ct.colgroup=ct.caption=ct.thead,ct.th=ct.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===undefined?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(mt(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&dt(mt(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++)1===e.nodeType&&(x.cleanData(mt(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!it.test(e)&&!ct[(nt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(tt,"<$1></$2>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(x.cleanData(mt(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=f.apply([],e);var r,i,o,s,a,u,l=0,c=this.length,p=this,h=c-1,d=e[0],g=x.isFunction(d);if(g||!(1>=c||"string"!=typeof d||x.support.checkClone)&&st.test(d))return this.each(function(r){var i=p.eq(r);g&&(e[0]=d.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(r=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),i=r.firstChild,1===r.childNodes.length&&(r=i),i)){for(o=x.map(mt(r,"script"),ft),s=o.length;c>l;l++)a=r,l!==h&&(a=x.clone(a,!0,!0),s&&x.merge(o,mt(a,"script"))),t.call(this[l],a,l);if(s)for(u=o[o.length-1].ownerDocument,x.map(o,ht),l=0;s>l;l++)a=o[l],at.test(a.type||"")&&!q.access(a,"globalEval")&&x.contains(u,a)&&(a.src?x._evalUrl(a.src):x.globalEval(a.textContent.replace(lt,"")))}return this}}),x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=[],i=x(e),o=i.length-1,s=0;for(;o>=s;s++)n=s===o?this:this.clone(!0),x(i[s])[t](n),h.apply(r,n.get());return this.pushStack(r)}}),x.extend({clone:function(e,t,n){var r,i,o,s,a=e.cloneNode(!0),u=x.contains(e.ownerDocument,e);if(!(x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=mt(a),o=mt(e),r=0,i=o.length;i>r;r++)yt(o[r],s[r]);if(t)if(n)for(o=o||mt(e),s=s||mt(a),r=0,i=o.length;i>r;r++)gt(o[r],s[r]);else gt(e,a);return s=mt(a,"script"),s.length>0&&dt(s,!u&&mt(e,"script")),a},buildFragment:function(e,t,n,r){var i,o,s,a,u,l,c=0,p=e.length,f=t.createDocumentFragment(),h=[];for(;p>c;c++)if(i=e[c],i||0===i)if("object"===x.type(i))x.merge(h,i.nodeType?[i]:i);else if(rt.test(i)){o=o||f.appendChild(t.createElement("div")),s=(nt.exec(i)||["",""])[1].toLowerCase(),a=ct[s]||ct._default,o.innerHTML=a[1]+i.replace(tt,"<$1></$2>")+a[2],l=a[0];while(l--)o=o.lastChild;x.merge(h,o.childNodes),o=f.firstChild,o.textContent=""}else h.push(t.createTextNode(i));f.textContent="",c=0;while(i=h[c++])if((!r||-1===x.inArray(i,r))&&(u=x.contains(i.ownerDocument,i),o=mt(f.appendChild(i),"script"),u&&dt(o),n)){l=0;while(i=o[l++])at.test(i.type||"")&&n.push(i)}return f},cleanData:function(e){var t,n,r,i,o,s,a=x.event.special,u=0;for(;(n=e[u])!==undefined;u++){if(F.accepts(n)&&(o=n[q.expando],o&&(t=q.cache[o]))){if(r=Object.keys(t.events||{}),r.length)for(s=0;(i=r[s])!==undefined;s++)a[i]?x.event.remove(n,i):x.removeEvent(n,i,t.handle);q.cache[o]&&delete q.cache[o]}delete L.cache[n[L.expando]]}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}});function pt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function ft(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function ht(e){var t=ut.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function dt(e,t){var n=e.length,r=0;for(;n>r;r++)q.set(e[r],"globalEval",!t||q.get(t[r],"globalEval"))}function gt(e,t){var n,r,i,o,s,a,u,l;if(1===t.nodeType){if(q.hasData(e)&&(o=q.access(e),s=q.set(t,o),l=o.events)){delete s.handle,s.events={};for(i in l)for(n=0,r=l[i].length;r>n;n++)x.event.add(t,i,l[i][n])}L.hasData(e)&&(a=L.access(e),u=x.extend({},a),L.set(t,u))}}function mt(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return t===undefined||t&&x.nodeName(e,t)?x.merge([e],n):n}function yt(e,t){var n=t.nodeName.toLowerCase();"input"===n&&ot.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}x.fn.extend({wrapAll:function(e){var t;return x.isFunction(e)?this.each(function(t){x(this).wrapAll(e.call(this,t))}):(this[0]&&(t=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this)},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var vt,xt,bt=/^(none|table(?!-c[ea]).+)/,wt=/^margin/,Tt=RegExp("^("+b+")(.*)$","i"),Ct=RegExp("^("+b+")(?!px)[a-z%]+$","i"),kt=RegExp("^([+-])=("+b+")","i"),Nt={BODY:"block"},Et={position:"absolute",visibility:"hidden",display:"block"},St={letterSpacing:0,fontWeight:400},jt=["Top","Right","Bottom","Left"],Dt=["Webkit","O","Moz","ms"];function At(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Dt.length;while(i--)if(t=Dt[i]+n,t in e)return t;return r}function Lt(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function qt(t){return e.getComputedStyle(t,null)}function Ht(e,t){var n,r,i,o=[],s=0,a=e.length;for(;a>s;s++)r=e[s],r.style&&(o[s]=q.get(r,"olddisplay"),n=r.style.display,t?(o[s]||"none"!==n||(r.style.display=""),""===r.style.display&&Lt(r)&&(o[s]=q.access(r,"olddisplay",Rt(r.nodeName)))):o[s]||(i=Lt(r),(n&&"none"!==n||!i)&&q.set(r,"olddisplay",i?n:x.css(r,"display"))));for(s=0;a>s;s++)r=e[s],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[s]||"":"none"));return e}x.fn.extend({css:function(e,t){return x.access(this,function(e,t,n){var r,i,o={},s=0;if(x.isArray(t)){for(r=qt(e),i=t.length;i>s;s++)o[t[s]]=x.css(e,t[s],!1,r);return o}return n!==undefined?x.style(e,t,n):x.css(e,t)},e,t,arguments.length>1)},show:function(){return Ht(this,!0)},hide:function(){return Ht(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Lt(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=vt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,s,a=x.camelCase(t),u=e.style;return t=x.cssProps[a]||(x.cssProps[a]=At(u,a)),s=x.cssHooks[t]||x.cssHooks[a],n===undefined?s&&"get"in s&&(i=s.get(e,!1,r))!==undefined?i:u[t]:(o=typeof n,"string"===o&&(i=kt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(x.css(e,t)),o="number"),null==n||"number"===o&&isNaN(n)||("number"!==o||x.cssNumber[a]||(n+="px"),x.support.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&(n=s.set(e,n,r))===undefined||(u[t]=n)),undefined)}},css:function(e,t,n,r){var i,o,s,a=x.camelCase(t);return t=x.cssProps[a]||(x.cssProps[a]=At(e.style,a)),s=x.cssHooks[t]||x.cssHooks[a],s&&"get"in s&&(i=s.get(e,!0,n)),i===undefined&&(i=vt(e,t,r)),"normal"===i&&t in St&&(i=St[t]),""===n||n?(o=parseFloat(i),n===!0||x.isNumeric(o)?o||0:i):i}}),vt=function(e,t,n){var r,i,o,s=n||qt(e),a=s?s.getPropertyValue(t)||s[t]:undefined,u=e.style;return s&&(""!==a||x.contains(e.ownerDocument,e)||(a=x.style(e,t)),Ct.test(a)&&wt.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=s.width,u.width=r,u.minWidth=i,u.maxWidth=o)),a};function Ot(e,t,n){var r=Tt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Ft(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,s=0;for(;4>o;o+=2)"margin"===n&&(s+=x.css(e,n+jt[o],!0,i)),r?("content"===n&&(s-=x.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(s-=x.css(e,"border"+jt[o]+"Width",!0,i))):(s+=x.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(s+=x.css(e,"border"+jt[o]+"Width",!0,i)));return s}function Pt(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=qt(e),s=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=vt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Ct.test(i))return i;r=s&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+Ft(e,t,n||(s?"border":"content"),r,o)+"px"}function Rt(e){var t=o,n=Nt[e];return n||(n=Mt(e,t),"none"!==n&&n||(xt=(xt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(xt[0].contentWindow||xt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=Mt(e,t),xt.detach()),Nt[e]=n),n}function Mt(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,t){x.cssHooks[t]={get:function(e,n,r){return n?0===e.offsetWidth&&bt.test(x.css(e,"display"))?x.swap(e,Et,function(){return Pt(e,t,r)}):Pt(e,t,r):undefined},set:function(e,n,r){var i=r&&qt(e);return Ot(e,n,r?Ft(e,t,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,t){return t?x.swap(e,{display:"inline-block"},vt,[e,"marginRight"]):undefined}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,t){x.cssHooks[t]={get:function(e,n){return n?(n=vt(e,t),Ct.test(n)?x(e).position()[t]+"px":n):undefined}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+jt[r]+t]=o[r]||o[r-2]||o[0];return i}},wt.test(e)||(x.cssHooks[e+t].set=Ot)});var Wt=/%20/g,$t=/\[\]$/,Bt=/\r?\n/g,It=/^(?:submit|button|image|reset|file)$/i,zt=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&zt.test(this.nodeName)&&!It.test(e)&&(this.checked||!ot.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(Bt,"\r\n")}}):{name:t.name,value:n.replace(Bt,"\r\n")}}).get()}}),x.param=function(e,t){var n,r=[],i=function(e,t){t=x.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(t===undefined&&(t=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){i(this.name,this.value)});else for(n in e)_t(n,e[n],t,i);return r.join("&").replace(Wt,"+")};function _t(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||$t.test(e)?r(e,i):_t(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)_t(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)
-},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var Xt,Ut,Yt=x.now(),Vt=/\?/,Gt=/#.*$/,Jt=/([?&])_=[^&]*/,Qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Kt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Zt=/^(?:GET|HEAD)$/,en=/^\/\//,tn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,nn=x.fn.load,rn={},on={},sn="*/".concat("*");try{Ut=i.href}catch(an){Ut=o.createElement("a"),Ut.href="",Ut=Ut.href}Xt=tn.exec(Ut.toLowerCase())||[];function un(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function ln(e,t,n,r){var i={},o=e===on;function s(a){var u;return i[a]=!0,x.each(e[a]||[],function(e,a){var l=a(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):undefined:(t.dataTypes.unshift(l),s(l),!1)}),u}return s(t.dataTypes[0])||!i["*"]&&s("*")}function cn(e,t){var n,r,i=x.ajaxSettings.flatOptions||{};for(n in t)t[n]!==undefined&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,t,n){if("string"!=typeof e&&nn)return nn.apply(this,arguments);var r,i,o,s=this,a=e.indexOf(" ");return a>=0&&(r=e.slice(a),e=e.slice(0,a)),x.isFunction(t)?(n=t,t=undefined):t&&"object"==typeof t&&(i="POST"),s.length>0&&x.ajax({url:e,type:i,dataType:"html",data:t}).done(function(e){o=arguments,s.html(r?x("<div>").append(x.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){s.each(n,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ut,type:"GET",isLocal:Kt.test(Xt[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":sn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?cn(cn(e,x.ajaxSettings),t):cn(x.ajaxSettings,e)},ajaxPrefilter:un(rn),ajaxTransport:un(on),ajax:function(e,t){"object"==typeof e&&(t=e,e=undefined),t=t||{};var n,r,i,o,s,a,u,l,c=x.ajaxSetup({},t),p=c.context||c,f=c.context&&(p.nodeType||p.jquery)?x(p):x.event,h=x.Deferred(),d=x.Callbacks("once memory"),g=c.statusCode||{},m={},y={},v=0,b="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===v){if(!o){o={};while(t=Qt.exec(i))o[t[1].toLowerCase()]=t[2]}t=o[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===v?i:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return v||(e=y[n]=y[n]||e,m[e]=t),this},overrideMimeType:function(e){return v||(c.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>v)for(t in e)g[t]=[g[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||b;return n&&n.abort(t),k(0,t),this}};if(h.promise(T).complete=d.add,T.success=T.done,T.error=T.fail,c.url=((e||c.url||Ut)+"").replace(Gt,"").replace(en,Xt[1]+"//"),c.type=t.method||t.type||c.method||c.type,c.dataTypes=x.trim(c.dataType||"*").toLowerCase().match(w)||[""],null==c.crossDomain&&(a=tn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===Xt[1]&&a[2]===Xt[2]&&(a[3]||("http:"===a[1]?"80":"443"))===(Xt[3]||("http:"===Xt[1]?"80":"443")))),c.data&&c.processData&&"string"!=typeof c.data&&(c.data=x.param(c.data,c.traditional)),ln(rn,c,t,T),2===v)return T;u=c.global,u&&0===x.active++&&x.event.trigger("ajaxStart"),c.type=c.type.toUpperCase(),c.hasContent=!Zt.test(c.type),r=c.url,c.hasContent||(c.data&&(r=c.url+=(Vt.test(r)?"&":"?")+c.data,delete c.data),c.cache===!1&&(c.url=Jt.test(r)?r.replace(Jt,"$1_="+Yt++):r+(Vt.test(r)?"&":"?")+"_="+Yt++)),c.ifModified&&(x.lastModified[r]&&T.setRequestHeader("If-Modified-Since",x.lastModified[r]),x.etag[r]&&T.setRequestHeader("If-None-Match",x.etag[r])),(c.data&&c.hasContent&&c.contentType!==!1||t.contentType)&&T.setRequestHeader("Content-Type",c.contentType),T.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+("*"!==c.dataTypes[0]?", "+sn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)T.setRequestHeader(l,c.headers[l]);if(c.beforeSend&&(c.beforeSend.call(p,T,c)===!1||2===v))return T.abort();b="abort";for(l in{success:1,error:1,complete:1})T[l](c[l]);if(n=ln(on,c,t,T)){T.readyState=1,u&&f.trigger("ajaxSend",[T,c]),c.async&&c.timeout>0&&(s=setTimeout(function(){T.abort("timeout")},c.timeout));try{v=1,n.send(m,k)}catch(C){if(!(2>v))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,t,o,a){var l,m,y,b,w,C=t;2!==v&&(v=2,s&&clearTimeout(s),n=undefined,i=a||"",T.readyState=e>0?4:0,l=e>=200&&300>e||304===e,o&&(b=pn(c,T,o)),b=fn(c,b,T,l),l?(c.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(x.lastModified[r]=w),w=T.getResponseHeader("etag"),w&&(x.etag[r]=w)),204===e||"HEAD"===c.type?C="nocontent":304===e?C="notmodified":(C=b.state,m=b.data,y=b.error,l=!y)):(y=C,(e||!C)&&(C="error",0>e&&(e=0))),T.status=e,T.statusText=(t||C)+"",l?h.resolveWith(p,[m,C,T]):h.rejectWith(p,[T,C,y]),T.statusCode(g),g=undefined,u&&f.trigger(l?"ajaxSuccess":"ajaxError",[T,c,l?m:y]),d.fireWith(p,[T,C]),u&&(f.trigger("ajaxComplete",[T,c]),--x.active||x.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,t){return x.get(e,undefined,t,"script")}}),x.each(["get","post"],function(e,t){x[t]=function(e,n,r,i){return x.isFunction(n)&&(i=i||r,r=n,n=undefined),x.ajax({url:e,type:t,dataType:i,data:n,success:r})}});function pn(e,t,n){var r,i,o,s,a=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),r===undefined&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in a)if(a[i]&&a[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}s||(s=i)}o=o||s}return o?(o!==u[0]&&u.unshift(o),n[o]):undefined}function fn(e,t,n,r){var i,o,s,a,u,l={},c=e.dataTypes.slice();if(c[1])for(s in e.converters)l[s.toLowerCase()]=e.converters[s];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(s=l[u+" "+o]||l["* "+o],!s)for(i in l)if(a=i.split(" "),a[1]===o&&(s=l[u+" "+a[0]]||l["* "+a[0]])){s===!0?s=l[i]:l[i]!==!0&&(o=a[0],c.unshift(a[1]));break}if(s!==!0)if(s&&e["throws"])t=s(t);else try{t=s(t)}catch(p){return{state:"parsererror",error:s?p:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===undefined&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),x.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(r,i){t=x("<script>").prop({async:!0,charset:e.scriptCharset,src:e.url}).on("load error",n=function(e){t.remove(),n=null,e&&i("error"===e.type?404:200,e.type)}),o.head.appendChild(t[0])},abort:function(){n&&n()}}}});var hn=[],dn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=hn.pop()||x.expando+"_"+Yt++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,s,a=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&!(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");return a||"jsonp"===t.dataTypes[0]?(i=t.jsonpCallback=x.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,a?t[a]=t[a].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(Vt.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return s||x.error(i+" was not called"),s[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){s=arguments},r.always(function(){e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,hn.push(i)),s&&x.isFunction(o)&&o(s[0]),s=o=undefined}),"script"):undefined}),x.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(e){}};var gn=x.ajaxSettings.xhr(),mn={0:200,1223:204},yn=0,vn={};e.ActiveXObject&&x(e).on("unload",function(){for(var e in vn)vn[e]();vn=undefined}),x.support.cors=!!gn&&"withCredentials"in gn,x.support.ajax=gn=!!gn,x.ajaxTransport(function(e){var t;return x.support.cors||gn&&!e.crossDomain?{send:function(n,r){var i,o,s=e.xhr();if(s.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(i in e.xhrFields)s[i]=e.xhrFields[i];e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),e.crossDomain||n["X-Requested-With"]||(n["X-Requested-With"]="XMLHttpRequest");for(i in n)s.setRequestHeader(i,n[i]);t=function(e){return function(){t&&(delete vn[o],t=s.onload=s.onerror=null,"abort"===e?s.abort():"error"===e?r(s.status||404,s.statusText):r(mn[s.status]||s.status,s.statusText,"string"==typeof s.responseText?{text:s.responseText}:undefined,s.getAllResponseHeaders()))}},s.onload=t(),s.onerror=t("error"),t=vn[o=yn++]=t("abort"),s.send(e.hasContent&&e.data||null)},abort:function(){t&&t()}}:undefined});var xn,bn,wn=/^(?:toggle|show|hide)$/,Tn=RegExp("^(?:([+-])=|)("+b+")([a-z%]*)$","i"),Cn=/queueHooks$/,kn=[An],Nn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Tn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),s=(x.cssNumber[e]||"px"!==o&&+r)&&Tn.exec(x.css(n.elem,e)),a=1,u=20;if(s&&s[3]!==o){o=o||s[3],i=i||[],s=+r||1;do a=a||".5",s/=a,x.style(n.elem,e,s+o);while(a!==(a=n.cur()/r)&&1!==a&&--u)}return i&&(s=n.start=+s||+r||0,n.unit=o,n.end=i[1]?s+(i[1]+1)*i[2]:+i[2]),n}]};function En(){return setTimeout(function(){xn=undefined}),xn=x.now()}function Sn(e,t,n){var r,i=(Nn[t]||[]).concat(Nn["*"]),o=0,s=i.length;for(;s>o;o++)if(r=i[o].call(n,t,e))return r}function jn(e,t,n){var r,i,o=0,s=kn.length,a=x.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=xn||En(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,s=0,u=l.tweens.length;for(;u>s;s++)l.tweens[s].run(o);return a.notifyWith(e,[l,o,n]),1>o&&u?n:(a.resolveWith(e,[l]),!1)},l=a.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:xn||En(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?a.resolveWith(e,[l,t]):a.rejectWith(e,[l,t]),this}}),c=l.props;for(Dn(c,l.opts.specialEasing);s>o;o++)if(r=kn[o].call(l,e,c,l.opts))return r;return x.map(c,Sn,l),x.isFunction(l.opts.start)&&l.opts.start.call(e,l),x.fx.timer(x.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function Dn(e,t){var n,r,i,o,s;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),s=x.cssHooks[r],s&&"expand"in s){o=s.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(jn,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Nn[n]=Nn[n]||[],Nn[n].unshift(t)},prefilter:function(e,t){t?kn.unshift(e):kn.push(e)}});function An(e,t,n){var r,i,o,s,a,u,l=this,c={},p=e.style,f=e.nodeType&&Lt(e),h=q.get(e,"fxshow");n.queue||(a=x._queueHooks(e,"fx"),null==a.unqueued&&(a.unqueued=0,u=a.empty.fire,a.empty.fire=function(){a.unqueued||u()}),a.unqueued++,l.always(function(){l.always(function(){a.unqueued--,x.queue(e,"fx").length||a.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(p.display="inline-block")),n.overflow&&(p.overflow="hidden",l.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],wn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show")){if("show"!==i||!h||h[r]===undefined)continue;f=!0}c[r]=h&&h[r]||x.style(e,r)}if(!x.isEmptyObject(c)){h?"hidden"in h&&(f=h.hidden):h=q.access(e,"fxshow",{}),o&&(h.hidden=!f),f?x(e).show():l.done(function(){x(e).hide()}),l.done(function(){var t;q.remove(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)s=Sn(f?h[r]:0,r,l),r in h||(h[r]=s.start,f&&(s.end=s.start,s.start="width"===r||"height"===r?1:0))}}function Ln(e,t,n,r,i){return new Ln.prototype.init(e,t,n,r,i)}x.Tween=Ln,Ln.prototype={constructor:Ln,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=Ln.propHooks[this.prop];return e&&e.get?e.get(this):Ln.propHooks._default.get(this)},run:function(e){var t,n=Ln.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ln.propHooks._default.set(this),this}},Ln.prototype.init.prototype=Ln.prototype,Ln.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Ln.propHooks.scrollTop=Ln.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(qn(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Lt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),s=function(){var t=jn(this,x.extend({},e),o);(i||q.get(this,"finish"))&&t.stop(!0)};return s.finish=s,i||o.queue===!1?this.each(s):this.queue(o.queue,s)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=undefined),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=x.timers,s=q.get(this);if(i)s[i]&&s[i].stop&&r(s[i]);else for(i in s)s[i]&&s[i].stop&&Cn.test(i)&&r(s[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));(t||!n)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=q.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,s=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;s>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function qn(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=jt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:qn("show"),slideUp:qn("hide"),slideToggle:qn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=Ln.prototype.init,x.fx.tick=function(){var e,t=x.timers,n=0;for(xn=x.now();t.length>n;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||x.fx.stop(),xn=undefined},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){bn||(bn=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(bn),bn=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===undefined?this:this.each(function(t){x.offset.setOffset(this,e,t)});var t,n,i=this[0],o={top:0,left:0},s=i&&i.ownerDocument;if(s)return t=s.documentElement,x.contains(t,i)?(typeof i.getBoundingClientRect!==r&&(o=i.getBoundingClientRect()),n=Hn(s),{top:o.top+n.pageYOffset-t.clientTop,left:o.left+n.pageXOffset-t.clientLeft}):o},x.offset={setOffset:function(e,t,n){var r,i,o,s,a,u,l,c=x.css(e,"position"),p=x(e),f={};"static"===c&&(e.style.position="relative"),a=p.offset(),o=x.css(e,"top"),u=x.css(e,"left"),l=("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1,l?(r=p.position(),s=r.top,i=r.left):(s=parseFloat(o)||0,i=parseFloat(u)||0),x.isFunction(t)&&(t=t.call(e,n,a)),null!=t.top&&(f.top=t.top-a.top+s),null!=t.left&&(f.left=t.left-a.left+i),"using"in t?t.using.call(e,f):p.css(f)}},x.fn.extend({position:function(){if(this[0]){var e,t,n=this[0],r={top:0,left:0};return"fixed"===x.css(n,"position")?t=n.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(r=e.offset()),r.top+=x.css(e[0],"borderTopWidth",!0),r.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-r.top-x.css(n,"marginTop",!0),left:t.left-r.left-x.css(n,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,n){var r="pageYOffset"===n;x.fn[t]=function(i){return x.access(this,function(t,i,o){var s=Hn(t);return o===undefined?s?s[n]:t[i]:(s?s.scrollTo(r?e.pageXOffset:o,r?o:e.pageYOffset):t[i]=o,undefined)},t,i,arguments.length,null)}});function Hn(e){return x.isWindow(e)?e:9===e.nodeType&&e.defaultView}x.each({Height:"height",Width:"width"},function(e,t){x.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){x.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),s=n||(r===!0||i===!0?"margin":"border");return x.access(this,function(t,n,r){var i;return x.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):r===undefined?x.css(t,n,s):x.style(t,n,r,s)},t,o?r:undefined,o,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}),"object"==typeof e&&"object"==typeof e.document&&(e.jQuery=e.$=x)})(window);
\ No newline at end of file
+/*!
+ * jQuery JavaScript Library v3.2.1
+ * https://jquery.com/
+ *
+ * Includes Sizzle.js
+ * https://sizzlejs.com/
+ *
+ * Copyright JS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2017-03-20T18:59Z
+ */
+( function( global, factory ) {
+
+  "use strict";
+
+  if ( typeof module === "object" && typeof module.exports === "object" ) {
+
+    // For CommonJS and CommonJS-like environments where a proper `window`
+    // is present, execute the factory and get jQuery.
+    // For environments that do not have a `window` with a `document`
+    // (such as Node.js), expose a factory as module.exports.
+    // This accentuates the need for the creation of a real `window`.
+    // e.g. var jQuery = require("jquery")(window);
+    // See ticket #14549 for more info.
+    module.exports = global.document ?
+      factory( global, true ) :
+      function( w ) {
+        if ( !w.document ) {
+          throw new Error( "jQuery requires a window with a document" );
+        }
+        return factory( w );
+      };
+  } else {
+    factory( global );
+  }
+
+// Pass this if window is not defined yet
+} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// enough that all such attempts are guarded in a try block.
+  "use strict";
+
+  var arr = [];
+
+  var document = window.document;
+
+  var getProto = Object.getPrototypeOf;
+
+  var slice = arr.slice;
+
+  var concat = arr.concat;
+
+  var push = arr.push;
+
+  var indexOf = arr.indexOf;
+
+  var class2type = {};
+
+  var toString = class2type.toString;
+
+  var hasOwn = class2type.hasOwnProperty;
+
+  var fnToString = hasOwn.toString;
+
+  var ObjectFunctionString = fnToString.call( Object );
+
+  var support = {};
+
+
+
+  function DOMEval( code, doc ) {
+    doc = doc || document;
+
+    var script = doc.createElement( "script" );
+
+    script.text = code;
+    doc.head.appendChild( script ).parentNode.removeChild( script );
+  }
+  /* global Symbol */
+// Defining this global in .eslintrc.json would create a danger of using the global
+// unguarded in another place, it seems safer to define global only for this module
+
+
+
+  var
+    version = "3.2.1",
+
+    // Define a local copy of jQuery
+    jQuery = function( selector, context ) {
+
+      // The jQuery object is actually just the init constructor 'enhanced'
+      // Need init if jQuery is called (just allow error to be thrown if not included)
+      return new jQuery.fn.init( selector, context );
+    },
+
+    // Support: Android <=4.0 only
+    // Make sure we trim BOM and NBSP
+    rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+    // Matches dashed string for camelizing
+    rmsPrefix = /^-ms-/,
+    rdashAlpha = /-([a-z])/g,
+
+    // Used by jQuery.camelCase as callback to replace()
+    fcamelCase = function( all, letter ) {
+      return letter.toUpperCase();
+    };
+
+  jQuery.fn = jQuery.prototype = {
+
+    // The current version of jQuery being used
+    jquery: version,
+
+    constructor: jQuery,
+
+    // The default length of a jQuery object is 0
+    length: 0,
+
+    toArray: function() {
+      return slice.call( this );
+    },
+
+    // Get the Nth element in the matched element set OR
+    // Get the whole matched element set as a clean array
+    get: function( num ) {
+
+      // Return all the elements in a clean array
+      if ( num == null ) {
+        return slice.call( this );
+      }
+
+      // Return just the one element from the set
+      return num < 0 ? this[ num + this.length ] : this[ num ];
+    },
+
+    // Take an array of elements and push it onto the stack
+    // (returning the new matched element set)
+    pushStack: function( elems ) {
+
+      // Build a new jQuery matched element set
+      var ret = jQuery.merge( this.constructor(), elems );
+
+      // Add the old object onto the stack (as a reference)
+      ret.prevObject = this;
+
+      // Return the newly-formed element set
+      return ret;
+    },
+
+    // Execute a callback for every element in the matched set.
+    each: function( callback ) {
+      return jQuery.each( this, callback );
+    },
+
+    map: function( callback ) {
+      return this.pushStack( jQuery.map( this, function( elem, i ) {
+        return callback.call( elem, i, elem );
+      } ) );
+    },
+
+    slice: function() {
+      return this.pushStack( slice.apply( this, arguments ) );
+    },
+
+    first: function() {
+      return this.eq( 0 );
+    },
+
+    last: function() {
+      return this.eq( -1 );
+    },
+
+    eq: function( i ) {
+      var len = this.length,
+        j = +i + ( i < 0 ? len : 0 );
+      return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
+    },
+
+    end: function() {
+      return this.prevObject || this.constructor();
+    },
+
+    // For internal use only.
+    // Behaves like an Array's method, not like a jQuery method.
+    push: push,
+    sort: arr.sort,
+    splice: arr.splice
+  };
+
+  jQuery.extend = jQuery.fn.extend = function() {
+    var options, name, src, copy, copyIsArray, clone,
+      target = arguments[ 0 ] || {},
+      i = 1,
+      length = arguments.length,
+      deep = false;
+
+    // Handle a deep copy situation
+    if ( typeof target === "boolean" ) {
+      deep = target;
+
+      // Skip the boolean and the target
+      target = arguments[ i ] || {};
+      i++;
+    }
+
+    // Handle case when target is a string or something (possible in deep copy)
+    if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
+      target = {};
+    }
+
+    // Extend jQuery itself if only one argument is passed
+    if ( i === length ) {
+      target = this;
+      i--;
+    }
+
+    for ( ; i < length; i++ ) {
+
+      // Only deal with non-null/undefined values
+      if ( ( options = arguments[ i ] ) != null ) {
+
+        // Extend the base object
+        for ( name in options ) {
+          src = target[ name ];
+          copy = options[ name ];
+
+          // Prevent never-ending loop
+          if ( target === copy ) {
+            continue;
+          }
+
+          // Recurse if we're merging plain objects or arrays
+          if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
+              ( copyIsArray = Array.isArray( copy ) ) ) ) {
+
+            if ( copyIsArray ) {
+              copyIsArray = false;
+              clone = src && Array.isArray( src ) ? src : [];
+
+            } else {
+              clone = src && jQuery.isPlainObject( src ) ? src : {};
+            }
+
+            // Never move original objects, clone them
+            target[ name ] = jQuery.extend( deep, clone, copy );
+
+            // Don't bring in undefined values
+          } else if ( copy !== undefined ) {
+            target[ name ] = copy;
+          }
+        }
+      }
+    }
+
+    // Return the modified object
+    return target;
+  };
+
+  jQuery.extend( {
+
+    // Unique for each copy of jQuery on the page
+    expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+    // Assume jQuery is ready without the ready module
+    isReady: true,
+
+    error: function( msg ) {
+      throw new Error( msg );
+    },
+
+    noop: function() {},
+
+    isFunction: function( obj ) {
+      return jQuery.type( obj ) === "function";
+    },
+
+    isWindow: function( obj ) {
+      return obj != null && obj === obj.window;
+    },
+
+    isNumeric: function( obj ) {
+
+      // As of jQuery 3.0, isNumeric is limited to
+      // strings and numbers (primitives or objects)
+      // that can be coerced to finite numbers (gh-2662)
+      var type = jQuery.type( obj );
+      return ( type === "number" || type === "string" ) &&
+
+        // parseFloat NaNs numeric-cast false positives ("")
+        // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+        // subtraction forces infinities to NaN
+        !isNaN( obj - parseFloat( obj ) );
+    },
+
+    isPlainObject: function( obj ) {
+      var proto, Ctor;
+
+      // Detect obvious negatives
+      // Use toString instead of jQuery.type to catch host objects
+      if ( !obj || toString.call( obj ) !== "[object Object]" ) {
+        return false;
+      }
+
+      proto = getProto( obj );
+
+      // Objects with no prototype (e.g., `Object.create( null )`) are plain
+      if ( !proto ) {
+        return true;
+      }
+
+      // Objects with prototype are plain iff they were constructed by a global Object function
+      Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
+      return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
+    },
+
+    isEmptyObject: function( obj ) {
+
+      /* eslint-disable no-unused-vars */
+      // See https://github.com/eslint/eslint/issues/6125
+      var name;
+
+      for ( name in obj ) {
+        return false;
+      }
+      return true;
+    },
+
+    type: function( obj ) {
+      if ( obj == null ) {
+        return obj + "";
+      }
+
+      // Support: Android <=2.3 only (functionish RegExp)
+      return typeof obj === "object" || typeof obj === "function" ?
+        class2type[ toString.call( obj ) ] || "object" :
+        typeof obj;
+    },
+
+    // Evaluates a script in a global context
+    globalEval: function( code ) {
+      DOMEval( code );
+    },
+
+    // Convert dashed to camelCase; used by the css and data modules
+    // Support: IE <=9 - 11, Edge 12 - 13
+    // Microsoft forgot to hump their vendor prefix (#9572)
+    camelCase: function( string ) {
+      return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+    },
+
+    each: function( obj, callback ) {
+      var length, i = 0;
+
+      if ( isArrayLike( obj ) ) {
+        length = obj.length;
+        for ( ; i < length; i++ ) {
+          if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+            break;
+          }
+        }
+      } else {
+        for ( i in obj ) {
+          if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+            break;
+          }
+        }
+      }
+
+      return obj;
+    },
+
+    // Support: Android <=4.0 only
+    trim: function( text ) {
+      return text == null ?
+        "" :
+        ( text + "" ).replace( rtrim, "" );
+    },
+
+    // results is for internal usage only
+    makeArray: function( arr, results ) {
+      var ret = results || [];
+
+      if ( arr != null ) {
+        if ( isArrayLike( Object( arr ) ) ) {
+          jQuery.merge( ret,
+            typeof arr === "string" ?
+              [ arr ] : arr
+          );
+        } else {
+          push.call( ret, arr );
+        }
+      }
+
+      return ret;
+    },
+
+    inArray: function( elem, arr, i ) {
+      return arr == null ? -1 : indexOf.call( arr, elem, i );
+    },
+
+    // Support: Android <=4.0 only, PhantomJS 1 only
+    // push.apply(_, arraylike) throws on ancient WebKit
+    merge: function( first, second ) {
+      var len = +second.length,
+        j = 0,
+        i = first.length;
+
+      for ( ; j < len; j++ ) {
+        first[ i++ ] = second[ j ];
+      }
+
+      first.length = i;
+
+      return first;
+    },
+
+    grep: function( elems, callback, invert ) {
+      var callbackInverse,
+        matches = [],
+        i = 0,
+        length = elems.length,
+        callbackExpect = !invert;
+
+      // Go through the array, only saving the items
+      // that pass the validator function
+      for ( ; i < length; i++ ) {
+        callbackInverse = !callback( elems[ i ], i );
+        if ( callbackInverse !== callbackExpect ) {
+          matches.push( elems[ i ] );
+        }
+      }
+
+      return matches;
+    },
+
+    // arg is for internal usage only
+    map: function( elems, callback, arg ) {
+      var length, value,
+        i = 0,
+        ret = [];
+
+      // Go through the array, translating each of the items to their new values
+      if ( isArrayLike( elems ) ) {
+        length = elems.length;
+        for ( ; i < length; i++ ) {
+          value = callback( elems[ i ], i, arg );
+
+          if ( value != null ) {
+            ret.push( value );
+          }
+        }
+
+        // Go through every key on the object,
+      } else {
+        for ( i in elems ) {
+          value = callback( elems[ i ], i, arg );
+
+          if ( value != null ) {
+            ret.push( value );
+          }
+        }
+      }
+
+      // Flatten any nested arrays
+      return concat.apply( [], ret );
+    },
+
+    // A global GUID counter for objects
+    guid: 1,
+
+    // Bind a function to a context, optionally partially applying any
+    // arguments.
+    proxy: function( fn, context ) {
+      var tmp, args, proxy;
+
+      if ( typeof context === "string" ) {
+        tmp = fn[ context ];
+        context = fn;
+        fn = tmp;
+      }
+
+      // Quick check to determine if target is callable, in the spec
+      // this throws a TypeError, but we will just return undefined.
+      if ( !jQuery.isFunction( fn ) ) {
+        return undefined;
+      }
+
+      // Simulated bind
+      args = slice.call( arguments, 2 );
+      proxy = function() {
+        return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+      };
+
+      // Set the guid of unique handler to the same of original handler, so it can be removed
+      proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+      return proxy;
+    },
+
+    now: Date.now,
+
+    // jQuery.support is not used in Core but other projects attach their
+    // properties to it so it needs to exist.
+    support: support
+  } );
+
+  if ( typeof Symbol === "function" ) {
+    jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
+  }
+
+// Populate the class2type map
+  jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+    function( i, name ) {
+      class2type[ "[object " + name + "]" ] = name.toLowerCase();
+    } );
+
+  function isArrayLike( obj ) {
+
+    // Support: real iOS 8.2 only (not reproducible in simulator)
+    // `in` check used to prevent JIT error (gh-2145)
+    // hasOwn isn't used here due to false negatives
+    // regarding Nodelist length in IE
+    var length = !!obj && "length" in obj && obj.length,
+      type = jQuery.type( obj );
+
+    if ( type === "function" || jQuery.isWindow( obj ) ) {
+      return false;
+    }
+
+    return type === "array" || length === 0 ||
+      typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+  }
+  var Sizzle =
+    /*!
+ * Sizzle CSS Selector Engine v2.3.3
+ * https://sizzlejs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2016-08-08
+ */
+    (function( window ) {
+
+      var i,
+        support,
+        Expr,
+        getText,
+        isXML,
+        tokenize,
+        compile,
+        select,
+        outermostContext,
+        sortInput,
+        hasDuplicate,
+
+        // Local document vars
+        setDocument,
+        document,
+        docElem,
+        documentIsHTML,
+        rbuggyQSA,
+        rbuggyMatches,
+        matches,
+        contains,
+
+        // Instance-specific data
+        expando = "sizzle" + 1 * new Date(),
+        preferredDoc = window.document,
+        dirruns = 0,
+        done = 0,
+        classCache = createCache(),
+        tokenCache = createCache(),
+        compilerCache = createCache(),
+        sortOrder = function( a, b ) {
+          if ( a === b ) {
+            hasDuplicate = true;
+          }
+          return 0;
+        },
+
+        // Instance methods
+        hasOwn = ({}).hasOwnProperty,
+        arr = [],
+        pop = arr.pop,
+        push_native = arr.push,
+        push = arr.push,
+        slice = arr.slice,
+        // Use a stripped-down indexOf as it's faster than native
+        // https://jsperf.com/thor-indexof-vs-for/5
+        indexOf = function( list, elem ) {
+          var i = 0,
+            len = list.length;
+          for ( ; i < len; i++ ) {
+            if ( list[i] === elem ) {
+              return i;
+            }
+          }
+          return -1;
+        },
+
+        booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+        // Regular expressions
+
+        // http://www.w3.org/TR/css3-selectors/#whitespace
+        whitespace = "[\\x20\\t\\r\\n\\f]",
+
+        // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+        identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+
+        // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+        attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+          // Operator (capture 2)
+          "*([*^$|!~]?=)" + whitespace +
+          // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+          "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+          "*\\]",
+
+        pseudos = ":(" + identifier + ")(?:\\((" +
+          // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+          // 1. quoted (capture 3; capture 4 or capture 5)
+          "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+          // 2. simple (capture 6)
+          "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+          // 3. anything else (capture 2)
+          ".*" +
+          ")\\)|)",
+
+        // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+        rwhitespace = new RegExp( whitespace + "+", "g" ),
+        rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+        rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+        rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+        rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+        rpseudo = new RegExp( pseudos ),
+        ridentifier = new RegExp( "^" + identifier + "$" ),
+
+        matchExpr = {
+          "ID": new RegExp( "^#(" + identifier + ")" ),
+          "CLASS": new RegExp( "^\\.(" + identifier + ")" ),
+          "TAG": new RegExp( "^(" + identifier + "|[*])" ),
+          "ATTR": new RegExp( "^" + attributes ),
+          "PSEUDO": new RegExp( "^" + pseudos ),
+          "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+            "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+            "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+          "bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+          // For use in libraries implementing .is()
+          // We use this for POS matching in `select`
+          "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+            whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+        },
+
+        rinputs = /^(?:input|select|textarea|button)$/i,
+        rheader = /^h\d$/i,
+
+        rnative = /^[^{]+\{\s*\[native \w/,
+
+        // Easily-parseable/retrievable ID or TAG or CLASS selectors
+        rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+        rsibling = /[+~]/,
+
+        // CSS escapes
+        // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+        runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+        funescape = function( _, escaped, escapedWhitespace ) {
+          var high = "0x" + escaped - 0x10000;
+          // NaN means non-codepoint
+          // Support: Firefox<24
+          // Workaround erroneous numeric interpretation of +"0x"
+          return high !== high || escapedWhitespace ?
+            escaped :
+            high < 0 ?
+              // BMP codepoint
+              String.fromCharCode( high + 0x10000 ) :
+              // Supplemental Plane codepoint (surrogate pair)
+              String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+        },
+
+        // CSS string/identifier serialization
+        // https://drafts.csswg.org/cssom/#common-serializing-idioms
+        rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
+        fcssescape = function( ch, asCodePoint ) {
+          if ( asCodePoint ) {
+
+            // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+            if ( ch === "\0" ) {
+              return "\uFFFD";
+            }
+
+            // Control characters and (dependent upon position) numbers get escaped as code points
+            return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+          }
+
+          // Other potentially-special ASCII characters get backslash-escaped
+          return "\\" + ch;
+        },
+
+        // Used for iframes
+        // See setDocument()
+        // Removing the function wrapper causes a "Permission Denied"
+        // error in IE
+        unloadHandler = function() {
+          setDocument();
+        },
+
+        disabledAncestor = addCombinator(
+          function( elem ) {
+            return elem.disabled === true && ("form" in elem || "label" in elem);
+          },
+          { dir: "parentNode", next: "legend" }
+        );
+
+// Optimize for push.apply( _, NodeList )
+      try {
+        push.apply(
+          (arr = slice.call( preferredDoc.childNodes )),
+          preferredDoc.childNodes
+        );
+        // Support: Android<4.0
+        // Detect silently failing push.apply
+        arr[ preferredDoc.childNodes.length ].nodeType;
+      } catch ( e ) {
+        push = { apply: arr.length ?
+
+          // Leverage slice if possible
+          function( target, els ) {
+            push_native.apply( target, slice.call(els) );
+          } :
+
+          // Support: IE<9
+          // Otherwise append directly
+          function( target, els ) {
+            var j = target.length,
+              i = 0;
+            // Can't trust NodeList.length
+            while ( (target[j++] = els[i++]) ) {}
+            target.length = j - 1;
+          }
+        };
+      }
+
+      function Sizzle( selector, context, results, seed ) {
+        var m, i, elem, nid, match, groups, newSelector,
+          newContext = context && context.ownerDocument,
+
+          // nodeType defaults to 9, since context defaults to document
+          nodeType = context ? context.nodeType : 9;
+
+        results = results || [];
+
+        // Return early from calls with invalid selector or context
+        if ( typeof selector !== "string" || !selector ||
+          nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
+          return results;
+        }
+
+        // Try to shortcut find operations (as opposed to filters) in HTML documents
+        if ( !seed ) {
+
+          if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+            setDocument( context );
+          }
+          context = context || document;
+
+          if ( documentIsHTML ) {
+
+            // If the selector is sufficiently simple, try using a "get*By*" DOM method
+            // (excepting DocumentFragment context, where the methods don't exist)
+            if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+
+              // ID selector
+              if ( (m = match[1]) ) {
+
+                // Document context
+                if ( nodeType === 9 ) {
+                  if ( (elem = context.getElementById( m )) ) {
+
+                    // Support: IE, Opera, Webkit
+                    // TODO: identify versions
+                    // getElementById can match elements by name instead of ID
+                    if ( elem.id === m ) {
+                      results.push( elem );
+                      return results;
+                    }
+                  } else {
+                    return results;
+                  }
+
+                  // Element context
+                } else {
+
+                  // Support: IE, Opera, Webkit
+                  // TODO: identify versions
+                  // getElementById can match elements by name instead of ID
+                  if ( newContext && (elem = newContext.getElementById( m )) &&
+                    contains( context, elem ) &&
+                    elem.id === m ) {
+
+                    results.push( elem );
+                    return results;
+                  }
+                }
+
+                // Type selector
+              } else if ( match[2] ) {
+                push.apply( results, context.getElementsByTagName( selector ) );
+                return results;
+
+                // Class selector
+              } else if ( (m = match[3]) && support.getElementsByClassName &&
+                context.getElementsByClassName ) {
+
+                push.apply( results, context.getElementsByClassName( m ) );
+                return results;
+              }
+            }
+
+            // Take advantage of querySelectorAll
+            if ( support.qsa &&
+              !compilerCache[ selector + " " ] &&
+              (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+
+              if ( nodeType !== 1 ) {
+                newContext = context;
+                newSelector = selector;
+
+                // qSA looks outside Element context, which is not what we want
+                // Thanks to Andrew Dupont for this workaround technique
+                // Support: IE <=8
+                // Exclude object elements
+              } else if ( context.nodeName.toLowerCase() !== "object" ) {
+
+                // Capture the context ID, setting it first if necessary
+                if ( (nid = context.getAttribute( "id" )) ) {
+                  nid = nid.replace( rcssescape, fcssescape );
+                } else {
+                  context.setAttribute( "id", (nid = expando) );
+                }
+
+                // Prefix every selector in the list
+                groups = tokenize( selector );
+                i = groups.length;
+                while ( i-- ) {
+                  groups[i] = "#" + nid + " " + toSelector( groups[i] );
+                }
+                newSelector = groups.join( "," );
+
+                // Expand context for sibling selectors
+                newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+                  context;
+              }
+
+              if ( newSelector ) {
+                try {
+                  push.apply( results,
+                    newContext.querySelectorAll( newSelector )
+                  );
+                  return results;
+                } catch ( qsaError ) {
+                } finally {
+                  if ( nid === expando ) {
+                    context.removeAttribute( "id" );
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        // All others
+        return select( selector.replace( rtrim, "$1" ), context, results, seed );
+      }
+
+      /**
+       * Create key-value caches of limited size
+       * @returns {function(string, object)} Returns the Object data after storing it on itself with
+       *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+       *	deleting the oldest entry
+       */
+      function createCache() {
+        var keys = [];
+
+        function cache( key, value ) {
+          // Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+          if ( keys.push( key + " " ) > Expr.cacheLength ) {
+            // Only keep the most recent entries
+            delete cache[ keys.shift() ];
+          }
+          return (cache[ key + " " ] = value);
+        }
+        return cache;
+      }
+
+      /**
+       * Mark a function for special use by Sizzle
+       * @param {Function} fn The function to mark
+       */
+      function markFunction( fn ) {
+        fn[ expando ] = true;
+        return fn;
+      }
+
+      /**
+       * Support testing using an element
+       * @param {Function} fn Passed the created element and returns a boolean result
+       */
+      function assert( fn ) {
+        var el = document.createElement("fieldset");
+
+        try {
+          return !!fn( el );
+        } catch (e) {
+          return false;
+        } finally {
+          // Remove from its parent by default
+          if ( el.parentNode ) {
+            el.parentNode.removeChild( el );
+          }
+          // release memory in IE
+          el = null;
+        }
+      }
+
+      /**
+       * Adds the same handler for all of the specified attrs
+       * @param {String} attrs Pipe-separated list of attributes
+       * @param {Function} handler The method that will be applied
+       */
+      function addHandle( attrs, handler ) {
+        var arr = attrs.split("|"),
+          i = arr.length;
+
+        while ( i-- ) {
+          Expr.attrHandle[ arr[i] ] = handler;
+        }
+      }
+
+      /**
+       * Checks document order of two siblings
+       * @param {Element} a
+       * @param {Element} b
+       * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+       */
+      function siblingCheck( a, b ) {
+        var cur = b && a,
+          diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+            a.sourceIndex - b.sourceIndex;
+
+        // Use IE sourceIndex if available on both nodes
+        if ( diff ) {
+          return diff;
+        }
+
+        // Check if b follows a
+        if ( cur ) {
+          while ( (cur = cur.nextSibling) ) {
+            if ( cur === b ) {
+              return -1;
+            }
+          }
+        }
+
+        return a ? 1 : -1;
+      }
+
+      /**
+       * Returns a function to use in pseudos for input types
+       * @param {String} type
+       */
+      function createInputPseudo( type ) {
+        return function( elem ) {
+          var name = elem.nodeName.toLowerCase();
+          return name === "input" && elem.type === type;
+        };
+      }
+
+      /**
+       * Returns a function to use in pseudos for buttons
+       * @param {String} type
+       */
+      function createButtonPseudo( type ) {
+        return function( elem ) {
+          var name = elem.nodeName.toLowerCase();
+          return (name === "input" || name === "button") && elem.type === type;
+        };
+      }
+
+      /**
+       * Returns a function to use in pseudos for :enabled/:disabled
+       * @param {Boolean} disabled true for :disabled; false for :enabled
+       */
+      function createDisabledPseudo( disabled ) {
+
+        // Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
+        return function( elem ) {
+
+          // Only certain elements can match :enabled or :disabled
+          // https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
+          // https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
+          if ( "form" in elem ) {
+
+            // Check for inherited disabledness on relevant non-disabled elements:
+            // * listed form-associated elements in a disabled fieldset
+            //   https://html.spec.whatwg.org/multipage/forms.html#category-listed
+            //   https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
+            // * option elements in a disabled optgroup
+            //   https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
+            // All such elements have a "form" property.
+            if ( elem.parentNode && elem.disabled === false ) {
+
+              // Option elements defer to a parent optgroup if present
+              if ( "label" in elem ) {
+                if ( "label" in elem.parentNode ) {
+                  return elem.parentNode.disabled === disabled;
+                } else {
+                  return elem.disabled === disabled;
+                }
+              }
+
+              // Support: IE 6 - 11
+              // Use the isDisabled shortcut property to check for disabled fieldset ancestors
+              return elem.isDisabled === disabled ||
+
+                // Where there is no isDisabled, check manually
+                /* jshint -W018 */
+                elem.isDisabled !== !disabled &&
+                disabledAncestor( elem ) === disabled;
+            }
+
+            return elem.disabled === disabled;
+
+            // Try to winnow out elements that can't be disabled before trusting the disabled property.
+            // Some victims get caught in our net (label, legend, menu, track), but it shouldn't
+            // even exist on them, let alone have a boolean value.
+          } else if ( "label" in elem ) {
+            return elem.disabled === disabled;
+          }
+
+          // Remaining elements are neither :enabled nor :disabled
+          return false;
+        };
+      }
+
+      /**
+       * Returns a function to use in pseudos for positionals
+       * @param {Function} fn
+       */
+      function createPositionalPseudo( fn ) {
+        return markFunction(function( argument ) {
+          argument = +argument;
+          return markFunction(function( seed, matches ) {
+            var j,
+              matchIndexes = fn( [], seed.length, argument ),
+              i = matchIndexes.length;
+
+            // Match elements found at the specified indexes
+            while ( i-- ) {
+              if ( seed[ (j = matchIndexes[i]) ] ) {
+                seed[j] = !(matches[j] = seed[j]);
+              }
+            }
+          });
+        });
+      }
+
+      /**
+       * Checks a node for validity as a Sizzle context
+       * @param {Element|Object=} context
+       * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+       */
+      function testContext( context ) {
+        return context && typeof context.getElementsByTagName !== "undefined" && context;
+      }
+
+// Expose support vars for convenience
+      support = Sizzle.support = {};
+
+      /**
+       * Detects XML nodes
+       * @param {Element|Object} elem An element or a document
+       * @returns {Boolean} True iff elem is a non-HTML XML node
+       */
+      isXML = Sizzle.isXML = function( elem ) {
+        // documentElement is verified for cases where it doesn't yet exist
+        // (such as loading iframes in IE - #4833)
+        var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+        return documentElement ? documentElement.nodeName !== "HTML" : false;
+      };
+
+      /**
+       * Sets document-related variables once based on the current document
+       * @param {Element|Object} [doc] An element or document object to use to set the document
+       * @returns {Object} Returns the current document
+       */
+      setDocument = Sizzle.setDocument = function( node ) {
+        var hasCompare, subWindow,
+          doc = node ? node.ownerDocument || node : preferredDoc;
+
+        // Return early if doc is invalid or already selected
+        if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+          return document;
+        }
+
+        // Update global variables
+        document = doc;
+        docElem = document.documentElement;
+        documentIsHTML = !isXML( document );
+
+        // Support: IE 9-11, Edge
+        // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
+        if ( preferredDoc !== document &&
+          (subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+
+          // Support: IE 11, Edge
+          if ( subWindow.addEventListener ) {
+            subWindow.addEventListener( "unload", unloadHandler, false );
+
+            // Support: IE 9 - 10 only
+          } else if ( subWindow.attachEvent ) {
+            subWindow.attachEvent( "onunload", unloadHandler );
+          }
+        }
+
+        /* Attributes
+	---------------------------------------------------------------------- */
+
+        // Support: IE<8
+        // Verify that getAttribute really returns attributes and not properties
+        // (excepting IE8 booleans)
+        support.attributes = assert(function( el ) {
+          el.className = "i";
+          return !el.getAttribute("className");
+        });
+
+        /* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+        // Check if getElementsByTagName("*") returns only elements
+        support.getElementsByTagName = assert(function( el ) {
+          el.appendChild( document.createComment("") );
+          return !el.getElementsByTagName("*").length;
+        });
+
+        // Support: IE<9
+        support.getElementsByClassName = rnative.test( document.getElementsByClassName );
+
+        // Support: IE<10
+        // Check if getElementById returns elements by name
+        // The broken getElementById methods don't pick up programmatically-set names,
+        // so use a roundabout getElementsByName test
+        support.getById = assert(function( el ) {
+          docElem.appendChild( el ).id = expando;
+          return !document.getElementsByName || !document.getElementsByName( expando ).length;
+        });
+
+        // ID filter and find
+        if ( support.getById ) {
+          Expr.filter["ID"] = function( id ) {
+            var attrId = id.replace( runescape, funescape );
+            return function( elem ) {
+              return elem.getAttribute("id") === attrId;
+            };
+          };
+          Expr.find["ID"] = function( id, context ) {
+            if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+              var elem = context.getElementById( id );
+              return elem ? [ elem ] : [];
+            }
+          };
+        } else {
+          Expr.filter["ID"] =  function( id ) {
+            var attrId = id.replace( runescape, funescape );
+            return function( elem ) {
+              var node = typeof elem.getAttributeNode !== "undefined" &&
+                elem.getAttributeNode("id");
+              return node && node.value === attrId;
+            };
+          };
+
+          // Support: IE 6 - 7 only
+          // getElementById is not reliable as a find shortcut
+          Expr.find["ID"] = function( id, context ) {
+            if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+              var node, i, elems,
+                elem = context.getElementById( id );
+
+              if ( elem ) {
+
+                // Verify the id attribute
+                node = elem.getAttributeNode("id");
+                if ( node && node.value === id ) {
+                  return [ elem ];
+                }
+
+                // Fall back on getElementsByName
+                elems = context.getElementsByName( id );
+                i = 0;
+                while ( (elem = elems[i++]) ) {
+                  node = elem.getAttributeNode("id");
+                  if ( node && node.value === id ) {
+                    return [ elem ];
+                  }
+                }
+              }
+
+              return [];
+            }
+          };
+        }
+
+        // Tag
+        Expr.find["TAG"] = support.getElementsByTagName ?
+          function( tag, context ) {
+            if ( typeof context.getElementsByTagName !== "undefined" ) {
+              return context.getElementsByTagName( tag );
+
+              // DocumentFragment nodes don't have gEBTN
+            } else if ( support.qsa ) {
+              return context.querySelectorAll( tag );
+            }
+          } :
+
+          function( tag, context ) {
+            var elem,
+              tmp = [],
+              i = 0,
+              // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
+              results = context.getElementsByTagName( tag );
+
+            // Filter out possible comments
+            if ( tag === "*" ) {
+              while ( (elem = results[i++]) ) {
+                if ( elem.nodeType === 1 ) {
+                  tmp.push( elem );
+                }
+              }
+
+              return tmp;
+            }
+            return results;
+          };
+
+        // Class
+        Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+          if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
+            return context.getElementsByClassName( className );
+          }
+        };
+
+        /* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+        // QSA and matchesSelector support
+
+        // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+        rbuggyMatches = [];
+
+        // qSa(:focus) reports false when true (Chrome 21)
+        // We allow this because of a bug in IE8/9 that throws an error
+        // whenever `document.activeElement` is accessed on an iframe
+        // So, we allow :focus to pass through QSA all the time to avoid the IE error
+        // See https://bugs.jquery.com/ticket/13378
+        rbuggyQSA = [];
+
+        if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+          // Build QSA regex
+          // Regex strategy adopted from Diego Perini
+          assert(function( el ) {
+            // Select is set to empty string on purpose
+            // This is to test IE's treatment of not explicitly
+            // setting a boolean content attribute,
+            // since its presence should be enough
+            // https://bugs.jquery.com/ticket/12359
+            docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
+              "<select id='" + expando + "-\r\\' msallowcapture=''>" +
+              "<option selected=''></option></select>";
+
+            // Support: IE8, Opera 11-12.16
+            // Nothing should be selected when empty strings follow ^= or $= or *=
+            // The test attribute must be unknown in Opera but "safe" for WinRT
+            // https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+            if ( el.querySelectorAll("[msallowcapture^='']").length ) {
+              rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+            }
+
+            // Support: IE8
+            // Boolean attributes and "value" are not treated correctly
+            if ( !el.querySelectorAll("[selected]").length ) {
+              rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+            }
+
+            // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
+            if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+              rbuggyQSA.push("~=");
+            }
+
+            // Webkit/Opera - :checked should return selected option elements
+            // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+            // IE8 throws error here and will not see later tests
+            if ( !el.querySelectorAll(":checked").length ) {
+              rbuggyQSA.push(":checked");
+            }
+
+            // Support: Safari 8+, iOS 8+
+            // https://bugs.webkit.org/show_bug.cgi?id=136851
+            // In-page `selector#id sibling-combinator selector` fails
+            if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
+              rbuggyQSA.push(".#.+[+~]");
+            }
+          });
+
+          assert(function( el ) {
+            el.innerHTML = "<a href='' disabled='disabled'></a>" +
+              "<select disabled='disabled'><option/></select>";
+
+            // Support: Windows 8 Native Apps
+            // The type and name attributes are restricted during .innerHTML assignment
+            var input = document.createElement("input");
+            input.setAttribute( "type", "hidden" );
+            el.appendChild( input ).setAttribute( "name", "D" );
+
+            // Support: IE8
+            // Enforce case-sensitivity of name attribute
+            if ( el.querySelectorAll("[name=d]").length ) {
+              rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+            }
+
+            // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+            // IE8 throws error here and will not see later tests
+            if ( el.querySelectorAll(":enabled").length !== 2 ) {
+              rbuggyQSA.push( ":enabled", ":disabled" );
+            }
+
+            // Support: IE9-11+
+            // IE's :disabled selector does not pick up the children of disabled fieldsets
+            docElem.appendChild( el ).disabled = true;
+            if ( el.querySelectorAll(":disabled").length !== 2 ) {
+              rbuggyQSA.push( ":enabled", ":disabled" );
+            }
+
+            // Opera 10-11 does not throw on post-comma invalid pseudos
+            el.querySelectorAll("*,:x");
+            rbuggyQSA.push(",.*:");
+          });
+        }
+
+        if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+            docElem.webkitMatchesSelector ||
+            docElem.mozMatchesSelector ||
+            docElem.oMatchesSelector ||
+            docElem.msMatchesSelector) )) ) {
+
+          assert(function( el ) {
+            // Check to see if it's possible to do matchesSelector
+            // on a disconnected node (IE 9)
+            support.disconnectedMatch = matches.call( el, "*" );
+
+            // This should fail with an exception
+            // Gecko does not error, returns false instead
+            matches.call( el, "[s!='']:x" );
+            rbuggyMatches.push( "!=", pseudos );
+          });
+        }
+
+        rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+        rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+        /* Contains
+	---------------------------------------------------------------------- */
+        hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+        // Element contains another
+        // Purposefully self-exclusive
+        // As in, an element does not contain itself
+        contains = hasCompare || rnative.test( docElem.contains ) ?
+          function( a, b ) {
+            var adown = a.nodeType === 9 ? a.documentElement : a,
+              bup = b && b.parentNode;
+            return a === bup || !!( bup && bup.nodeType === 1 && (
+              adown.contains ?
+                adown.contains( bup ) :
+                a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+            ));
+          } :
+          function( a, b ) {
+            if ( b ) {
+              while ( (b = b.parentNode) ) {
+                if ( b === a ) {
+                  return true;
+                }
+              }
+            }
+            return false;
+          };
+
+        /* Sorting
+	---------------------------------------------------------------------- */
+
+        // Document order sorting
+        sortOrder = hasCompare ?
+          function( a, b ) {
+
+            // Flag for duplicate removal
+            if ( a === b ) {
+              hasDuplicate = true;
+              return 0;
+            }
+
+            // Sort on method existence if only one input has compareDocumentPosition
+            var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+            if ( compare ) {
+              return compare;
+            }
+
+            // Calculate position if both inputs belong to the same document
+            compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+              a.compareDocumentPosition( b ) :
+
+              // Otherwise we know they are disconnected
+              1;
+
+            // Disconnected nodes
+            if ( compare & 1 ||
+              (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+              // Choose the first element that is related to our preferred document
+              if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+                return -1;
+              }
+              if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+                return 1;
+              }
+
+              // Maintain original order
+              return sortInput ?
+                ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+                0;
+            }
+
+            return compare & 4 ? -1 : 1;
+          } :
+          function( a, b ) {
+            // Exit early if the nodes are identical
+            if ( a === b ) {
+              hasDuplicate = true;
+              return 0;
+            }
+
+            var cur,
+              i = 0,
+              aup = a.parentNode,
+              bup = b.parentNode,
+              ap = [ a ],
+              bp = [ b ];
+
+            // Parentless nodes are either documents or disconnected
+            if ( !aup || !bup ) {
+              return a === document ? -1 :
+                b === document ? 1 :
+                  aup ? -1 :
+                    bup ? 1 :
+                      sortInput ?
+                        ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+                        0;
+
+              // If the nodes are siblings, we can do a quick check
+            } else if ( aup === bup ) {
+              return siblingCheck( a, b );
+            }
+
+            // Otherwise we need full lists of their ancestors for comparison
+            cur = a;
+            while ( (cur = cur.parentNode) ) {
+              ap.unshift( cur );
+            }
+            cur = b;
+            while ( (cur = cur.parentNode) ) {
+              bp.unshift( cur );
+            }
+
+            // Walk down the tree looking for a discrepancy
+            while ( ap[i] === bp[i] ) {
+              i++;
+            }
+
+            return i ?
+              // Do a sibling check if the nodes have a common ancestor
+              siblingCheck( ap[i], bp[i] ) :
+
+              // Otherwise nodes in our document sort first
+              ap[i] === preferredDoc ? -1 :
+                bp[i] === preferredDoc ? 1 :
+                  0;
+          };
+
+        return document;
+      };
+
+      Sizzle.matches = function( expr, elements ) {
+        return Sizzle( expr, null, null, elements );
+      };
+
+      Sizzle.matchesSelector = function( elem, expr ) {
+        // Set document vars if needed
+        if ( ( elem.ownerDocument || elem ) !== document ) {
+          setDocument( elem );
+        }
+
+        // Make sure that attribute selectors are quoted
+        expr = expr.replace( rattributeQuotes, "='$1']" );
+
+        if ( support.matchesSelector && documentIsHTML &&
+          !compilerCache[ expr + " " ] &&
+          ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+          ( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+          try {
+            var ret = matches.call( elem, expr );
+
+            // IE 9's matchesSelector returns false on disconnected nodes
+            if ( ret || support.disconnectedMatch ||
+              // As well, disconnected nodes are said to be in a document
+              // fragment in IE 9
+              elem.document && elem.document.nodeType !== 11 ) {
+              return ret;
+            }
+          } catch (e) {}
+        }
+
+        return Sizzle( expr, document, null, [ elem ] ).length > 0;
+      };
+
+      Sizzle.contains = function( context, elem ) {
+        // Set document vars if needed
+        if ( ( context.ownerDocument || context ) !== document ) {
+          setDocument( context );
+        }
+        return contains( context, elem );
+      };
+
+      Sizzle.attr = function( elem, name ) {
+        // Set document vars if needed
+        if ( ( elem.ownerDocument || elem ) !== document ) {
+          setDocument( elem );
+        }
+
+        var fn = Expr.attrHandle[ name.toLowerCase() ],
+          // Don't get fooled by Object.prototype properties (jQuery #13807)
+          val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+            fn( elem, name, !documentIsHTML ) :
+            undefined;
+
+        return val !== undefined ?
+          val :
+          support.attributes || !documentIsHTML ?
+            elem.getAttribute( name ) :
+            (val = elem.getAttributeNode(name)) && val.specified ?
+              val.value :
+              null;
+      };
+
+      Sizzle.escape = function( sel ) {
+        return (sel + "").replace( rcssescape, fcssescape );
+      };
+
+      Sizzle.error = function( msg ) {
+        throw new Error( "Syntax error, unrecognized expression: " + msg );
+      };
+
+      /**
+       * Document sorting and removing duplicates
+       * @param {ArrayLike} results
+       */
+      Sizzle.uniqueSort = function( results ) {
+        var elem,
+          duplicates = [],
+          j = 0,
+          i = 0;
+
+        // Unless we *know* we can detect duplicates, assume their presence
+        hasDuplicate = !support.detectDuplicates;
+        sortInput = !support.sortStable && results.slice( 0 );
+        results.sort( sortOrder );
+
+        if ( hasDuplicate ) {
+          while ( (elem = results[i++]) ) {
+            if ( elem === results[ i ] ) {
+              j = duplicates.push( i );
+            }
+          }
+          while ( j-- ) {
+            results.splice( duplicates[ j ], 1 );
+          }
+        }
+
+        // Clear input after sorting to release objects
+        // See https://github.com/jquery/sizzle/pull/225
+        sortInput = null;
+
+        return results;
+      };
+
+      /**
+       * Utility function for retrieving the text value of an array of DOM nodes
+       * @param {Array|Element} elem
+       */
+      getText = Sizzle.getText = function( elem ) {
+        var node,
+          ret = "",
+          i = 0,
+          nodeType = elem.nodeType;
+
+        if ( !nodeType ) {
+          // If no nodeType, this is expected to be an array
+          while ( (node = elem[i++]) ) {
+            // Do not traverse comment nodes
+            ret += getText( node );
+          }
+        } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+          // Use textContent for elements
+          // innerText usage removed for consistency of new lines (jQuery #11153)
+          if ( typeof elem.textContent === "string" ) {
+            return elem.textContent;
+          } else {
+            // Traverse its children
+            for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+              ret += getText( elem );
+            }
+          }
+        } else if ( nodeType === 3 || nodeType === 4 ) {
+          return elem.nodeValue;
+        }
+        // Do not include comment or processing instruction nodes
+
+        return ret;
+      };
+
+      Expr = Sizzle.selectors = {
+
+        // Can be adjusted by the user
+        cacheLength: 50,
+
+        createPseudo: markFunction,
+
+        match: matchExpr,
+
+        attrHandle: {},
+
+        find: {},
+
+        relative: {
+          ">": { dir: "parentNode", first: true },
+          " ": { dir: "parentNode" },
+          "+": { dir: "previousSibling", first: true },
+          "~": { dir: "previousSibling" }
+        },
+
+        preFilter: {
+          "ATTR": function( match ) {
+            match[1] = match[1].replace( runescape, funescape );
+
+            // Move the given value to match[3] whether quoted or unquoted
+            match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+            if ( match[2] === "~=" ) {
+              match[3] = " " + match[3] + " ";
+            }
+
+            return match.slice( 0, 4 );
+          },
+
+          "CHILD": function( match ) {
+            /* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+            match[1] = match[1].toLowerCase();
+
+            if ( match[1].slice( 0, 3 ) === "nth" ) {
+              // nth-* requires argument
+              if ( !match[3] ) {
+                Sizzle.error( match[0] );
+              }
+
+              // numeric x and y parameters for Expr.filter.CHILD
+              // remember that false/true cast respectively to 0/1
+              match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+              match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+              // other types prohibit arguments
+            } else if ( match[3] ) {
+              Sizzle.error( match[0] );
+            }
+
+            return match;
+          },
+
+          "PSEUDO": function( match ) {
+            var excess,
+              unquoted = !match[6] && match[2];
+
+            if ( matchExpr["CHILD"].test( match[0] ) ) {
+              return null;
+            }
+
+            // Accept quoted arguments as-is
+            if ( match[3] ) {
+              match[2] = match[4] || match[5] || "";
+
+              // Strip excess characters from unquoted arguments
+            } else if ( unquoted && rpseudo.test( unquoted ) &&
+              // Get excess from tokenize (recursively)
+              (excess = tokenize( unquoted, true )) &&
+              // advance to the next closing parenthesis
+              (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+              // excess is a negative index
+              match[0] = match[0].slice( 0, excess );
+              match[2] = unquoted.slice( 0, excess );
+            }
+
+            // Return only captures needed by the pseudo filter method (type and argument)
+            return match.slice( 0, 3 );
+          }
+        },
+
+        filter: {
+
+          "TAG": function( nodeNameSelector ) {
+            var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+            return nodeNameSelector === "*" ?
+              function() { return true; } :
+              function( elem ) {
+                return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+              };
+          },
+
+          "CLASS": function( className ) {
+            var pattern = classCache[ className + " " ];
+
+            return pattern ||
+              (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+              classCache( className, function( elem ) {
+                return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
+              });
+          },
+
+          "ATTR": function( name, operator, check ) {
+            return function( elem ) {
+              var result = Sizzle.attr( elem, name );
+
+              if ( result == null ) {
+                return operator === "!=";
+              }
+              if ( !operator ) {
+                return true;
+              }
+
+              result += "";
+
+              return operator === "=" ? result === check :
+                operator === "!=" ? result !== check :
+                  operator === "^=" ? check && result.indexOf( check ) === 0 :
+                    operator === "*=" ? check && result.indexOf( check ) > -1 :
+                      operator === "$=" ? check && result.slice( -check.length ) === check :
+                        operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
+                          operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+                            false;
+            };
+          },
+
+          "CHILD": function( type, what, argument, first, last ) {
+            var simple = type.slice( 0, 3 ) !== "nth",
+              forward = type.slice( -4 ) !== "last",
+              ofType = what === "of-type";
+
+            return first === 1 && last === 0 ?
+
+              // Shortcut for :nth-*(n)
+              function( elem ) {
+                return !!elem.parentNode;
+              } :
+
+              function( elem, context, xml ) {
+                var cache, uniqueCache, outerCache, node, nodeIndex, start,
+                  dir = simple !== forward ? "nextSibling" : "previousSibling",
+                  parent = elem.parentNode,
+                  name = ofType && elem.nodeName.toLowerCase(),
+                  useCache = !xml && !ofType,
+                  diff = false;
+
+                if ( parent ) {
+
+                  // :(first|last|only)-(child|of-type)
+                  if ( simple ) {
+                    while ( dir ) {
+                      node = elem;
+                      while ( (node = node[ dir ]) ) {
+                        if ( ofType ?
+                            node.nodeName.toLowerCase() === name :
+                            node.nodeType === 1 ) {
+
+                          return false;
+                        }
+                      }
+                      // Reverse direction for :only-* (if we haven't yet done so)
+                      start = dir = type === "only" && !start && "nextSibling";
+                    }
+                    return true;
+                  }
+
+                  start = [ forward ? parent.firstChild : parent.lastChild ];
+
+                  // non-xml :nth-child(...) stores cache data on `parent`
+                  if ( forward && useCache ) {
+
+                    // Seek `elem` from a previously-cached index
+
+                    // ...in a gzip-friendly way
+                    node = parent;
+                    outerCache = node[ expando ] || (node[ expando ] = {});
+
+                    // Support: IE <9 only
+                    // Defend against cloned attroperties (jQuery gh-1709)
+                    uniqueCache = outerCache[ node.uniqueID ] ||
+                      (outerCache[ node.uniqueID ] = {});
+
+                    cache = uniqueCache[ type ] || [];
+                    nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+                    diff = nodeIndex && cache[ 2 ];
+                    node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+                    while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+                      // Fallback to seeking `elem` from the start
+                      (diff = nodeIndex = 0) || start.pop()) ) {
+
+                      // When found, cache indexes on `parent` and break
+                      if ( node.nodeType === 1 && ++diff && node === elem ) {
+                        uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
+                        break;
+                      }
+                    }
+
+                  } else {
+                    // Use previously-cached element index if available
+                    if ( useCache ) {
+                      // ...in a gzip-friendly way
+                      node = elem;
+                      outerCache = node[ expando ] || (node[ expando ] = {});
+
+                      // Support: IE <9 only
+                      // Defend against cloned attroperties (jQuery gh-1709)
+                      uniqueCache = outerCache[ node.uniqueID ] ||
+                        (outerCache[ node.uniqueID ] = {});
+
+                      cache = uniqueCache[ type ] || [];
+                      nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+                      diff = nodeIndex;
+                    }
+
+                    // xml :nth-child(...)
+                    // or :nth-last-child(...) or :nth(-last)?-of-type(...)
+                    if ( diff === false ) {
+                      // Use the same loop as above to seek `elem` from the start
+                      while ( (node = ++nodeIndex && node && node[ dir ] ||
+                        (diff = nodeIndex = 0) || start.pop()) ) {
+
+                        if ( ( ofType ?
+                            node.nodeName.toLowerCase() === name :
+                            node.nodeType === 1 ) &&
+                          ++diff ) {
+
+                          // Cache the index of each encountered element
+                          if ( useCache ) {
+                            outerCache = node[ expando ] || (node[ expando ] = {});
+
+                            // Support: IE <9 only
+                            // Defend against cloned attroperties (jQuery gh-1709)
+                            uniqueCache = outerCache[ node.uniqueID ] ||
+                              (outerCache[ node.uniqueID ] = {});
+
+                            uniqueCache[ type ] = [ dirruns, diff ];
+                          }
+
+                          if ( node === elem ) {
+                            break;
+                          }
+                        }
+                      }
+                    }
+                  }
+
+                  // Incorporate the offset, then check against cycle size
+                  diff -= last;
+                  return diff === first || ( diff % first === 0 && diff / first >= 0 );
+                }
+              };
+          },
+
+          "PSEUDO": function( pseudo, argument ) {
+            // pseudo-class names are case-insensitive
+            // http://www.w3.org/TR/selectors/#pseudo-classes
+            // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+            // Remember that setFilters inherits from pseudos
+            var args,
+              fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+                Sizzle.error( "unsupported pseudo: " + pseudo );
+
+            // The user may use createPseudo to indicate that
+            // arguments are needed to create the filter function
+            // just as Sizzle does
+            if ( fn[ expando ] ) {
+              return fn( argument );
+            }
+
+            // But maintain support for old signatures
+            if ( fn.length > 1 ) {
+              args = [ pseudo, pseudo, "", argument ];
+              return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+                markFunction(function( seed, matches ) {
+                  var idx,
+                    matched = fn( seed, argument ),
+                    i = matched.length;
+                  while ( i-- ) {
+                    idx = indexOf( seed, matched[i] );
+                    seed[ idx ] = !( matches[ idx ] = matched[i] );
+                  }
+                }) :
+                function( elem ) {
+                  return fn( elem, 0, args );
+                };
+            }
+
+            return fn;
+          }
+        },
+
+        pseudos: {
+          // Potentially complex pseudos
+          "not": markFunction(function( selector ) {
+            // Trim the selector passed to compile
+            // to avoid treating leading and trailing
+            // spaces as combinators
+            var input = [],
+              results = [],
+              matcher = compile( selector.replace( rtrim, "$1" ) );
+
+            return matcher[ expando ] ?
+              markFunction(function( seed, matches, context, xml ) {
+                var elem,
+                  unmatched = matcher( seed, null, xml, [] ),
+                  i = seed.length;
+
+                // Match elements unmatched by `matcher`
+                while ( i-- ) {
+                  if ( (elem = unmatched[i]) ) {
+                    seed[i] = !(matches[i] = elem);
+                  }
+                }
+              }) :
+              function( elem, context, xml ) {
+                input[0] = elem;
+                matcher( input, null, xml, results );
+                // Don't keep the element (issue #299)
+                input[0] = null;
+                return !results.pop();
+              };
+          }),
+
+          "has": markFunction(function( selector ) {
+            return function( elem ) {
+              return Sizzle( selector, elem ).length > 0;
+            };
+          }),
+
+          "contains": markFunction(function( text ) {
+            text = text.replace( runescape, funescape );
+            return function( elem ) {
+              return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+            };
+          }),
+
+          // "Whether an element is represented by a :lang() selector
+          // is based solely on the element's language value
+          // being equal to the identifier C,
+          // or beginning with the identifier C immediately followed by "-".
+          // The matching of C against the element's language value is performed case-insensitively.
+          // The identifier C does not have to be a valid language name."
+          // http://www.w3.org/TR/selectors/#lang-pseudo
+          "lang": markFunction( function( lang ) {
+            // lang value must be a valid identifier
+            if ( !ridentifier.test(lang || "") ) {
+              Sizzle.error( "unsupported lang: " + lang );
+            }
+            lang = lang.replace( runescape, funescape ).toLowerCase();
+            return function( elem ) {
+              var elemLang;
+              do {
+                if ( (elemLang = documentIsHTML ?
+                    elem.lang :
+                    elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+                  elemLang = elemLang.toLowerCase();
+                  return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+                }
+              } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+              return false;
+            };
+          }),
+
+          // Miscellaneous
+          "target": function( elem ) {
+            var hash = window.location && window.location.hash;
+            return hash && hash.slice( 1 ) === elem.id;
+          },
+
+          "root": function( elem ) {
+            return elem === docElem;
+          },
+
+          "focus": function( elem ) {
+            return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+          },
+
+          // Boolean properties
+          "enabled": createDisabledPseudo( false ),
+          "disabled": createDisabledPseudo( true ),
+
+          "checked": function( elem ) {
+            // In CSS3, :checked should return both checked and selected elements
+            // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+            var nodeName = elem.nodeName.toLowerCase();
+            return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+          },
+
+          "selected": function( elem ) {
+            // Accessing this property makes selected-by-default
+            // options in Safari work properly
+            if ( elem.parentNode ) {
+              elem.parentNode.selectedIndex;
+            }
+
+            return elem.selected === true;
+          },
+
+          // Contents
+          "empty": function( elem ) {
+            // http://www.w3.org/TR/selectors/#empty-pseudo
+            // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+            //   but not by others (comment: 8; processing instruction: 7; etc.)
+            // nodeType < 6 works because attributes (2) do not appear as children
+            for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+              if ( elem.nodeType < 6 ) {
+                return false;
+              }
+            }
+            return true;
+          },
+
+          "parent": function( elem ) {
+            return !Expr.pseudos["empty"]( elem );
+          },
+
+          // Element/input types
+          "header": function( elem ) {
+            return rheader.test( elem.nodeName );
+          },
+
+          "input": function( elem ) {
+            return rinputs.test( elem.nodeName );
+          },
+
+          "button": function( elem ) {
+            var name = elem.nodeName.toLowerCase();
+            return name === "input" && elem.type === "button" || name === "button";
+          },
+
+          "text": function( elem ) {
+            var attr;
+            return elem.nodeName.toLowerCase() === "input" &&
+              elem.type === "text" &&
+
+              // Support: IE<8
+              // New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+              ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+          },
+
+          // Position-in-collection
+          "first": createPositionalPseudo(function() {
+            return [ 0 ];
+          }),
+
+          "last": createPositionalPseudo(function( matchIndexes, length ) {
+            return [ length - 1 ];
+          }),
+
+          "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+            return [ argument < 0 ? argument + length : argument ];
+          }),
+
+          "even": createPositionalPseudo(function( matchIndexes, length ) {
+            var i = 0;
+            for ( ; i < length; i += 2 ) {
+              matchIndexes.push( i );
+            }
+            return matchIndexes;
+          }),
+
+          "odd": createPositionalPseudo(function( matchIndexes, length ) {
+            var i = 1;
+            for ( ; i < length; i += 2 ) {
+              matchIndexes.push( i );
+            }
+            return matchIndexes;
+          }),
+
+          "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+            var i = argument < 0 ? argument + length : argument;
+            for ( ; --i >= 0; ) {
+              matchIndexes.push( i );
+            }
+            return matchIndexes;
+          }),
+
+          "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+            var i = argument < 0 ? argument + length : argument;
+            for ( ; ++i < length; ) {
+              matchIndexes.push( i );
+            }
+            return matchIndexes;
+          })
+        }
+      };
+
+      Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+      for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+        Expr.pseudos[ i ] = createInputPseudo( i );
+      }
+      for ( i in { submit: true, reset: true } ) {
+        Expr.pseudos[ i ] = createButtonPseudo( i );
+      }
+
+// Easy API for creating new setFilters
+      function setFilters() {}
+      setFilters.prototype = Expr.filters = Expr.pseudos;
+      Expr.setFilters = new setFilters();
+
+      tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+        var matched, match, tokens, type,
+          soFar, groups, preFilters,
+          cached = tokenCache[ selector + " " ];
+
+        if ( cached ) {
+          return parseOnly ? 0 : cached.slice( 0 );
+        }
+
+        soFar = selector;
+        groups = [];
+        preFilters = Expr.preFilter;
+
+        while ( soFar ) {
+
+          // Comma and first run
+          if ( !matched || (match = rcomma.exec( soFar )) ) {
+            if ( match ) {
+              // Don't consume trailing commas as valid
+              soFar = soFar.slice( match[0].length ) || soFar;
+            }
+            groups.push( (tokens = []) );
+          }
+
+          matched = false;
+
+          // Combinators
+          if ( (match = rcombinators.exec( soFar )) ) {
+            matched = match.shift();
+            tokens.push({
+              value: matched,
+              // Cast descendant combinators to space
+              type: match[0].replace( rtrim, " " )
+            });
+            soFar = soFar.slice( matched.length );
+          }
+
+          // Filters
+          for ( type in Expr.filter ) {
+            if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+                (match = preFilters[ type ]( match ))) ) {
+              matched = match.shift();
+              tokens.push({
+                value: matched,
+                type: type,
+                matches: match
+              });
+              soFar = soFar.slice( matched.length );
+            }
+          }
+
+          if ( !matched ) {
+            break;
+          }
+        }
+
+        // Return the length of the invalid excess
+        // if we're just parsing
+        // Otherwise, throw an error or return tokens
+        return parseOnly ?
+          soFar.length :
+          soFar ?
+            Sizzle.error( selector ) :
+            // Cache the tokens
+            tokenCache( selector, groups ).slice( 0 );
+      };
+
+      function toSelector( tokens ) {
+        var i = 0,
+          len = tokens.length,
+          selector = "";
+        for ( ; i < len; i++ ) {
+          selector += tokens[i].value;
+        }
+        return selector;
+      }
+
+      function addCombinator( matcher, combinator, base ) {
+        var dir = combinator.dir,
+          skip = combinator.next,
+          key = skip || dir,
+          checkNonElements = base && key === "parentNode",
+          doneName = done++;
+
+        return combinator.first ?
+          // Check against closest ancestor/preceding element
+          function( elem, context, xml ) {
+            while ( (elem = elem[ dir ]) ) {
+              if ( elem.nodeType === 1 || checkNonElements ) {
+                return matcher( elem, context, xml );
+              }
+            }
+            return false;
+          } :
+
+          // Check against all ancestor/preceding elements
+          function( elem, context, xml ) {
+            var oldCache, uniqueCache, outerCache,
+              newCache = [ dirruns, doneName ];
+
+            // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
+            if ( xml ) {
+              while ( (elem = elem[ dir ]) ) {
+                if ( elem.nodeType === 1 || checkNonElements ) {
+                  if ( matcher( elem, context, xml ) ) {
+                    return true;
+                  }
+                }
+              }
+            } else {
+              while ( (elem = elem[ dir ]) ) {
+                if ( elem.nodeType === 1 || checkNonElements ) {
+                  outerCache = elem[ expando ] || (elem[ expando ] = {});
+
+                  // Support: IE <9 only
+                  // Defend against cloned attroperties (jQuery gh-1709)
+                  uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+
+                  if ( skip && skip === elem.nodeName.toLowerCase() ) {
+                    elem = elem[ dir ] || elem;
+                  } else if ( (oldCache = uniqueCache[ key ]) &&
+                    oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+                    // Assign to newCache so results back-propagate to previous elements
+                    return (newCache[ 2 ] = oldCache[ 2 ]);
+                  } else {
+                    // Reuse newcache so results back-propagate to previous elements
+                    uniqueCache[ key ] = newCache;
+
+                    // A match means we're done; a fail means we have to keep checking
+                    if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+                      return true;
+                    }
+                  }
+                }
+              }
+            }
+            return false;
+          };
+      }
+
+      function elementMatcher( matchers ) {
+        return matchers.length > 1 ?
+          function( elem, context, xml ) {
+            var i = matchers.length;
+            while ( i-- ) {
+              if ( !matchers[i]( elem, context, xml ) ) {
+                return false;
+              }
+            }
+            return true;
+          } :
+          matchers[0];
+      }
+
+      function multipleContexts( selector, contexts, results ) {
+        var i = 0,
+          len = contexts.length;
+        for ( ; i < len; i++ ) {
+          Sizzle( selector, contexts[i], results );
+        }
+        return results;
+      }
+
+      function condense( unmatched, map, filter, context, xml ) {
+        var elem,
+          newUnmatched = [],
+          i = 0,
+          len = unmatched.length,
+          mapped = map != null;
+
+        for ( ; i < len; i++ ) {
+          if ( (elem = unmatched[i]) ) {
+            if ( !filter || filter( elem, context, xml ) ) {
+              newUnmatched.push( elem );
+              if ( mapped ) {
+                map.push( i );
+              }
+            }
+          }
+        }
+
+        return newUnmatched;
+      }
+
+      function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+        if ( postFilter && !postFilter[ expando ] ) {
+          postFilter = setMatcher( postFilter );
+        }
+        if ( postFinder && !postFinder[ expando ] ) {
+          postFinder = setMatcher( postFinder, postSelector );
+        }
+        return markFunction(function( seed, results, context, xml ) {
+          var temp, i, elem,
+            preMap = [],
+            postMap = [],
+            preexisting = results.length,
+
+            // Get initial elements from seed or context
+            elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+            // Prefilter to get matcher input, preserving a map for seed-results synchronization
+            matcherIn = preFilter && ( seed || !selector ) ?
+              condense( elems, preMap, preFilter, context, xml ) :
+              elems,
+
+            matcherOut = matcher ?
+              // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+              postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+                // ...intermediate processing is necessary
+                [] :
+
+                // ...otherwise use results directly
+                results :
+              matcherIn;
+
+          // Find primary matches
+          if ( matcher ) {
+            matcher( matcherIn, matcherOut, context, xml );
+          }
+
+          // Apply postFilter
+          if ( postFilter ) {
+            temp = condense( matcherOut, postMap );
+            postFilter( temp, [], context, xml );
+
+            // Un-match failing elements by moving them back to matcherIn
+            i = temp.length;
+            while ( i-- ) {
+              if ( (elem = temp[i]) ) {
+                matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+              }
+            }
+          }
+
+          if ( seed ) {
+            if ( postFinder || preFilter ) {
+              if ( postFinder ) {
+                // Get the final matcherOut by condensing this intermediate into postFinder contexts
+                temp = [];
+                i = matcherOut.length;
+                while ( i-- ) {
+                  if ( (elem = matcherOut[i]) ) {
+                    // Restore matcherIn since elem is not yet a final match
+                    temp.push( (matcherIn[i] = elem) );
+                  }
+                }
+                postFinder( null, (matcherOut = []), temp, xml );
+              }
+
+              // Move matched elements from seed to results to keep them synchronized
+              i = matcherOut.length;
+              while ( i-- ) {
+                if ( (elem = matcherOut[i]) &&
+                  (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+
+                  seed[temp] = !(results[temp] = elem);
+                }
+              }
+            }
+
+            // Add elements to results, through postFinder if defined
+          } else {
+            matcherOut = condense(
+              matcherOut === results ?
+                matcherOut.splice( preexisting, matcherOut.length ) :
+                matcherOut
+            );
+            if ( postFinder ) {
+              postFinder( null, results, matcherOut, xml );
+            } else {
+              push.apply( results, matcherOut );
+            }
+          }
+        });
+      }
+
+      function matcherFromTokens( tokens ) {
+        var checkContext, matcher, j,
+          len = tokens.length,
+          leadingRelative = Expr.relative[ tokens[0].type ],
+          implicitRelative = leadingRelative || Expr.relative[" "],
+          i = leadingRelative ? 1 : 0,
+
+          // The foundational matcher ensures that elements are reachable from top-level context(s)
+          matchContext = addCombinator( function( elem ) {
+            return elem === checkContext;
+          }, implicitRelative, true ),
+          matchAnyContext = addCombinator( function( elem ) {
+            return indexOf( checkContext, elem ) > -1;
+          }, implicitRelative, true ),
+          matchers = [ function( elem, context, xml ) {
+            var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+              (checkContext = context).nodeType ?
+                matchContext( elem, context, xml ) :
+                matchAnyContext( elem, context, xml ) );
+            // Avoid hanging onto element (issue #299)
+            checkContext = null;
+            return ret;
+          } ];
+
+        for ( ; i < len; i++ ) {
+          if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+            matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+          } else {
+            matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+            // Return special upon seeing a positional matcher
+            if ( matcher[ expando ] ) {
+              // Find the next relative operator (if any) for proper handling
+              j = ++i;
+              for ( ; j < len; j++ ) {
+                if ( Expr.relative[ tokens[j].type ] ) {
+                  break;
+                }
+              }
+              return setMatcher(
+                i > 1 && elementMatcher( matchers ),
+                i > 1 && toSelector(
+                // If the preceding token was a descendant combinator, insert an implicit any-element `*`
+                tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+                ).replace( rtrim, "$1" ),
+                matcher,
+                i < j && matcherFromTokens( tokens.slice( i, j ) ),
+                j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+                j < len && toSelector( tokens )
+              );
+            }
+            matchers.push( matcher );
+          }
+        }
+
+        return elementMatcher( matchers );
+      }
+
+      function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+        var bySet = setMatchers.length > 0,
+          byElement = elementMatchers.length > 0,
+          superMatcher = function( seed, context, xml, results, outermost ) {
+            var elem, j, matcher,
+              matchedCount = 0,
+              i = "0",
+              unmatched = seed && [],
+              setMatched = [],
+              contextBackup = outermostContext,
+              // We must always have either seed elements or outermost context
+              elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+              // Use integer dirruns iff this is the outermost matcher
+              dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+              len = elems.length;
+
+            if ( outermost ) {
+              outermostContext = context === document || context || outermost;
+            }
+
+            // Add elements passing elementMatchers directly to results
+            // Support: IE<9, Safari
+            // Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+            for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+              if ( byElement && elem ) {
+                j = 0;
+                if ( !context && elem.ownerDocument !== document ) {
+                  setDocument( elem );
+                  xml = !documentIsHTML;
+                }
+                while ( (matcher = elementMatchers[j++]) ) {
+                  if ( matcher( elem, context || document, xml) ) {
+                    results.push( elem );
+                    break;
+                  }
+                }
+                if ( outermost ) {
+                  dirruns = dirrunsUnique;
+                }
+              }
+
+              // Track unmatched elements for set filters
+              if ( bySet ) {
+                // They will have gone through all possible matchers
+                if ( (elem = !matcher && elem) ) {
+                  matchedCount--;
+                }
+
+                // Lengthen the array for every element, matched or not
+                if ( seed ) {
+                  unmatched.push( elem );
+                }
+              }
+            }
+
+            // `i` is now the count of elements visited above, and adding it to `matchedCount`
+            // makes the latter nonnegative.
+            matchedCount += i;
+
+            // Apply set filters to unmatched elements
+            // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
+            // equals `i`), unless we didn't visit _any_ elements in the above loop because we have
+            // no element matchers and no seed.
+            // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
+            // case, which will result in a "00" `matchedCount` that differs from `i` but is also
+            // numerically zero.
+            if ( bySet && i !== matchedCount ) {
+              j = 0;
+              while ( (matcher = setMatchers[j++]) ) {
+                matcher( unmatched, setMatched, context, xml );
+              }
+
+              if ( seed ) {
+                // Reintegrate element matches to eliminate the need for sorting
+                if ( matchedCount > 0 ) {
+                  while ( i-- ) {
+                    if ( !(unmatched[i] || setMatched[i]) ) {
+                      setMatched[i] = pop.call( results );
+                    }
+                  }
+                }
+
+                // Discard index placeholder values to get only actual matches
+                setMatched = condense( setMatched );
+              }
+
+              // Add matches to results
+              push.apply( results, setMatched );
+
+              // Seedless set matches succeeding multiple successful matchers stipulate sorting
+              if ( outermost && !seed && setMatched.length > 0 &&
+                ( matchedCount + setMatchers.length ) > 1 ) {
+
+                Sizzle.uniqueSort( results );
+              }
+            }
+
+            // Override manipulation of globals by nested matchers
+            if ( outermost ) {
+              dirruns = dirrunsUnique;
+              outermostContext = contextBackup;
+            }
+
+            return unmatched;
+          };
+
+        return bySet ?
+          markFunction( superMatcher ) :
+          superMatcher;
+      }
+
+      compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+        var i,
+          setMatchers = [],
+          elementMatchers = [],
+          cached = compilerCache[ selector + " " ];
+
+        if ( !cached ) {
+          // Generate a function of recursive functions that can be used to check each element
+          if ( !match ) {
+            match = tokenize( selector );
+          }
+          i = match.length;
+          while ( i-- ) {
+            cached = matcherFromTokens( match[i] );
+            if ( cached[ expando ] ) {
+              setMatchers.push( cached );
+            } else {
+              elementMatchers.push( cached );
+            }
+          }
+
+          // Cache the compiled function
+          cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+          // Save selector and tokenization
+          cached.selector = selector;
+        }
+        return cached;
+      };
+
+      /**
+       * A low-level selection function that works with Sizzle's compiled
+       *  selector functions
+       * @param {String|Function} selector A selector or a pre-compiled
+       *  selector function built with Sizzle.compile
+       * @param {Element} context
+       * @param {Array} [results]
+       * @param {Array} [seed] A set of elements to match against
+       */
+      select = Sizzle.select = function( selector, context, results, seed ) {
+        var i, tokens, token, type, find,
+          compiled = typeof selector === "function" && selector,
+          match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+        results = results || [];
+
+        // Try to minimize operations if there is only one selector in the list and no seed
+        // (the latter of which guarantees us context)
+        if ( match.length === 1 ) {
+
+          // Reduce context if the leading compound selector is an ID
+          tokens = match[0] = match[0].slice( 0 );
+          if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+            context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
+
+            context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+            if ( !context ) {
+              return results;
+
+              // Precompiled matchers will still verify ancestry, so step up a level
+            } else if ( compiled ) {
+              context = context.parentNode;
+            }
+
+            selector = selector.slice( tokens.shift().value.length );
+          }
+
+          // Fetch a seed set for right-to-left matching
+          i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+          while ( i-- ) {
+            token = tokens[i];
+
+            // Abort if we hit a combinator
+            if ( Expr.relative[ (type = token.type) ] ) {
+              break;
+            }
+            if ( (find = Expr.find[ type ]) ) {
+              // Search, expanding context for leading sibling combinators
+              if ( (seed = find(
+                  token.matches[0].replace( runescape, funescape ),
+                  rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+                )) ) {
+
+                // If seed is empty or no tokens remain, we can return early
+                tokens.splice( i, 1 );
+                selector = seed.length && toSelector( tokens );
+                if ( !selector ) {
+                  push.apply( results, seed );
+                  return results;
+                }
+
+                break;
+              }
+            }
+          }
+        }
+
+        // Compile and execute a filtering function if one is not provided
+        // Provide `match` to avoid retokenization if we modified the selector above
+        ( compiled || compile( selector, match ) )(
+          seed,
+          context,
+          !documentIsHTML,
+          results,
+          !context || rsibling.test( selector ) && testContext( context.parentNode ) || context
+        );
+        return results;
+      };
+
+// One-time assignments
+
+// Sort stability
+      support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome 14-35+
+// Always assume duplicates if they aren't passed to the comparison function
+      support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+      setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+      support.sortDetached = assert(function( el ) {
+        // Should return 1, but returns 4 (following)
+        return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
+      });
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+      if ( !assert(function( el ) {
+          el.innerHTML = "<a href='#'></a>";
+          return el.firstChild.getAttribute("href") === "#" ;
+        }) ) {
+        addHandle( "type|href|height|width", function( elem, name, isXML ) {
+          if ( !isXML ) {
+            return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+          }
+        });
+      }
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+      if ( !support.attributes || !assert(function( el ) {
+          el.innerHTML = "<input/>";
+          el.firstChild.setAttribute( "value", "" );
+          return el.firstChild.getAttribute( "value" ) === "";
+        }) ) {
+        addHandle( "value", function( elem, name, isXML ) {
+          if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+            return elem.defaultValue;
+          }
+        });
+      }
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+      if ( !assert(function( el ) {
+          return el.getAttribute("disabled") == null;
+        }) ) {
+        addHandle( booleans, function( elem, name, isXML ) {
+          var val;
+          if ( !isXML ) {
+            return elem[ name ] === true ? name.toLowerCase() :
+              (val = elem.getAttributeNode( name )) && val.specified ?
+                val.value :
+                null;
+          }
+        });
+      }
+
+      return Sizzle;
+
+    })( window );
+
+
+
+  jQuery.find = Sizzle;
+  jQuery.expr = Sizzle.selectors;
+
+// Deprecated
+  jQuery.expr[ ":" ] = jQuery.expr.pseudos;
+  jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
+  jQuery.text = Sizzle.getText;
+  jQuery.isXMLDoc = Sizzle.isXML;
+  jQuery.contains = Sizzle.contains;
+  jQuery.escapeSelector = Sizzle.escape;
+
+
+
+
+  var dir = function( elem, dir, until ) {
+    var matched = [],
+      truncate = until !== undefined;
+
+    while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
+      if ( elem.nodeType === 1 ) {
+        if ( truncate && jQuery( elem ).is( until ) ) {
+          break;
+        }
+        matched.push( elem );
+      }
+    }
+    return matched;
+  };
+
+
+  var siblings = function( n, elem ) {
+    var matched = [];
+
+    for ( ; n; n = n.nextSibling ) {
+      if ( n.nodeType === 1 && n !== elem ) {
+        matched.push( n );
+      }
+    }
+
+    return matched;
+  };
+
+
+  var rneedsContext = jQuery.expr.match.needsContext;
+
+
+
+  function nodeName( elem, name ) {
+
+    return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+
+  };
+  var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
+
+
+
+  var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+  function winnow( elements, qualifier, not ) {
+    if ( jQuery.isFunction( qualifier ) ) {
+      return jQuery.grep( elements, function( elem, i ) {
+        return !!qualifier.call( elem, i, elem ) !== not;
+      } );
+    }
+
+    // Single element
+    if ( qualifier.nodeType ) {
+      return jQuery.grep( elements, function( elem ) {
+        return ( elem === qualifier ) !== not;
+      } );
+    }
+
+    // Arraylike of elements (jQuery, arguments, Array)
+    if ( typeof qualifier !== "string" ) {
+      return jQuery.grep( elements, function( elem ) {
+        return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
+      } );
+    }
+
+    // Simple selector that can be filtered directly, removing non-Elements
+    if ( risSimple.test( qualifier ) ) {
+      return jQuery.filter( qualifier, elements, not );
+    }
+
+    // Complex selector, compare the two sets, removing non-Elements
+    qualifier = jQuery.filter( qualifier, elements );
+    return jQuery.grep( elements, function( elem ) {
+      return ( indexOf.call( qualifier, elem ) > -1 ) !== not && elem.nodeType === 1;
+    } );
+  }
+
+  jQuery.filter = function( expr, elems, not ) {
+    var elem = elems[ 0 ];
+
+    if ( not ) {
+      expr = ":not(" + expr + ")";
+    }
+
+    if ( elems.length === 1 && elem.nodeType === 1 ) {
+      return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
+    }
+
+    return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+      return elem.nodeType === 1;
+    } ) );
+  };
+
+  jQuery.fn.extend( {
+    find: function( selector ) {
+      var i, ret,
+        len = this.length,
+        self = this;
+
+      if ( typeof selector !== "string" ) {
+        return this.pushStack( jQuery( selector ).filter( function() {
+          for ( i = 0; i < len; i++ ) {
+            if ( jQuery.contains( self[ i ], this ) ) {
+              return true;
+            }
+          }
+        } ) );
+      }
+
+      ret = this.pushStack( [] );
+
+      for ( i = 0; i < len; i++ ) {
+        jQuery.find( selector, self[ i ], ret );
+      }
+
+      return len > 1 ? jQuery.uniqueSort( ret ) : ret;
+    },
+    filter: function( selector ) {
+      return this.pushStack( winnow( this, selector || [], false ) );
+    },
+    not: function( selector ) {
+      return this.pushStack( winnow( this, selector || [], true ) );
+    },
+    is: function( selector ) {
+      return !!winnow(
+        this,
+
+        // If this is a positional/relative selector, check membership in the returned set
+        // so $("p:first").is("p:last") won't return true for a doc with two "p".
+        typeof selector === "string" && rneedsContext.test( selector ) ?
+          jQuery( selector ) :
+          selector || [],
+        false
+      ).length;
+    }
+  } );
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+  var rootjQuery,
+
+    // A simple way to check for HTML strings
+    // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+    // Strict HTML recognition (#11290: must start with <)
+    // Shortcut simple #id case for speed
+    rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
+
+    init = jQuery.fn.init = function( selector, context, root ) {
+      var match, elem;
+
+      // HANDLE: $(""), $(null), $(undefined), $(false)
+      if ( !selector ) {
+        return this;
+      }
+
+      // Method init() accepts an alternate rootjQuery
+      // so migrate can support jQuery.sub (gh-2101)
+      root = root || rootjQuery;
+
+      // Handle HTML strings
+      if ( typeof selector === "string" ) {
+        if ( selector[ 0 ] === "<" &&
+          selector[ selector.length - 1 ] === ">" &&
+          selector.length >= 3 ) {
+
+          // Assume that strings that start and end with <> are HTML and skip the regex check
+          match = [ null, selector, null ];
+
+        } else {
+          match = rquickExpr.exec( selector );
+        }
+
+        // Match html or make sure no context is specified for #id
+        if ( match && ( match[ 1 ] || !context ) ) {
+
+          // HANDLE: $(html) -> $(array)
+          if ( match[ 1 ] ) {
+            context = context instanceof jQuery ? context[ 0 ] : context;
+
+            // Option to run scripts is true for back-compat
+            // Intentionally let the error be thrown if parseHTML is not present
+            jQuery.merge( this, jQuery.parseHTML(
+              match[ 1 ],
+              context && context.nodeType ? context.ownerDocument || context : document,
+              true
+            ) );
+
+            // HANDLE: $(html, props)
+            if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
+              for ( match in context ) {
+
+                // Properties of context are called as methods if possible
+                if ( jQuery.isFunction( this[ match ] ) ) {
+                  this[ match ]( context[ match ] );
+
+                  // ...and otherwise set as attributes
+                } else {
+                  this.attr( match, context[ match ] );
+                }
+              }
+            }
+
+            return this;
+
+            // HANDLE: $(#id)
+          } else {
+            elem = document.getElementById( match[ 2 ] );
+
+            if ( elem ) {
+
+              // Inject the element directly into the jQuery object
+              this[ 0 ] = elem;
+              this.length = 1;
+            }
+            return this;
+          }
+
+          // HANDLE: $(expr, $(...))
+        } else if ( !context || context.jquery ) {
+          return ( context || root ).find( selector );
+
+          // HANDLE: $(expr, context)
+          // (which is just equivalent to: $(context).find(expr)
+        } else {
+          return this.constructor( context ).find( selector );
+        }
+
+        // HANDLE: $(DOMElement)
+      } else if ( selector.nodeType ) {
+        this[ 0 ] = selector;
+        this.length = 1;
+        return this;
+
+        // HANDLE: $(function)
+        // Shortcut for document ready
+      } else if ( jQuery.isFunction( selector ) ) {
+        return root.ready !== undefined ?
+          root.ready( selector ) :
+
+          // Execute immediately if ready is not present
+          selector( jQuery );
+      }
+
+      return jQuery.makeArray( selector, this );
+    };
+
+// Give the init function the jQuery prototype for later instantiation
+  init.prototype = jQuery.fn;
+
+// Initialize central reference
+  rootjQuery = jQuery( document );
+
+
+  var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+
+    // Methods guaranteed to produce a unique set when starting from a unique set
+    guaranteedUnique = {
+      children: true,
+      contents: true,
+      next: true,
+      prev: true
+    };
+
+  jQuery.fn.extend( {
+    has: function( target ) {
+      var targets = jQuery( target, this ),
+        l = targets.length;
+
+      return this.filter( function() {
+        var i = 0;
+        for ( ; i < l; i++ ) {
+          if ( jQuery.contains( this, targets[ i ] ) ) {
+            return true;
+          }
+        }
+      } );
+    },
+
+    closest: function( selectors, context ) {
+      var cur,
+        i = 0,
+        l = this.length,
+        matched = [],
+        targets = typeof selectors !== "string" && jQuery( selectors );
+
+      // Positional selectors never match, since there's no _selection_ context
+      if ( !rneedsContext.test( selectors ) ) {
+        for ( ; i < l; i++ ) {
+          for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+
+            // Always skip document fragments
+            if ( cur.nodeType < 11 && ( targets ?
+                targets.index( cur ) > -1 :
+
+                // Don't pass non-elements to Sizzle
+                cur.nodeType === 1 &&
+                jQuery.find.matchesSelector( cur, selectors ) ) ) {
+
+              matched.push( cur );
+              break;
+            }
+          }
+        }
+      }
+
+      return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
+    },
+
+    // Determine the position of an element within the set
+    index: function( elem ) {
+
+      // No argument, return index in parent
+      if ( !elem ) {
+        return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+      }
+
+      // Index in selector
+      if ( typeof elem === "string" ) {
+        return indexOf.call( jQuery( elem ), this[ 0 ] );
+      }
+
+      // Locate the position of the desired element
+      return indexOf.call( this,
+
+        // If it receives a jQuery object, the first element is used
+        elem.jquery ? elem[ 0 ] : elem
+      );
+    },
+
+    add: function( selector, context ) {
+      return this.pushStack(
+        jQuery.uniqueSort(
+          jQuery.merge( this.get(), jQuery( selector, context ) )
+        )
+      );
+    },
+
+    addBack: function( selector ) {
+      return this.add( selector == null ?
+        this.prevObject : this.prevObject.filter( selector )
+      );
+    }
+  } );
+
+  function sibling( cur, dir ) {
+    while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
+    return cur;
+  }
+
+  jQuery.each( {
+    parent: function( elem ) {
+      var parent = elem.parentNode;
+      return parent && parent.nodeType !== 11 ? parent : null;
+    },
+    parents: function( elem ) {
+      return dir( elem, "parentNode" );
+    },
+    parentsUntil: function( elem, i, until ) {
+      return dir( elem, "parentNode", until );
+    },
+    next: function( elem ) {
+      return sibling( elem, "nextSibling" );
+    },
+    prev: function( elem ) {
+      return sibling( elem, "previousSibling" );
+    },
+    nextAll: function( elem ) {
+      return dir( elem, "nextSibling" );
+    },
+    prevAll: function( elem ) {
+      return dir( elem, "previousSibling" );
+    },
+    nextUntil: function( elem, i, until ) {
+      return dir( elem, "nextSibling", until );
+    },
+    prevUntil: function( elem, i, until ) {
+      return dir( elem, "previousSibling", until );
+    },
+    siblings: function( elem ) {
+      return siblings( ( elem.parentNode || {} ).firstChild, elem );
+    },
+    children: function( elem ) {
+      return siblings( elem.firstChild );
+    },
+    contents: function( elem ) {
+      if ( nodeName( elem, "iframe" ) ) {
+        return elem.contentDocument;
+      }
+
+      // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
+      // Treat the template element as a regular one in browsers that
+      // don't support it.
+      if ( nodeName( elem, "template" ) ) {
+        elem = elem.content || elem;
+      }
+
+      return jQuery.merge( [], elem.childNodes );
+    }
+  }, function( name, fn ) {
+    jQuery.fn[ name ] = function( until, selector ) {
+      var matched = jQuery.map( this, fn, until );
+
+      if ( name.slice( -5 ) !== "Until" ) {
+        selector = until;
+      }
+
+      if ( selector && typeof selector === "string" ) {
+        matched = jQuery.filter( selector, matched );
+      }
+
+      if ( this.length > 1 ) {
+
+        // Remove duplicates
+        if ( !guaranteedUnique[ name ] ) {
+          jQuery.uniqueSort( matched );
+        }
+
+        // Reverse order for parents* and prev-derivatives
+        if ( rparentsprev.test( name ) ) {
+          matched.reverse();
+        }
+      }
+
+      return this.pushStack( matched );
+    };
+  } );
+  var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
+
+
+
+// Convert String-formatted options into Object-formatted ones
+  function createOptions( options ) {
+    var object = {};
+    jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
+      object[ flag ] = true;
+    } );
+    return object;
+  }
+
+  /*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+  jQuery.Callbacks = function( options ) {
+
+    // Convert options from String-formatted to Object-formatted if needed
+    // (we check in cache first)
+    options = typeof options === "string" ?
+      createOptions( options ) :
+      jQuery.extend( {}, options );
+
+    var // Flag to know if list is currently firing
+      firing,
+
+      // Last fire value for non-forgettable lists
+      memory,
+
+      // Flag to know if list was already fired
+      fired,
+
+      // Flag to prevent firing
+      locked,
+
+      // Actual callback list
+      list = [],
+
+      // Queue of execution data for repeatable lists
+      queue = [],
+
+      // Index of currently firing callback (modified by add/remove as needed)
+      firingIndex = -1,
+
+      // Fire callbacks
+      fire = function() {
+
+        // Enforce single-firing
+        locked = locked || options.once;
+
+        // Execute callbacks for all pending executions,
+        // respecting firingIndex overrides and runtime changes
+        fired = firing = true;
+        for ( ; queue.length; firingIndex = -1 ) {
+          memory = queue.shift();
+          while ( ++firingIndex < list.length ) {
+
+            // Run callback and check for early termination
+            if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
+              options.stopOnFalse ) {
+
+              // Jump to end and forget the data so .add doesn't re-fire
+              firingIndex = list.length;
+              memory = false;
+            }
+          }
+        }
+
+        // Forget the data if we're done with it
+        if ( !options.memory ) {
+          memory = false;
+        }
+
+        firing = false;
+
+        // Clean up if we're done firing for good
+        if ( locked ) {
+
+          // Keep an empty list if we have data for future add calls
+          if ( memory ) {
+            list = [];
+
+            // Otherwise, this object is spent
+          } else {
+            list = "";
+          }
+        }
+      },
+
+      // Actual Callbacks object
+      self = {
+
+        // Add a callback or a collection of callbacks to the list
+        add: function() {
+          if ( list ) {
+
+            // If we have memory from a past run, we should fire after adding
+            if ( memory && !firing ) {
+              firingIndex = list.length - 1;
+              queue.push( memory );
+            }
+
+            ( function add( args ) {
+              jQuery.each( args, function( _, arg ) {
+                if ( jQuery.isFunction( arg ) ) {
+                  if ( !options.unique || !self.has( arg ) ) {
+                    list.push( arg );
+                  }
+                } else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
+
+                  // Inspect recursively
+                  add( arg );
+                }
+              } );
+            } )( arguments );
+
+            if ( memory && !firing ) {
+              fire();
+            }
+          }
+          return this;
+        },
+
+        // Remove a callback from the list
+        remove: function() {
+          jQuery.each( arguments, function( _, arg ) {
+            var index;
+            while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+              list.splice( index, 1 );
+
+              // Handle firing indexes
+              if ( index <= firingIndex ) {
+                firingIndex--;
+              }
+            }
+          } );
+          return this;
+        },
+
+        // Check if a given callback is in the list.
+        // If no argument is given, return whether or not list has callbacks attached.
+        has: function( fn ) {
+          return fn ?
+            jQuery.inArray( fn, list ) > -1 :
+            list.length > 0;
+        },
+
+        // Remove all callbacks from the list
+        empty: function() {
+          if ( list ) {
+            list = [];
+          }
+          return this;
+        },
+
+        // Disable .fire and .add
+        // Abort any current/pending executions
+        // Clear all callbacks and values
+        disable: function() {
+          locked = queue = [];
+          list = memory = "";
+          return this;
+        },
+        disabled: function() {
+          return !list;
+        },
+
+        // Disable .fire
+        // Also disable .add unless we have memory (since it would have no effect)
+        // Abort any pending executions
+        lock: function() {
+          locked = queue = [];
+          if ( !memory && !firing ) {
+            list = memory = "";
+          }
+          return this;
+        },
+        locked: function() {
+          return !!locked;
+        },
+
+        // Call all callbacks with the given context and arguments
+        fireWith: function( context, args ) {
+          if ( !locked ) {
+            args = args || [];
+            args = [ context, args.slice ? args.slice() : args ];
+            queue.push( args );
+            if ( !firing ) {
+              fire();
+            }
+          }
+          return this;
+        },
+
+        // Call all the callbacks with the given arguments
+        fire: function() {
+          self.fireWith( this, arguments );
+          return this;
+        },
+
+        // To know if the callbacks have already been called at least once
+        fired: function() {
+          return !!fired;
+        }
+      };
+
+    return self;
+  };
+
+
+  function Identity( v ) {
+    return v;
+  }
+  function Thrower( ex ) {
+    throw ex;
+  }
+
+  function adoptValue( value, resolve, reject, noValue ) {
+    var method;
+
+    try {
+
+      // Check for promise aspect first to privilege synchronous behavior
+      if ( value && jQuery.isFunction( ( method = value.promise ) ) ) {
+        method.call( value ).done( resolve ).fail( reject );
+
+        // Other thenables
+      } else if ( value && jQuery.isFunction( ( method = value.then ) ) ) {
+        method.call( value, resolve, reject );
+
+        // Other non-thenables
+      } else {
+
+        // Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer:
+        // * false: [ value ].slice( 0 ) => resolve( value )
+        // * true: [ value ].slice( 1 ) => resolve()
+        resolve.apply( undefined, [ value ].slice( noValue ) );
+      }
+
+      // For Promises/A+, convert exceptions into rejections
+      // Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
+      // Deferred#then to conditionally suppress rejection.
+    } catch ( value ) {
+
+      // Support: Android 4.0 only
+      // Strict mode functions invoked without .call/.apply get global-object context
+      reject.apply( undefined, [ value ] );
+    }
+  }
+
+  jQuery.extend( {
+
+    Deferred: function( func ) {
+      var tuples = [
+
+          // action, add listener, callbacks,
+          // ... .then handlers, argument index, [final state]
+          [ "notify", "progress", jQuery.Callbacks( "memory" ),
+            jQuery.Callbacks( "memory" ), 2 ],
+          [ "resolve", "done", jQuery.Callbacks( "once memory" ),
+            jQuery.Callbacks( "once memory" ), 0, "resolved" ],
+          [ "reject", "fail", jQuery.Callbacks( "once memory" ),
+            jQuery.Callbacks( "once memory" ), 1, "rejected" ]
+        ],
+        state = "pending",
+        promise = {
+          state: function() {
+            return state;
+          },
+          always: function() {
+            deferred.done( arguments ).fail( arguments );
+            return this;
+          },
+          "catch": function( fn ) {
+            return promise.then( null, fn );
+          },
+
+          // Keep pipe for back-compat
+          pipe: function( /* fnDone, fnFail, fnProgress */ ) {
+            var fns = arguments;
+
+            return jQuery.Deferred( function( newDefer ) {
+              jQuery.each( tuples, function( i, tuple ) {
+
+                // Map tuples (progress, done, fail) to arguments (done, fail, progress)
+                var fn = jQuery.isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
+
+                // deferred.progress(function() { bind to newDefer or newDefer.notify })
+                // deferred.done(function() { bind to newDefer or newDefer.resolve })
+                // deferred.fail(function() { bind to newDefer or newDefer.reject })
+                deferred[ tuple[ 1 ] ]( function() {
+                  var returned = fn && fn.apply( this, arguments );
+                  if ( returned && jQuery.isFunction( returned.promise ) ) {
+                    returned.promise()
+                      .progress( newDefer.notify )
+                      .done( newDefer.resolve )
+                      .fail( newDefer.reject );
+                  } else {
+                    newDefer[ tuple[ 0 ] + "With" ](
+                      this,
+                      fn ? [ returned ] : arguments
+                    );
+                  }
+                } );
+              } );
+              fns = null;
+            } ).promise();
+          },
+          then: function( onFulfilled, onRejected, onProgress ) {
+            var maxDepth = 0;
+            function resolve( depth, deferred, handler, special ) {
+              return function() {
+                var that = this,
+                  args = arguments,
+                  mightThrow = function() {
+                    var returned, then;
+
+                    // Support: Promises/A+ section 2.3.3.3.3
+                    // https://promisesaplus.com/#point-59
+                    // Ignore double-resolution attempts
+                    if ( depth < maxDepth ) {
+                      return;
+                    }
+
+                    returned = handler.apply( that, args );
+
+                    // Support: Promises/A+ section 2.3.1
+                    // https://promisesaplus.com/#point-48
+                    if ( returned === deferred.promise() ) {
+                      throw new TypeError( "Thenable self-resolution" );
+                    }
+
+                    // Support: Promises/A+ sections 2.3.3.1, 3.5
+                    // https://promisesaplus.com/#point-54
+                    // https://promisesaplus.com/#point-75
+                    // Retrieve `then` only once
+                    then = returned &&
+
+                      // Support: Promises/A+ section 2.3.4
+                      // https://promisesaplus.com/#point-64
+                      // Only check objects and functions for thenability
+                      ( typeof returned === "object" ||
+                        typeof returned === "function" ) &&
+                      returned.then;
+
+                    // Handle a returned thenable
+                    if ( jQuery.isFunction( then ) ) {
+
+                      // Special processors (notify) just wait for resolution
+                      if ( special ) {
+                        then.call(
+                          returned,
+                          resolve( maxDepth, deferred, Identity, special ),
+                          resolve( maxDepth, deferred, Thrower, special )
+                        );
+
+                        // Normal processors (resolve) also hook into progress
+                      } else {
+
+                        // ...and disregard older resolution values
+                        maxDepth++;
+
+                        then.call(
+                          returned,
+                          resolve( maxDepth, deferred, Identity, special ),
+                          resolve( maxDepth, deferred, Thrower, special ),
+                          resolve( maxDepth, deferred, Identity,
+                            deferred.notifyWith )
+                        );
+                      }
+
+                      // Handle all other returned values
+                    } else {
+
+                      // Only substitute handlers pass on context
+                      // and multiple values (non-spec behavior)
+                      if ( handler !== Identity ) {
+                        that = undefined;
+                        args = [ returned ];
+                      }
+
+                      // Process the value(s)
+                      // Default process is resolve
+                      ( special || deferred.resolveWith )( that, args );
+                    }
+                  },
+
+                  // Only normal processors (resolve) catch and reject exceptions
+                  process = special ?
+                    mightThrow :
+                    function() {
+                      try {
+                        mightThrow();
+                      } catch ( e ) {
+
+                        if ( jQuery.Deferred.exceptionHook ) {
+                          jQuery.Deferred.exceptionHook( e,
+                            process.stackTrace );
+                        }
+
+                        // Support: Promises/A+ section 2.3.3.3.4.1
+                        // https://promisesaplus.com/#point-61
+                        // Ignore post-resolution exceptions
+                        if ( depth + 1 >= maxDepth ) {
+
+                          // Only substitute handlers pass on context
+                          // and multiple values (non-spec behavior)
+                          if ( handler !== Thrower ) {
+                            that = undefined;
+                            args = [ e ];
+                          }
+
+                          deferred.rejectWith( that, args );
+                        }
+                      }
+                    };
+
+                // Support: Promises/A+ section 2.3.3.3.1
+                // https://promisesaplus.com/#point-57
+                // Re-resolve promises immediately to dodge false rejection from
+                // subsequent errors
+                if ( depth ) {
+                  process();
+                } else {
+
+                  // Call an optional hook to record the stack, in case of exception
+                  // since it's otherwise lost when execution goes async
+                  if ( jQuery.Deferred.getStackHook ) {
+                    process.stackTrace = jQuery.Deferred.getStackHook();
+                  }
+                  window.setTimeout( process );
+                }
+              };
+            }
+
+            return jQuery.Deferred( function( newDefer ) {
+
+              // progress_handlers.add( ... )
+              tuples[ 0 ][ 3 ].add(
+                resolve(
+                  0,
+                  newDefer,
+                  jQuery.isFunction( onProgress ) ?
+                    onProgress :
+                    Identity,
+                  newDefer.notifyWith
+                )
+              );
+
+              // fulfilled_handlers.add( ... )
+              tuples[ 1 ][ 3 ].add(
+                resolve(
+                  0,
+                  newDefer,
+                  jQuery.isFunction( onFulfilled ) ?
+                    onFulfilled :
+                    Identity
+                )
+              );
+
+              // rejected_handlers.add( ... )
+              tuples[ 2 ][ 3 ].add(
+                resolve(
+                  0,
+                  newDefer,
+                  jQuery.isFunction( onRejected ) ?
+                    onRejected :
+                    Thrower
+                )
+              );
+            } ).promise();
+          },
+
+          // Get a promise for this deferred
+          // If obj is provided, the promise aspect is added to the object
+          promise: function( obj ) {
+            return obj != null ? jQuery.extend( obj, promise ) : promise;
+          }
+        },
+        deferred = {};
+
+      // Add list-specific methods
+      jQuery.each( tuples, function( i, tuple ) {
+        var list = tuple[ 2 ],
+          stateString = tuple[ 5 ];
+
+        // promise.progress = list.add
+        // promise.done = list.add
+        // promise.fail = list.add
+        promise[ tuple[ 1 ] ] = list.add;
+
+        // Handle state
+        if ( stateString ) {
+          list.add(
+            function() {
+
+              // state = "resolved" (i.e., fulfilled)
+              // state = "rejected"
+              state = stateString;
+            },
+
+            // rejected_callbacks.disable
+            // fulfilled_callbacks.disable
+            tuples[ 3 - i ][ 2 ].disable,
+
+            // progress_callbacks.lock
+            tuples[ 0 ][ 2 ].lock
+          );
+        }
+
+        // progress_handlers.fire
+        // fulfilled_handlers.fire
+        // rejected_handlers.fire
+        list.add( tuple[ 3 ].fire );
+
+        // deferred.notify = function() { deferred.notifyWith(...) }
+        // deferred.resolve = function() { deferred.resolveWith(...) }
+        // deferred.reject = function() { deferred.rejectWith(...) }
+        deferred[ tuple[ 0 ] ] = function() {
+          deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
+          return this;
+        };
+
+        // deferred.notifyWith = list.fireWith
+        // deferred.resolveWith = list.fireWith
+        // deferred.rejectWith = list.fireWith
+        deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
+      } );
+
+      // Make the deferred a promise
+      promise.promise( deferred );
+
+      // Call given func if any
+      if ( func ) {
+        func.call( deferred, deferred );
+      }
+
+      // All done!
+      return deferred;
+    },
+
+    // Deferred helper
+    when: function( singleValue ) {
+      var
+
+        // count of uncompleted subordinates
+        remaining = arguments.length,
+
+        // count of unprocessed arguments
+        i = remaining,
+
+        // subordinate fulfillment data
+        resolveContexts = Array( i ),
+        resolveValues = slice.call( arguments ),
+
+        // the master Deferred
+        master = jQuery.Deferred(),
+
+        // subordinate callback factory
+        updateFunc = function( i ) {
+          return function( value ) {
+            resolveContexts[ i ] = this;
+            resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+            if ( !( --remaining ) ) {
+              master.resolveWith( resolveContexts, resolveValues );
+            }
+          };
+        };
+
+      // Single- and empty arguments are adopted like Promise.resolve
+      if ( remaining <= 1 ) {
+        adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+          !remaining );
+
+        // Use .then() to unwrap secondary thenables (cf. gh-3000)
+        if ( master.state() === "pending" ||
+          jQuery.isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
+
+          return master.then();
+        }
+      }
+
+      // Multiple arguments are aggregated like Promise.all array elements
+      while ( i-- ) {
+        adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
+      }
+
+      return master.promise();
+    }
+  } );
+
+
+// These usually indicate a programmer mistake during development,
+// warn about them ASAP rather than swallowing them by default.
+  var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
+
+  jQuery.Deferred.exceptionHook = function( error, stack ) {
+
+    // Support: IE 8 - 9 only
+    // Console exists when dev tools are open, which can happen at any time
+    if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
+      window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
+    }
+  };
+
+
+
+
+  jQuery.readyException = function( error ) {
+    window.setTimeout( function() {
+      throw error;
+    } );
+  };
+
+
+
+
+// The deferred used on DOM ready
+  var readyList = jQuery.Deferred();
+
+  jQuery.fn.ready = function( fn ) {
+
+    readyList
+      .then( fn )
+
+      // Wrap jQuery.readyException in a function so that the lookup
+      // happens at the time of error handling instead of callback
+      // registration.
+      .catch( function( error ) {
+        jQuery.readyException( error );
+      } );
+
+    return this;
+  };
+
+  jQuery.extend( {
+
+    // Is the DOM ready to be used? Set to true once it occurs.
+    isReady: false,
+
+    // A counter to track how many items to wait for before
+    // the ready event fires. See #6781
+    readyWait: 1,
+
+    // Handle when the DOM is ready
+    ready: function( wait ) {
+
+      // Abort if there are pending holds or we're already ready
+      if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+        return;
+      }
+
+      // Remember that the DOM is ready
+      jQuery.isReady = true;
+
+      // If a normal DOM Ready event fired, decrement, and wait if need be
+      if ( wait !== true && --jQuery.readyWait > 0 ) {
+        return;
+      }
+
+      // If there are functions bound, to execute
+      readyList.resolveWith( document, [ jQuery ] );
+    }
+  } );
+
+  jQuery.ready.then = readyList.then;
+
+// The ready event handler and self cleanup method
+  function completed() {
+    document.removeEventListener( "DOMContentLoaded", completed );
+    window.removeEventListener( "load", completed );
+    jQuery.ready();
+  }
+
+// Catch cases where $(document).ready() is called
+// after the browser event has already occurred.
+// Support: IE <=9 - 10 only
+// Older IE sometimes signals "interactive" too soon
+  if ( document.readyState === "complete" ||
+    ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+
+    // Handle it asynchronously to allow scripts the opportunity to delay ready
+    window.setTimeout( jQuery.ready );
+
+  } else {
+
+    // Use the handy event callback
+    document.addEventListener( "DOMContentLoaded", completed );
+
+    // A fallback to window.onload, that will always work
+    window.addEventListener( "load", completed );
+  }
+
+
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+  var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+    var i = 0,
+      len = elems.length,
+      bulk = key == null;
+
+    // Sets many values
+    if ( jQuery.type( key ) === "object" ) {
+      chainable = true;
+      for ( i in key ) {
+        access( elems, fn, i, key[ i ], true, emptyGet, raw );
+      }
+
+      // Sets one value
+    } else if ( value !== undefined ) {
+      chainable = true;
+
+      if ( !jQuery.isFunction( value ) ) {
+        raw = true;
+      }
+
+      if ( bulk ) {
+
+        // Bulk operations run against the entire set
+        if ( raw ) {
+          fn.call( elems, value );
+          fn = null;
+
+          // ...except when executing function values
+        } else {
+          bulk = fn;
+          fn = function( elem, key, value ) {
+            return bulk.call( jQuery( elem ), value );
+          };
+        }
+      }
+
+      if ( fn ) {
+        for ( ; i < len; i++ ) {
+          fn(
+            elems[ i ], key, raw ?
+              value :
+              value.call( elems[ i ], i, fn( elems[ i ], key ) )
+          );
+        }
+      }
+    }
+
+    if ( chainable ) {
+      return elems;
+    }
+
+    // Gets
+    if ( bulk ) {
+      return fn.call( elems );
+    }
+
+    return len ? fn( elems[ 0 ], key ) : emptyGet;
+  };
+  var acceptData = function( owner ) {
+
+    // Accepts only:
+    //  - Node
+    //    - Node.ELEMENT_NODE
+    //    - Node.DOCUMENT_NODE
+    //  - Object
+    //    - Any
+    return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
+  };
+
+
+
+
+  function Data() {
+    this.expando = jQuery.expando + Data.uid++;
+  }
+
+  Data.uid = 1;
+
+  Data.prototype = {
+
+    cache: function( owner ) {
+
+      // Check if the owner object already has a cache
+      var value = owner[ this.expando ];
+
+      // If not, create one
+      if ( !value ) {
+        value = {};
+
+        // We can accept data for non-element nodes in modern browsers,
+        // but we should not, see #8335.
+        // Always return an empty object.
+        if ( acceptData( owner ) ) {
+
+          // If it is a node unlikely to be stringify-ed or looped over
+          // use plain assignment
+          if ( owner.nodeType ) {
+            owner[ this.expando ] = value;
+
+            // Otherwise secure it in a non-enumerable property
+            // configurable must be true to allow the property to be
+            // deleted when data is removed
+          } else {
+            Object.defineProperty( owner, this.expando, {
+              value: value,
+              configurable: true
+            } );
+          }
+        }
+      }
+
+      return value;
+    },
+    set: function( owner, data, value ) {
+      var prop,
+        cache = this.cache( owner );
+
+      // Handle: [ owner, key, value ] args
+      // Always use camelCase key (gh-2257)
+      if ( typeof data === "string" ) {
+        cache[ jQuery.camelCase( data ) ] = value;
+
+        // Handle: [ owner, { properties } ] args
+      } else {
+
+        // Copy the properties one-by-one to the cache object
+        for ( prop in data ) {
+          cache[ jQuery.camelCase( prop ) ] = data[ prop ];
+        }
+      }
+      return cache;
+    },
+    get: function( owner, key ) {
+      return key === undefined ?
+        this.cache( owner ) :
+
+        // Always use camelCase key (gh-2257)
+        owner[ this.expando ] && owner[ this.expando ][ jQuery.camelCase( key ) ];
+    },
+    access: function( owner, key, value ) {
+
+      // In cases where either:
+      //
+      //   1. No key was specified
+      //   2. A string key was specified, but no value provided
+      //
+      // Take the "read" path and allow the get method to determine
+      // which value to return, respectively either:
+      //
+      //   1. The entire cache object
+      //   2. The data stored at the key
+      //
+      if ( key === undefined ||
+        ( ( key && typeof key === "string" ) && value === undefined ) ) {
+
+        return this.get( owner, key );
+      }
+
+      // When the key is not a string, or both a key and value
+      // are specified, set or extend (existing objects) with either:
+      //
+      //   1. An object of properties
+      //   2. A key and value
+      //
+      this.set( owner, key, value );
+
+      // Since the "set" path can have two possible entry points
+      // return the expected data based on which path was taken[*]
+      return value !== undefined ? value : key;
+    },
+    remove: function( owner, key ) {
+      var i,
+        cache = owner[ this.expando ];
+
+      if ( cache === undefined ) {
+        return;
+      }
+
+      if ( key !== undefined ) {
+
+        // Support array or space separated string of keys
+        if ( Array.isArray( key ) ) {
+
+          // If key is an array of keys...
+          // We always set camelCase keys, so remove that.
+          key = key.map( jQuery.camelCase );
+        } else {
+          key = jQuery.camelCase( key );
+
+          // If a key with the spaces exists, use it.
+          // Otherwise, create an array by matching non-whitespace
+          key = key in cache ?
+            [ key ] :
+            ( key.match( rnothtmlwhite ) || [] );
+        }
+
+        i = key.length;
+
+        while ( i-- ) {
+          delete cache[ key[ i ] ];
+        }
+      }
+
+      // Remove the expando if there's no more data
+      if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
+
+        // Support: Chrome <=35 - 45
+        // Webkit & Blink performance suffers when deleting properties
+        // from DOM nodes, so set to undefined instead
+        // https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
+        if ( owner.nodeType ) {
+          owner[ this.expando ] = undefined;
+        } else {
+          delete owner[ this.expando ];
+        }
+      }
+    },
+    hasData: function( owner ) {
+      var cache = owner[ this.expando ];
+      return cache !== undefined && !jQuery.isEmptyObject( cache );
+    }
+  };
+  var dataPriv = new Data();
+
+  var dataUser = new Data();
+
+
+
+//	Implementation Summary
+//
+//	1. Enforce API surface and semantic compatibility with 1.9.x branch
+//	2. Improve the module's maintainability by reducing the storage
+//		paths to a single mechanism.
+//	3. Use the same single mechanism to support "private" and "user" data.
+//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
+//	5. Avoid exposing implementation details on user objects (eg. expando properties)
+//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
+
+  var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+    rmultiDash = /[A-Z]/g;
+
+  function getData( data ) {
+    if ( data === "true" ) {
+      return true;
+    }
+
+    if ( data === "false" ) {
+      return false;
+    }
+
+    if ( data === "null" ) {
+      return null;
+    }
+
+    // Only convert to a number if it doesn't change the string
+    if ( data === +data + "" ) {
+      return +data;
+    }
+
+    if ( rbrace.test( data ) ) {
+      return JSON.parse( data );
+    }
+
+    return data;
+  }
+
+  function dataAttr( elem, key, data ) {
+    var name;
+
+    // If nothing was found internally, try to fetch any
+    // data from the HTML5 data-* attribute
+    if ( data === undefined && elem.nodeType === 1 ) {
+      name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
+      data = elem.getAttribute( name );
+
+      if ( typeof data === "string" ) {
+        try {
+          data = getData( data );
+        } catch ( e ) {}
+
+        // Make sure we set the data so it isn't changed later
+        dataUser.set( elem, key, data );
+      } else {
+        data = undefined;
+      }
+    }
+    return data;
+  }
+
+  jQuery.extend( {
+    hasData: function( elem ) {
+      return dataUser.hasData( elem ) || dataPriv.hasData( elem );
+    },
+
+    data: function( elem, name, data ) {
+      return dataUser.access( elem, name, data );
+    },
+
+    removeData: function( elem, name ) {
+      dataUser.remove( elem, name );
+    },
+
+    // TODO: Now that all calls to _data and _removeData have been replaced
+    // with direct calls to dataPriv methods, these can be deprecated.
+    _data: function( elem, name, data ) {
+      return dataPriv.access( elem, name, data );
+    },
+
+    _removeData: function( elem, name ) {
+      dataPriv.remove( elem, name );
+    }
+  } );
+
+  jQuery.fn.extend( {
+    data: function( key, value ) {
+      var i, name, data,
+        elem = this[ 0 ],
+        attrs = elem && elem.attributes;
+
+      // Gets all values
+      if ( key === undefined ) {
+        if ( this.length ) {
+          data = dataUser.get( elem );
+
+          if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
+            i = attrs.length;
+            while ( i-- ) {
+
+              // Support: IE 11 only
+              // The attrs elements can be null (#14894)
+              if ( attrs[ i ] ) {
+                name = attrs[ i ].name;
+                if ( name.indexOf( "data-" ) === 0 ) {
+                  name = jQuery.camelCase( name.slice( 5 ) );
+                  dataAttr( elem, name, data[ name ] );
+                }
+              }
+            }
+            dataPriv.set( elem, "hasDataAttrs", true );
+          }
+        }
+
+        return data;
+      }
+
+      // Sets multiple values
+      if ( typeof key === "object" ) {
+        return this.each( function() {
+          dataUser.set( this, key );
+        } );
+      }
+
+      return access( this, function( value ) {
+        var data;
+
+        // The calling jQuery object (element matches) is not empty
+        // (and therefore has an element appears at this[ 0 ]) and the
+        // `value` parameter was not undefined. An empty jQuery object
+        // will result in `undefined` for elem = this[ 0 ] which will
+        // throw an exception if an attempt to read a data cache is made.
+        if ( elem && value === undefined ) {
+
+          // Attempt to get data from the cache
+          // The key will always be camelCased in Data
+          data = dataUser.get( elem, key );
+          if ( data !== undefined ) {
+            return data;
+          }
+
+          // Attempt to "discover" the data in
+          // HTML5 custom data-* attrs
+          data = dataAttr( elem, key );
+          if ( data !== undefined ) {
+            return data;
+          }
+
+          // We tried really hard, but the data doesn't exist.
+          return;
+        }
+
+        // Set the data...
+        this.each( function() {
+
+          // We always store the camelCased key
+          dataUser.set( this, key, value );
+        } );
+      }, null, value, arguments.length > 1, null, true );
+    },
+
+    removeData: function( key ) {
+      return this.each( function() {
+        dataUser.remove( this, key );
+      } );
+    }
+  } );
+
+
+  jQuery.extend( {
+    queue: function( elem, type, data ) {
+      var queue;
+
+      if ( elem ) {
+        type = ( type || "fx" ) + "queue";
+        queue = dataPriv.get( elem, type );
+
+        // Speed up dequeue by getting out quickly if this is just a lookup
+        if ( data ) {
+          if ( !queue || Array.isArray( data ) ) {
+            queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
+          } else {
+            queue.push( data );
+          }
+        }
+        return queue || [];
+      }
+    },
+
+    dequeue: function( elem, type ) {
+      type = type || "fx";
+
+      var queue = jQuery.queue( elem, type ),
+        startLength = queue.length,
+        fn = queue.shift(),
+        hooks = jQuery._queueHooks( elem, type ),
+        next = function() {
+          jQuery.dequeue( elem, type );
+        };
+
+      // If the fx queue is dequeued, always remove the progress sentinel
+      if ( fn === "inprogress" ) {
+        fn = queue.shift();
+        startLength--;
+      }
+
+      if ( fn ) {
+
+        // Add a progress sentinel to prevent the fx queue from being
+        // automatically dequeued
+        if ( type === "fx" ) {
+          queue.unshift( "inprogress" );
+        }
+
+        // Clear up the last queue stop function
+        delete hooks.stop;
+        fn.call( elem, next, hooks );
+      }
+
+      if ( !startLength && hooks ) {
+        hooks.empty.fire();
+      }
+    },
+
+    // Not public - generate a queueHooks object, or return the current one
+    _queueHooks: function( elem, type ) {
+      var key = type + "queueHooks";
+      return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
+        empty: jQuery.Callbacks( "once memory" ).add( function() {
+          dataPriv.remove( elem, [ type + "queue", key ] );
+        } )
+      } );
+    }
+  } );
+
+  jQuery.fn.extend( {
+    queue: function( type, data ) {
+      var setter = 2;
+
+      if ( typeof type !== "string" ) {
+        data = type;
+        type = "fx";
+        setter--;
+      }
+
+      if ( arguments.length < setter ) {
+        return jQuery.queue( this[ 0 ], type );
+      }
+
+      return data === undefined ?
+        this :
+        this.each( function() {
+          var queue = jQuery.queue( this, type, data );
+
+          // Ensure a hooks for this queue
+          jQuery._queueHooks( this, type );
+
+          if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
+            jQuery.dequeue( this, type );
+          }
+        } );
+    },
+    dequeue: function( type ) {
+      return this.each( function() {
+        jQuery.dequeue( this, type );
+      } );
+    },
+    clearQueue: function( type ) {
+      return this.queue( type || "fx", [] );
+    },
+
+    // Get a promise resolved when queues of a certain type
+    // are emptied (fx is the type by default)
+    promise: function( type, obj ) {
+      var tmp,
+        count = 1,
+        defer = jQuery.Deferred(),
+        elements = this,
+        i = this.length,
+        resolve = function() {
+          if ( !( --count ) ) {
+            defer.resolveWith( elements, [ elements ] );
+          }
+        };
+
+      if ( typeof type !== "string" ) {
+        obj = type;
+        type = undefined;
+      }
+      type = type || "fx";
+
+      while ( i-- ) {
+        tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
+        if ( tmp && tmp.empty ) {
+          count++;
+          tmp.empty.add( resolve );
+        }
+      }
+      resolve();
+      return defer.promise( obj );
+    }
+  } );
+  var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
+
+  var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
+
+
+  var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+  var isHiddenWithinTree = function( elem, el ) {
+
+    // isHiddenWithinTree might be called from jQuery#filter function;
+    // in that case, element will be second argument
+    elem = el || elem;
+
+    // Inline style trumps all
+    return elem.style.display === "none" ||
+      elem.style.display === "" &&
+
+      // Otherwise, check computed style
+      // Support: Firefox <=43 - 45
+      // Disconnected elements can have computed display: none, so first confirm that elem is
+      // in the document.
+      jQuery.contains( elem.ownerDocument, elem ) &&
+
+      jQuery.css( elem, "display" ) === "none";
+  };
+
+  var swap = function( elem, options, callback, args ) {
+    var ret, name,
+      old = {};
+
+    // Remember the old values, and insert the new ones
+    for ( name in options ) {
+      old[ name ] = elem.style[ name ];
+      elem.style[ name ] = options[ name ];
+    }
+
+    ret = callback.apply( elem, args || [] );
+
+    // Revert the old values
+    for ( name in options ) {
+      elem.style[ name ] = old[ name ];
+    }
+
+    return ret;
+  };
+
+
+
+
+  function adjustCSS( elem, prop, valueParts, tween ) {
+    var adjusted,
+      scale = 1,
+      maxIterations = 20,
+      currentValue = tween ?
+        function() {
+          return tween.cur();
+        } :
+        function() {
+          return jQuery.css( elem, prop, "" );
+        },
+      initial = currentValue(),
+      unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+      // Starting value computation is required for potential unit mismatches
+      initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+        rcssNum.exec( jQuery.css( elem, prop ) );
+
+    if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
+
+      // Trust units reported by jQuery.css
+      unit = unit || initialInUnit[ 3 ];
+
+      // Make sure we update the tween properties later on
+      valueParts = valueParts || [];
+
+      // Iteratively approximate from a nonzero starting point
+      initialInUnit = +initial || 1;
+
+      do {
+
+        // If previous iteration zeroed out, double until we get *something*.
+        // Use string for doubling so we don't accidentally see scale as unchanged below
+        scale = scale || ".5";
+
+        // Adjust and apply
+        initialInUnit = initialInUnit / scale;
+        jQuery.style( elem, prop, initialInUnit + unit );
+
+        // Update scale, tolerating zero or NaN from tween.cur()
+        // Break the loop if scale is unchanged or perfect, or if we've just had enough.
+      } while (
+        scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
+        );
+    }
+
+    if ( valueParts ) {
+      initialInUnit = +initialInUnit || +initial || 0;
+
+      // Apply relative offset (+=/-=) if specified
+      adjusted = valueParts[ 1 ] ?
+        initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
+        +valueParts[ 2 ];
+      if ( tween ) {
+        tween.unit = unit;
+        tween.start = initialInUnit;
+        tween.end = adjusted;
+      }
+    }
+    return adjusted;
+  }
+
+
+  var defaultDisplayMap = {};
+
+  function getDefaultDisplay( elem ) {
+    var temp,
+      doc = elem.ownerDocument,
+      nodeName = elem.nodeName,
+      display = defaultDisplayMap[ nodeName ];
+
+    if ( display ) {
+      return display;
+    }
+
+    temp = doc.body.appendChild( doc.createElement( nodeName ) );
+    display = jQuery.css( temp, "display" );
+
+    temp.parentNode.removeChild( temp );
+
+    if ( display === "none" ) {
+      display = "block";
+    }
+    defaultDisplayMap[ nodeName ] = display;
+
+    return display;
+  }
+
+  function showHide( elements, show ) {
+    var display, elem,
+      values = [],
+      index = 0,
+      length = elements.length;
+
+    // Determine new display value for elements that need to change
+    for ( ; index < length; index++ ) {
+      elem = elements[ index ];
+      if ( !elem.style ) {
+        continue;
+      }
+
+      display = elem.style.display;
+      if ( show ) {
+
+        // Since we force visibility upon cascade-hidden elements, an immediate (and slow)
+        // check is required in this first loop unless we have a nonempty display value (either
+        // inline or about-to-be-restored)
+        if ( display === "none" ) {
+          values[ index ] = dataPriv.get( elem, "display" ) || null;
+          if ( !values[ index ] ) {
+            elem.style.display = "";
+          }
+        }
+        if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
+          values[ index ] = getDefaultDisplay( elem );
+        }
+      } else {
+        if ( display !== "none" ) {
+          values[ index ] = "none";
+
+          // Remember what we're overwriting
+          dataPriv.set( elem, "display", display );
+        }
+      }
+    }
+
+    // Set the display of the elements in a second loop to avoid constant reflow
+    for ( index = 0; index < length; index++ ) {
+      if ( values[ index ] != null ) {
+        elements[ index ].style.display = values[ index ];
+      }
+    }
+
+    return elements;
+  }
+
+  jQuery.fn.extend( {
+    show: function() {
+      return showHide( this, true );
+    },
+    hide: function() {
+      return showHide( this );
+    },
+    toggle: function( state ) {
+      if ( typeof state === "boolean" ) {
+        return state ? this.show() : this.hide();
+      }
+
+      return this.each( function() {
+        if ( isHiddenWithinTree( this ) ) {
+          jQuery( this ).show();
+        } else {
+          jQuery( this ).hide();
+        }
+      } );
+    }
+  } );
+  var rcheckableType = ( /^(?:checkbox|radio)$/i );
+
+  var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
+
+  var rscriptType = ( /^$|\/(?:java|ecma)script/i );
+
+
+
+// We have to close these tags to support XHTML (#13200)
+  var wrapMap = {
+
+    // Support: IE <=9 only
+    option: [ 1, "<select multiple='multiple'>", "</select>" ],
+
+    // XHTML parsers do not magically insert elements in the
+    // same way that tag soup parsers do. So we cannot shorten
+    // this by omitting <tbody> or other required elements.
+    thead: [ 1, "<table>", "</table>" ],
+    col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
+    tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+    td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+    _default: [ 0, "", "" ]
+  };
+
+// Support: IE <=9 only
+  wrapMap.optgroup = wrapMap.option;
+
+  wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+  wrapMap.th = wrapMap.td;
+
+
+  function getAll( context, tag ) {
+
+    // Support: IE <=9 - 11 only
+    // Use typeof to avoid zero-argument method invocation on host objects (#15151)
+    var ret;
+
+    if ( typeof context.getElementsByTagName !== "undefined" ) {
+      ret = context.getElementsByTagName( tag || "*" );
+
+    } else if ( typeof context.querySelectorAll !== "undefined" ) {
+      ret = context.querySelectorAll( tag || "*" );
+
+    } else {
+      ret = [];
+    }
+
+    if ( tag === undefined || tag && nodeName( context, tag ) ) {
+      return jQuery.merge( [ context ], ret );
+    }
+
+    return ret;
+  }
+
+
+// Mark scripts as having already been evaluated
+  function setGlobalEval( elems, refElements ) {
+    var i = 0,
+      l = elems.length;
+
+    for ( ; i < l; i++ ) {
+      dataPriv.set(
+        elems[ i ],
+        "globalEval",
+        !refElements || dataPriv.get( refElements[ i ], "globalEval" )
+      );
+    }
+  }
+
+
+  var rhtml = /<|&#?\w+;/;
+
+  function buildFragment( elems, context, scripts, selection, ignored ) {
+    var elem, tmp, tag, wrap, contains, j,
+      fragment = context.createDocumentFragment(),
+      nodes = [],
+      i = 0,
+      l = elems.length;
+
+    for ( ; i < l; i++ ) {
+      elem = elems[ i ];
+
+      if ( elem || elem === 0 ) {
+
+        // Add nodes directly
+        if ( jQuery.type( elem ) === "object" ) {
+
+          // Support: Android <=4.0 only, PhantomJS 1 only
+          // push.apply(_, arraylike) throws on ancient WebKit
+          jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+          // Convert non-html into a text node
+        } else if ( !rhtml.test( elem ) ) {
+          nodes.push( context.createTextNode( elem ) );
+
+          // Convert html into DOM nodes
+        } else {
+          tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
+
+          // Deserialize a standard representation
+          tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+          wrap = wrapMap[ tag ] || wrapMap._default;
+          tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
+
+          // Descend through wrappers to the right content
+          j = wrap[ 0 ];
+          while ( j-- ) {
+            tmp = tmp.lastChild;
+          }
+
+          // Support: Android <=4.0 only, PhantomJS 1 only
+          // push.apply(_, arraylike) throws on ancient WebKit
+          jQuery.merge( nodes, tmp.childNodes );
+
+          // Remember the top-level container
+          tmp = fragment.firstChild;
+
+          // Ensure the created nodes are orphaned (#12392)
+          tmp.textContent = "";
+        }
+      }
+    }
+
+    // Remove wrapper from fragment
+    fragment.textContent = "";
+
+    i = 0;
+    while ( ( elem = nodes[ i++ ] ) ) {
+
+      // Skip elements already in the context collection (trac-4087)
+      if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
+        if ( ignored ) {
+          ignored.push( elem );
+        }
+        continue;
+      }
+
+      contains = jQuery.contains( elem.ownerDocument, elem );
+
+      // Append to fragment
+      tmp = getAll( fragment.appendChild( elem ), "script" );
+
+      // Preserve script evaluation history
+      if ( contains ) {
+        setGlobalEval( tmp );
+      }
+
+      // Capture executables
+      if ( scripts ) {
+        j = 0;
+        while ( ( elem = tmp[ j++ ] ) ) {
+          if ( rscriptType.test( elem.type || "" ) ) {
+            scripts.push( elem );
+          }
+        }
+      }
+    }
+
+    return fragment;
+  }
+
+
+  ( function() {
+    var fragment = document.createDocumentFragment(),
+      div = fragment.appendChild( document.createElement( "div" ) ),
+      input = document.createElement( "input" );
+
+    // Support: Android 4.0 - 4.3 only
+    // Check state lost if the name is set (#11217)
+    // Support: Windows Web Apps (WWA)
+    // `name` and `type` must use .setAttribute for WWA (#14901)
+    input.setAttribute( "type", "radio" );
+    input.setAttribute( "checked", "checked" );
+    input.setAttribute( "name", "t" );
+
+    div.appendChild( input );
+
+    // Support: Android <=4.1 only
+    // Older WebKit doesn't clone checked state correctly in fragments
+    support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+    // Support: IE <=11 only
+    // Make sure textarea (and checkbox) defaultValue is properly cloned
+    div.innerHTML = "<textarea>x</textarea>";
+    support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+  } )();
+  var documentElement = document.documentElement;
+
+
+
+  var
+    rkeyEvent = /^key/,
+    rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
+    rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+
+  function returnTrue() {
+    return true;
+  }
+
+  function returnFalse() {
+    return false;
+  }
+
+// Support: IE <=9 only
+// See #13393 for more info
+  function safeActiveElement() {
+    try {
+      return document.activeElement;
+    } catch ( err ) { }
+  }
+
+  function on( elem, types, selector, data, fn, one ) {
+    var origFn, type;
+
+    // Types can be a map of types/handlers
+    if ( typeof types === "object" ) {
+
+      // ( types-Object, selector, data )
+      if ( typeof selector !== "string" ) {
+
+        // ( types-Object, data )
+        data = data || selector;
+        selector = undefined;
+      }
+      for ( type in types ) {
+        on( elem, type, selector, data, types[ type ], one );
+      }
+      return elem;
+    }
+
+    if ( data == null && fn == null ) {
+
+      // ( types, fn )
+      fn = selector;
+      data = selector = undefined;
+    } else if ( fn == null ) {
+      if ( typeof selector === "string" ) {
+
+        // ( types, selector, fn )
+        fn = data;
+        data = undefined;
+      } else {
+
+        // ( types, data, fn )
+        fn = data;
+        data = selector;
+        selector = undefined;
+      }
+    }
+    if ( fn === false ) {
+      fn = returnFalse;
+    } else if ( !fn ) {
+      return elem;
+    }
+
+    if ( one === 1 ) {
+      origFn = fn;
+      fn = function( event ) {
+
+        // Can use an empty set, since event contains the info
+        jQuery().off( event );
+        return origFn.apply( this, arguments );
+      };
+
+      // Use same guid so caller can remove using origFn
+      fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+    }
+    return elem.each( function() {
+      jQuery.event.add( this, types, fn, data, selector );
+    } );
+  }
+
+  /*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+  jQuery.event = {
+
+    global: {},
+
+    add: function( elem, types, handler, data, selector ) {
+
+      var handleObjIn, eventHandle, tmp,
+        events, t, handleObj,
+        special, handlers, type, namespaces, origType,
+        elemData = dataPriv.get( elem );
+
+      // Don't attach events to noData or text/comment nodes (but allow plain objects)
+      if ( !elemData ) {
+        return;
+      }
+
+      // Caller can pass in an object of custom data in lieu of the handler
+      if ( handler.handler ) {
+        handleObjIn = handler;
+        handler = handleObjIn.handler;
+        selector = handleObjIn.selector;
+      }
+
+      // Ensure that invalid selectors throw exceptions at attach time
+      // Evaluate against documentElement in case elem is a non-element node (e.g., document)
+      if ( selector ) {
+        jQuery.find.matchesSelector( documentElement, selector );
+      }
+
+      // Make sure that the handler has a unique ID, used to find/remove it later
+      if ( !handler.guid ) {
+        handler.guid = jQuery.guid++;
+      }
+
+      // Init the element's event structure and main handler, if this is the first
+      if ( !( events = elemData.events ) ) {
+        events = elemData.events = {};
+      }
+      if ( !( eventHandle = elemData.handle ) ) {
+        eventHandle = elemData.handle = function( e ) {
+
+          // Discard the second event of a jQuery.event.trigger() and
+          // when an event is called after a page has unloaded
+          return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
+            jQuery.event.dispatch.apply( elem, arguments ) : undefined;
+        };
+      }
+
+      // Handle multiple events separated by a space
+      types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+      t = types.length;
+      while ( t-- ) {
+        tmp = rtypenamespace.exec( types[ t ] ) || [];
+        type = origType = tmp[ 1 ];
+        namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+
+        // There *must* be a type, no attaching namespace-only handlers
+        if ( !type ) {
+          continue;
+        }
+
+        // If event changes its type, use the special event handlers for the changed type
+        special = jQuery.event.special[ type ] || {};
+
+        // If selector defined, determine special event api type, otherwise given type
+        type = ( selector ? special.delegateType : special.bindType ) || type;
+
+        // Update special based on newly reset type
+        special = jQuery.event.special[ type ] || {};
+
+        // handleObj is passed to all event handlers
+        handleObj = jQuery.extend( {
+          type: type,
+          origType: origType,
+          data: data,
+          handler: handler,
+          guid: handler.guid,
+          selector: selector,
+          needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+          namespace: namespaces.join( "." )
+        }, handleObjIn );
+
+        // Init the event handler queue if we're the first
+        if ( !( handlers = events[ type ] ) ) {
+          handlers = events[ type ] = [];
+          handlers.delegateCount = 0;
+
+          // Only use addEventListener if the special events handler returns false
+          if ( !special.setup ||
+            special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+
+            if ( elem.addEventListener ) {
+              elem.addEventListener( type, eventHandle );
+            }
+          }
+        }
+
+        if ( special.add ) {
+          special.add.call( elem, handleObj );
+
+          if ( !handleObj.handler.guid ) {
+            handleObj.handler.guid = handler.guid;
+          }
+        }
+
+        // Add to the element's handler list, delegates in front
+        if ( selector ) {
+          handlers.splice( handlers.delegateCount++, 0, handleObj );
+        } else {
+          handlers.push( handleObj );
+        }
+
+        // Keep track of which events have ever been used, for event optimization
+        jQuery.event.global[ type ] = true;
+      }
+
+    },
+
+    // Detach an event or set of events from an element
+    remove: function( elem, types, handler, selector, mappedTypes ) {
+
+      var j, origCount, tmp,
+        events, t, handleObj,
+        special, handlers, type, namespaces, origType,
+        elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
+
+      if ( !elemData || !( events = elemData.events ) ) {
+        return;
+      }
+
+      // Once for each type.namespace in types; type may be omitted
+      types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+      t = types.length;
+      while ( t-- ) {
+        tmp = rtypenamespace.exec( types[ t ] ) || [];
+        type = origType = tmp[ 1 ];
+        namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+
+        // Unbind all events (on this namespace, if provided) for the element
+        if ( !type ) {
+          for ( type in events ) {
+            jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+          }
+          continue;
+        }
+
+        special = jQuery.event.special[ type ] || {};
+        type = ( selector ? special.delegateType : special.bindType ) || type;
+        handlers = events[ type ] || [];
+        tmp = tmp[ 2 ] &&
+          new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
+
+        // Remove matching events
+        origCount = j = handlers.length;
+        while ( j-- ) {
+          handleObj = handlers[ j ];
+
+          if ( ( mappedTypes || origType === handleObj.origType ) &&
+            ( !handler || handler.guid === handleObj.guid ) &&
+            ( !tmp || tmp.test( handleObj.namespace ) ) &&
+            ( !selector || selector === handleObj.selector ||
+              selector === "**" && handleObj.selector ) ) {
+            handlers.splice( j, 1 );
+
+            if ( handleObj.selector ) {
+              handlers.delegateCount--;
+            }
+            if ( special.remove ) {
+              special.remove.call( elem, handleObj );
+            }
+          }
+        }
+
+        // Remove generic event handler if we removed something and no more handlers exist
+        // (avoids potential for endless recursion during removal of special event handlers)
+        if ( origCount && !handlers.length ) {
+          if ( !special.teardown ||
+            special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+
+            jQuery.removeEvent( elem, type, elemData.handle );
+          }
+
+          delete events[ type ];
+        }
+      }
+
+      // Remove data and the expando if it's no longer used
+      if ( jQuery.isEmptyObject( events ) ) {
+        dataPriv.remove( elem, "handle events" );
+      }
+    },
+
+    dispatch: function( nativeEvent ) {
+
+      // Make a writable jQuery.Event from the native event object
+      var event = jQuery.event.fix( nativeEvent );
+
+      var i, j, ret, matched, handleObj, handlerQueue,
+        args = new Array( arguments.length ),
+        handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+        special = jQuery.event.special[ event.type ] || {};
+
+      // Use the fix-ed jQuery.Event rather than the (read-only) native event
+      args[ 0 ] = event;
+
+      for ( i = 1; i < arguments.length; i++ ) {
+        args[ i ] = arguments[ i ];
+      }
+
+      event.delegateTarget = this;
+
+      // Call the preDispatch hook for the mapped type, and let it bail if desired
+      if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+        return;
+      }
+
+      // Determine handlers
+      handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+      // Run delegates first; they may want to stop propagation beneath us
+      i = 0;
+      while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
+        event.currentTarget = matched.elem;
+
+        j = 0;
+        while ( ( handleObj = matched.handlers[ j++ ] ) &&
+        !event.isImmediatePropagationStopped() ) {
+
+          // Triggered event must either 1) have no namespace, or 2) have namespace(s)
+          // a subset or equal to those in the bound event (both can have no namespace).
+          if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
+
+            event.handleObj = handleObj;
+            event.data = handleObj.data;
+
+            ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+              handleObj.handler ).apply( matched.elem, args );
+
+            if ( ret !== undefined ) {
+              if ( ( event.result = ret ) === false ) {
+                event.preventDefault();
+                event.stopPropagation();
+              }
+            }
+          }
+        }
+      }
+
+      // Call the postDispatch hook for the mapped type
+      if ( special.postDispatch ) {
+        special.postDispatch.call( this, event );
+      }
+
+      return event.result;
+    },
+
+    handlers: function( event, handlers ) {
+      var i, handleObj, sel, matchedHandlers, matchedSelectors,
+        handlerQueue = [],
+        delegateCount = handlers.delegateCount,
+        cur = event.target;
+
+      // Find delegate handlers
+      if ( delegateCount &&
+
+        // Support: IE <=9
+        // Black-hole SVG <use> instance trees (trac-13180)
+        cur.nodeType &&
+
+        // Support: Firefox <=42
+        // Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
+        // https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
+        // Support: IE 11 only
+        // ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
+        !( event.type === "click" && event.button >= 1 ) ) {
+
+        for ( ; cur !== this; cur = cur.parentNode || this ) {
+
+          // Don't check non-elements (#13208)
+          // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+          if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
+            matchedHandlers = [];
+            matchedSelectors = {};
+            for ( i = 0; i < delegateCount; i++ ) {
+              handleObj = handlers[ i ];
+
+              // Don't conflict with Object.prototype properties (#13203)
+              sel = handleObj.selector + " ";
+
+              if ( matchedSelectors[ sel ] === undefined ) {
+                matchedSelectors[ sel ] = handleObj.needsContext ?
+                  jQuery( sel, this ).index( cur ) > -1 :
+                  jQuery.find( sel, this, null, [ cur ] ).length;
+              }
+              if ( matchedSelectors[ sel ] ) {
+                matchedHandlers.push( handleObj );
+              }
+            }
+            if ( matchedHandlers.length ) {
+              handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
+            }
+          }
+        }
+      }
+
+      // Add the remaining (directly-bound) handlers
+      cur = this;
+      if ( delegateCount < handlers.length ) {
+        handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
+      }
+
+      return handlerQueue;
+    },
+
+    addProp: function( name, hook ) {
+      Object.defineProperty( jQuery.Event.prototype, name, {
+        enumerable: true,
+        configurable: true,
+
+        get: jQuery.isFunction( hook ) ?
+          function() {
+            if ( this.originalEvent ) {
+              return hook( this.originalEvent );
+            }
+          } :
+          function() {
+            if ( this.originalEvent ) {
+              return this.originalEvent[ name ];
+            }
+          },
+
+        set: function( value ) {
+          Object.defineProperty( this, name, {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: value
+          } );
+        }
+      } );
+    },
+
+    fix: function( originalEvent ) {
+      return originalEvent[ jQuery.expando ] ?
+        originalEvent :
+        new jQuery.Event( originalEvent );
+    },
+
+    special: {
+      load: {
+
+        // Prevent triggered image.load events from bubbling to window.load
+        noBubble: true
+      },
+      focus: {
+
+        // Fire native event if possible so blur/focus sequence is correct
+        trigger: function() {
+          if ( this !== safeActiveElement() && this.focus ) {
+            this.focus();
+            return false;
+          }
+        },
+        delegateType: "focusin"
+      },
+      blur: {
+        trigger: function() {
+          if ( this === safeActiveElement() && this.blur ) {
+            this.blur();
+            return false;
+          }
+        },
+        delegateType: "focusout"
+      },
+      click: {
+
+        // For checkbox, fire native event so checked state will be right
+        trigger: function() {
+          if ( this.type === "checkbox" && this.click && nodeName( this, "input" ) ) {
+            this.click();
+            return false;
+          }
+        },
+
+        // For cross-browser consistency, don't fire native .click() on links
+        _default: function( event ) {
+          return nodeName( event.target, "a" );
+        }
+      },
+
+      beforeunload: {
+        postDispatch: function( event ) {
+
+          // Support: Firefox 20+
+          // Firefox doesn't alert if the returnValue field is not set.
+          if ( event.result !== undefined && event.originalEvent ) {
+            event.originalEvent.returnValue = event.result;
+          }
+        }
+      }
+    }
+  };
+
+  jQuery.removeEvent = function( elem, type, handle ) {
+
+    // This "if" is needed for plain objects
+    if ( elem.removeEventListener ) {
+      elem.removeEventListener( type, handle );
+    }
+  };
+
+  jQuery.Event = function( src, props ) {
+
+    // Allow instantiation without the 'new' keyword
+    if ( !( this instanceof jQuery.Event ) ) {
+      return new jQuery.Event( src, props );
+    }
+
+    // Event object
+    if ( src && src.type ) {
+      this.originalEvent = src;
+      this.type = src.type;
+
+      // Events bubbling up the document may have been marked as prevented
+      // by a handler lower down the tree; reflect the correct value.
+      this.isDefaultPrevented = src.defaultPrevented ||
+      src.defaultPrevented === undefined &&
+
+      // Support: Android <=2.3 only
+      src.returnValue === false ?
+        returnTrue :
+        returnFalse;
+
+      // Create target properties
+      // Support: Safari <=6 - 7 only
+      // Target should not be a text node (#504, #13143)
+      this.target = ( src.target && src.target.nodeType === 3 ) ?
+        src.target.parentNode :
+        src.target;
+
+      this.currentTarget = src.currentTarget;
+      this.relatedTarget = src.relatedTarget;
+
+      // Event type
+    } else {
+      this.type = src;
+    }
+
+    // Put explicitly provided properties onto the event object
+    if ( props ) {
+      jQuery.extend( this, props );
+    }
+
+    // Create a timestamp if incoming event doesn't have one
+    this.timeStamp = src && src.timeStamp || jQuery.now();
+
+    // Mark it as fixed
+    this[ jQuery.expando ] = true;
+  };
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+  jQuery.Event.prototype = {
+    constructor: jQuery.Event,
+    isDefaultPrevented: returnFalse,
+    isPropagationStopped: returnFalse,
+    isImmediatePropagationStopped: returnFalse,
+    isSimulated: false,
+
+    preventDefault: function() {
+      var e = this.originalEvent;
+
+      this.isDefaultPrevented = returnTrue;
+
+      if ( e && !this.isSimulated ) {
+        e.preventDefault();
+      }
+    },
+    stopPropagation: function() {
+      var e = this.originalEvent;
+
+      this.isPropagationStopped = returnTrue;
+
+      if ( e && !this.isSimulated ) {
+        e.stopPropagation();
+      }
+    },
+    stopImmediatePropagation: function() {
+      var e = this.originalEvent;
+
+      this.isImmediatePropagationStopped = returnTrue;
+
+      if ( e && !this.isSimulated ) {
+        e.stopImmediatePropagation();
+      }
+
+      this.stopPropagation();
+    }
+  };
+
+// Includes all common event props including KeyEvent and MouseEvent specific props
+  jQuery.each( {
+    altKey: true,
+    bubbles: true,
+    cancelable: true,
+    changedTouches: true,
+    ctrlKey: true,
+    detail: true,
+    eventPhase: true,
+    metaKey: true,
+    pageX: true,
+    pageY: true,
+    shiftKey: true,
+    view: true,
+    "char": true,
+    charCode: true,
+    key: true,
+    keyCode: true,
+    button: true,
+    buttons: true,
+    clientX: true,
+    clientY: true,
+    offsetX: true,
+    offsetY: true,
+    pointerId: true,
+    pointerType: true,
+    screenX: true,
+    screenY: true,
+    targetTouches: true,
+    toElement: true,
+    touches: true,
+
+    which: function( event ) {
+      var button = event.button;
+
+      // Add which for key events
+      if ( event.which == null && rkeyEvent.test( event.type ) ) {
+        return event.charCode != null ? event.charCode : event.keyCode;
+      }
+
+      // Add which for click: 1 === left; 2 === middle; 3 === right
+      if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
+        if ( button & 1 ) {
+          return 1;
+        }
+
+        if ( button & 2 ) {
+          return 3;
+        }
+
+        if ( button & 4 ) {
+          return 2;
+        }
+
+        return 0;
+      }
+
+      return event.which;
+    }
+  }, jQuery.event.addProp );
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+// so that event delegation works in jQuery.
+// Do the same for pointerenter/pointerleave and pointerover/pointerout
+//
+// Support: Safari 7 only
+// Safari sends mouseenter too often; see:
+// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
+// for the description of the bug (it existed in older Chrome versions as well).
+  jQuery.each( {
+    mouseenter: "mouseover",
+    mouseleave: "mouseout",
+    pointerenter: "pointerover",
+    pointerleave: "pointerout"
+  }, function( orig, fix ) {
+    jQuery.event.special[ orig ] = {
+      delegateType: fix,
+      bindType: fix,
+
+      handle: function( event ) {
+        var ret,
+          target = this,
+          related = event.relatedTarget,
+          handleObj = event.handleObj;
+
+        // For mouseenter/leave call the handler if related is outside the target.
+        // NB: No relatedTarget if the mouse left/entered the browser window
+        if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
+          event.type = handleObj.origType;
+          ret = handleObj.handler.apply( this, arguments );
+          event.type = fix;
+        }
+        return ret;
+      }
+    };
+  } );
+
+  jQuery.fn.extend( {
+
+    on: function( types, selector, data, fn ) {
+      return on( this, types, selector, data, fn );
+    },
+    one: function( types, selector, data, fn ) {
+      return on( this, types, selector, data, fn, 1 );
+    },
+    off: function( types, selector, fn ) {
+      var handleObj, type;
+      if ( types && types.preventDefault && types.handleObj ) {
+
+        // ( event )  dispatched jQuery.Event
+        handleObj = types.handleObj;
+        jQuery( types.delegateTarget ).off(
+          handleObj.namespace ?
+            handleObj.origType + "." + handleObj.namespace :
+            handleObj.origType,
+          handleObj.selector,
+          handleObj.handler
+        );
+        return this;
+      }
+      if ( typeof types === "object" ) {
+
+        // ( types-object [, selector] )
+        for ( type in types ) {
+          this.off( type, selector, types[ type ] );
+        }
+        return this;
+      }
+      if ( selector === false || typeof selector === "function" ) {
+
+        // ( types [, fn] )
+        fn = selector;
+        selector = undefined;
+      }
+      if ( fn === false ) {
+        fn = returnFalse;
+      }
+      return this.each( function() {
+        jQuery.event.remove( this, types, fn, selector );
+      } );
+    }
+  } );
+
+
+  var
+
+    /* eslint-disable max-len */
+
+    // See https://github.com/eslint/eslint/issues/3229
+    rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
+
+    /* eslint-enable */
+
+    // Support: IE <=10 - 11, Edge 12 - 13
+    // In IE/Edge using regex groups here causes severe slowdowns.
+    // See https://connect.microsoft.com/IE/feedback/details/1736512/
+    rnoInnerhtml = /<script|<style|<link/i,
+
+    // checked="checked" or checked
+    rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+    rscriptTypeMasked = /^true\/(.*)/,
+    rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
+
+// Prefer a tbody over its parent table for containing new rows
+  function manipulationTarget( elem, content ) {
+    if ( nodeName( elem, "table" ) &&
+      nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
+
+      return jQuery( ">tbody", elem )[ 0 ] || elem;
+    }
+
+    return elem;
+  }
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+  function disableScript( elem ) {
+    elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
+    return elem;
+  }
+  function restoreScript( elem ) {
+    var match = rscriptTypeMasked.exec( elem.type );
+
+    if ( match ) {
+      elem.type = match[ 1 ];
+    } else {
+      elem.removeAttribute( "type" );
+    }
+
+    return elem;
+  }
+
+  function cloneCopyEvent( src, dest ) {
+    var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+
+    if ( dest.nodeType !== 1 ) {
+      return;
+    }
+
+    // 1. Copy private data: events, handlers, etc.
+    if ( dataPriv.hasData( src ) ) {
+      pdataOld = dataPriv.access( src );
+      pdataCur = dataPriv.set( dest, pdataOld );
+      events = pdataOld.events;
+
+      if ( events ) {
+        delete pdataCur.handle;
+        pdataCur.events = {};
+
+        for ( type in events ) {
+          for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+            jQuery.event.add( dest, type, events[ type ][ i ] );
+          }
+        }
+      }
+    }
+
+    // 2. Copy user data
+    if ( dataUser.hasData( src ) ) {
+      udataOld = dataUser.access( src );
+      udataCur = jQuery.extend( {}, udataOld );
+
+      dataUser.set( dest, udataCur );
+    }
+  }
+
+// Fix IE bugs, see support tests
+  function fixInput( src, dest ) {
+    var nodeName = dest.nodeName.toLowerCase();
+
+    // Fails to persist the checked state of a cloned checkbox or radio button.
+    if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+      dest.checked = src.checked;
+
+      // Fails to return the selected option to the default selected state when cloning options
+    } else if ( nodeName === "input" || nodeName === "textarea" ) {
+      dest.defaultValue = src.defaultValue;
+    }
+  }
+
+  function domManip( collection, args, callback, ignored ) {
+
+    // Flatten any nested arrays
+    args = concat.apply( [], args );
+
+    var fragment, first, scripts, hasScripts, node, doc,
+      i = 0,
+      l = collection.length,
+      iNoClone = l - 1,
+      value = args[ 0 ],
+      isFunction = jQuery.isFunction( value );
+
+    // We can't cloneNode fragments that contain checked, in WebKit
+    if ( isFunction ||
+      ( l > 1 && typeof value === "string" &&
+        !support.checkClone && rchecked.test( value ) ) ) {
+      return collection.each( function( index ) {
+        var self = collection.eq( index );
+        if ( isFunction ) {
+          args[ 0 ] = value.call( this, index, self.html() );
+        }
+        domManip( self, args, callback, ignored );
+      } );
+    }
+
+    if ( l ) {
+      fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+      first = fragment.firstChild;
+
+      if ( fragment.childNodes.length === 1 ) {
+        fragment = first;
+      }
+
+      // Require either new content or an interest in ignored elements to invoke the callback
+      if ( first || ignored ) {
+        scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+        hasScripts = scripts.length;
+
+        // Use the original fragment for the last item
+        // instead of the first because it can end up
+        // being emptied incorrectly in certain situations (#8070).
+        for ( ; i < l; i++ ) {
+          node = fragment;
+
+          if ( i !== iNoClone ) {
+            node = jQuery.clone( node, true, true );
+
+            // Keep references to cloned scripts for later restoration
+            if ( hasScripts ) {
+
+              // Support: Android <=4.0 only, PhantomJS 1 only
+              // push.apply(_, arraylike) throws on ancient WebKit
+              jQuery.merge( scripts, getAll( node, "script" ) );
+            }
+          }
+
+          callback.call( collection[ i ], node, i );
+        }
+
+        if ( hasScripts ) {
+          doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+          // Reenable scripts
+          jQuery.map( scripts, restoreScript );
+
+          // Evaluate executable scripts on first document insertion
+          for ( i = 0; i < hasScripts; i++ ) {
+            node = scripts[ i ];
+            if ( rscriptType.test( node.type || "" ) &&
+              !dataPriv.access( node, "globalEval" ) &&
+              jQuery.contains( doc, node ) ) {
+
+              if ( node.src ) {
+
+                // Optional AJAX dependency, but won't run scripts if not present
+                if ( jQuery._evalUrl ) {
+                  jQuery._evalUrl( node.src );
+                }
+              } else {
+                DOMEval( node.textContent.replace( rcleanScript, "" ), doc );
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return collection;
+  }
+
+  function remove( elem, selector, keepData ) {
+    var node,
+      nodes = selector ? jQuery.filter( selector, elem ) : elem,
+      i = 0;
+
+    for ( ; ( node = nodes[ i ] ) != null; i++ ) {
+      if ( !keepData && node.nodeType === 1 ) {
+        jQuery.cleanData( getAll( node ) );
+      }
+
+      if ( node.parentNode ) {
+        if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+          setGlobalEval( getAll( node, "script" ) );
+        }
+        node.parentNode.removeChild( node );
+      }
+    }
+
+    return elem;
+  }
+
+  jQuery.extend( {
+    htmlPrefilter: function( html ) {
+      return html.replace( rxhtmlTag, "<$1></$2>" );
+    },
+
+    clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+      var i, l, srcElements, destElements,
+        clone = elem.cloneNode( true ),
+        inPage = jQuery.contains( elem.ownerDocument, elem );
+
+      // Fix IE cloning issues
+      if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
+        !jQuery.isXMLDoc( elem ) ) {
+
+        // We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
+        destElements = getAll( clone );
+        srcElements = getAll( elem );
+
+        for ( i = 0, l = srcElements.length; i < l; i++ ) {
+          fixInput( srcElements[ i ], destElements[ i ] );
+        }
+      }
+
+      // Copy the events from the original to the clone
+      if ( dataAndEvents ) {
+        if ( deepDataAndEvents ) {
+          srcElements = srcElements || getAll( elem );
+          destElements = destElements || getAll( clone );
+
+          for ( i = 0, l = srcElements.length; i < l; i++ ) {
+            cloneCopyEvent( srcElements[ i ], destElements[ i ] );
+          }
+        } else {
+          cloneCopyEvent( elem, clone );
+        }
+      }
+
+      // Preserve script evaluation history
+      destElements = getAll( clone, "script" );
+      if ( destElements.length > 0 ) {
+        setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+      }
+
+      // Return the cloned set
+      return clone;
+    },
+
+    cleanData: function( elems ) {
+      var data, elem, type,
+        special = jQuery.event.special,
+        i = 0;
+
+      for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
+        if ( acceptData( elem ) ) {
+          if ( ( data = elem[ dataPriv.expando ] ) ) {
+            if ( data.events ) {
+              for ( type in data.events ) {
+                if ( special[ type ] ) {
+                  jQuery.event.remove( elem, type );
+
+                  // This is a shortcut to avoid jQuery.event.remove's overhead
+                } else {
+                  jQuery.removeEvent( elem, type, data.handle );
+                }
+              }
+            }
+
+            // Support: Chrome <=35 - 45+
+            // Assign undefined instead of using delete, see Data#remove
+            elem[ dataPriv.expando ] = undefined;
+          }
+          if ( elem[ dataUser.expando ] ) {
+
+            // Support: Chrome <=35 - 45+
+            // Assign undefined instead of using delete, see Data#remove
+            elem[ dataUser.expando ] = undefined;
+          }
+        }
+      }
+    }
+  } );
+
+  jQuery.fn.extend( {
+    detach: function( selector ) {
+      return remove( this, selector, true );
+    },
+
+    remove: function( selector ) {
+      return remove( this, selector );
+    },
+
+    text: function( value ) {
+      return access( this, function( value ) {
+        return value === undefined ?
+          jQuery.text( this ) :
+          this.empty().each( function() {
+            if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+              this.textContent = value;
+            }
+          } );
+      }, null, value, arguments.length );
+    },
+
+    append: function() {
+      return domManip( this, arguments, function( elem ) {
+        if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+          var target = manipulationTarget( this, elem );
+          target.appendChild( elem );
+        }
+      } );
+    },
+
+    prepend: function() {
+      return domManip( this, arguments, function( elem ) {
+        if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+          var target = manipulationTarget( this, elem );
+          target.insertBefore( elem, target.firstChild );
+        }
+      } );
+    },
+
+    before: function() {
+      return domManip( this, arguments, function( elem ) {
+        if ( this.parentNode ) {
+          this.parentNode.insertBefore( elem, this );
+        }
+      } );
+    },
+
+    after: function() {
+      return domManip( this, arguments, function( elem ) {
+        if ( this.parentNode ) {
+          this.parentNode.insertBefore( elem, this.nextSibling );
+        }
+      } );
+    },
+
+    empty: function() {
+      var elem,
+        i = 0;
+
+      for ( ; ( elem = this[ i ] ) != null; i++ ) {
+        if ( elem.nodeType === 1 ) {
+
+          // Prevent memory leaks
+          jQuery.cleanData( getAll( elem, false ) );
+
+          // Remove any remaining nodes
+          elem.textContent = "";
+        }
+      }
+
+      return this;
+    },
+
+    clone: function( dataAndEvents, deepDataAndEvents ) {
+      dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+      deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+      return this.map( function() {
+        return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+      } );
+    },
+
+    html: function( value ) {
+      return access( this, function( value ) {
+        var elem = this[ 0 ] || {},
+          i = 0,
+          l = this.length;
+
+        if ( value === undefined && elem.nodeType === 1 ) {
+          return elem.innerHTML;
+        }
+
+        // See if we can take a shortcut and just use innerHTML
+        if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+          !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+          value = jQuery.htmlPrefilter( value );
+
+          try {
+            for ( ; i < l; i++ ) {
+              elem = this[ i ] || {};
+
+              // Remove element nodes and prevent memory leaks
+              if ( elem.nodeType === 1 ) {
+                jQuery.cleanData( getAll( elem, false ) );
+                elem.innerHTML = value;
+              }
+            }
+
+            elem = 0;
+
+            // If using innerHTML throws an exception, use the fallback method
+          } catch ( e ) {}
+        }
+
+        if ( elem ) {
+          this.empty().append( value );
+        }
+      }, null, value, arguments.length );
+    },
+
+    replaceWith: function() {
+      var ignored = [];
+
+      // Make the changes, replacing each non-ignored context element with the new content
+      return domManip( this, arguments, function( elem ) {
+        var parent = this.parentNode;
+
+        if ( jQuery.inArray( this, ignored ) < 0 ) {
+          jQuery.cleanData( getAll( this ) );
+          if ( parent ) {
+            parent.replaceChild( elem, this );
+          }
+        }
+
+        // Force callback invocation
+      }, ignored );
+    }
+  } );
+
+  jQuery.each( {
+    appendTo: "append",
+    prependTo: "prepend",
+    insertBefore: "before",
+    insertAfter: "after",
+    replaceAll: "replaceWith"
+  }, function( name, original ) {
+    jQuery.fn[ name ] = function( selector ) {
+      var elems,
+        ret = [],
+        insert = jQuery( selector ),
+        last = insert.length - 1,
+        i = 0;
+
+      for ( ; i <= last; i++ ) {
+        elems = i === last ? this : this.clone( true );
+        jQuery( insert[ i ] )[ original ]( elems );
+
+        // Support: Android <=4.0 only, PhantomJS 1 only
+        // .get() because push.apply(_, arraylike) throws on ancient WebKit
+        push.apply( ret, elems.get() );
+      }
+
+      return this.pushStack( ret );
+    };
+  } );
+  var rmargin = ( /^margin/ );
+
+  var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+  var getStyles = function( elem ) {
+
+    // Support: IE <=11 only, Firefox <=30 (#15098, #14150)
+    // IE throws on elements created in popups
+    // FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+    var view = elem.ownerDocument.defaultView;
+
+    if ( !view || !view.opener ) {
+      view = window;
+    }
+
+    return view.getComputedStyle( elem );
+  };
+
+
+
+  ( function() {
+
+    // Executing both pixelPosition & boxSizingReliable tests require only one layout
+    // so they're executed at the same time to save the second computation.
+    function computeStyleTests() {
+
+      // This is a singleton, we need to execute it only once
+      if ( !div ) {
+        return;
+      }
+
+      div.style.cssText =
+        "box-sizing:border-box;" +
+        "position:relative;display:block;" +
+        "margin:auto;border:1px;padding:1px;" +
+        "top:1%;width:50%";
+      div.innerHTML = "";
+      documentElement.appendChild( container );
+
+      var divStyle = window.getComputedStyle( div );
+      pixelPositionVal = divStyle.top !== "1%";
+
+      // Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
+      reliableMarginLeftVal = divStyle.marginLeft === "2px";
+      boxSizingReliableVal = divStyle.width === "4px";
+
+      // Support: Android 4.0 - 4.3 only
+      // Some styles come back with percentage values, even though they shouldn't
+      div.style.marginRight = "50%";
+      pixelMarginRightVal = divStyle.marginRight === "4px";
+
+      documentElement.removeChild( container );
+
+      // Nullify the div so it wouldn't be stored in the memory and
+      // it will also be a sign that checks already performed
+      div = null;
+    }
+
+    var pixelPositionVal, boxSizingReliableVal, pixelMarginRightVal, reliableMarginLeftVal,
+      container = document.createElement( "div" ),
+      div = document.createElement( "div" );
+
+    // Finish early in limited (non-browser) environments
+    if ( !div.style ) {
+      return;
+    }
+
+    // Support: IE <=9 - 11 only
+    // Style of cloned element affects source element cloned (#8908)
+    div.style.backgroundClip = "content-box";
+    div.cloneNode( true ).style.backgroundClip = "";
+    support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+    container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
+      "padding:0;margin-top:1px;position:absolute";
+    container.appendChild( div );
+
+    jQuery.extend( support, {
+      pixelPosition: function() {
+        computeStyleTests();
+        return pixelPositionVal;
+      },
+      boxSizingReliable: function() {
+        computeStyleTests();
+        return boxSizingReliableVal;
+      },
+      pixelMarginRight: function() {
+        computeStyleTests();
+        return pixelMarginRightVal;
+      },
+      reliableMarginLeft: function() {
+        computeStyleTests();
+        return reliableMarginLeftVal;
+      }
+    } );
+  } )();
+
+
+  function curCSS( elem, name, computed ) {
+    var width, minWidth, maxWidth, ret,
+
+      // Support: Firefox 51+
+      // Retrieving style before computed somehow
+      // fixes an issue with getting wrong values
+      // on detached elements
+      style = elem.style;
+
+    computed = computed || getStyles( elem );
+
+    // getPropertyValue is needed for:
+    //   .css('filter') (IE 9 only, #12537)
+    //   .css('--customProperty) (#3144)
+    if ( computed ) {
+      ret = computed.getPropertyValue( name ) || computed[ name ];
+
+      if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+        ret = jQuery.style( elem, name );
+      }
+
+      // A tribute to the "awesome hack by Dean Edwards"
+      // Android Browser returns percentage for some values,
+      // but width seems to be reliably pixels.
+      // This is against the CSSOM draft spec:
+      // https://drafts.csswg.org/cssom/#resolved-values
+      if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+        // Remember the original values
+        width = style.width;
+        minWidth = style.minWidth;
+        maxWidth = style.maxWidth;
+
+        // Put in the new values to get a computed value out
+        style.minWidth = style.maxWidth = style.width = ret;
+        ret = computed.width;
+
+        // Revert the changed values
+        style.width = width;
+        style.minWidth = minWidth;
+        style.maxWidth = maxWidth;
+      }
+    }
+
+    return ret !== undefined ?
+
+      // Support: IE <=9 - 11 only
+      // IE returns zIndex value as an integer.
+      ret + "" :
+      ret;
+  }
+
+
+  function addGetHookIf( conditionFn, hookFn ) {
+
+    // Define the hook, we'll check on the first run if it's really needed.
+    return {
+      get: function() {
+        if ( conditionFn() ) {
+
+          // Hook not needed (or it's not possible to use it due
+          // to missing dependency), remove it.
+          delete this.get;
+          return;
+        }
+
+        // Hook needed; redefine it so that the support test is not executed again.
+        return ( this.get = hookFn ).apply( this, arguments );
+      }
+    };
+  }
+
+
+  var
+
+    // Swappable if display is none or starts with table
+    // except "table", "table-cell", or "table-caption"
+    // See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+    rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+    rcustomProp = /^--/,
+    cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+    cssNormalTransform = {
+      letterSpacing: "0",
+      fontWeight: "400"
+    },
+
+    cssPrefixes = [ "Webkit", "Moz", "ms" ],
+    emptyStyle = document.createElement( "div" ).style;
+
+// Return a css property mapped to a potentially vendor prefixed property
+  function vendorPropName( name ) {
+
+    // Shortcut for names that are not vendor prefixed
+    if ( name in emptyStyle ) {
+      return name;
+    }
+
+    // Check for vendor prefixed names
+    var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
+      i = cssPrefixes.length;
+
+    while ( i-- ) {
+      name = cssPrefixes[ i ] + capName;
+      if ( name in emptyStyle ) {
+        return name;
+      }
+    }
+  }
+
+// Return a property mapped along what jQuery.cssProps suggests or to
+// a vendor prefixed property.
+  function finalPropName( name ) {
+    var ret = jQuery.cssProps[ name ];
+    if ( !ret ) {
+      ret = jQuery.cssProps[ name ] = vendorPropName( name ) || name;
+    }
+    return ret;
+  }
+
+  function setPositiveNumber( elem, value, subtract ) {
+
+    // Any relative (+/-) values have already been
+    // normalized at this point
+    var matches = rcssNum.exec( value );
+    return matches ?
+
+      // Guard against undefined "subtract", e.g., when used as in cssHooks
+      Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
+      value;
+  }
+
+  function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+    var i,
+      val = 0;
+
+    // If we already have the right measurement, avoid augmentation
+    if ( extra === ( isBorderBox ? "border" : "content" ) ) {
+      i = 4;
+
+      // Otherwise initialize for horizontal or vertical properties
+    } else {
+      i = name === "width" ? 1 : 0;
+    }
+
+    for ( ; i < 4; i += 2 ) {
+
+      // Both box models exclude margin, so add it if we want it
+      if ( extra === "margin" ) {
+        val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+      }
+
+      if ( isBorderBox ) {
+
+        // border-box includes padding, so remove it if we want content
+        if ( extra === "content" ) {
+          val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+        }
+
+        // At this point, extra isn't border nor margin, so remove border
+        if ( extra !== "margin" ) {
+          val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+        }
+      } else {
+
+        // At this point, extra isn't content, so add padding
+        val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+        // At this point, extra isn't content nor padding, so add border
+        if ( extra !== "padding" ) {
+          val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+        }
+      }
+    }
+
+    return val;
+  }
+
+  function getWidthOrHeight( elem, name, extra ) {
+
+    // Start with computed style
+    var valueIsBorderBox,
+      styles = getStyles( elem ),
+      val = curCSS( elem, name, styles ),
+      isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+    // Computed unit is not pixels. Stop here and return.
+    if ( rnumnonpx.test( val ) ) {
+      return val;
+    }
+
+    // Check for style in case a browser which returns unreliable values
+    // for getComputedStyle silently falls back to the reliable elem.style
+    valueIsBorderBox = isBorderBox &&
+      ( support.boxSizingReliable() || val === elem.style[ name ] );
+
+    // Fall back to offsetWidth/Height when value is "auto"
+    // This happens for inline elements with no explicit setting (gh-3571)
+    if ( val === "auto" ) {
+      val = elem[ "offset" + name[ 0 ].toUpperCase() + name.slice( 1 ) ];
+    }
+
+    // Normalize "", auto, and prepare for extra
+    val = parseFloat( val ) || 0;
+
+    // Use the active box-sizing model to add/subtract irrelevant styles
+    return ( val +
+      augmentWidthOrHeight(
+        elem,
+        name,
+        extra || ( isBorderBox ? "border" : "content" ),
+        valueIsBorderBox,
+        styles
+      )
+    ) + "px";
+  }
+
+  jQuery.extend( {
+
+    // Add in style property hooks for overriding the default
+    // behavior of getting and setting a style property
+    cssHooks: {
+      opacity: {
+        get: function( elem, computed ) {
+          if ( computed ) {
+
+            // We should always get a number back from opacity
+            var ret = curCSS( elem, "opacity" );
+            return ret === "" ? "1" : ret;
+          }
+        }
+      }
+    },
+
+    // Don't automatically add "px" to these possibly-unitless properties
+    cssNumber: {
+      "animationIterationCount": true,
+      "columnCount": true,
+      "fillOpacity": true,
+      "flexGrow": true,
+      "flexShrink": true,
+      "fontWeight": true,
+      "lineHeight": true,
+      "opacity": true,
+      "order": true,
+      "orphans": true,
+      "widows": true,
+      "zIndex": true,
+      "zoom": true
+    },
+
+    // Add in properties whose names you wish to fix before
+    // setting or getting the value
+    cssProps: {
+      "float": "cssFloat"
+    },
+
+    // Get and set the style property on a DOM Node
+    style: function( elem, name, value, extra ) {
+
+      // Don't set styles on text and comment nodes
+      if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+        return;
+      }
+
+      // Make sure that we're working with the right name
+      var ret, type, hooks,
+        origName = jQuery.camelCase( name ),
+        isCustomProp = rcustomProp.test( name ),
+        style = elem.style;
+
+      // Make sure that we're working with the right name. We don't
+      // want to query the value if it is a CSS custom property
+      // since they are user-defined.
+      if ( !isCustomProp ) {
+        name = finalPropName( origName );
+      }
+
+      // Gets hook for the prefixed version, then unprefixed version
+      hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+      // Check if we're setting a value
+      if ( value !== undefined ) {
+        type = typeof value;
+
+        // Convert "+=" or "-=" to relative numbers (#7345)
+        if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+          value = adjustCSS( elem, name, ret );
+
+          // Fixes bug #9237
+          type = "number";
+        }
+
+        // Make sure that null and NaN values aren't set (#7116)
+        if ( value == null || value !== value ) {
+          return;
+        }
+
+        // If a number was passed in, add the unit (except for certain CSS properties)
+        if ( type === "number" ) {
+          value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+        }
+
+        // background-* props affect original clone's values
+        if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+          style[ name ] = "inherit";
+        }
+
+        // If a hook was provided, use that value, otherwise just set the specified value
+        if ( !hooks || !( "set" in hooks ) ||
+          ( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+
+          if ( isCustomProp ) {
+            style.setProperty( name, value );
+          } else {
+            style[ name ] = value;
+          }
+        }
+
+      } else {
+
+        // If a hook was provided get the non-computed value from there
+        if ( hooks && "get" in hooks &&
+          ( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+
+          return ret;
+        }
+
+        // Otherwise just get the value from the style object
+        return style[ name ];
+      }
+    },
+
+    css: function( elem, name, extra, styles ) {
+      var val, num, hooks,
+        origName = jQuery.camelCase( name ),
+        isCustomProp = rcustomProp.test( name );
+
+      // Make sure that we're working with the right name. We don't
+      // want to modify the value if it is a CSS custom property
+      // since they are user-defined.
+      if ( !isCustomProp ) {
+        name = finalPropName( origName );
+      }
+
+      // Try prefixed name followed by the unprefixed name
+      hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+      // If a hook was provided get the computed value from there
+      if ( hooks && "get" in hooks ) {
+        val = hooks.get( elem, true, extra );
+      }
+
+      // Otherwise, if a way to get the computed value exists, use that
+      if ( val === undefined ) {
+        val = curCSS( elem, name, styles );
+      }
+
+      // Convert "normal" to computed value
+      if ( val === "normal" && name in cssNormalTransform ) {
+        val = cssNormalTransform[ name ];
+      }
+
+      // Make numeric if forced or a qualifier was provided and val looks numeric
+      if ( extra === "" || extra ) {
+        num = parseFloat( val );
+        return extra === true || isFinite( num ) ? num || 0 : val;
+      }
+
+      return val;
+    }
+  } );
+
+  jQuery.each( [ "height", "width" ], function( i, name ) {
+    jQuery.cssHooks[ name ] = {
+      get: function( elem, computed, extra ) {
+        if ( computed ) {
+
+          // Certain elements can have dimension info if we invisibly show them
+          // but it must have a current display style that would benefit
+          return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+
+          // Support: Safari 8+
+          // Table columns in Safari have non-zero offsetWidth & zero
+          // getBoundingClientRect().width unless display is changed.
+          // Support: IE <=11 only
+          // Running getBoundingClientRect on a disconnected node
+          // in IE throws an error.
+          ( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
+            swap( elem, cssShow, function() {
+              return getWidthOrHeight( elem, name, extra );
+            } ) :
+            getWidthOrHeight( elem, name, extra );
+        }
+      },
+
+      set: function( elem, value, extra ) {
+        var matches,
+          styles = extra && getStyles( elem ),
+          subtract = extra && augmentWidthOrHeight(
+            elem,
+            name,
+            extra,
+            jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+            styles
+          );
+
+        // Convert to pixels if value adjustment is needed
+        if ( subtract && ( matches = rcssNum.exec( value ) ) &&
+          ( matches[ 3 ] || "px" ) !== "px" ) {
+
+          elem.style[ name ] = value;
+          value = jQuery.css( elem, name );
+        }
+
+        return setPositiveNumber( elem, value, subtract );
+      }
+    };
+  } );
+
+  jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+    function( elem, computed ) {
+      if ( computed ) {
+        return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
+          elem.getBoundingClientRect().left -
+          swap( elem, { marginLeft: 0 }, function() {
+            return elem.getBoundingClientRect().left;
+          } )
+        ) + "px";
+      }
+    }
+  );
+
+// These hooks are used by animate to expand properties
+  jQuery.each( {
+    margin: "",
+    padding: "",
+    border: "Width"
+  }, function( prefix, suffix ) {
+    jQuery.cssHooks[ prefix + suffix ] = {
+      expand: function( value ) {
+        var i = 0,
+          expanded = {},
+
+          // Assumes a single number if not a string
+          parts = typeof value === "string" ? value.split( " " ) : [ value ];
+
+        for ( ; i < 4; i++ ) {
+          expanded[ prefix + cssExpand[ i ] + suffix ] =
+            parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+        }
+
+        return expanded;
+      }
+    };
+
+    if ( !rmargin.test( prefix ) ) {
+      jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+    }
+  } );
+
+  jQuery.fn.extend( {
+    css: function( name, value ) {
+      return access( this, function( elem, name, value ) {
+        var styles, len,
+          map = {},
+          i = 0;
+
+        if ( Array.isArray( name ) ) {
+          styles = getStyles( elem );
+          len = name.length;
+
+          for ( ; i < len; i++ ) {
+            map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+          }
+
+          return map;
+        }
+
+        return value !== undefined ?
+          jQuery.style( elem, name, value ) :
+          jQuery.css( elem, name );
+      }, name, value, arguments.length > 1 );
+    }
+  } );
+
+
+  function Tween( elem, options, prop, end, easing ) {
+    return new Tween.prototype.init( elem, options, prop, end, easing );
+  }
+  jQuery.Tween = Tween;
+
+  Tween.prototype = {
+    constructor: Tween,
+    init: function( elem, options, prop, end, easing, unit ) {
+      this.elem = elem;
+      this.prop = prop;
+      this.easing = easing || jQuery.easing._default;
+      this.options = options;
+      this.start = this.now = this.cur();
+      this.end = end;
+      this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+    },
+    cur: function() {
+      var hooks = Tween.propHooks[ this.prop ];
+
+      return hooks && hooks.get ?
+        hooks.get( this ) :
+        Tween.propHooks._default.get( this );
+    },
+    run: function( percent ) {
+      var eased,
+        hooks = Tween.propHooks[ this.prop ];
+
+      if ( this.options.duration ) {
+        this.pos = eased = jQuery.easing[ this.easing ](
+          percent, this.options.duration * percent, 0, 1, this.options.duration
+        );
+      } else {
+        this.pos = eased = percent;
+      }
+      this.now = ( this.end - this.start ) * eased + this.start;
+
+      if ( this.options.step ) {
+        this.options.step.call( this.elem, this.now, this );
+      }
+
+      if ( hooks && hooks.set ) {
+        hooks.set( this );
+      } else {
+        Tween.propHooks._default.set( this );
+      }
+      return this;
+    }
+  };
+
+  Tween.prototype.init.prototype = Tween.prototype;
+
+  Tween.propHooks = {
+    _default: {
+      get: function( tween ) {
+        var result;
+
+        // Use a property on the element directly when it is not a DOM element,
+        // or when there is no matching style property that exists.
+        if ( tween.elem.nodeType !== 1 ||
+          tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+          return tween.elem[ tween.prop ];
+        }
+
+        // Passing an empty string as a 3rd parameter to .css will automatically
+        // attempt a parseFloat and fallback to a string if the parse fails.
+        // Simple values such as "10px" are parsed to Float;
+        // complex values such as "rotate(1rad)" are returned as-is.
+        result = jQuery.css( tween.elem, tween.prop, "" );
+
+        // Empty strings, null, undefined and "auto" are converted to 0.
+        return !result || result === "auto" ? 0 : result;
+      },
+      set: function( tween ) {
+
+        // Use step hook for back compat.
+        // Use cssHook if its there.
+        // Use .style if available and use plain properties where available.
+        if ( jQuery.fx.step[ tween.prop ] ) {
+          jQuery.fx.step[ tween.prop ]( tween );
+        } else if ( tween.elem.nodeType === 1 &&
+          ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
+            jQuery.cssHooks[ tween.prop ] ) ) {
+          jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+        } else {
+          tween.elem[ tween.prop ] = tween.now;
+        }
+      }
+    }
+  };
+
+// Support: IE <=9 only
+// Panic based approach to setting things on disconnected nodes
+  Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+    set: function( tween ) {
+      if ( tween.elem.nodeType && tween.elem.parentNode ) {
+        tween.elem[ tween.prop ] = tween.now;
+      }
+    }
+  };
+
+  jQuery.easing = {
+    linear: function( p ) {
+      return p;
+    },
+    swing: function( p ) {
+      return 0.5 - Math.cos( p * Math.PI ) / 2;
+    },
+    _default: "swing"
+  };
+
+  jQuery.fx = Tween.prototype.init;
+
+// Back compat <1.8 extension point
+  jQuery.fx.step = {};
+
+
+
+
+  var
+    fxNow, inProgress,
+    rfxtypes = /^(?:toggle|show|hide)$/,
+    rrun = /queueHooks$/;
+
+  function schedule() {
+    if ( inProgress ) {
+      if ( document.hidden === false && window.requestAnimationFrame ) {
+        window.requestAnimationFrame( schedule );
+      } else {
+        window.setTimeout( schedule, jQuery.fx.interval );
+      }
+
+      jQuery.fx.tick();
+    }
+  }
+
+// Animations created synchronously will run synchronously
+  function createFxNow() {
+    window.setTimeout( function() {
+      fxNow = undefined;
+    } );
+    return ( fxNow = jQuery.now() );
+  }
+
+// Generate parameters to create a standard animation
+  function genFx( type, includeWidth ) {
+    var which,
+      i = 0,
+      attrs = { height: type };
+
+    // If we include width, step value is 1 to do all cssExpand values,
+    // otherwise step value is 2 to skip over Left and Right
+    includeWidth = includeWidth ? 1 : 0;
+    for ( ; i < 4; i += 2 - includeWidth ) {
+      which = cssExpand[ i ];
+      attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+    }
+
+    if ( includeWidth ) {
+      attrs.opacity = attrs.width = type;
+    }
+
+    return attrs;
+  }
+
+  function createTween( value, prop, animation ) {
+    var tween,
+      collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+      index = 0,
+      length = collection.length;
+    for ( ; index < length; index++ ) {
+      if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+
+        // We're done with this property
+        return tween;
+      }
+    }
+  }
+
+  function defaultPrefilter( elem, props, opts ) {
+    var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
+      isBox = "width" in props || "height" in props,
+      anim = this,
+      orig = {},
+      style = elem.style,
+      hidden = elem.nodeType && isHiddenWithinTree( elem ),
+      dataShow = dataPriv.get( elem, "fxshow" );
+
+    // Queue-skipping animations hijack the fx hooks
+    if ( !opts.queue ) {
+      hooks = jQuery._queueHooks( elem, "fx" );
+      if ( hooks.unqueued == null ) {
+        hooks.unqueued = 0;
+        oldfire = hooks.empty.fire;
+        hooks.empty.fire = function() {
+          if ( !hooks.unqueued ) {
+            oldfire();
+          }
+        };
+      }
+      hooks.unqueued++;
+
+      anim.always( function() {
+
+        // Ensure the complete handler is called before this completes
+        anim.always( function() {
+          hooks.unqueued--;
+          if ( !jQuery.queue( elem, "fx" ).length ) {
+            hooks.empty.fire();
+          }
+        } );
+      } );
+    }
+
+    // Detect show/hide animations
+    for ( prop in props ) {
+      value = props[ prop ];
+      if ( rfxtypes.test( value ) ) {
+        delete props[ prop ];
+        toggle = toggle || value === "toggle";
+        if ( value === ( hidden ? "hide" : "show" ) ) {
+
+          // Pretend to be hidden if this is a "show" and
+          // there is still data from a stopped show/hide
+          if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+            hidden = true;
+
+            // Ignore all other no-op show/hide data
+          } else {
+            continue;
+          }
+        }
+        orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+      }
+    }
+
+    // Bail out if this is a no-op like .hide().hide()
+    propTween = !jQuery.isEmptyObject( props );
+    if ( !propTween && jQuery.isEmptyObject( orig ) ) {
+      return;
+    }
+
+    // Restrict "overflow" and "display" styles during box animations
+    if ( isBox && elem.nodeType === 1 ) {
+
+      // Support: IE <=9 - 11, Edge 12 - 13
+      // Record all 3 overflow attributes because IE does not infer the shorthand
+      // from identically-valued overflowX and overflowY
+      opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+      // Identify a display type, preferring old show/hide data over the CSS cascade
+      restoreDisplay = dataShow && dataShow.display;
+      if ( restoreDisplay == null ) {
+        restoreDisplay = dataPriv.get( elem, "display" );
+      }
+      display = jQuery.css( elem, "display" );
+      if ( display === "none" ) {
+        if ( restoreDisplay ) {
+          display = restoreDisplay;
+        } else {
+
+          // Get nonempty value(s) by temporarily forcing visibility
+          showHide( [ elem ], true );
+          restoreDisplay = elem.style.display || restoreDisplay;
+          display = jQuery.css( elem, "display" );
+          showHide( [ elem ] );
+        }
+      }
+
+      // Animate inline elements as inline-block
+      if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
+        if ( jQuery.css( elem, "float" ) === "none" ) {
+
+          // Restore the original display value at the end of pure show/hide animations
+          if ( !propTween ) {
+            anim.done( function() {
+              style.display = restoreDisplay;
+            } );
+            if ( restoreDisplay == null ) {
+              display = style.display;
+              restoreDisplay = display === "none" ? "" : display;
+            }
+          }
+          style.display = "inline-block";
+        }
+      }
+    }
+
+    if ( opts.overflow ) {
+      style.overflow = "hidden";
+      anim.always( function() {
+        style.overflow = opts.overflow[ 0 ];
+        style.overflowX = opts.overflow[ 1 ];
+        style.overflowY = opts.overflow[ 2 ];
+      } );
+    }
+
+    // Implement show/hide animations
+    propTween = false;
+    for ( prop in orig ) {
+
+      // General show/hide setup for this element animation
+      if ( !propTween ) {
+        if ( dataShow ) {
+          if ( "hidden" in dataShow ) {
+            hidden = dataShow.hidden;
+          }
+        } else {
+          dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
+        }
+
+        // Store hidden/visible for toggle so `.stop().toggle()` "reverses"
+        if ( toggle ) {
+          dataShow.hidden = !hidden;
+        }
+
+        // Show elements before animating them
+        if ( hidden ) {
+          showHide( [ elem ], true );
+        }
+
+        /* eslint-disable no-loop-func */
+
+        anim.done( function() {
+
+          /* eslint-enable no-loop-func */
+
+          // The final step of a "hide" animation is actually hiding the element
+          if ( !hidden ) {
+            showHide( [ elem ] );
+          }
+          dataPriv.remove( elem, "fxshow" );
+          for ( prop in orig ) {
+            jQuery.style( elem, prop, orig[ prop ] );
+          }
+        } );
+      }
+
+      // Per-property setup
+      propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+      if ( !( prop in dataShow ) ) {
+        dataShow[ prop ] = propTween.start;
+        if ( hidden ) {
+          propTween.end = propTween.start;
+          propTween.start = 0;
+        }
+      }
+    }
+  }
+
+  function propFilter( props, specialEasing ) {
+    var index, name, easing, value, hooks;
+
+    // camelCase, specialEasing and expand cssHook pass
+    for ( index in props ) {
+      name = jQuery.camelCase( index );
+      easing = specialEasing[ name ];
+      value = props[ index ];
+      if ( Array.isArray( value ) ) {
+        easing = value[ 1 ];
+        value = props[ index ] = value[ 0 ];
+      }
+
+      if ( index !== name ) {
+        props[ name ] = value;
+        delete props[ index ];
+      }
+
+      hooks = jQuery.cssHooks[ name ];
+      if ( hooks && "expand" in hooks ) {
+        value = hooks.expand( value );
+        delete props[ name ];
+
+        // Not quite $.extend, this won't overwrite existing keys.
+        // Reusing 'index' because we have the correct "name"
+        for ( index in value ) {
+          if ( !( index in props ) ) {
+            props[ index ] = value[ index ];
+            specialEasing[ index ] = easing;
+          }
+        }
+      } else {
+        specialEasing[ name ] = easing;
+      }
+    }
+  }
+
+  function Animation( elem, properties, options ) {
+    var result,
+      stopped,
+      index = 0,
+      length = Animation.prefilters.length,
+      deferred = jQuery.Deferred().always( function() {
+
+        // Don't match elem in the :animated selector
+        delete tick.elem;
+      } ),
+      tick = function() {
+        if ( stopped ) {
+          return false;
+        }
+        var currentTime = fxNow || createFxNow(),
+          remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+
+          // Support: Android 2.3 only
+          // Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+          temp = remaining / animation.duration || 0,
+          percent = 1 - temp,
+          index = 0,
+          length = animation.tweens.length;
+
+        for ( ; index < length; index++ ) {
+          animation.tweens[ index ].run( percent );
+        }
+
+        deferred.notifyWith( elem, [ animation, percent, remaining ] );
+
+        // If there's more to do, yield
+        if ( percent < 1 && length ) {
+          return remaining;
+        }
+
+        // If this was an empty animation, synthesize a final progress notification
+        if ( !length ) {
+          deferred.notifyWith( elem, [ animation, 1, 0 ] );
+        }
+
+        // Resolve the animation and report its conclusion
+        deferred.resolveWith( elem, [ animation ] );
+        return false;
+      },
+      animation = deferred.promise( {
+        elem: elem,
+        props: jQuery.extend( {}, properties ),
+        opts: jQuery.extend( true, {
+          specialEasing: {},
+          easing: jQuery.easing._default
+        }, options ),
+        originalProperties: properties,
+        originalOptions: options,
+        startTime: fxNow || createFxNow(),
+        duration: options.duration,
+        tweens: [],
+        createTween: function( prop, end ) {
+          var tween = jQuery.Tween( elem, animation.opts, prop, end,
+            animation.opts.specialEasing[ prop ] || animation.opts.easing );
+          animation.tweens.push( tween );
+          return tween;
+        },
+        stop: function( gotoEnd ) {
+          var index = 0,
+
+            // If we are going to the end, we want to run all the tweens
+            // otherwise we skip this part
+            length = gotoEnd ? animation.tweens.length : 0;
+          if ( stopped ) {
+            return this;
+          }
+          stopped = true;
+          for ( ; index < length; index++ ) {
+            animation.tweens[ index ].run( 1 );
+          }
+
+          // Resolve when we played the last frame; otherwise, reject
+          if ( gotoEnd ) {
+            deferred.notifyWith( elem, [ animation, 1, 0 ] );
+            deferred.resolveWith( elem, [ animation, gotoEnd ] );
+          } else {
+            deferred.rejectWith( elem, [ animation, gotoEnd ] );
+          }
+          return this;
+        }
+      } ),
+      props = animation.props;
+
+    propFilter( props, animation.opts.specialEasing );
+
+    for ( ; index < length; index++ ) {
+      result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+      if ( result ) {
+        if ( jQuery.isFunction( result.stop ) ) {
+          jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+            jQuery.proxy( result.stop, result );
+        }
+        return result;
+      }
+    }
+
+    jQuery.map( props, createTween, animation );
+
+    if ( jQuery.isFunction( animation.opts.start ) ) {
+      animation.opts.start.call( elem, animation );
+    }
+
+    // Attach callbacks from options
+    animation
+      .progress( animation.opts.progress )
+      .done( animation.opts.done, animation.opts.complete )
+      .fail( animation.opts.fail )
+      .always( animation.opts.always );
+
+    jQuery.fx.timer(
+      jQuery.extend( tick, {
+        elem: elem,
+        anim: animation,
+        queue: animation.opts.queue
+      } )
+    );
+
+    return animation;
+  }
+
+  jQuery.Animation = jQuery.extend( Animation, {
+
+    tweeners: {
+      "*": [ function( prop, value ) {
+        var tween = this.createTween( prop, value );
+        adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+        return tween;
+      } ]
+    },
+
+    tweener: function( props, callback ) {
+      if ( jQuery.isFunction( props ) ) {
+        callback = props;
+        props = [ "*" ];
+      } else {
+        props = props.match( rnothtmlwhite );
+      }
+
+      var prop,
+        index = 0,
+        length = props.length;
+
+      for ( ; index < length; index++ ) {
+        prop = props[ index ];
+        Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+        Animation.tweeners[ prop ].unshift( callback );
+      }
+    },
+
+    prefilters: [ defaultPrefilter ],
+
+    prefilter: function( callback, prepend ) {
+      if ( prepend ) {
+        Animation.prefilters.unshift( callback );
+      } else {
+        Animation.prefilters.push( callback );
+      }
+    }
+  } );
+
+  jQuery.speed = function( speed, easing, fn ) {
+    var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+      complete: fn || !fn && easing ||
+      jQuery.isFunction( speed ) && speed,
+      duration: speed,
+      easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+    };
+
+    // Go to the end state if fx are off
+    if ( jQuery.fx.off ) {
+      opt.duration = 0;
+
+    } else {
+      if ( typeof opt.duration !== "number" ) {
+        if ( opt.duration in jQuery.fx.speeds ) {
+          opt.duration = jQuery.fx.speeds[ opt.duration ];
+
+        } else {
+          opt.duration = jQuery.fx.speeds._default;
+        }
+      }
+    }
+
+    // Normalize opt.queue - true/undefined/null -> "fx"
+    if ( opt.queue == null || opt.queue === true ) {
+      opt.queue = "fx";
+    }
+
+    // Queueing
+    opt.old = opt.complete;
+
+    opt.complete = function() {
+      if ( jQuery.isFunction( opt.old ) ) {
+        opt.old.call( this );
+      }
+
+      if ( opt.queue ) {
+        jQuery.dequeue( this, opt.queue );
+      }
+    };
+
+    return opt;
+  };
+
+  jQuery.fn.extend( {
+    fadeTo: function( speed, to, easing, callback ) {
+
+      // Show any hidden elements after setting opacity to 0
+      return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
+
+      // Animate to the value specified
+        .end().animate( { opacity: to }, speed, easing, callback );
+    },
+    animate: function( prop, speed, easing, callback ) {
+      var empty = jQuery.isEmptyObject( prop ),
+        optall = jQuery.speed( speed, easing, callback ),
+        doAnimation = function() {
+
+          // Operate on a copy of prop so per-property easing won't be lost
+          var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+          // Empty animations, or finishing resolves immediately
+          if ( empty || dataPriv.get( this, "finish" ) ) {
+            anim.stop( true );
+          }
+        };
+      doAnimation.finish = doAnimation;
+
+      return empty || optall.queue === false ?
+        this.each( doAnimation ) :
+        this.queue( optall.queue, doAnimation );
+    },
+    stop: function( type, clearQueue, gotoEnd ) {
+      var stopQueue = function( hooks ) {
+        var stop = hooks.stop;
+        delete hooks.stop;
+        stop( gotoEnd );
+      };
+
+      if ( typeof type !== "string" ) {
+        gotoEnd = clearQueue;
+        clearQueue = type;
+        type = undefined;
+      }
+      if ( clearQueue && type !== false ) {
+        this.queue( type || "fx", [] );
+      }
+
+      return this.each( function() {
+        var dequeue = true,
+          index = type != null && type + "queueHooks",
+          timers = jQuery.timers,
+          data = dataPriv.get( this );
+
+        if ( index ) {
+          if ( data[ index ] && data[ index ].stop ) {
+            stopQueue( data[ index ] );
+          }
+        } else {
+          for ( index in data ) {
+            if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+              stopQueue( data[ index ] );
+            }
+          }
+        }
+
+        for ( index = timers.length; index--; ) {
+          if ( timers[ index ].elem === this &&
+            ( type == null || timers[ index ].queue === type ) ) {
+
+            timers[ index ].anim.stop( gotoEnd );
+            dequeue = false;
+            timers.splice( index, 1 );
+          }
+        }
+
+        // Start the next in the queue if the last step wasn't forced.
+        // Timers currently will call their complete callbacks, which
+        // will dequeue but only if they were gotoEnd.
+        if ( dequeue || !gotoEnd ) {
+          jQuery.dequeue( this, type );
+        }
+      } );
+    },
+    finish: function( type ) {
+      if ( type !== false ) {
+        type = type || "fx";
+      }
+      return this.each( function() {
+        var index,
+          data = dataPriv.get( this ),
+          queue = data[ type + "queue" ],
+          hooks = data[ type + "queueHooks" ],
+          timers = jQuery.timers,
+          length = queue ? queue.length : 0;
+
+        // Enable finishing flag on private data
+        data.finish = true;
+
+        // Empty the queue first
+        jQuery.queue( this, type, [] );
+
+        if ( hooks && hooks.stop ) {
+          hooks.stop.call( this, true );
+        }
+
+        // Look for any active animations, and finish them
+        for ( index = timers.length; index--; ) {
+          if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+            timers[ index ].anim.stop( true );
+            timers.splice( index, 1 );
+          }
+        }
+
+        // Look for any animations in the old queue and finish them
+        for ( index = 0; index < length; index++ ) {
+          if ( queue[ index ] && queue[ index ].finish ) {
+            queue[ index ].finish.call( this );
+          }
+        }
+
+        // Turn off finishing flag
+        delete data.finish;
+      } );
+    }
+  } );
+
+  jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+    var cssFn = jQuery.fn[ name ];
+    jQuery.fn[ name ] = function( speed, easing, callback ) {
+      return speed == null || typeof speed === "boolean" ?
+        cssFn.apply( this, arguments ) :
+        this.animate( genFx( name, true ), speed, easing, callback );
+    };
+  } );
+
+// Generate shortcuts for custom animations
+  jQuery.each( {
+    slideDown: genFx( "show" ),
+    slideUp: genFx( "hide" ),
+    slideToggle: genFx( "toggle" ),
+    fadeIn: { opacity: "show" },
+    fadeOut: { opacity: "hide" },
+    fadeToggle: { opacity: "toggle" }
+  }, function( name, props ) {
+    jQuery.fn[ name ] = function( speed, easing, callback ) {
+      return this.animate( props, speed, easing, callback );
+    };
+  } );
+
+  jQuery.timers = [];
+  jQuery.fx.tick = function() {
+    var timer,
+      i = 0,
+      timers = jQuery.timers;
+
+    fxNow = jQuery.now();
+
+    for ( ; i < timers.length; i++ ) {
+      timer = timers[ i ];
+
+      // Run the timer and safely remove it when done (allowing for external removal)
+      if ( !timer() && timers[ i ] === timer ) {
+        timers.splice( i--, 1 );
+      }
+    }
+
+    if ( !timers.length ) {
+      jQuery.fx.stop();
+    }
+    fxNow = undefined;
+  };
+
+  jQuery.fx.timer = function( timer ) {
+    jQuery.timers.push( timer );
+    jQuery.fx.start();
+  };
+
+  jQuery.fx.interval = 13;
+  jQuery.fx.start = function() {
+    if ( inProgress ) {
+      return;
+    }
+
+    inProgress = true;
+    schedule();
+  };
+
+  jQuery.fx.stop = function() {
+    inProgress = null;
+  };
+
+  jQuery.fx.speeds = {
+    slow: 600,
+    fast: 200,
+
+    // Default speed
+    _default: 400
+  };
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+  jQuery.fn.delay = function( time, type ) {
+    time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+    type = type || "fx";
+
+    return this.queue( type, function( next, hooks ) {
+      var timeout = window.setTimeout( next, time );
+      hooks.stop = function() {
+        window.clearTimeout( timeout );
+      };
+    } );
+  };
+
+
+  ( function() {
+    var input = document.createElement( "input" ),
+      select = document.createElement( "select" ),
+      opt = select.appendChild( document.createElement( "option" ) );
+
+    input.type = "checkbox";
+
+    // Support: Android <=4.3 only
+    // Default value for a checkbox should be "on"
+    support.checkOn = input.value !== "";
+
+    // Support: IE <=11 only
+    // Must access selectedIndex to make default options select
+    support.optSelected = opt.selected;
+
+    // Support: IE <=11 only
+    // An input loses its value after becoming a radio
+    input = document.createElement( "input" );
+    input.value = "t";
+    input.type = "radio";
+    support.radioValue = input.value === "t";
+  } )();
+
+
+  var boolHook,
+    attrHandle = jQuery.expr.attrHandle;
+
+  jQuery.fn.extend( {
+    attr: function( name, value ) {
+      return access( this, jQuery.attr, name, value, arguments.length > 1 );
+    },
+
+    removeAttr: function( name ) {
+      return this.each( function() {
+        jQuery.removeAttr( this, name );
+      } );
+    }
+  } );
+
+  jQuery.extend( {
+    attr: function( elem, name, value ) {
+      var ret, hooks,
+        nType = elem.nodeType;
+
+      // Don't get/set attributes on text, comment and attribute nodes
+      if ( nType === 3 || nType === 8 || nType === 2 ) {
+        return;
+      }
+
+      // Fallback to prop when attributes are not supported
+      if ( typeof elem.getAttribute === "undefined" ) {
+        return jQuery.prop( elem, name, value );
+      }
+
+      // Attribute hooks are determined by the lowercase version
+      // Grab necessary hook if one is defined
+      if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+        hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
+          ( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
+      }
+
+      if ( value !== undefined ) {
+        if ( value === null ) {
+          jQuery.removeAttr( elem, name );
+          return;
+        }
+
+        if ( hooks && "set" in hooks &&
+          ( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+          return ret;
+        }
+
+        elem.setAttribute( name, value + "" );
+        return value;
+      }
+
+      if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+        return ret;
+      }
+
+      ret = jQuery.find.attr( elem, name );
+
+      // Non-existent attributes return null, we normalize to undefined
+      return ret == null ? undefined : ret;
+    },
+
+    attrHooks: {
+      type: {
+        set: function( elem, value ) {
+          if ( !support.radioValue && value === "radio" &&
+            nodeName( elem, "input" ) ) {
+            var val = elem.value;
+            elem.setAttribute( "type", value );
+            if ( val ) {
+              elem.value = val;
+            }
+            return value;
+          }
+        }
+      }
+    },
+
+    removeAttr: function( elem, value ) {
+      var name,
+        i = 0,
+
+        // Attribute names can contain non-HTML whitespace characters
+        // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+        attrNames = value && value.match( rnothtmlwhite );
+
+      if ( attrNames && elem.nodeType === 1 ) {
+        while ( ( name = attrNames[ i++ ] ) ) {
+          elem.removeAttribute( name );
+        }
+      }
+    }
+  } );
+
+// Hooks for boolean attributes
+  boolHook = {
+    set: function( elem, value, name ) {
+      if ( value === false ) {
+
+        // Remove boolean attributes when set to false
+        jQuery.removeAttr( elem, name );
+      } else {
+        elem.setAttribute( name, name );
+      }
+      return name;
+    }
+  };
+
+  jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+    var getter = attrHandle[ name ] || jQuery.find.attr;
+
+    attrHandle[ name ] = function( elem, name, isXML ) {
+      var ret, handle,
+        lowercaseName = name.toLowerCase();
+
+      if ( !isXML ) {
+
+        // Avoid an infinite loop by temporarily removing this function from the getter
+        handle = attrHandle[ lowercaseName ];
+        attrHandle[ lowercaseName ] = ret;
+        ret = getter( elem, name, isXML ) != null ?
+          lowercaseName :
+          null;
+        attrHandle[ lowercaseName ] = handle;
+      }
+      return ret;
+    };
+  } );
+
+
+
+
+  var rfocusable = /^(?:input|select|textarea|button)$/i,
+    rclickable = /^(?:a|area)$/i;
+
+  jQuery.fn.extend( {
+    prop: function( name, value ) {
+      return access( this, jQuery.prop, name, value, arguments.length > 1 );
+    },
+
+    removeProp: function( name ) {
+      return this.each( function() {
+        delete this[ jQuery.propFix[ name ] || name ];
+      } );
+    }
+  } );
+
+  jQuery.extend( {
+    prop: function( elem, name, value ) {
+      var ret, hooks,
+        nType = elem.nodeType;
+
+      // Don't get/set properties on text, comment and attribute nodes
+      if ( nType === 3 || nType === 8 || nType === 2 ) {
+        return;
+      }
+
+      if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+
+        // Fix name and attach hooks
+        name = jQuery.propFix[ name ] || name;
+        hooks = jQuery.propHooks[ name ];
+      }
+
+      if ( value !== undefined ) {
+        if ( hooks && "set" in hooks &&
+          ( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+          return ret;
+        }
+
+        return ( elem[ name ] = value );
+      }
+
+      if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+        return ret;
+      }
+
+      return elem[ name ];
+    },
+
+    propHooks: {
+      tabIndex: {
+        get: function( elem ) {
+
+          // Support: IE <=9 - 11 only
+          // elem.tabIndex doesn't always return the
+          // correct value when it hasn't been explicitly set
+          // https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+          // Use proper attribute retrieval(#12072)
+          var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+          if ( tabindex ) {
+            return parseInt( tabindex, 10 );
+          }
+
+          if (
+            rfocusable.test( elem.nodeName ) ||
+            rclickable.test( elem.nodeName ) &&
+            elem.href
+          ) {
+            return 0;
+          }
+
+          return -1;
+        }
+      }
+    },
+
+    propFix: {
+      "for": "htmlFor",
+      "class": "className"
+    }
+  } );
+
+// Support: IE <=11 only
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+// eslint rule "no-unused-expressions" is disabled for this code
+// since it considers such accessions noop
+  if ( !support.optSelected ) {
+    jQuery.propHooks.selected = {
+      get: function( elem ) {
+
+        /* eslint no-unused-expressions: "off" */
+
+        var parent = elem.parentNode;
+        if ( parent && parent.parentNode ) {
+          parent.parentNode.selectedIndex;
+        }
+        return null;
+      },
+      set: function( elem ) {
+
+        /* eslint no-unused-expressions: "off" */
+
+        var parent = elem.parentNode;
+        if ( parent ) {
+          parent.selectedIndex;
+
+          if ( parent.parentNode ) {
+            parent.parentNode.selectedIndex;
+          }
+        }
+      }
+    };
+  }
+
+  jQuery.each( [
+    "tabIndex",
+    "readOnly",
+    "maxLength",
+    "cellSpacing",
+    "cellPadding",
+    "rowSpan",
+    "colSpan",
+    "useMap",
+    "frameBorder",
+    "contentEditable"
+  ], function() {
+    jQuery.propFix[ this.toLowerCase() ] = this;
+  } );
+
+
+
+
+  // Strip and collapse whitespace according to HTML spec
+  // https://html.spec.whatwg.org/multipage/infrastructure.html#strip-and-collapse-whitespace
+  function stripAndCollapse( value ) {
+    var tokens = value.match( rnothtmlwhite ) || [];
+    return tokens.join( " " );
+  }
+
+
+  function getClass( elem ) {
+    return elem.getAttribute && elem.getAttribute( "class" ) || "";
+  }
+
+  jQuery.fn.extend( {
+    addClass: function( value ) {
+      var classes, elem, cur, curValue, clazz, j, finalValue,
+        i = 0;
+
+      if ( jQuery.isFunction( value ) ) {
+        return this.each( function( j ) {
+          jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+        } );
+      }
+
+      if ( typeof value === "string" && value ) {
+        classes = value.match( rnothtmlwhite ) || [];
+
+        while ( ( elem = this[ i++ ] ) ) {
+          curValue = getClass( elem );
+          cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+
+          if ( cur ) {
+            j = 0;
+            while ( ( clazz = classes[ j++ ] ) ) {
+              if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+                cur += clazz + " ";
+              }
+            }
+
+            // Only assign if different to avoid unneeded rendering.
+            finalValue = stripAndCollapse( cur );
+            if ( curValue !== finalValue ) {
+              elem.setAttribute( "class", finalValue );
+            }
+          }
+        }
+      }
+
+      return this;
+    },
+
+    removeClass: function( value ) {
+      var classes, elem, cur, curValue, clazz, j, finalValue,
+        i = 0;
+
+      if ( jQuery.isFunction( value ) ) {
+        return this.each( function( j ) {
+          jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+        } );
+      }
+
+      if ( !arguments.length ) {
+        return this.attr( "class", "" );
+      }
+
+      if ( typeof value === "string" && value ) {
+        classes = value.match( rnothtmlwhite ) || [];
+
+        while ( ( elem = this[ i++ ] ) ) {
+          curValue = getClass( elem );
+
+          // This expression is here for better compressibility (see addClass)
+          cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+
+          if ( cur ) {
+            j = 0;
+            while ( ( clazz = classes[ j++ ] ) ) {
+
+              // Remove *all* instances
+              while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+                cur = cur.replace( " " + clazz + " ", " " );
+              }
+            }
+
+            // Only assign if different to avoid unneeded rendering.
+            finalValue = stripAndCollapse( cur );
+            if ( curValue !== finalValue ) {
+              elem.setAttribute( "class", finalValue );
+            }
+          }
+        }
+      }
+
+      return this;
+    },
+
+    toggleClass: function( value, stateVal ) {
+      var type = typeof value;
+
+      if ( typeof stateVal === "boolean" && type === "string" ) {
+        return stateVal ? this.addClass( value ) : this.removeClass( value );
+      }
+
+      if ( jQuery.isFunction( value ) ) {
+        return this.each( function( i ) {
+          jQuery( this ).toggleClass(
+            value.call( this, i, getClass( this ), stateVal ),
+            stateVal
+          );
+        } );
+      }
+
+      return this.each( function() {
+        var className, i, self, classNames;
+
+        if ( type === "string" ) {
+
+          // Toggle individual class names
+          i = 0;
+          self = jQuery( this );
+          classNames = value.match( rnothtmlwhite ) || [];
+
+          while ( ( className = classNames[ i++ ] ) ) {
+
+            // Check each className given, space separated list
+            if ( self.hasClass( className ) ) {
+              self.removeClass( className );
+            } else {
+              self.addClass( className );
+            }
+          }
+
+          // Toggle whole class name
+        } else if ( value === undefined || type === "boolean" ) {
+          className = getClass( this );
+          if ( className ) {
+
+            // Store className if set
+            dataPriv.set( this, "__className__", className );
+          }
+
+          // If the element has a class name or if we're passed `false`,
+          // then remove the whole classname (if there was one, the above saved it).
+          // Otherwise bring back whatever was previously saved (if anything),
+          // falling back to the empty string if nothing was stored.
+          if ( this.setAttribute ) {
+            this.setAttribute( "class",
+              className || value === false ?
+                "" :
+                dataPriv.get( this, "__className__" ) || ""
+            );
+          }
+        }
+      } );
+    },
+
+    hasClass: function( selector ) {
+      var className, elem,
+        i = 0;
+
+      className = " " + selector + " ";
+      while ( ( elem = this[ i++ ] ) ) {
+        if ( elem.nodeType === 1 &&
+          ( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
+          return true;
+        }
+      }
+
+      return false;
+    }
+  } );
+
+
+
+
+  var rreturn = /\r/g;
+
+  jQuery.fn.extend( {
+    val: function( value ) {
+      var hooks, ret, isFunction,
+        elem = this[ 0 ];
+
+      if ( !arguments.length ) {
+        if ( elem ) {
+          hooks = jQuery.valHooks[ elem.type ] ||
+            jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+          if ( hooks &&
+            "get" in hooks &&
+            ( ret = hooks.get( elem, "value" ) ) !== undefined
+          ) {
+            return ret;
+          }
+
+          ret = elem.value;
+
+          // Handle most common string cases
+          if ( typeof ret === "string" ) {
+            return ret.replace( rreturn, "" );
+          }
+
+          // Handle cases where value is null/undef or number
+          return ret == null ? "" : ret;
+        }
+
+        return;
+      }
+
+      isFunction = jQuery.isFunction( value );
+
+      return this.each( function( i ) {
+        var val;
+
+        if ( this.nodeType !== 1 ) {
+          return;
+        }
+
+        if ( isFunction ) {
+          val = value.call( this, i, jQuery( this ).val() );
+        } else {
+          val = value;
+        }
+
+        // Treat null/undefined as ""; convert numbers to string
+        if ( val == null ) {
+          val = "";
+
+        } else if ( typeof val === "number" ) {
+          val += "";
+
+        } else if ( Array.isArray( val ) ) {
+          val = jQuery.map( val, function( value ) {
+            return value == null ? "" : value + "";
+          } );
+        }
+
+        hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+        // If set returns undefined, fall back to normal setting
+        if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+          this.value = val;
+        }
+      } );
+    }
+  } );
+
+  jQuery.extend( {
+    valHooks: {
+      option: {
+        get: function( elem ) {
+
+          var val = jQuery.find.attr( elem, "value" );
+          return val != null ?
+            val :
+
+            // Support: IE <=10 - 11 only
+            // option.text throws exceptions (#14686, #14858)
+            // Strip and collapse whitespace
+            // https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+            stripAndCollapse( jQuery.text( elem ) );
+        }
+      },
+      select: {
+        get: function( elem ) {
+          var value, option, i,
+            options = elem.options,
+            index = elem.selectedIndex,
+            one = elem.type === "select-one",
+            values = one ? null : [],
+            max = one ? index + 1 : options.length;
+
+          if ( index < 0 ) {
+            i = max;
+
+          } else {
+            i = one ? index : 0;
+          }
+
+          // Loop through all the selected options
+          for ( ; i < max; i++ ) {
+            option = options[ i ];
+
+            // Support: IE <=9 only
+            // IE8-9 doesn't update selected after form reset (#2551)
+            if ( ( option.selected || i === index ) &&
+
+              // Don't return options that are disabled or in a disabled optgroup
+              !option.disabled &&
+              ( !option.parentNode.disabled ||
+                !nodeName( option.parentNode, "optgroup" ) ) ) {
+
+              // Get the specific value for the option
+              value = jQuery( option ).val();
+
+              // We don't need an array for one selects
+              if ( one ) {
+                return value;
+              }
+
+              // Multi-Selects return an array
+              values.push( value );
+            }
+          }
+
+          return values;
+        },
+
+        set: function( elem, value ) {
+          var optionSet, option,
+            options = elem.options,
+            values = jQuery.makeArray( value ),
+            i = options.length;
+
+          while ( i-- ) {
+            option = options[ i ];
+
+            /* eslint-disable no-cond-assign */
+
+            if ( option.selected =
+                jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
+            ) {
+              optionSet = true;
+            }
+
+            /* eslint-enable no-cond-assign */
+          }
+
+          // Force browsers to behave consistently when non-matching value is set
+          if ( !optionSet ) {
+            elem.selectedIndex = -1;
+          }
+          return values;
+        }
+      }
+    }
+  } );
+
+// Radios and checkboxes getter/setter
+  jQuery.each( [ "radio", "checkbox" ], function() {
+    jQuery.valHooks[ this ] = {
+      set: function( elem, value ) {
+        if ( Array.isArray( value ) ) {
+          return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+        }
+      }
+    };
+    if ( !support.checkOn ) {
+      jQuery.valHooks[ this ].get = function( elem ) {
+        return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+      };
+    }
+  } );
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+  var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/;
+
+  jQuery.extend( jQuery.event, {
+
+    trigger: function( event, data, elem, onlyHandlers ) {
+
+      var i, cur, tmp, bubbleType, ontype, handle, special,
+        eventPath = [ elem || document ],
+        type = hasOwn.call( event, "type" ) ? event.type : event,
+        namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
+
+      cur = tmp = elem = elem || document;
+
+      // Don't do events on text and comment nodes
+      if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+        return;
+      }
+
+      // focus/blur morphs to focusin/out; ensure we're not firing them right now
+      if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+        return;
+      }
+
+      if ( type.indexOf( "." ) > -1 ) {
+
+        // Namespaced trigger; create a regexp to match event type in handle()
+        namespaces = type.split( "." );
+        type = namespaces.shift();
+        namespaces.sort();
+      }
+      ontype = type.indexOf( ":" ) < 0 && "on" + type;
+
+      // Caller can pass in a jQuery.Event object, Object, or just an event type string
+      event = event[ jQuery.expando ] ?
+        event :
+        new jQuery.Event( type, typeof event === "object" && event );
+
+      // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+      event.isTrigger = onlyHandlers ? 2 : 3;
+      event.namespace = namespaces.join( "." );
+      event.rnamespace = event.namespace ?
+        new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
+        null;
+
+      // Clean up the event in case it is being reused
+      event.result = undefined;
+      if ( !event.target ) {
+        event.target = elem;
+      }
+
+      // Clone any incoming data and prepend the event, creating the handler arg list
+      data = data == null ?
+        [ event ] :
+        jQuery.makeArray( data, [ event ] );
+
+      // Allow special events to draw outside the lines
+      special = jQuery.event.special[ type ] || {};
+      if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+        return;
+      }
+
+      // Determine event propagation path in advance, per W3C events spec (#9951)
+      // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+      if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+        bubbleType = special.delegateType || type;
+        if ( !rfocusMorph.test( bubbleType + type ) ) {
+          cur = cur.parentNode;
+        }
+        for ( ; cur; cur = cur.parentNode ) {
+          eventPath.push( cur );
+          tmp = cur;
+        }
+
+        // Only add window if we got to document (e.g., not plain obj or detached DOM)
+        if ( tmp === ( elem.ownerDocument || document ) ) {
+          eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+        }
+      }
+
+      // Fire handlers on the event path
+      i = 0;
+      while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
+
+        event.type = i > 1 ?
+          bubbleType :
+          special.bindType || type;
+
+        // jQuery handler
+        handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+          dataPriv.get( cur, "handle" );
+        if ( handle ) {
+          handle.apply( cur, data );
+        }
+
+        // Native handler
+        handle = ontype && cur[ ontype ];
+        if ( handle && handle.apply && acceptData( cur ) ) {
+          event.result = handle.apply( cur, data );
+          if ( event.result === false ) {
+            event.preventDefault();
+          }
+        }
+      }
+      event.type = type;
+
+      // If nobody prevented the default action, do it now
+      if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+        if ( ( !special._default ||
+            special._default.apply( eventPath.pop(), data ) === false ) &&
+          acceptData( elem ) ) {
+
+          // Call a native DOM method on the target with the same name as the event.
+          // Don't do default actions on window, that's where global variables be (#6170)
+          if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
+
+            // Don't re-trigger an onFOO event when we call its FOO() method
+            tmp = elem[ ontype ];
+
+            if ( tmp ) {
+              elem[ ontype ] = null;
+            }
+
+            // Prevent re-triggering of the same event, since we already bubbled it above
+            jQuery.event.triggered = type;
+            elem[ type ]();
+            jQuery.event.triggered = undefined;
+
+            if ( tmp ) {
+              elem[ ontype ] = tmp;
+            }
+          }
+        }
+      }
+
+      return event.result;
+    },
+
+    // Piggyback on a donor event to simulate a different one
+    // Used only for `focus(in | out)` events
+    simulate: function( type, elem, event ) {
+      var e = jQuery.extend(
+        new jQuery.Event(),
+        event,
+        {
+          type: type,
+          isSimulated: true
+        }
+      );
+
+      jQuery.event.trigger( e, null, elem );
+    }
+
+  } );
+
+  jQuery.fn.extend( {
+
+    trigger: function( type, data ) {
+      return this.each( function() {
+        jQuery.event.trigger( type, data, this );
+      } );
+    },
+    triggerHandler: function( type, data ) {
+      var elem = this[ 0 ];
+      if ( elem ) {
+        return jQuery.event.trigger( type, data, elem, true );
+      }
+    }
+  } );
+
+
+  jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+    "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+    "change select submit keydown keypress keyup contextmenu" ).split( " " ),
+    function( i, name ) {
+
+      // Handle event binding
+      jQuery.fn[ name ] = function( data, fn ) {
+        return arguments.length > 0 ?
+          this.on( name, null, data, fn ) :
+          this.trigger( name );
+      };
+    } );
+
+  jQuery.fn.extend( {
+    hover: function( fnOver, fnOut ) {
+      return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+    }
+  } );
+
+
+
+
+  support.focusin = "onfocusin" in window;
+
+
+// Support: Firefox <=44
+// Firefox doesn't have focus(in | out) events
+// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+//
+// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
+// focus(in | out) events fire after focus & blur events,
+// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
+  if ( !support.focusin ) {
+    jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+      // Attach a single capturing handler on the document while someone wants focusin/focusout
+      var handler = function( event ) {
+        jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+      };
+
+      jQuery.event.special[ fix ] = {
+        setup: function() {
+          var doc = this.ownerDocument || this,
+            attaches = dataPriv.access( doc, fix );
+
+          if ( !attaches ) {
+            doc.addEventListener( orig, handler, true );
+          }
+          dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
+        },
+        teardown: function() {
+          var doc = this.ownerDocument || this,
+            attaches = dataPriv.access( doc, fix ) - 1;
+
+          if ( !attaches ) {
+            doc.removeEventListener( orig, handler, true );
+            dataPriv.remove( doc, fix );
+
+          } else {
+            dataPriv.access( doc, fix, attaches );
+          }
+        }
+      };
+    } );
+  }
+  var location = window.location;
+
+  var nonce = jQuery.now();
+
+  var rquery = ( /\?/ );
+
+
+
+// Cross-browser xml parsing
+  jQuery.parseXML = function( data ) {
+    var xml;
+    if ( !data || typeof data !== "string" ) {
+      return null;
+    }
+
+    // Support: IE 9 - 11 only
+    // IE throws on parseFromString with invalid input.
+    try {
+      xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
+    } catch ( e ) {
+      xml = undefined;
+    }
+
+    if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
+      jQuery.error( "Invalid XML: " + data );
+    }
+    return xml;
+  };
+
+
+  var
+    rbracket = /\[\]$/,
+    rCRLF = /\r?\n/g,
+    rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+    rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+  function buildParams( prefix, obj, traditional, add ) {
+    var name;
+
+    if ( Array.isArray( obj ) ) {
+
+      // Serialize array item.
+      jQuery.each( obj, function( i, v ) {
+        if ( traditional || rbracket.test( prefix ) ) {
+
+          // Treat each array item as a scalar.
+          add( prefix, v );
+
+        } else {
+
+          // Item is non-scalar (array or object), encode its numeric index.
+          buildParams(
+            prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+            v,
+            traditional,
+            add
+          );
+        }
+      } );
+
+    } else if ( !traditional && jQuery.type( obj ) === "object" ) {
+
+      // Serialize object item.
+      for ( name in obj ) {
+        buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+      }
+
+    } else {
+
+      // Serialize scalar item.
+      add( prefix, obj );
+    }
+  }
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+  jQuery.param = function( a, traditional ) {
+    var prefix,
+      s = [],
+      add = function( key, valueOrFunction ) {
+
+        // If value is a function, invoke it and use its return value
+        var value = jQuery.isFunction( valueOrFunction ) ?
+          valueOrFunction() :
+          valueOrFunction;
+
+        s[ s.length ] = encodeURIComponent( key ) + "=" +
+          encodeURIComponent( value == null ? "" : value );
+      };
+
+    // If an array was passed in, assume that it is an array of form elements.
+    if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+      // Serialize the form elements
+      jQuery.each( a, function() {
+        add( this.name, this.value );
+      } );
+
+    } else {
+
+      // If traditional, encode the "old" way (the way 1.3.2 or older
+      // did it), otherwise encode params recursively.
+      for ( prefix in a ) {
+        buildParams( prefix, a[ prefix ], traditional, add );
+      }
+    }
+
+    // Return the resulting serialization
+    return s.join( "&" );
+  };
+
+  jQuery.fn.extend( {
+    serialize: function() {
+      return jQuery.param( this.serializeArray() );
+    },
+    serializeArray: function() {
+      return this.map( function() {
+
+        // Can add propHook for "elements" to filter or add form elements
+        var elements = jQuery.prop( this, "elements" );
+        return elements ? jQuery.makeArray( elements ) : this;
+      } )
+        .filter( function() {
+          var type = this.type;
+
+          // Use .is( ":disabled" ) so that fieldset[disabled] works
+          return this.name && !jQuery( this ).is( ":disabled" ) &&
+            rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+            ( this.checked || !rcheckableType.test( type ) );
+        } )
+        .map( function( i, elem ) {
+          var val = jQuery( this ).val();
+
+          if ( val == null ) {
+            return null;
+          }
+
+          if ( Array.isArray( val ) ) {
+            return jQuery.map( val, function( val ) {
+              return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+            } );
+          }
+
+          return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+        } ).get();
+    }
+  } );
+
+
+  var
+    r20 = /%20/g,
+    rhash = /#.*$/,
+    rantiCache = /([?&])_=[^&]*/,
+    rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
+
+    // #7653, #8125, #8152: local protocol detection
+    rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+    rnoContent = /^(?:GET|HEAD)$/,
+    rprotocol = /^\/\//,
+
+    /* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+    prefilters = {},
+
+    /* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+    transports = {},
+
+    // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+    allTypes = "*/".concat( "*" ),
+
+    // Anchor tag for parsing the document origin
+    originAnchor = document.createElement( "a" );
+  originAnchor.href = location.href;
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+  function addToPrefiltersOrTransports( structure ) {
+
+    // dataTypeExpression is optional and defaults to "*"
+    return function( dataTypeExpression, func ) {
+
+      if ( typeof dataTypeExpression !== "string" ) {
+        func = dataTypeExpression;
+        dataTypeExpression = "*";
+      }
+
+      var dataType,
+        i = 0,
+        dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || [];
+
+      if ( jQuery.isFunction( func ) ) {
+
+        // For each dataType in the dataTypeExpression
+        while ( ( dataType = dataTypes[ i++ ] ) ) {
+
+          // Prepend if requested
+          if ( dataType[ 0 ] === "+" ) {
+            dataType = dataType.slice( 1 ) || "*";
+            ( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
+
+            // Otherwise append
+          } else {
+            ( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
+          }
+        }
+      }
+    };
+  }
+
+// Base inspection function for prefilters and transports
+  function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+    var inspected = {},
+      seekingTransport = ( structure === transports );
+
+    function inspect( dataType ) {
+      var selected;
+      inspected[ dataType ] = true;
+      jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+        var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+        if ( typeof dataTypeOrTransport === "string" &&
+          !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+
+          options.dataTypes.unshift( dataTypeOrTransport );
+          inspect( dataTypeOrTransport );
+          return false;
+        } else if ( seekingTransport ) {
+          return !( selected = dataTypeOrTransport );
+        }
+      } );
+      return selected;
+    }
+
+    return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+  }
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+  function ajaxExtend( target, src ) {
+    var key, deep,
+      flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+    for ( key in src ) {
+      if ( src[ key ] !== undefined ) {
+        ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+      }
+    }
+    if ( deep ) {
+      jQuery.extend( true, target, deep );
+    }
+
+    return target;
+  }
+
+  /* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+  function ajaxHandleResponses( s, jqXHR, responses ) {
+
+    var ct, type, finalDataType, firstDataType,
+      contents = s.contents,
+      dataTypes = s.dataTypes;
+
+    // Remove auto dataType and get content-type in the process
+    while ( dataTypes[ 0 ] === "*" ) {
+      dataTypes.shift();
+      if ( ct === undefined ) {
+        ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
+      }
+    }
+
+    // Check if we're dealing with a known content-type
+    if ( ct ) {
+      for ( type in contents ) {
+        if ( contents[ type ] && contents[ type ].test( ct ) ) {
+          dataTypes.unshift( type );
+          break;
+        }
+      }
+    }
+
+    // Check to see if we have a response for the expected dataType
+    if ( dataTypes[ 0 ] in responses ) {
+      finalDataType = dataTypes[ 0 ];
+    } else {
+
+      // Try convertible dataTypes
+      for ( type in responses ) {
+        if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
+          finalDataType = type;
+          break;
+        }
+        if ( !firstDataType ) {
+          firstDataType = type;
+        }
+      }
+
+      // Or just use first one
+      finalDataType = finalDataType || firstDataType;
+    }
+
+    // If we found a dataType
+    // We add the dataType to the list if needed
+    // and return the corresponding response
+    if ( finalDataType ) {
+      if ( finalDataType !== dataTypes[ 0 ] ) {
+        dataTypes.unshift( finalDataType );
+      }
+      return responses[ finalDataType ];
+    }
+  }
+
+  /* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+  function ajaxConvert( s, response, jqXHR, isSuccess ) {
+    var conv2, current, conv, tmp, prev,
+      converters = {},
+
+      // Work with a copy of dataTypes in case we need to modify it for conversion
+      dataTypes = s.dataTypes.slice();
+
+    // Create converters map with lowercased keys
+    if ( dataTypes[ 1 ] ) {
+      for ( conv in s.converters ) {
+        converters[ conv.toLowerCase() ] = s.converters[ conv ];
+      }
+    }
+
+    current = dataTypes.shift();
+
+    // Convert to each sequential dataType
+    while ( current ) {
+
+      if ( s.responseFields[ current ] ) {
+        jqXHR[ s.responseFields[ current ] ] = response;
+      }
+
+      // Apply the dataFilter if provided
+      if ( !prev && isSuccess && s.dataFilter ) {
+        response = s.dataFilter( response, s.dataType );
+      }
+
+      prev = current;
+      current = dataTypes.shift();
+
+      if ( current ) {
+
+        // There's only work to do if current dataType is non-auto
+        if ( current === "*" ) {
+
+          current = prev;
+
+          // Convert response if prev dataType is non-auto and differs from current
+        } else if ( prev !== "*" && prev !== current ) {
+
+          // Seek a direct converter
+          conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+          // If none found, seek a pair
+          if ( !conv ) {
+            for ( conv2 in converters ) {
+
+              // If conv2 outputs current
+              tmp = conv2.split( " " );
+              if ( tmp[ 1 ] === current ) {
+
+                // If prev can be converted to accepted input
+                conv = converters[ prev + " " + tmp[ 0 ] ] ||
+                  converters[ "* " + tmp[ 0 ] ];
+                if ( conv ) {
+
+                  // Condense equivalence converters
+                  if ( conv === true ) {
+                    conv = converters[ conv2 ];
+
+                    // Otherwise, insert the intermediate dataType
+                  } else if ( converters[ conv2 ] !== true ) {
+                    current = tmp[ 0 ];
+                    dataTypes.unshift( tmp[ 1 ] );
+                  }
+                  break;
+                }
+              }
+            }
+          }
+
+          // Apply converter (if not an equivalence)
+          if ( conv !== true ) {
+
+            // Unless errors are allowed to bubble, catch and return them
+            if ( conv && s.throws ) {
+              response = conv( response );
+            } else {
+              try {
+                response = conv( response );
+              } catch ( e ) {
+                return {
+                  state: "parsererror",
+                  error: conv ? e : "No conversion from " + prev + " to " + current
+                };
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return { state: "success", data: response };
+  }
+
+  jQuery.extend( {
+
+    // Counter for holding the number of active queries
+    active: 0,
+
+    // Last-Modified header cache for next request
+    lastModified: {},
+    etag: {},
+
+    ajaxSettings: {
+      url: location.href,
+      type: "GET",
+      isLocal: rlocalProtocol.test( location.protocol ),
+      global: true,
+      processData: true,
+      async: true,
+      contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+
+      /*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+      accepts: {
+        "*": allTypes,
+        text: "text/plain",
+        html: "text/html",
+        xml: "application/xml, text/xml",
+        json: "application/json, text/javascript"
+      },
+
+      contents: {
+        xml: /\bxml\b/,
+        html: /\bhtml/,
+        json: /\bjson\b/
+      },
+
+      responseFields: {
+        xml: "responseXML",
+        text: "responseText",
+        json: "responseJSON"
+      },
+
+      // Data converters
+      // Keys separate source (or catchall "*") and destination types with a single space
+      converters: {
+
+        // Convert anything to text
+        "* text": String,
+
+        // Text to html (true = no transformation)
+        "text html": true,
+
+        // Evaluate text as a json expression
+        "text json": JSON.parse,
+
+        // Parse text as xml
+        "text xml": jQuery.parseXML
+      },
+
+      // For options that shouldn't be deep extended:
+      // you can add your own custom options here if
+      // and when you create one that shouldn't be
+      // deep extended (see ajaxExtend)
+      flatOptions: {
+        url: true,
+        context: true
+      }
+    },
+
+    // Creates a full fledged settings object into target
+    // with both ajaxSettings and settings fields.
+    // If target is omitted, writes into ajaxSettings.
+    ajaxSetup: function( target, settings ) {
+      return settings ?
+
+        // Building a settings object
+        ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+        // Extending ajaxSettings
+        ajaxExtend( jQuery.ajaxSettings, target );
+    },
+
+    ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+    ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+    // Main method
+    ajax: function( url, options ) {
+
+      // If url is an object, simulate pre-1.5 signature
+      if ( typeof url === "object" ) {
+        options = url;
+        url = undefined;
+      }
+
+      // Force options to be an object
+      options = options || {};
+
+      var transport,
+
+        // URL without anti-cache param
+        cacheURL,
+
+        // Response headers
+        responseHeadersString,
+        responseHeaders,
+
+        // timeout handle
+        timeoutTimer,
+
+        // Url cleanup var
+        urlAnchor,
+
+        // Request state (becomes false upon send and true upon completion)
+        completed,
+
+        // To know if global events are to be dispatched
+        fireGlobals,
+
+        // Loop variable
+        i,
+
+        // uncached part of the url
+        uncached,
+
+        // Create the final options object
+        s = jQuery.ajaxSetup( {}, options ),
+
+        // Callbacks context
+        callbackContext = s.context || s,
+
+        // Context for global events is callbackContext if it is a DOM node or jQuery collection
+        globalEventContext = s.context &&
+        ( callbackContext.nodeType || callbackContext.jquery ) ?
+          jQuery( callbackContext ) :
+          jQuery.event,
+
+        // Deferreds
+        deferred = jQuery.Deferred(),
+        completeDeferred = jQuery.Callbacks( "once memory" ),
+
+        // Status-dependent callbacks
+        statusCode = s.statusCode || {},
+
+        // Headers (they are sent all at once)
+        requestHeaders = {},
+        requestHeadersNames = {},
+
+        // Default abort message
+        strAbort = "canceled",
+
+        // Fake xhr
+        jqXHR = {
+          readyState: 0,
+
+          // Builds headers hashtable if needed
+          getResponseHeader: function( key ) {
+            var match;
+            if ( completed ) {
+              if ( !responseHeaders ) {
+                responseHeaders = {};
+                while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
+                  responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+                }
+              }
+              match = responseHeaders[ key.toLowerCase() ];
+            }
+            return match == null ? null : match;
+          },
+
+          // Raw string
+          getAllResponseHeaders: function() {
+            return completed ? responseHeadersString : null;
+          },
+
+          // Caches the header
+          setRequestHeader: function( name, value ) {
+            if ( completed == null ) {
+              name = requestHeadersNames[ name.toLowerCase() ] =
+                requestHeadersNames[ name.toLowerCase() ] || name;
+              requestHeaders[ name ] = value;
+            }
+            return this;
+          },
+
+          // Overrides response content-type header
+          overrideMimeType: function( type ) {
+            if ( completed == null ) {
+              s.mimeType = type;
+            }
+            return this;
+          },
+
+          // Status-dependent callbacks
+          statusCode: function( map ) {
+            var code;
+            if ( map ) {
+              if ( completed ) {
+
+                // Execute the appropriate callbacks
+                jqXHR.always( map[ jqXHR.status ] );
+              } else {
+
+                // Lazy-add the new callbacks in a way that preserves old ones
+                for ( code in map ) {
+                  statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+                }
+              }
+            }
+            return this;
+          },
+
+          // Cancel the request
+          abort: function( statusText ) {
+            var finalText = statusText || strAbort;
+            if ( transport ) {
+              transport.abort( finalText );
+            }
+            done( 0, finalText );
+            return this;
+          }
+        };
+
+      // Attach deferreds
+      deferred.promise( jqXHR );
+
+      // Add protocol if not provided (prefilters might expect it)
+      // Handle falsy url in the settings object (#10093: consistency with old signature)
+      // We also use the url parameter if available
+      s.url = ( ( url || s.url || location.href ) + "" )
+        .replace( rprotocol, location.protocol + "//" );
+
+      // Alias method option to type as per ticket #12004
+      s.type = options.method || options.type || s.method || s.type;
+
+      // Extract dataTypes list
+      s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ];
+
+      // A cross-domain request is in order when the origin doesn't match the current origin.
+      if ( s.crossDomain == null ) {
+        urlAnchor = document.createElement( "a" );
+
+        // Support: IE <=8 - 11, Edge 12 - 13
+        // IE throws exception on accessing the href property if url is malformed,
+        // e.g. http://example.com:80x/
+        try {
+          urlAnchor.href = s.url;
+
+          // Support: IE <=8 - 11 only
+          // Anchor's host property isn't correctly set when s.url is relative
+          urlAnchor.href = urlAnchor.href;
+          s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
+            urlAnchor.protocol + "//" + urlAnchor.host;
+        } catch ( e ) {
+
+          // If there is an error parsing the URL, assume it is crossDomain,
+          // it can be rejected by the transport if it is invalid
+          s.crossDomain = true;
+        }
+      }
+
+      // Convert data if not already a string
+      if ( s.data && s.processData && typeof s.data !== "string" ) {
+        s.data = jQuery.param( s.data, s.traditional );
+      }
+
+      // Apply prefilters
+      inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+      // If request was aborted inside a prefilter, stop there
+      if ( completed ) {
+        return jqXHR;
+      }
+
+      // We can fire global events as of now if asked to
+      // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+      fireGlobals = jQuery.event && s.global;
+
+      // Watch for a new set of requests
+      if ( fireGlobals && jQuery.active++ === 0 ) {
+        jQuery.event.trigger( "ajaxStart" );
+      }
+
+      // Uppercase the type
+      s.type = s.type.toUpperCase();
+
+      // Determine if request has content
+      s.hasContent = !rnoContent.test( s.type );
+
+      // Save the URL in case we're toying with the If-Modified-Since
+      // and/or If-None-Match header later on
+      // Remove hash to simplify url manipulation
+      cacheURL = s.url.replace( rhash, "" );
+
+      // More options handling for requests with no content
+      if ( !s.hasContent ) {
+
+        // Remember the hash so we can put it back
+        uncached = s.url.slice( cacheURL.length );
+
+        // If data is available, append data to url
+        if ( s.data ) {
+          cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
+
+          // #9682: remove data so that it's not used in an eventual retry
+          delete s.data;
+        }
+
+        // Add or update anti-cache param if needed
+        if ( s.cache === false ) {
+          cacheURL = cacheURL.replace( rantiCache, "$1" );
+          uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+        }
+
+        // Put hash and anti-cache on the URL that will be requested (gh-1732)
+        s.url = cacheURL + uncached;
+
+        // Change '%20' to '+' if this is encoded form body content (gh-2658)
+      } else if ( s.data && s.processData &&
+        ( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
+        s.data = s.data.replace( r20, "+" );
+      }
+
+      // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+      if ( s.ifModified ) {
+        if ( jQuery.lastModified[ cacheURL ] ) {
+          jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+        }
+        if ( jQuery.etag[ cacheURL ] ) {
+          jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+        }
+      }
+
+      // Set the correct header, if data is being sent
+      if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+        jqXHR.setRequestHeader( "Content-Type", s.contentType );
+      }
+
+      // Set the Accepts header for the server, depending on the dataType
+      jqXHR.setRequestHeader(
+        "Accept",
+        s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+          s.accepts[ s.dataTypes[ 0 ] ] +
+          ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+          s.accepts[ "*" ]
+      );
+
+      // Check for headers option
+      for ( i in s.headers ) {
+        jqXHR.setRequestHeader( i, s.headers[ i ] );
+      }
+
+      // Allow custom headers/mimetypes and early abort
+      if ( s.beforeSend &&
+        ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
+
+        // Abort if not done already and return
+        return jqXHR.abort();
+      }
+
+      // Aborting is no longer a cancellation
+      strAbort = "abort";
+
+      // Install callbacks on deferreds
+      completeDeferred.add( s.complete );
+      jqXHR.done( s.success );
+      jqXHR.fail( s.error );
+
+      // Get transport
+      transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+      // If no transport, we auto-abort
+      if ( !transport ) {
+        done( -1, "No Transport" );
+      } else {
+        jqXHR.readyState = 1;
+
+        // Send global event
+        if ( fireGlobals ) {
+          globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+        }
+
+        // If request was aborted inside ajaxSend, stop there
+        if ( completed ) {
+          return jqXHR;
+        }
+
+        // Timeout
+        if ( s.async && s.timeout > 0 ) {
+          timeoutTimer = window.setTimeout( function() {
+            jqXHR.abort( "timeout" );
+          }, s.timeout );
+        }
+
+        try {
+          completed = false;
+          transport.send( requestHeaders, done );
+        } catch ( e ) {
+
+          // Rethrow post-completion exceptions
+          if ( completed ) {
+            throw e;
+          }
+
+          // Propagate others as results
+          done( -1, e );
+        }
+      }
+
+      // Callback for when everything is done
+      function done( status, nativeStatusText, responses, headers ) {
+        var isSuccess, success, error, response, modified,
+          statusText = nativeStatusText;
+
+        // Ignore repeat invocations
+        if ( completed ) {
+          return;
+        }
+
+        completed = true;
+
+        // Clear timeout if it exists
+        if ( timeoutTimer ) {
+          window.clearTimeout( timeoutTimer );
+        }
+
+        // Dereference transport for early garbage collection
+        // (no matter how long the jqXHR object will be used)
+        transport = undefined;
+
+        // Cache response headers
+        responseHeadersString = headers || "";
+
+        // Set readyState
+        jqXHR.readyState = status > 0 ? 4 : 0;
+
+        // Determine if successful
+        isSuccess = status >= 200 && status < 300 || status === 304;
+
+        // Get response data
+        if ( responses ) {
+          response = ajaxHandleResponses( s, jqXHR, responses );
+        }
+
+        // Convert no matter what (that way responseXXX fields are always set)
+        response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+        // If successful, handle type chaining
+        if ( isSuccess ) {
+
+          // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+          if ( s.ifModified ) {
+            modified = jqXHR.getResponseHeader( "Last-Modified" );
+            if ( modified ) {
+              jQuery.lastModified[ cacheURL ] = modified;
+            }
+            modified = jqXHR.getResponseHeader( "etag" );
+            if ( modified ) {
+              jQuery.etag[ cacheURL ] = modified;
+            }
+          }
+
+          // if no content
+          if ( status === 204 || s.type === "HEAD" ) {
+            statusText = "nocontent";
+
+            // if not modified
+          } else if ( status === 304 ) {
+            statusText = "notmodified";
+
+            // If we have data, let's convert it
+          } else {
+            statusText = response.state;
+            success = response.data;
+            error = response.error;
+            isSuccess = !error;
+          }
+        } else {
+
+          // Extract error from statusText and normalize for non-aborts
+          error = statusText;
+          if ( status || !statusText ) {
+            statusText = "error";
+            if ( status < 0 ) {
+              status = 0;
+            }
+          }
+        }
+
+        // Set data for the fake xhr object
+        jqXHR.status = status;
+        jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+        // Success/Error
+        if ( isSuccess ) {
+          deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+        } else {
+          deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+        }
+
+        // Status-dependent callbacks
+        jqXHR.statusCode( statusCode );
+        statusCode = undefined;
+
+        if ( fireGlobals ) {
+          globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+            [ jqXHR, s, isSuccess ? success : error ] );
+        }
+
+        // Complete
+        completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+        if ( fireGlobals ) {
+          globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+
+          // Handle the global AJAX counter
+          if ( !( --jQuery.active ) ) {
+            jQuery.event.trigger( "ajaxStop" );
+          }
+        }
+      }
+
+      return jqXHR;
+    },
+
+    getJSON: function( url, data, callback ) {
+      return jQuery.get( url, data, callback, "json" );
+    },
+
+    getScript: function( url, callback ) {
+      return jQuery.get( url, undefined, callback, "script" );
+    }
+  } );
+
+  jQuery.each( [ "get", "post" ], function( i, method ) {
+    jQuery[ method ] = function( url, data, callback, type ) {
+
+      // Shift arguments if data argument was omitted
+      if ( jQuery.isFunction( data ) ) {
+        type = type || callback;
+        callback = data;
+        data = undefined;
+      }
+
+      // The url can be an options object (which then must have .url)
+      return jQuery.ajax( jQuery.extend( {
+        url: url,
+        type: method,
+        dataType: type,
+        data: data,
+        success: callback
+      }, jQuery.isPlainObject( url ) && url ) );
+    };
+  } );
+
+
+  jQuery._evalUrl = function( url ) {
+    return jQuery.ajax( {
+      url: url,
+
+      // Make this explicit, since user can override this through ajaxSetup (#11264)
+      type: "GET",
+      dataType: "script",
+      cache: true,
+      async: false,
+      global: false,
+      "throws": true
+    } );
+  };
+
+
+  jQuery.fn.extend( {
+    wrapAll: function( html ) {
+      var wrap;
+
+      if ( this[ 0 ] ) {
+        if ( jQuery.isFunction( html ) ) {
+          html = html.call( this[ 0 ] );
+        }
+
+        // The elements to wrap the target around
+        wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+
+        if ( this[ 0 ].parentNode ) {
+          wrap.insertBefore( this[ 0 ] );
+        }
+
+        wrap.map( function() {
+          var elem = this;
+
+          while ( elem.firstElementChild ) {
+            elem = elem.firstElementChild;
+          }
+
+          return elem;
+        } ).append( this );
+      }
+
+      return this;
+    },
+
+    wrapInner: function( html ) {
+      if ( jQuery.isFunction( html ) ) {
+        return this.each( function( i ) {
+          jQuery( this ).wrapInner( html.call( this, i ) );
+        } );
+      }
+
+      return this.each( function() {
+        var self = jQuery( this ),
+          contents = self.contents();
+
+        if ( contents.length ) {
+          contents.wrapAll( html );
+
+        } else {
+          self.append( html );
+        }
+      } );
+    },
+
+    wrap: function( html ) {
+      var isFunction = jQuery.isFunction( html );
+
+      return this.each( function( i ) {
+        jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
+      } );
+    },
+
+    unwrap: function( selector ) {
+      this.parent( selector ).not( "body" ).each( function() {
+        jQuery( this ).replaceWith( this.childNodes );
+      } );
+      return this;
+    }
+  } );
+
+
+  jQuery.expr.pseudos.hidden = function( elem ) {
+    return !jQuery.expr.pseudos.visible( elem );
+  };
+  jQuery.expr.pseudos.visible = function( elem ) {
+    return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
+  };
+
+
+
+
+  jQuery.ajaxSettings.xhr = function() {
+    try {
+      return new window.XMLHttpRequest();
+    } catch ( e ) {}
+  };
+
+  var xhrSuccessStatus = {
+
+      // File protocol always yields status code 0, assume 200
+      0: 200,
+
+      // Support: IE <=9 only
+      // #1450: sometimes IE returns 1223 when it should be 204
+      1223: 204
+    },
+    xhrSupported = jQuery.ajaxSettings.xhr();
+
+  support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+  support.ajax = xhrSupported = !!xhrSupported;
+
+  jQuery.ajaxTransport( function( options ) {
+    var callback, errorCallback;
+
+    // Cross domain only allowed if supported through XMLHttpRequest
+    if ( support.cors || xhrSupported && !options.crossDomain ) {
+      return {
+        send: function( headers, complete ) {
+          var i,
+            xhr = options.xhr();
+
+          xhr.open(
+            options.type,
+            options.url,
+            options.async,
+            options.username,
+            options.password
+          );
+
+          // Apply custom fields if provided
+          if ( options.xhrFields ) {
+            for ( i in options.xhrFields ) {
+              xhr[ i ] = options.xhrFields[ i ];
+            }
+          }
+
+          // Override mime type if needed
+          if ( options.mimeType && xhr.overrideMimeType ) {
+            xhr.overrideMimeType( options.mimeType );
+          }
+
+          // X-Requested-With header
+          // For cross-domain requests, seeing as conditions for a preflight are
+          // akin to a jigsaw puzzle, we simply never set it to be sure.
+          // (it can always be set on a per-request basis or even using ajaxSetup)
+          // For same-domain requests, won't change header if already provided.
+          if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+            headers[ "X-Requested-With" ] = "XMLHttpRequest";
+          }
+
+          // Set headers
+          for ( i in headers ) {
+            xhr.setRequestHeader( i, headers[ i ] );
+          }
+
+          // Callback
+          callback = function( type ) {
+            return function() {
+              if ( callback ) {
+                callback = errorCallback = xhr.onload =
+                  xhr.onerror = xhr.onabort = xhr.onreadystatechange = null;
+
+                if ( type === "abort" ) {
+                  xhr.abort();
+                } else if ( type === "error" ) {
+
+                  // Support: IE <=9 only
+                  // On a manual native abort, IE9 throws
+                  // errors on any property access that is not readyState
+                  if ( typeof xhr.status !== "number" ) {
+                    complete( 0, "error" );
+                  } else {
+                    complete(
+
+                      // File: protocol always yields status 0; see #8605, #14207
+                      xhr.status,
+                      xhr.statusText
+                    );
+                  }
+                } else {
+                  complete(
+                    xhrSuccessStatus[ xhr.status ] || xhr.status,
+                    xhr.statusText,
+
+                    // Support: IE <=9 only
+                    // IE9 has no XHR2 but throws on binary (trac-11426)
+                    // For XHR2 non-text, let the caller handle it (gh-2498)
+                    ( xhr.responseType || "text" ) !== "text"  ||
+                    typeof xhr.responseText !== "string" ?
+                      { binary: xhr.response } :
+                      { text: xhr.responseText },
+                    xhr.getAllResponseHeaders()
+                  );
+                }
+              }
+            };
+          };
+
+          // Listen to events
+          xhr.onload = callback();
+          errorCallback = xhr.onerror = callback( "error" );
+
+          // Support: IE 9 only
+          // Use onreadystatechange to replace onabort
+          // to handle uncaught aborts
+          if ( xhr.onabort !== undefined ) {
+            xhr.onabort = errorCallback;
+          } else {
+            xhr.onreadystatechange = function() {
+
+              // Check readyState before timeout as it changes
+              if ( xhr.readyState === 4 ) {
+
+                // Allow onerror to be called first,
+                // but that will not handle a native abort
+                // Also, save errorCallback to a variable
+                // as xhr.onerror cannot be accessed
+                window.setTimeout( function() {
+                  if ( callback ) {
+                    errorCallback();
+                  }
+                } );
+              }
+            };
+          }
+
+          // Create the abort callback
+          callback = callback( "abort" );
+
+          try {
+
+            // Do send the request (this may raise an exception)
+            xhr.send( options.hasContent && options.data || null );
+          } catch ( e ) {
+
+            // #14683: Only rethrow if this hasn't been notified as an error yet
+            if ( callback ) {
+              throw e;
+            }
+          }
+        },
+
+        abort: function() {
+          if ( callback ) {
+            callback();
+          }
+        }
+      };
+    }
+  } );
+
+
+
+
+// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
+  jQuery.ajaxPrefilter( function( s ) {
+    if ( s.crossDomain ) {
+      s.contents.script = false;
+    }
+  } );
+
+// Install script dataType
+  jQuery.ajaxSetup( {
+    accepts: {
+      script: "text/javascript, application/javascript, " +
+      "application/ecmascript, application/x-ecmascript"
+    },
+    contents: {
+      script: /\b(?:java|ecma)script\b/
+    },
+    converters: {
+      "text script": function( text ) {
+        jQuery.globalEval( text );
+        return text;
+      }
+    }
+  } );
+
+// Handle cache's special case and crossDomain
+  jQuery.ajaxPrefilter( "script", function( s ) {
+    if ( s.cache === undefined ) {
+      s.cache = false;
+    }
+    if ( s.crossDomain ) {
+      s.type = "GET";
+    }
+  } );
+
+// Bind script tag hack transport
+  jQuery.ajaxTransport( "script", function( s ) {
+
+    // This transport only deals with cross domain requests
+    if ( s.crossDomain ) {
+      var script, callback;
+      return {
+        send: function( _, complete ) {
+          script = jQuery( "<script>" ).prop( {
+            charset: s.scriptCharset,
+            src: s.url
+          } ).on(
+            "load error",
+            callback = function( evt ) {
+              script.remove();
+              callback = null;
+              if ( evt ) {
+                complete( evt.type === "error" ? 404 : 200, evt.type );
+              }
+            }
+          );
+
+          // Use native DOM manipulation to avoid our domManip AJAX trickery
+          document.head.appendChild( script[ 0 ] );
+        },
+        abort: function() {
+          if ( callback ) {
+            callback();
+          }
+        }
+      };
+    }
+  } );
+
+
+
+
+  var oldCallbacks = [],
+    rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+  jQuery.ajaxSetup( {
+    jsonp: "callback",
+    jsonpCallback: function() {
+      var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+      this[ callback ] = true;
+      return callback;
+    }
+  } );
+
+// Detect, normalize options and install callbacks for jsonp requests
+  jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+    var callbackName, overwritten, responseContainer,
+      jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+          "url" :
+          typeof s.data === "string" &&
+          ( s.contentType || "" )
+            .indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+          rjsonp.test( s.data ) && "data"
+      );
+
+    // Handle iff the expected data type is "jsonp" or we have a parameter to set
+    if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+      // Get callback name, remembering preexisting value associated with it
+      callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+        s.jsonpCallback() :
+        s.jsonpCallback;
+
+      // Insert callback into url or form data
+      if ( jsonProp ) {
+        s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+      } else if ( s.jsonp !== false ) {
+        s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+      }
+
+      // Use data converter to retrieve json after script execution
+      s.converters[ "script json" ] = function() {
+        if ( !responseContainer ) {
+          jQuery.error( callbackName + " was not called" );
+        }
+        return responseContainer[ 0 ];
+      };
+
+      // Force json dataType
+      s.dataTypes[ 0 ] = "json";
+
+      // Install callback
+      overwritten = window[ callbackName ];
+      window[ callbackName ] = function() {
+        responseContainer = arguments;
+      };
+
+      // Clean-up function (fires after converters)
+      jqXHR.always( function() {
+
+        // If previous value didn't exist - remove it
+        if ( overwritten === undefined ) {
+          jQuery( window ).removeProp( callbackName );
+
+          // Otherwise restore preexisting value
+        } else {
+          window[ callbackName ] = overwritten;
+        }
+
+        // Save back as free
+        if ( s[ callbackName ] ) {
+
+          // Make sure that re-using the options doesn't screw things around
+          s.jsonpCallback = originalSettings.jsonpCallback;
+
+          // Save the callback name for future use
+          oldCallbacks.push( callbackName );
+        }
+
+        // Call if it was a function and we have a response
+        if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+          overwritten( responseContainer[ 0 ] );
+        }
+
+        responseContainer = overwritten = undefined;
+      } );
+
+      // Delegate to script
+      return "script";
+    }
+  } );
+
+
+
+
+// Support: Safari 8 only
+// In Safari 8 documents created via document.implementation.createHTMLDocument
+// collapse sibling forms: the second one becomes a child of the first one.
+// Because of that, this security measure has to be disabled in Safari 8.
+// https://bugs.webkit.org/show_bug.cgi?id=137337
+  support.createHTMLDocument = ( function() {
+    var body = document.implementation.createHTMLDocument( "" ).body;
+    body.innerHTML = "<form></form><form></form>";
+    return body.childNodes.length === 2;
+  } )();
+
+
+// Argument "data" should be string of html
+// context (optional): If specified, the fragment will be created in this context,
+// defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+  jQuery.parseHTML = function( data, context, keepScripts ) {
+    if ( typeof data !== "string" ) {
+      return [];
+    }
+    if ( typeof context === "boolean" ) {
+      keepScripts = context;
+      context = false;
+    }
+
+    var base, parsed, scripts;
+
+    if ( !context ) {
+
+      // Stop scripts or inline event handlers from being executed immediately
+      // by using document.implementation
+      if ( support.createHTMLDocument ) {
+        context = document.implementation.createHTMLDocument( "" );
+
+        // Set the base href for the created document
+        // so any parsed elements with URLs
+        // are based on the document's URL (gh-2965)
+        base = context.createElement( "base" );
+        base.href = document.location.href;
+        context.head.appendChild( base );
+      } else {
+        context = document;
+      }
+    }
+
+    parsed = rsingleTag.exec( data );
+    scripts = !keepScripts && [];
+
+    // Single tag
+    if ( parsed ) {
+      return [ context.createElement( parsed[ 1 ] ) ];
+    }
+
+    parsed = buildFragment( [ data ], context, scripts );
+
+    if ( scripts && scripts.length ) {
+      jQuery( scripts ).remove();
+    }
+
+    return jQuery.merge( [], parsed.childNodes );
+  };
+
+
+  /**
+   * Load a url into a page
+   */
+  jQuery.fn.load = function( url, params, callback ) {
+    var selector, type, response,
+      self = this,
+      off = url.indexOf( " " );
+
+    if ( off > -1 ) {
+      selector = stripAndCollapse( url.slice( off ) );
+      url = url.slice( 0, off );
+    }
+
+    // If it's a function
+    if ( jQuery.isFunction( params ) ) {
+
+      // We assume that it's the callback
+      callback = params;
+      params = undefined;
+
+      // Otherwise, build a param string
+    } else if ( params && typeof params === "object" ) {
+      type = "POST";
+    }
+
+    // If we have elements to modify, make the request
+    if ( self.length > 0 ) {
+      jQuery.ajax( {
+        url: url,
+
+        // If "type" variable is undefined, then "GET" method will be used.
+        // Make value of this field explicit since
+        // user can override it through ajaxSetup method
+        type: type || "GET",
+        dataType: "html",
+        data: params
+      } ).done( function( responseText ) {
+
+        // Save response for use in complete callback
+        response = arguments;
+
+        self.html( selector ?
+
+          // If a selector was specified, locate the right elements in a dummy div
+          // Exclude scripts to avoid IE 'Permission Denied' errors
+          jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+          // Otherwise use the full result
+          responseText );
+
+        // If the request succeeds, this function gets "data", "status", "jqXHR"
+        // but they are ignored because response was set above.
+        // If it fails, this function gets "jqXHR", "status", "error"
+      } ).always( callback && function( jqXHR, status ) {
+        self.each( function() {
+          callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
+        } );
+      } );
+    }
+
+    return this;
+  };
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+  jQuery.each( [
+    "ajaxStart",
+    "ajaxStop",
+    "ajaxComplete",
+    "ajaxError",
+    "ajaxSuccess",
+    "ajaxSend"
+  ], function( i, type ) {
+    jQuery.fn[ type ] = function( fn ) {
+      return this.on( type, fn );
+    };
+  } );
+
+
+
+
+  jQuery.expr.pseudos.animated = function( elem ) {
+    return jQuery.grep( jQuery.timers, function( fn ) {
+      return elem === fn.elem;
+    } ).length;
+  };
+
+
+
+
+  jQuery.offset = {
+    setOffset: function( elem, options, i ) {
+      var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+        position = jQuery.css( elem, "position" ),
+        curElem = jQuery( elem ),
+        props = {};
+
+      // Set position first, in-case top/left are set even on static elem
+      if ( position === "static" ) {
+        elem.style.position = "relative";
+      }
+
+      curOffset = curElem.offset();
+      curCSSTop = jQuery.css( elem, "top" );
+      curCSSLeft = jQuery.css( elem, "left" );
+      calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+        ( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
+
+      // Need to be able to calculate position if either
+      // top or left is auto and position is either absolute or fixed
+      if ( calculatePosition ) {
+        curPosition = curElem.position();
+        curTop = curPosition.top;
+        curLeft = curPosition.left;
+
+      } else {
+        curTop = parseFloat( curCSSTop ) || 0;
+        curLeft = parseFloat( curCSSLeft ) || 0;
+      }
+
+      if ( jQuery.isFunction( options ) ) {
+
+        // Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
+        options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
+      }
+
+      if ( options.top != null ) {
+        props.top = ( options.top - curOffset.top ) + curTop;
+      }
+      if ( options.left != null ) {
+        props.left = ( options.left - curOffset.left ) + curLeft;
+      }
+
+      if ( "using" in options ) {
+        options.using.call( elem, props );
+
+      } else {
+        curElem.css( props );
+      }
+    }
+  };
+
+  jQuery.fn.extend( {
+    offset: function( options ) {
+
+      // Preserve chaining for setter
+      if ( arguments.length ) {
+        return options === undefined ?
+          this :
+          this.each( function( i ) {
+            jQuery.offset.setOffset( this, options, i );
+          } );
+      }
+
+      var doc, docElem, rect, win,
+        elem = this[ 0 ];
+
+      if ( !elem ) {
+        return;
+      }
+
+      // Return zeros for disconnected and hidden (display: none) elements (gh-2310)
+      // Support: IE <=11 only
+      // Running getBoundingClientRect on a
+      // disconnected node in IE throws an error
+      if ( !elem.getClientRects().length ) {
+        return { top: 0, left: 0 };
+      }
+
+      rect = elem.getBoundingClientRect();
+
+      doc = elem.ownerDocument;
+      docElem = doc.documentElement;
+      win = doc.defaultView;
+
+      return {
+        top: rect.top + win.pageYOffset - docElem.clientTop,
+        left: rect.left + win.pageXOffset - docElem.clientLeft
+      };
+    },
+
+    position: function() {
+      if ( !this[ 0 ] ) {
+        return;
+      }
+
+      var offsetParent, offset,
+        elem = this[ 0 ],
+        parentOffset = { top: 0, left: 0 };
+
+      // Fixed elements are offset from window (parentOffset = {top:0, left: 0},
+      // because it is its only offset parent
+      if ( jQuery.css( elem, "position" ) === "fixed" ) {
+
+        // Assume getBoundingClientRect is there when computed position is fixed
+        offset = elem.getBoundingClientRect();
+
+      } else {
+
+        // Get *real* offsetParent
+        offsetParent = this.offsetParent();
+
+        // Get correct offsets
+        offset = this.offset();
+        if ( !nodeName( offsetParent[ 0 ], "html" ) ) {
+          parentOffset = offsetParent.offset();
+        }
+
+        // Add offsetParent borders
+        parentOffset = {
+          top: parentOffset.top + jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ),
+          left: parentOffset.left + jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true )
+        };
+      }
+
+      // Subtract parent offsets and element margins
+      return {
+        top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+        left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
+      };
+    },
+
+    // This method will return documentElement in the following cases:
+    // 1) For the element inside the iframe without offsetParent, this method will return
+    //    documentElement of the parent window
+    // 2) For the hidden or detached element
+    // 3) For body or html element, i.e. in case of the html node - it will return itself
+    //
+    // but those exceptions were never presented as a real life use-cases
+    // and might be considered as more preferable results.
+    //
+    // This logic, however, is not guaranteed and can change at any point in the future
+    offsetParent: function() {
+      return this.map( function() {
+        var offsetParent = this.offsetParent;
+
+        while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
+          offsetParent = offsetParent.offsetParent;
+        }
+
+        return offsetParent || documentElement;
+      } );
+    }
+  } );
+
+// Create scrollLeft and scrollTop methods
+  jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+    var top = "pageYOffset" === prop;
+
+    jQuery.fn[ method ] = function( val ) {
+      return access( this, function( elem, method, val ) {
+
+        // Coalesce documents and windows
+        var win;
+        if ( jQuery.isWindow( elem ) ) {
+          win = elem;
+        } else if ( elem.nodeType === 9 ) {
+          win = elem.defaultView;
+        }
+
+        if ( val === undefined ) {
+          return win ? win[ prop ] : elem[ method ];
+        }
+
+        if ( win ) {
+          win.scrollTo(
+            !top ? val : win.pageXOffset,
+            top ? val : win.pageYOffset
+          );
+
+        } else {
+          elem[ method ] = val;
+        }
+      }, method, val, arguments.length );
+    };
+  } );
+
+// Support: Safari <=7 - 9.1, Chrome <=37 - 49
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
+// getComputedStyle returns percent when specified for top/left/bottom/right;
+// rather than make the css module depend on the offset module, just check for it here
+  jQuery.each( [ "top", "left" ], function( i, prop ) {
+    jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+      function( elem, computed ) {
+        if ( computed ) {
+          computed = curCSS( elem, prop );
+
+          // If curCSS returns percentage, fallback to offset
+          return rnumnonpx.test( computed ) ?
+            jQuery( elem ).position()[ prop ] + "px" :
+            computed;
+        }
+      }
+    );
+  } );
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+  jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+    jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
+      function( defaultExtra, funcName ) {
+
+        // Margin is only for outerHeight, outerWidth
+        jQuery.fn[ funcName ] = function( margin, value ) {
+          var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+            extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+          return access( this, function( elem, type, value ) {
+            var doc;
+
+            if ( jQuery.isWindow( elem ) ) {
+
+              // $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
+              return funcName.indexOf( "outer" ) === 0 ?
+                elem[ "inner" + name ] :
+                elem.document.documentElement[ "client" + name ];
+            }
+
+            // Get document width or height
+            if ( elem.nodeType === 9 ) {
+              doc = elem.documentElement;
+
+              // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+              // whichever is greatest
+              return Math.max(
+                elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+                elem.body[ "offset" + name ], doc[ "offset" + name ],
+                doc[ "client" + name ]
+              );
+            }
+
+            return value === undefined ?
+
+              // Get width or height on the element, requesting but not forcing parseFloat
+              jQuery.css( elem, type, extra ) :
+
+              // Set width or height on the element
+              jQuery.style( elem, type, value, extra );
+          }, type, chainable ? margin : undefined, chainable );
+        };
+      } );
+  } );
+
+
+  jQuery.fn.extend( {
+
+    bind: function( types, data, fn ) {
+      return this.on( types, null, data, fn );
+    },
+    unbind: function( types, fn ) {
+      return this.off( types, null, fn );
+    },
+
+    delegate: function( selector, types, data, fn ) {
+      return this.on( types, selector, data, fn );
+    },
+    undelegate: function( selector, types, fn ) {
+
+      // ( namespace ) or ( selector, types [, fn] )
+      return arguments.length === 1 ?
+        this.off( selector, "**" ) :
+        this.off( types, selector || "**", fn );
+    }
+  } );
+
+  jQuery.holdReady = function( hold ) {
+    if ( hold ) {
+      jQuery.readyWait++;
+    } else {
+      jQuery.ready( true );
+    }
+  };
+  jQuery.isArray = Array.isArray;
+  jQuery.parseJSON = JSON.parse;
+  jQuery.nodeName = nodeName;
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+  if ( typeof define === "function" && define.amd ) {
+    define( "jquery", [], function() {
+      return jQuery;
+    } );
+  }
+
+
+
+
+  var
+
+    // Map over jQuery in case of overwrite
+    _jQuery = window.jQuery,
+
+    // Map over the $ in case of overwrite
+    _$ = window.$;
+
+  jQuery.noConflict = function( deep ) {
+    if ( window.$ === jQuery ) {
+      window.$ = _$;
+    }
+
+    if ( deep && window.jQuery === jQuery ) {
+      window.jQuery = _jQuery;
+    }
+
+    return jQuery;
+  };
+
+// Expose jQuery and $ identifiers, even in AMD
+// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+  if ( !noGlobal ) {
+    window.jQuery = window.$ = jQuery;
+  }
+
+
+
+
+  return jQuery;
+} );
diff --git a/docs-web/src/main/webapp/src/lib/jquery.ui.js b/docs-web/src/main/webapp/src/lib/jquery.ui.js
index 7ab58373..da7c3ae6 100644
--- a/docs-web/src/main/webapp/src/lib/jquery.ui.js
+++ b/docs-web/src/main/webapp/src/lib/jquery.ui.js
@@ -1,6 +1,2564 @@
-/*! jQuery UI - v1.10.3 - 2014-01-10
- * http://jqueryui.com
- * Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.sortable.js
- * Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+/*! jQuery UI - v1.12.1 - 2017-11-09
+* http://jqueryui.com
+* Includes: widget.js, data.js, scroll-parent.js, widgets/sortable.js, widgets/mouse.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
 
-(function(t,e){function n(e,n){var r,s,o,a=e.nodeName.toLowerCase();return"area"===a?(r=e.parentNode,s=r.name,e.href&&s&&"map"===r.nodeName.toLowerCase()?(o=t("img[usemap=#"+s+"]")[0],!!o&&i(o)):!1):(/input|select|textarea|button|object/.test(a)?!e.disabled:"a"===a?e.href||n:n)&&i(e)}function i(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}var r=0,s=/^ui-id-\d+$/;t.ui=t.ui||{},t.extend(t.ui,{version:"1.10.3",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({focus:function(e){return function(n,i){return"number"==typeof n?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),i&&i.call(e)},n)}):e.apply(this,arguments)}}(t.fn.focus),scrollParent:function(){var e;return e=t.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(t.css(this,"position"))&&/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!e.length?t(document):e},zIndex:function(n){if(n!==e)return this.css("zIndex",n);if(this.length)for(var i,r,s=t(this[0]);s.length&&s[0]!==document;){if(i=s.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(r=parseInt(s.css("zIndex"),10),!isNaN(r)&&0!==r))return r;s=s.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++r)})},removeUniqueId:function(){return this.each(function(){s.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(n){return!!t.data(n,e)}}):function(e,n,i){return!!t.data(e,i[3])},focusable:function(e){return n(e,!isNaN(t.attr(e,"tabindex")))},tabbable:function(e){var i=t.attr(e,"tabindex"),r=isNaN(i);return(r||i>=0)&&n(e,!r)}}),t("<a>").outerWidth(1).jquery||t.each(["Width","Height"],function(n,i){function r(e,n,i,r){return t.each(s,function(){n-=parseFloat(t.css(e,"padding"+this))||0,i&&(n-=parseFloat(t.css(e,"border"+this+"Width"))||0),r&&(n-=parseFloat(t.css(e,"margin"+this))||0)}),n}var s="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(n){return n===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,r(this,n)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,r(this,e,!0,n)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(n){return arguments.length?e.call(this,t.camelCase(n)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.support.selectstart="onselectstart"in document.createElement("div"),t.fn.extend({disableSelection:function(){return this.bind((t.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(t){t.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),t.extend(t.ui,{plugin:{add:function(e,n,i){var r,s=t.ui[e].prototype;for(r in i)s.plugins[r]=s.plugins[r]||[],s.plugins[r].push([n,i[r]])},call:function(t,e,n){var i,r=t.plugins[e];if(r&&t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType)for(i=0;r.length>i;i++)t.options[r[i][0]]&&r[i][1].apply(t.element,n)}},hasScroll:function(e,n){if("hidden"===t(e).css("overflow"))return!1;var i=n&&"left"===n?"scrollLeft":"scrollTop",r=!1;return e[i]>0?!0:(e[i]=1,r=e[i]>0,e[i]=0,r)}})})(jQuery);(function(t,e){var i=0,s=Array.prototype.slice,o=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(n){}o(e)},t.widget=function(i,s,o){var n,r,a,l,h={},c=i.split(".")[0];i=i.split(".")[1],n=c+"-"+i,o||(o=s,s=t.Widget),t.expr[":"][n.toLowerCase()]=function(e){return!!t.data(e,n)},t[c]=t[c]||{},r=t[c][i],a=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new a(t,i)},t.extend(a,r,{version:o.version,_proto:t.extend({},o),_childConstructors:[]}),l=new s,l.options=t.widget.extend({},l.options),t.each(o,function(i,o){return t.isFunction(o)?(h[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,n=this._superApply;return this._super=t,this._superApply=e,i=o.apply(this,arguments),this._super=s,this._superApply=n,i}}(),e):(h[i]=o,e)}),a.prototype=t.widget.extend(l,{widgetEventPrefix:r?l.widgetEventPrefix:i},h,{constructor:a,namespace:c,widgetName:i,widgetFullName:n}),r?(t.each(r._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,a,i._proto)}),delete r._childConstructors):s._childConstructors.push(a),t.widget.bridge(i,a)},t.widget.extend=function(i){for(var o,n,r=s.call(arguments,1),a=0,l=r.length;l>a;a++)for(o in r[a])n=r[a][o],r[a].hasOwnProperty(o)&&n!==e&&(i[o]=t.isPlainObject(n)?t.isPlainObject(i[o])?t.widget.extend({},i[o],n):t.widget.extend({},n):n);return i},t.widget.bridge=function(i,o){var n=o.prototype.widgetFullName||i;t.fn[i]=function(r){var a="string"==typeof r,l=s.call(arguments,1),h=this;return r=!a&&l.length?t.widget.extend.apply(null,[r].concat(l)):r,a?this.each(function(){var s,o=t.data(this,n);return o?t.isFunction(o[r])&&"_"!==r.charAt(0)?(s=o[r].apply(o,l),s!==o&&s!==e?(h=s&&s.jquery?h.pushStack(s.get()):s,!1):e):t.error("no such method '"+r+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+r+"'")}):this.each(function(){var e=t.data(this,n);e?e.option(r||{})._init():t.data(this,n,new o(r,this))}),h}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var o,n,r,a=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(a={},o=i.split("."),i=o.shift(),o.length){for(n=a[i]=t.widget.extend({},this.options[i]),r=0;o.length-1>r;r++)n[o[r]]=n[o[r]]||{},n=n[o[r]];if(i=o.pop(),s===e)return n[i]===e?null:n[i];n[i]=s}else{if(s===e)return this.options[i]===e?null:this.options[i];a[i]=s}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,o){var n,r=this;"boolean"!=typeof i&&(o=s,s=i,i=!1),o?(s=n=t(s),this.bindings=this.bindings.add(s)):(o=s,s=this.element,n=this.widget()),t.each(o,function(o,a){function l(){return i||r.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?r[a]:a).apply(r,arguments):e}"string"!=typeof a&&(l.guid=a.guid=a.guid||l.guid||t.guid++);var h=o.match(/^(\w+)\s*(.*)$/),c=h[1]+r.eventNamespace,p=h[2];p?n.delegate(p,c,l):s.bind(c,l)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var o,n,r=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],n=i.originalEvent)for(o in n)o in i||(i[o]=n[o]);return this.element.trigger(i,s),!(t.isFunction(r)&&r.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,o,n){"string"==typeof o&&(o={effect:o});var r,a=o?o===!0||"number"==typeof o?i:o.effect||i:e;o=o||{},"number"==typeof o&&(o={duration:o}),r=!t.isEmptyObject(o),o.complete=n,o.delay&&s.delay(o.delay),r&&t.effects&&t.effects.effect[a]?s[e](o):a!==e&&s[a]?s[a](o.duration,o.easing,n):s.queue(function(i){t(this)[e](),n&&n.call(s[0]),i()})}})})(jQuery);(function(t){var e=!1;t(document).mouseup(function(){e=!1}),t.widget("ui.mouse",{version:"1.10.3",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(s){return!0===t.data(s.target,e.widgetName+".preventClickEvent")?(t.removeData(s.target,e.widgetName+".preventClickEvent"),s.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(s){if(!e){this._mouseStarted&&this._mouseUp(s),this._mouseDownEvent=s;var i=this,o=1===s.which,n="string"==typeof this.options.cancel&&s.target.nodeName?t(s.target).closest(this.options.cancel).length:!1;return o&&!n&&this._mouseCapture(s)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(s)&&this._mouseDelayMet(s)&&(this._mouseStarted=this._mouseStart(s)!==!1,!this._mouseStarted)?(s.preventDefault(),!0):(!0===t.data(s.target,this.widgetName+".preventClickEvent")&&t.removeData(s.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},t(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),s.preventDefault(),e=!0,!0)):!0}},_mouseMove:function(e){return t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button?this._mouseUp(e):this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})})(jQuery);(function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):undefined}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-t(document).scrollTop()<a.scrollSensitivity?r=t(document).scrollTop(t(document).scrollTop()-a.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<a.scrollSensitivity&&(r=t(document).scrollTop(t(document).scrollTop()+a.scrollSpeed)),e.pageX-t(document).scrollLeft()<a.scrollSensitivity?r=t(document).scrollLeft(t(document).scrollLeft()-a.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<a.scrollSensitivity&&(r=t(document).scrollLeft(t(document).scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,o=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return n?this.floating?a&&"right"===a||"down"===o?2:1:o&&("down"===o?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return this.floating&&o?"right"===o&&s||"left"===o&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){var i,s,n,o,a=[],r=[],h=this._connectWith();if(h&&e)for(i=h.length-1;i>=0;i--)for(n=t(h[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&r.push([t.isFunction(o.options.items)?o.options.items.call(o.element):t(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(r.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),i=r.length-1;i>=0;i--)r[i][0].each(function(){a.push(this)});return t(a)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?e.currentItem.children().each(function(){t("<td>&#160;</td>",e.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,o,a,r,h,l,c,u,d,p,f=null,g=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],g=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[g].containerCache.over||(this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1);else{for(a=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],o=this.items.length-1;o>=0;o--)t.contains(this.containers[g].element[0],this.items[o].item[0])&&this.items[o].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[o].top,this.items[o].height))&&(u=this.items[o].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[o][l]-c)&&(d=!0,u+=this.items[o][l]),a>Math.abs(u-c)&&(a=Math.abs(u-c),r=this.items[o],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[g])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[g].element,!0),this._trigger("change",s,this._uiHash()),this.containers[g]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[g],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)("auto"===this._storedCSS[i]||"static"===this._storedCSS[i])&&(this._storedCSS[i]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),i=this.containers.length-1;i>=0;i--)e||s.push(function(t){return function(e){t._trigger("deactivate",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(function(t){return function(e){t._trigger("out",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})})(jQuery);
\ No newline at end of file
+(function( factory ) {
+  if ( typeof define === "function" && define.amd ) {
+
+    // AMD. Register as an anonymous module.
+    define([ "jquery" ], factory );
+  } else {
+
+    // Browser globals
+    factory( jQuery );
+  }
+}(function( $ ) {
+
+  $.ui = $.ui || {};
+
+  var version = $.ui.version = "1.12.1";
+
+
+  /*!
+   * jQuery UI Widget 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
+
+//>>label: Widget
+//>>group: Core
+//>>description: Provides a factory for creating stateful widgets with a common API.
+//>>docs: http://api.jqueryui.com/jQuery.widget/
+//>>demos: http://jqueryui.com/widget/
+
+
+
+  var widgetUuid = 0;
+  var widgetSlice = Array.prototype.slice;
+
+  $.cleanData = ( function( orig ) {
+    return function( elems ) {
+      var events, elem, i;
+      for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
+        try {
+
+          // Only trigger remove when necessary to save time
+          events = $._data( elem, "events" );
+          if ( events && events.remove ) {
+            $( elem ).triggerHandler( "remove" );
+          }
+
+          // Http://bugs.jquery.com/ticket/8235
+        } catch ( e ) {}
+      }
+      orig( elems );
+    };
+  } )( $.cleanData );
+
+  $.widget = function( name, base, prototype ) {
+    var existingConstructor, constructor, basePrototype;
+
+    // ProxiedPrototype allows the provided prototype to remain unmodified
+    // so that it can be used as a mixin for multiple widgets (#8876)
+    var proxiedPrototype = {};
+
+    var namespace = name.split( "." )[ 0 ];
+    name = name.split( "." )[ 1 ];
+    var fullName = namespace + "-" + name;
+
+    if ( !prototype ) {
+      prototype = base;
+      base = $.Widget;
+    }
+
+    if ( $.isArray( prototype ) ) {
+      prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
+    }
+
+    // Create selector for plugin
+    $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+      return !!$.data( elem, fullName );
+    };
+
+    $[ namespace ] = $[ namespace ] || {};
+    existingConstructor = $[ namespace ][ name ];
+    constructor = $[ namespace ][ name ] = function( options, element ) {
+
+      // Allow instantiation without "new" keyword
+      if ( !this._createWidget ) {
+        return new constructor( options, element );
+      }
+
+      // Allow instantiation without initializing for simple inheritance
+      // must use "new" keyword (the code above always passes args)
+      if ( arguments.length ) {
+        this._createWidget( options, element );
+      }
+    };
+
+    // Extend with the existing constructor to carry over any static properties
+    $.extend( constructor, existingConstructor, {
+      version: prototype.version,
+
+      // Copy the object used to create the prototype in case we need to
+      // redefine the widget later
+      _proto: $.extend( {}, prototype ),
+
+      // Track widgets that inherit from this widget in case this widget is
+      // redefined after a widget inherits from it
+      _childConstructors: []
+    } );
+
+    basePrototype = new base();
+
+    // We need to make the options hash a property directly on the new instance
+    // otherwise we'll modify the options hash on the prototype that we're
+    // inheriting from
+    basePrototype.options = $.widget.extend( {}, basePrototype.options );
+    $.each( prototype, function( prop, value ) {
+      if ( !$.isFunction( value ) ) {
+        proxiedPrototype[ prop ] = value;
+        return;
+      }
+      proxiedPrototype[ prop ] = ( function() {
+        function _super() {
+          return base.prototype[ prop ].apply( this, arguments );
+        }
+
+        function _superApply( args ) {
+          return base.prototype[ prop ].apply( this, args );
+        }
+
+        return function() {
+          var __super = this._super;
+          var __superApply = this._superApply;
+          var returnValue;
+
+          this._super = _super;
+          this._superApply = _superApply;
+
+          returnValue = value.apply( this, arguments );
+
+          this._super = __super;
+          this._superApply = __superApply;
+
+          return returnValue;
+        };
+      } )();
+    } );
+    constructor.prototype = $.widget.extend( basePrototype, {
+
+      // TODO: remove support for widgetEventPrefix
+      // always use the name + a colon as the prefix, e.g., draggable:start
+      // don't prefix for widgets that aren't DOM-based
+      widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name
+    }, proxiedPrototype, {
+      constructor: constructor,
+      namespace: namespace,
+      widgetName: name,
+      widgetFullName: fullName
+    } );
+
+    // If this widget is being redefined then we need to find all widgets that
+    // are inheriting from it and redefine all of them so that they inherit from
+    // the new version of this widget. We're essentially trying to replace one
+    // level in the prototype chain.
+    if ( existingConstructor ) {
+      $.each( existingConstructor._childConstructors, function( i, child ) {
+        var childPrototype = child.prototype;
+
+        // Redefine the child widget using the same prototype that was
+        // originally used, but inherit from the new version of the base
+        $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor,
+          child._proto );
+      } );
+
+      // Remove the list of existing child constructors from the old constructor
+      // so the old child constructors can be garbage collected
+      delete existingConstructor._childConstructors;
+    } else {
+      base._childConstructors.push( constructor );
+    }
+
+    $.widget.bridge( name, constructor );
+
+    return constructor;
+  };
+
+  $.widget.extend = function( target ) {
+    var input = widgetSlice.call( arguments, 1 );
+    var inputIndex = 0;
+    var inputLength = input.length;
+    var key;
+    var value;
+
+    for ( ; inputIndex < inputLength; inputIndex++ ) {
+      for ( key in input[ inputIndex ] ) {
+        value = input[ inputIndex ][ key ];
+        if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+
+          // Clone objects
+          if ( $.isPlainObject( value ) ) {
+            target[ key ] = $.isPlainObject( target[ key ] ) ?
+              $.widget.extend( {}, target[ key ], value ) :
+
+              // Don't extend strings, arrays, etc. with objects
+              $.widget.extend( {}, value );
+
+            // Copy everything else by reference
+          } else {
+            target[ key ] = value;
+          }
+        }
+      }
+    }
+    return target;
+  };
+
+  $.widget.bridge = function( name, object ) {
+    var fullName = object.prototype.widgetFullName || name;
+    $.fn[ name ] = function( options ) {
+      var isMethodCall = typeof options === "string";
+      var args = widgetSlice.call( arguments, 1 );
+      var returnValue = this;
+
+      if ( isMethodCall ) {
+
+        // If this is an empty collection, we need to have the instance method
+        // return undefined instead of the jQuery instance
+        if ( !this.length && options === "instance" ) {
+          returnValue = undefined;
+        } else {
+          this.each( function() {
+            var methodValue;
+            var instance = $.data( this, fullName );
+
+            if ( options === "instance" ) {
+              returnValue = instance;
+              return false;
+            }
+
+            if ( !instance ) {
+              return $.error( "cannot call methods on " + name +
+                " prior to initialization; " +
+                "attempted to call method '" + options + "'" );
+            }
+
+            if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
+              return $.error( "no such method '" + options + "' for " + name +
+                " widget instance" );
+            }
+
+            methodValue = instance[ options ].apply( instance, args );
+
+            if ( methodValue !== instance && methodValue !== undefined ) {
+              returnValue = methodValue && methodValue.jquery ?
+                returnValue.pushStack( methodValue.get() ) :
+                methodValue;
+              return false;
+            }
+          } );
+        }
+      } else {
+
+        // Allow multiple hashes to be passed on init
+        if ( args.length ) {
+          options = $.widget.extend.apply( null, [ options ].concat( args ) );
+        }
+
+        this.each( function() {
+          var instance = $.data( this, fullName );
+          if ( instance ) {
+            instance.option( options || {} );
+            if ( instance._init ) {
+              instance._init();
+            }
+          } else {
+            $.data( this, fullName, new object( options, this ) );
+          }
+        } );
+      }
+
+      return returnValue;
+    };
+  };
+
+  $.Widget = function( /* options, element */ ) {};
+  $.Widget._childConstructors = [];
+
+  $.Widget.prototype = {
+    widgetName: "widget",
+    widgetEventPrefix: "",
+    defaultElement: "<div>",
+
+    options: {
+      classes: {},
+      disabled: false,
+
+      // Callbacks
+      create: null
+    },
+
+    _createWidget: function( options, element ) {
+      element = $( element || this.defaultElement || this )[ 0 ];
+      this.element = $( element );
+      this.uuid = widgetUuid++;
+      this.eventNamespace = "." + this.widgetName + this.uuid;
+
+      this.bindings = $();
+      this.hoverable = $();
+      this.focusable = $();
+      this.classesElementLookup = {};
+
+      if ( element !== this ) {
+        $.data( element, this.widgetFullName, this );
+        this._on( true, this.element, {
+          remove: function( event ) {
+            if ( event.target === element ) {
+              this.destroy();
+            }
+          }
+        } );
+        this.document = $( element.style ?
+
+          // Element within the document
+          element.ownerDocument :
+
+          // Element is window or document
+          element.document || element );
+        this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow );
+      }
+
+      this.options = $.widget.extend( {},
+        this.options,
+        this._getCreateOptions(),
+        options );
+
+      this._create();
+
+      if ( this.options.disabled ) {
+        this._setOptionDisabled( this.options.disabled );
+      }
+
+      this._trigger( "create", null, this._getCreateEventData() );
+      this._init();
+    },
+
+    _getCreateOptions: function() {
+      return {};
+    },
+
+    _getCreateEventData: $.noop,
+
+    _create: $.noop,
+
+    _init: $.noop,
+
+    destroy: function() {
+      var that = this;
+
+      this._destroy();
+      $.each( this.classesElementLookup, function( key, value ) {
+        that._removeClass( value, key );
+      } );
+
+      // We can probably remove the unbind calls in 2.0
+      // all event bindings should go through this._on()
+      this.element
+        .off( this.eventNamespace )
+        .removeData( this.widgetFullName );
+      this.widget()
+        .off( this.eventNamespace )
+        .removeAttr( "aria-disabled" );
+
+      // Clean up events and states
+      this.bindings.off( this.eventNamespace );
+    },
+
+    _destroy: $.noop,
+
+    widget: function() {
+      return this.element;
+    },
+
+    option: function( key, value ) {
+      var options = key;
+      var parts;
+      var curOption;
+      var i;
+
+      if ( arguments.length === 0 ) {
+
+        // Don't return a reference to the internal hash
+        return $.widget.extend( {}, this.options );
+      }
+
+      if ( typeof key === "string" ) {
+
+        // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+        options = {};
+        parts = key.split( "." );
+        key = parts.shift();
+        if ( parts.length ) {
+          curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+          for ( i = 0; i < parts.length - 1; i++ ) {
+            curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+            curOption = curOption[ parts[ i ] ];
+          }
+          key = parts.pop();
+          if ( arguments.length === 1 ) {
+            return curOption[ key ] === undefined ? null : curOption[ key ];
+          }
+          curOption[ key ] = value;
+        } else {
+          if ( arguments.length === 1 ) {
+            return this.options[ key ] === undefined ? null : this.options[ key ];
+          }
+          options[ key ] = value;
+        }
+      }
+
+      this._setOptions( options );
+
+      return this;
+    },
+
+    _setOptions: function( options ) {
+      var key;
+
+      for ( key in options ) {
+        this._setOption( key, options[ key ] );
+      }
+
+      return this;
+    },
+
+    _setOption: function( key, value ) {
+      if ( key === "classes" ) {
+        this._setOptionClasses( value );
+      }
+
+      this.options[ key ] = value;
+
+      if ( key === "disabled" ) {
+        this._setOptionDisabled( value );
+      }
+
+      return this;
+    },
+
+    _setOptionClasses: function( value ) {
+      var classKey, elements, currentElements;
+
+      for ( classKey in value ) {
+        currentElements = this.classesElementLookup[ classKey ];
+        if ( value[ classKey ] === this.options.classes[ classKey ] ||
+          !currentElements ||
+          !currentElements.length ) {
+          continue;
+        }
+
+        // We are doing this to create a new jQuery object because the _removeClass() call
+        // on the next line is going to destroy the reference to the current elements being
+        // tracked. We need to save a copy of this collection so that we can add the new classes
+        // below.
+        elements = $( currentElements.get() );
+        this._removeClass( currentElements, classKey );
+
+        // We don't use _addClass() here, because that uses this.options.classes
+        // for generating the string of classes. We want to use the value passed in from
+        // _setOption(), this is the new value of the classes option which was passed to
+        // _setOption(). We pass this value directly to _classes().
+        elements.addClass( this._classes( {
+          element: elements,
+          keys: classKey,
+          classes: value,
+          add: true
+        } ) );
+      }
+    },
+
+    _setOptionDisabled: function( value ) {
+      this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
+
+      // If the widget is becoming disabled, then nothing is interactive
+      if ( value ) {
+        this._removeClass( this.hoverable, null, "ui-state-hover" );
+        this._removeClass( this.focusable, null, "ui-state-focus" );
+      }
+    },
+
+    enable: function() {
+      return this._setOptions( { disabled: false } );
+    },
+
+    disable: function() {
+      return this._setOptions( { disabled: true } );
+    },
+
+    _classes: function( options ) {
+      var full = [];
+      var that = this;
+
+      options = $.extend( {
+        element: this.element,
+        classes: this.options.classes || {}
+      }, options );
+
+      function processClassString( classes, checkOption ) {
+        var current, i;
+        for ( i = 0; i < classes.length; i++ ) {
+          current = that.classesElementLookup[ classes[ i ] ] || $();
+          if ( options.add ) {
+            current = $( $.unique( current.get().concat( options.element.get() ) ) );
+          } else {
+            current = $( current.not( options.element ).get() );
+          }
+          that.classesElementLookup[ classes[ i ] ] = current;
+          full.push( classes[ i ] );
+          if ( checkOption && options.classes[ classes[ i ] ] ) {
+            full.push( options.classes[ classes[ i ] ] );
+          }
+        }
+      }
+
+      this._on( options.element, {
+        "remove": "_untrackClassesElement"
+      } );
+
+      if ( options.keys ) {
+        processClassString( options.keys.match( /\S+/g ) || [], true );
+      }
+      if ( options.extra ) {
+        processClassString( options.extra.match( /\S+/g ) || [] );
+      }
+
+      return full.join( " " );
+    },
+
+    _untrackClassesElement: function( event ) {
+      var that = this;
+      $.each( that.classesElementLookup, function( key, value ) {
+        if ( $.inArray( event.target, value ) !== -1 ) {
+          that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
+        }
+      } );
+    },
+
+    _removeClass: function( element, keys, extra ) {
+      return this._toggleClass( element, keys, extra, false );
+    },
+
+    _addClass: function( element, keys, extra ) {
+      return this._toggleClass( element, keys, extra, true );
+    },
+
+    _toggleClass: function( element, keys, extra, add ) {
+      add = ( typeof add === "boolean" ) ? add : extra;
+      var shift = ( typeof element === "string" || element === null ),
+        options = {
+          extra: shift ? keys : extra,
+          keys: shift ? element : keys,
+          element: shift ? this.element : element,
+          add: add
+        };
+      options.element.toggleClass( this._classes( options ), add );
+      return this;
+    },
+
+    _on: function( suppressDisabledCheck, element, handlers ) {
+      var delegateElement;
+      var instance = this;
+
+      // No suppressDisabledCheck flag, shuffle arguments
+      if ( typeof suppressDisabledCheck !== "boolean" ) {
+        handlers = element;
+        element = suppressDisabledCheck;
+        suppressDisabledCheck = false;
+      }
+
+      // No element argument, shuffle and use this.element
+      if ( !handlers ) {
+        handlers = element;
+        element = this.element;
+        delegateElement = this.widget();
+      } else {
+        element = delegateElement = $( element );
+        this.bindings = this.bindings.add( element );
+      }
+
+      $.each( handlers, function( event, handler ) {
+        function handlerProxy() {
+
+          // Allow widgets to customize the disabled handling
+          // - disabled as an array instead of boolean
+          // - disabled class as method for disabling individual parts
+          if ( !suppressDisabledCheck &&
+            ( instance.options.disabled === true ||
+              $( this ).hasClass( "ui-state-disabled" ) ) ) {
+            return;
+          }
+          return ( typeof handler === "string" ? instance[ handler ] : handler )
+            .apply( instance, arguments );
+        }
+
+        // Copy the guid so direct unbinding works
+        if ( typeof handler !== "string" ) {
+          handlerProxy.guid = handler.guid =
+            handler.guid || handlerProxy.guid || $.guid++;
+        }
+
+        var match = event.match( /^([\w:-]*)\s*(.*)$/ );
+        var eventName = match[ 1 ] + instance.eventNamespace;
+        var selector = match[ 2 ];
+
+        if ( selector ) {
+          delegateElement.on( eventName, selector, handlerProxy );
+        } else {
+          element.on( eventName, handlerProxy );
+        }
+      } );
+    },
+
+    _off: function( element, eventName ) {
+      eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
+        this.eventNamespace;
+      element.off( eventName ).off( eventName );
+
+      // Clear the stack to avoid memory leaks (#10056)
+      this.bindings = $( this.bindings.not( element ).get() );
+      this.focusable = $( this.focusable.not( element ).get() );
+      this.hoverable = $( this.hoverable.not( element ).get() );
+    },
+
+    _delay: function( handler, delay ) {
+      function handlerProxy() {
+        return ( typeof handler === "string" ? instance[ handler ] : handler )
+          .apply( instance, arguments );
+      }
+      var instance = this;
+      return setTimeout( handlerProxy, delay || 0 );
+    },
+
+    _hoverable: function( element ) {
+      this.hoverable = this.hoverable.add( element );
+      this._on( element, {
+        mouseenter: function( event ) {
+          this._addClass( $( event.currentTarget ), null, "ui-state-hover" );
+        },
+        mouseleave: function( event ) {
+          this._removeClass( $( event.currentTarget ), null, "ui-state-hover" );
+        }
+      } );
+    },
+
+    _focusable: function( element ) {
+      this.focusable = this.focusable.add( element );
+      this._on( element, {
+        focusin: function( event ) {
+          this._addClass( $( event.currentTarget ), null, "ui-state-focus" );
+        },
+        focusout: function( event ) {
+          this._removeClass( $( event.currentTarget ), null, "ui-state-focus" );
+        }
+      } );
+    },
+
+    _trigger: function( type, event, data ) {
+      var prop, orig;
+      var callback = this.options[ type ];
+
+      data = data || {};
+      event = $.Event( event );
+      event.type = ( type === this.widgetEventPrefix ?
+        type :
+        this.widgetEventPrefix + type ).toLowerCase();
+
+      // The original event may come from any element
+      // so we need to reset the target on the new event
+      event.target = this.element[ 0 ];
+
+      // Copy original event properties over to the new event
+      orig = event.originalEvent;
+      if ( orig ) {
+        for ( prop in orig ) {
+          if ( !( prop in event ) ) {
+            event[ prop ] = orig[ prop ];
+          }
+        }
+      }
+
+      this.element.trigger( event, data );
+      return !( $.isFunction( callback ) &&
+        callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
+        event.isDefaultPrevented() );
+    }
+  };
+
+  $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+    $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+      if ( typeof options === "string" ) {
+        options = { effect: options };
+      }
+
+      var hasOptions;
+      var effectName = !options ?
+        method :
+        options === true || typeof options === "number" ?
+          defaultEffect :
+          options.effect || defaultEffect;
+
+      options = options || {};
+      if ( typeof options === "number" ) {
+        options = { duration: options };
+      }
+
+      hasOptions = !$.isEmptyObject( options );
+      options.complete = callback;
+
+      if ( options.delay ) {
+        element.delay( options.delay );
+      }
+
+      if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+        element[ method ]( options );
+      } else if ( effectName !== method && element[ effectName ] ) {
+        element[ effectName ]( options.duration, options.easing, callback );
+      } else {
+        element.queue( function( next ) {
+          $( this )[ method ]();
+          if ( callback ) {
+            callback.call( element[ 0 ] );
+          }
+          next();
+        } );
+      }
+    };
+  } );
+
+  var widget = $.widget;
+
+
+  /*!
+   * jQuery UI :data 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
+
+//>>label: :data Selector
+//>>group: Core
+//>>description: Selects elements which have data stored under the specified key.
+//>>docs: http://api.jqueryui.com/data-selector/
+
+
+  var data = $.extend( $.expr[ ":" ], {
+    data: $.expr.createPseudo ?
+      $.expr.createPseudo( function( dataName ) {
+        return function( elem ) {
+          return !!$.data( elem, dataName );
+        };
+      } ) :
+
+      // Support: jQuery <1.8
+      function( elem, i, match ) {
+        return !!$.data( elem, match[ 3 ] );
+      }
+  } );
+
+  /*!
+   * jQuery UI Scroll Parent 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
+
+//>>label: scrollParent
+//>>group: Core
+//>>description: Get the closest ancestor element that is scrollable.
+//>>docs: http://api.jqueryui.com/scrollParent/
+
+
+
+  var scrollParent = $.fn.scrollParent = function( includeHidden ) {
+    var position = this.css( "position" ),
+      excludeStaticParent = position === "absolute",
+      overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
+      scrollParent = this.parents().filter( function() {
+        var parent = $( this );
+        if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
+          return false;
+        }
+        return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) +
+          parent.css( "overflow-x" ) );
+      } ).eq( 0 );
+
+    return position === "fixed" || !scrollParent.length ?
+      $( this[ 0 ].ownerDocument || document ) :
+      scrollParent;
+  };
+
+
+
+
+// This file is deprecated
+  var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+  /*!
+   * jQuery UI Mouse 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
+
+//>>label: Mouse
+//>>group: Widgets
+//>>description: Abstracts mouse-based interactions to assist in creating certain widgets.
+//>>docs: http://api.jqueryui.com/mouse/
+
+
+
+  var mouseHandled = false;
+  $( document ).on( "mouseup", function() {
+    mouseHandled = false;
+  } );
+
+  var widgetsMouse = $.widget( "ui.mouse", {
+    version: "1.12.1",
+    options: {
+      cancel: "input, textarea, button, select, option",
+      distance: 1,
+      delay: 0
+    },
+    _mouseInit: function() {
+      var that = this;
+
+      this.element
+        .on( "mousedown." + this.widgetName, function( event ) {
+          return that._mouseDown( event );
+        } )
+        .on( "click." + this.widgetName, function( event ) {
+          if ( true === $.data( event.target, that.widgetName + ".preventClickEvent" ) ) {
+            $.removeData( event.target, that.widgetName + ".preventClickEvent" );
+            event.stopImmediatePropagation();
+            return false;
+          }
+        } );
+
+      this.started = false;
+    },
+
+    // TODO: make sure destroying one instance of mouse doesn't mess with
+    // other instances of mouse
+    _mouseDestroy: function() {
+      this.element.off( "." + this.widgetName );
+      if ( this._mouseMoveDelegate ) {
+        this.document
+          .off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+          .off( "mouseup." + this.widgetName, this._mouseUpDelegate );
+      }
+    },
+
+    _mouseDown: function( event ) {
+
+      // don't let more than one widget handle mouseStart
+      if ( mouseHandled ) {
+        return;
+      }
+
+      this._mouseMoved = false;
+
+      // We may have missed mouseup (out of window)
+      ( this._mouseStarted && this._mouseUp( event ) );
+
+      this._mouseDownEvent = event;
+
+      var that = this,
+        btnIsLeft = ( event.which === 1 ),
+
+        // event.target.nodeName works around a bug in IE 8 with
+        // disabled inputs (#7620)
+        elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
+          $( event.target ).closest( this.options.cancel ).length : false );
+      if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
+        return true;
+      }
+
+      this.mouseDelayMet = !this.options.delay;
+      if ( !this.mouseDelayMet ) {
+        this._mouseDelayTimer = setTimeout( function() {
+          that.mouseDelayMet = true;
+        }, this.options.delay );
+      }
+
+      if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+        this._mouseStarted = ( this._mouseStart( event ) !== false );
+        if ( !this._mouseStarted ) {
+          event.preventDefault();
+          return true;
+        }
+      }
+
+      // Click event may never have fired (Gecko & Opera)
+      if ( true === $.data( event.target, this.widgetName + ".preventClickEvent" ) ) {
+        $.removeData( event.target, this.widgetName + ".preventClickEvent" );
+      }
+
+      // These delegates are required to keep context
+      this._mouseMoveDelegate = function( event ) {
+        return that._mouseMove( event );
+      };
+      this._mouseUpDelegate = function( event ) {
+        return that._mouseUp( event );
+      };
+
+      this.document
+        .on( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+        .on( "mouseup." + this.widgetName, this._mouseUpDelegate );
+
+      event.preventDefault();
+
+      mouseHandled = true;
+      return true;
+    },
+
+    _mouseMove: function( event ) {
+
+      // Only check for mouseups outside the document if you've moved inside the document
+      // at least once. This prevents the firing of mouseup in the case of IE<9, which will
+      // fire a mousemove event if content is placed under the cursor. See #7778
+      // Support: IE <9
+      if ( this._mouseMoved ) {
+
+        // IE mouseup check - mouseup happened when mouse was out of window
+        if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) &&
+          !event.button ) {
+          return this._mouseUp( event );
+
+          // Iframe mouseup check - mouseup occurred in another document
+        } else if ( !event.which ) {
+
+          // Support: Safari <=8 - 9
+          // Safari sets which to 0 if you press any of the following keys
+          // during a drag (#14461)
+          if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
+            event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
+            this.ignoreMissingWhich = true;
+          } else if ( !this.ignoreMissingWhich ) {
+            return this._mouseUp( event );
+          }
+        }
+      }
+
+      if ( event.which || event.button ) {
+        this._mouseMoved = true;
+      }
+
+      if ( this._mouseStarted ) {
+        this._mouseDrag( event );
+        return event.preventDefault();
+      }
+
+      if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+        this._mouseStarted =
+          ( this._mouseStart( this._mouseDownEvent, event ) !== false );
+        ( this._mouseStarted ? this._mouseDrag( event ) : this._mouseUp( event ) );
+      }
+
+      return !this._mouseStarted;
+    },
+
+    _mouseUp: function( event ) {
+      this.document
+        .off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+        .off( "mouseup." + this.widgetName, this._mouseUpDelegate );
+
+      if ( this._mouseStarted ) {
+        this._mouseStarted = false;
+
+        if ( event.target === this._mouseDownEvent.target ) {
+          $.data( event.target, this.widgetName + ".preventClickEvent", true );
+        }
+
+        this._mouseStop( event );
+      }
+
+      if ( this._mouseDelayTimer ) {
+        clearTimeout( this._mouseDelayTimer );
+        delete this._mouseDelayTimer;
+      }
+
+      this.ignoreMissingWhich = false;
+      mouseHandled = false;
+      event.preventDefault();
+    },
+
+    _mouseDistanceMet: function( event ) {
+      return ( Math.max(
+          Math.abs( this._mouseDownEvent.pageX - event.pageX ),
+          Math.abs( this._mouseDownEvent.pageY - event.pageY )
+        ) >= this.options.distance
+      );
+    },
+
+    _mouseDelayMet: function( /* event */ ) {
+      return this.mouseDelayMet;
+    },
+
+    // These are placeholder methods, to be overriden by extending plugin
+    _mouseStart: function( /* event */ ) {},
+    _mouseDrag: function( /* event */ ) {},
+    _mouseStop: function( /* event */ ) {},
+    _mouseCapture: function( /* event */ ) { return true; }
+  } );
+
+
+  /*!
+   * jQuery UI Sortable 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
+
+//>>label: Sortable
+//>>group: Interactions
+//>>description: Enables items in a list to be sorted using the mouse.
+//>>docs: http://api.jqueryui.com/sortable/
+//>>demos: http://jqueryui.com/sortable/
+//>>css.structure: ../../themes/base/sortable.css
+
+
+
+  var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
+    version: "1.12.1",
+    widgetEventPrefix: "sort",
+    ready: false,
+    options: {
+      appendTo: "parent",
+      axis: false,
+      connectWith: false,
+      containment: false,
+      cursor: "auto",
+      cursorAt: false,
+      dropOnEmpty: true,
+      forcePlaceholderSize: false,
+      forceHelperSize: false,
+      grid: false,
+      handle: false,
+      helper: "original",
+      items: "> *",
+      opacity: false,
+      placeholder: false,
+      revert: false,
+      scroll: true,
+      scrollSensitivity: 20,
+      scrollSpeed: 20,
+      scope: "default",
+      tolerance: "intersect",
+      zIndex: 1000,
+
+      // Callbacks
+      activate: null,
+      beforeStop: null,
+      change: null,
+      deactivate: null,
+      out: null,
+      over: null,
+      receive: null,
+      remove: null,
+      sort: null,
+      start: null,
+      stop: null,
+      update: null
+    },
+
+    _isOverAxis: function( x, reference, size ) {
+      return ( x >= reference ) && ( x < ( reference + size ) );
+    },
+
+    _isFloating: function( item ) {
+      return ( /left|right/ ).test( item.css( "float" ) ) ||
+        ( /inline|table-cell/ ).test( item.css( "display" ) );
+    },
+
+    _create: function() {
+      this.containerCache = {};
+      this._addClass( "ui-sortable" );
+
+      //Get the items
+      this.refresh();
+
+      //Let's determine the parent's offset
+      this.offset = this.element.offset();
+
+      //Initialize mouse events for interaction
+      this._mouseInit();
+
+      this._setHandleClassName();
+
+      //We're ready to go
+      this.ready = true;
+
+    },
+
+    _setOption: function( key, value ) {
+      this._super( key, value );
+
+      if ( key === "handle" ) {
+        this._setHandleClassName();
+      }
+    },
+
+    _setHandleClassName: function() {
+      var that = this;
+      this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" );
+      $.each( this.items, function() {
+        that._addClass(
+          this.instance.options.handle ?
+            this.item.find( this.instance.options.handle ) :
+            this.item,
+          "ui-sortable-handle"
+        );
+      } );
+    },
+
+    _destroy: function() {
+      this._mouseDestroy();
+
+      for ( var i = this.items.length - 1; i >= 0; i-- ) {
+        this.items[ i ].item.removeData( this.widgetName + "-item" );
+      }
+
+      return this;
+    },
+
+    _mouseCapture: function( event, overrideHandle ) {
+      var currentItem = null,
+        validHandle = false,
+        that = this;
+
+      if ( this.reverting ) {
+        return false;
+      }
+
+      if ( this.options.disabled || this.options.type === "static" ) {
+        return false;
+      }
+
+      //We have to refresh the items data once first
+      this._refreshItems( event );
+
+      //Find out if the clicked node (or one of its parents) is a actual item in this.items
+      $( event.target ).parents().each( function() {
+        if ( $.data( this, that.widgetName + "-item" ) === that ) {
+          currentItem = $( this );
+          return false;
+        }
+      } );
+      if ( $.data( event.target, that.widgetName + "-item" ) === that ) {
+        currentItem = $( event.target );
+      }
+
+      if ( !currentItem ) {
+        return false;
+      }
+      if ( this.options.handle && !overrideHandle ) {
+        $( this.options.handle, currentItem ).find( "*" ).addBack().each( function() {
+          if ( this === event.target ) {
+            validHandle = true;
+          }
+        } );
+        if ( !validHandle ) {
+          return false;
+        }
+      }
+
+      this.currentItem = currentItem;
+      this._removeCurrentsFromItems();
+      return true;
+
+    },
+
+    _mouseStart: function( event, overrideHandle, noActivation ) {
+
+      var i, body,
+        o = this.options;
+
+      this.currentContainer = this;
+
+      //We only need to call refreshPositions, because the refreshItems call has been moved to
+      // mouseCapture
+      this.refreshPositions();
+
+      //Create and append the visible helper
+      this.helper = this._createHelper( event );
+
+      //Cache the helper size
+      this._cacheHelperProportions();
+
+      /*
+       * - Position generation -
+       * This block generates everything position related - it's the core of draggables.
+       */
+
+      //Cache the margins of the original element
+      this._cacheMargins();
+
+      //Get the next scrolling parent
+      this.scrollParent = this.helper.scrollParent();
+
+      //The element's absolute position on the page minus margins
+      this.offset = this.currentItem.offset();
+      this.offset = {
+        top: this.offset.top - this.margins.top,
+        left: this.offset.left - this.margins.left
+      };
+
+      $.extend( this.offset, {
+        click: { //Where the click happened, relative to the element
+          left: event.pageX - this.offset.left,
+          top: event.pageY - this.offset.top
+        },
+        parent: this._getParentOffset(),
+
+        // This is a relative to absolute position minus the actual position calculation -
+        // only used for relative positioned helper
+        relative: this._getRelativeOffset()
+      } );
+
+      // Only after we got the offset, we can change the helper's position to absolute
+      // TODO: Still need to figure out a way to make relative sorting possible
+      this.helper.css( "position", "absolute" );
+      this.cssPosition = this.helper.css( "position" );
+
+      //Generate the original position
+      this.originalPosition = this._generatePosition( event );
+      this.originalPageX = event.pageX;
+      this.originalPageY = event.pageY;
+
+      //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+      ( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
+
+      //Cache the former DOM position
+      this.domPosition = {
+        prev: this.currentItem.prev()[ 0 ],
+        parent: this.currentItem.parent()[ 0 ]
+      };
+
+      // If the helper is not the original, hide the original so it's not playing any role during
+      // the drag, won't cause anything bad this way
+      if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+        this.currentItem.hide();
+      }
+
+      //Create the placeholder
+      this._createPlaceholder();
+
+      //Set a containment if given in the options
+      if ( o.containment ) {
+        this._setContainment();
+      }
+
+      if ( o.cursor && o.cursor !== "auto" ) { // cursor option
+        body = this.document.find( "body" );
+
+        // Support: IE
+        this.storedCursor = body.css( "cursor" );
+        body.css( "cursor", o.cursor );
+
+        this.storedStylesheet =
+          $( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
+      }
+
+      if ( o.opacity ) { // opacity option
+        if ( this.helper.css( "opacity" ) ) {
+          this._storedOpacity = this.helper.css( "opacity" );
+        }
+        this.helper.css( "opacity", o.opacity );
+      }
+
+      if ( o.zIndex ) { // zIndex option
+        if ( this.helper.css( "zIndex" ) ) {
+          this._storedZIndex = this.helper.css( "zIndex" );
+        }
+        this.helper.css( "zIndex", o.zIndex );
+      }
+
+      //Prepare scrolling
+      if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+        this.scrollParent[ 0 ].tagName !== "HTML" ) {
+        this.overflowOffset = this.scrollParent.offset();
+      }
+
+      //Call callbacks
+      this._trigger( "start", event, this._uiHash() );
+
+      //Recache the helper size
+      if ( !this._preserveHelperProportions ) {
+        this._cacheHelperProportions();
+      }
+
+      //Post "activate" events to possible containers
+      if ( !noActivation ) {
+        for ( i = this.containers.length - 1; i >= 0; i-- ) {
+          this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+        }
+      }
+
+      //Prepare possible droppables
+      if ( $.ui.ddmanager ) {
+        $.ui.ddmanager.current = this;
+      }
+
+      if ( $.ui.ddmanager && !o.dropBehaviour ) {
+        $.ui.ddmanager.prepareOffsets( this, event );
+      }
+
+      this.dragging = true;
+
+      this._addClass( this.helper, "ui-sortable-helper" );
+
+      // Execute the drag once - this causes the helper not to be visiblebefore getting its
+      // correct position
+      this._mouseDrag( event );
+      return true;
+
+    },
+
+    _mouseDrag: function( event ) {
+      var i, item, itemElement, intersection,
+        o = this.options,
+        scrolled = false;
+
+      //Compute the helpers position
+      this.position = this._generatePosition( event );
+      this.positionAbs = this._convertPositionTo( "absolute" );
+
+      if ( !this.lastPositionAbs ) {
+        this.lastPositionAbs = this.positionAbs;
+      }
+
+      //Do scrolling
+      if ( this.options.scroll ) {
+        if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+          this.scrollParent[ 0 ].tagName !== "HTML" ) {
+
+          if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
+            event.pageY < o.scrollSensitivity ) {
+            this.scrollParent[ 0 ].scrollTop =
+              scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
+          } else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
+            this.scrollParent[ 0 ].scrollTop =
+              scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
+          }
+
+          if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
+            event.pageX < o.scrollSensitivity ) {
+            this.scrollParent[ 0 ].scrollLeft = scrolled =
+              this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
+          } else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
+            this.scrollParent[ 0 ].scrollLeft = scrolled =
+              this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
+          }
+
+        } else {
+
+          if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
+            scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
+          } else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
+            o.scrollSensitivity ) {
+            scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
+          }
+
+          if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
+            scrolled = this.document.scrollLeft(
+              this.document.scrollLeft() - o.scrollSpeed
+            );
+          } else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
+            o.scrollSensitivity ) {
+            scrolled = this.document.scrollLeft(
+              this.document.scrollLeft() + o.scrollSpeed
+            );
+          }
+
+        }
+
+        if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
+          $.ui.ddmanager.prepareOffsets( this, event );
+        }
+      }
+
+      //Regenerate the absolute position used for position checks
+      this.positionAbs = this._convertPositionTo( "absolute" );
+
+      //Set the helper position
+      if ( !this.options.axis || this.options.axis !== "y" ) {
+        this.helper[ 0 ].style.left = this.position.left + "px";
+      }
+      if ( !this.options.axis || this.options.axis !== "x" ) {
+        this.helper[ 0 ].style.top = this.position.top + "px";
+      }
+
+      //Rearrange
+      for ( i = this.items.length - 1; i >= 0; i-- ) {
+
+        //Cache variables and intersection, continue if no intersection
+        item = this.items[ i ];
+        itemElement = item.item[ 0 ];
+        intersection = this._intersectsWithPointer( item );
+        if ( !intersection ) {
+          continue;
+        }
+
+        // Only put the placeholder inside the current Container, skip all
+        // items from other containers. This works because when moving
+        // an item from one container to another the
+        // currentContainer is switched before the placeholder is moved.
+        //
+        // Without this, moving items in "sub-sortables" can cause
+        // the placeholder to jitter between the outer and inner container.
+        if ( item.instance !== this.currentContainer ) {
+          continue;
+        }
+
+        // Cannot intersect with itself
+        // no useless actions that have been done before
+        // no action if the item moved is the parent of the item checked
+        if ( itemElement !== this.currentItem[ 0 ] &&
+          this.placeholder[ intersection === 1 ? "next" : "prev" ]()[ 0 ] !== itemElement &&
+          !$.contains( this.placeholder[ 0 ], itemElement ) &&
+          ( this.options.type === "semi-dynamic" ?
+              !$.contains( this.element[ 0 ], itemElement ) :
+              true
+          )
+        ) {
+
+          this.direction = intersection === 1 ? "down" : "up";
+
+          if ( this.options.tolerance === "pointer" || this._intersectsWithSides( item ) ) {
+            this._rearrange( event, item );
+          } else {
+            break;
+          }
+
+          this._trigger( "change", event, this._uiHash() );
+          break;
+        }
+      }
+
+      //Post events to containers
+      this._contactContainers( event );
+
+      //Interconnect with droppables
+      if ( $.ui.ddmanager ) {
+        $.ui.ddmanager.drag( this, event );
+      }
+
+      //Call callbacks
+      this._trigger( "sort", event, this._uiHash() );
+
+      this.lastPositionAbs = this.positionAbs;
+      return false;
+
+    },
+
+    _mouseStop: function( event, noPropagation ) {
+
+      if ( !event ) {
+        return;
+      }
+
+      //If we are using droppables, inform the manager about the drop
+      if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+        $.ui.ddmanager.drop( this, event );
+      }
+
+      if ( this.options.revert ) {
+        var that = this,
+          cur = this.placeholder.offset(),
+          axis = this.options.axis,
+          animation = {};
+
+        if ( !axis || axis === "x" ) {
+          animation.left = cur.left - this.offset.parent.left - this.margins.left +
+            ( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
+                0 :
+                this.offsetParent[ 0 ].scrollLeft
+            );
+        }
+        if ( !axis || axis === "y" ) {
+          animation.top = cur.top - this.offset.parent.top - this.margins.top +
+            ( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
+                0 :
+                this.offsetParent[ 0 ].scrollTop
+            );
+        }
+        this.reverting = true;
+        $( this.helper ).animate(
+          animation,
+          parseInt( this.options.revert, 10 ) || 500,
+          function() {
+            that._clear( event );
+          }
+        );
+      } else {
+        this._clear( event, noPropagation );
+      }
+
+      return false;
+
+    },
+
+    cancel: function() {
+
+      if ( this.dragging ) {
+
+        this._mouseUp( new $.Event( "mouseup", { target: null } ) );
+
+        if ( this.options.helper === "original" ) {
+          this.currentItem.css( this._storedCSS );
+          this._removeClass( this.currentItem, "ui-sortable-helper" );
+        } else {
+          this.currentItem.show();
+        }
+
+        //Post deactivating events to containers
+        for ( var i = this.containers.length - 1; i >= 0; i-- ) {
+          this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) );
+          if ( this.containers[ i ].containerCache.over ) {
+            this.containers[ i ]._trigger( "out", null, this._uiHash( this ) );
+            this.containers[ i ].containerCache.over = 0;
+          }
+        }
+
+      }
+
+      if ( this.placeholder ) {
+
+        //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
+        // it unbinds ALL events from the original node!
+        if ( this.placeholder[ 0 ].parentNode ) {
+          this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
+        }
+        if ( this.options.helper !== "original" && this.helper &&
+          this.helper[ 0 ].parentNode ) {
+          this.helper.remove();
+        }
+
+        $.extend( this, {
+          helper: null,
+          dragging: false,
+          reverting: false,
+          _noFinalSort: null
+        } );
+
+        if ( this.domPosition.prev ) {
+          $( this.domPosition.prev ).after( this.currentItem );
+        } else {
+          $( this.domPosition.parent ).prepend( this.currentItem );
+        }
+      }
+
+      return this;
+
+    },
+
+    serialize: function( o ) {
+
+      var items = this._getItemsAsjQuery( o && o.connected ),
+        str = [];
+      o = o || {};
+
+      $( items ).each( function() {
+        var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" )
+          .match( o.expression || ( /(.+)[\-=_](.+)/ ) );
+        if ( res ) {
+          str.push(
+            ( o.key || res[ 1 ] + "[]" ) +
+            "=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) );
+        }
+      } );
+
+      if ( !str.length && o.key ) {
+        str.push( o.key + "=" );
+      }
+
+      return str.join( "&" );
+
+    },
+
+    toArray: function( o ) {
+
+      var items = this._getItemsAsjQuery( o && o.connected ),
+        ret = [];
+
+      o = o || {};
+
+      items.each( function() {
+        ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" );
+      } );
+      return ret;
+
+    },
+
+    /* Be careful with the following core functions */
+    _intersectsWith: function( item ) {
+
+      var x1 = this.positionAbs.left,
+        x2 = x1 + this.helperProportions.width,
+        y1 = this.positionAbs.top,
+        y2 = y1 + this.helperProportions.height,
+        l = item.left,
+        r = l + item.width,
+        t = item.top,
+        b = t + item.height,
+        dyClick = this.offset.click.top,
+        dxClick = this.offset.click.left,
+        isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t &&
+          ( y1 + dyClick ) < b ),
+        isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l &&
+          ( x1 + dxClick ) < r ),
+        isOverElement = isOverElementHeight && isOverElementWidth;
+
+      if ( this.options.tolerance === "pointer" ||
+        this.options.forcePointerForContainers ||
+        ( this.options.tolerance !== "pointer" &&
+          this.helperProportions[ this.floating ? "width" : "height" ] >
+          item[ this.floating ? "width" : "height" ] )
+      ) {
+        return isOverElement;
+      } else {
+
+        return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half
+          x2 - ( this.helperProportions.width / 2 ) < r && // Left Half
+          t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half
+          y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half
+
+      }
+    },
+
+    _intersectsWithPointer: function( item ) {
+      var verticalDirection, horizontalDirection,
+        isOverElementHeight = ( this.options.axis === "x" ) ||
+          this._isOverAxis(
+            this.positionAbs.top + this.offset.click.top, item.top, item.height ),
+        isOverElementWidth = ( this.options.axis === "y" ) ||
+          this._isOverAxis(
+            this.positionAbs.left + this.offset.click.left, item.left, item.width ),
+        isOverElement = isOverElementHeight && isOverElementWidth;
+
+      if ( !isOverElement ) {
+        return false;
+      }
+
+      verticalDirection = this._getDragVerticalDirection();
+      horizontalDirection = this._getDragHorizontalDirection();
+
+      return this.floating ?
+        ( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 )
+        : ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
+
+    },
+
+    _intersectsWithSides: function( item ) {
+
+      var isOverBottomHalf = this._isOverAxis( this.positionAbs.top +
+        this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
+        isOverRightHalf = this._isOverAxis( this.positionAbs.left +
+          this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
+        verticalDirection = this._getDragVerticalDirection(),
+        horizontalDirection = this._getDragHorizontalDirection();
+
+      if ( this.floating && horizontalDirection ) {
+        return ( ( horizontalDirection === "right" && isOverRightHalf ) ||
+          ( horizontalDirection === "left" && !isOverRightHalf ) );
+      } else {
+        return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) ||
+          ( verticalDirection === "up" && !isOverBottomHalf ) );
+      }
+
+    },
+
+    _getDragVerticalDirection: function() {
+      var delta = this.positionAbs.top - this.lastPositionAbs.top;
+      return delta !== 0 && ( delta > 0 ? "down" : "up" );
+    },
+
+    _getDragHorizontalDirection: function() {
+      var delta = this.positionAbs.left - this.lastPositionAbs.left;
+      return delta !== 0 && ( delta > 0 ? "right" : "left" );
+    },
+
+    refresh: function( event ) {
+      this._refreshItems( event );
+      this._setHandleClassName();
+      this.refreshPositions();
+      return this;
+    },
+
+    _connectWith: function() {
+      var options = this.options;
+      return options.connectWith.constructor === String ?
+        [ options.connectWith ] :
+        options.connectWith;
+    },
+
+    _getItemsAsjQuery: function( connected ) {
+
+      var i, j, cur, inst,
+        items = [],
+        queries = [],
+        connectWith = this._connectWith();
+
+      if ( connectWith && connected ) {
+        for ( i = connectWith.length - 1; i >= 0; i-- ) {
+          cur = $( connectWith[ i ], this.document[ 0 ] );
+          for ( j = cur.length - 1; j >= 0; j-- ) {
+            inst = $.data( cur[ j ], this.widgetFullName );
+            if ( inst && inst !== this && !inst.options.disabled ) {
+              queries.push( [ $.isFunction( inst.options.items ) ?
+                inst.options.items.call( inst.element ) :
+                $( inst.options.items, inst.element )
+                  .not( ".ui-sortable-helper" )
+                  .not( ".ui-sortable-placeholder" ), inst ] );
+            }
+          }
+        }
+      }
+
+      queries.push( [ $.isFunction( this.options.items ) ?
+        this.options.items
+          .call( this.element, null, { options: this.options, item: this.currentItem } ) :
+        $( this.options.items, this.element )
+          .not( ".ui-sortable-helper" )
+          .not( ".ui-sortable-placeholder" ), this ] );
+
+      function addItems() {
+        items.push( this );
+      }
+      for ( i = queries.length - 1; i >= 0; i-- ) {
+        queries[ i ][ 0 ].each( addItems );
+      }
+
+      return $( items );
+
+    },
+
+    _removeCurrentsFromItems: function() {
+
+      var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" );
+
+      this.items = $.grep( this.items, function( item ) {
+        for ( var j = 0; j < list.length; j++ ) {
+          if ( list[ j ] === item.item[ 0 ] ) {
+            return false;
+          }
+        }
+        return true;
+      } );
+
+    },
+
+    _refreshItems: function( event ) {
+
+      this.items = [];
+      this.containers = [ this ];
+
+      var i, j, cur, inst, targetData, _queries, item, queriesLength,
+        items = this.items,
+        queries = [ [ $.isFunction( this.options.items ) ?
+          this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) :
+          $( this.options.items, this.element ), this ] ],
+        connectWith = this._connectWith();
+
+      //Shouldn't be run the first time through due to massive slow-down
+      if ( connectWith && this.ready ) {
+        for ( i = connectWith.length - 1; i >= 0; i-- ) {
+          cur = $( connectWith[ i ], this.document[ 0 ] );
+          for ( j = cur.length - 1; j >= 0; j-- ) {
+            inst = $.data( cur[ j ], this.widgetFullName );
+            if ( inst && inst !== this && !inst.options.disabled ) {
+              queries.push( [ $.isFunction( inst.options.items ) ?
+                inst.options.items
+                  .call( inst.element[ 0 ], event, { item: this.currentItem } ) :
+                $( inst.options.items, inst.element ), inst ] );
+              this.containers.push( inst );
+            }
+          }
+        }
+      }
+
+      for ( i = queries.length - 1; i >= 0; i-- ) {
+        targetData = queries[ i ][ 1 ];
+        _queries = queries[ i ][ 0 ];
+
+        for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) {
+          item = $( _queries[ j ] );
+
+          // Data for target checking (mouse manager)
+          item.data( this.widgetName + "-item", targetData );
+
+          items.push( {
+            item: item,
+            instance: targetData,
+            width: 0, height: 0,
+            left: 0, top: 0
+          } );
+        }
+      }
+
+    },
+
+    refreshPositions: function( fast ) {
+
+      // Determine whether items are being displayed horizontally
+      this.floating = this.items.length ?
+        this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
+        false;
+
+      //This has to be redone because due to the item being moved out/into the offsetParent,
+      // the offsetParent's position will change
+      if ( this.offsetParent && this.helper ) {
+        this.offset.parent = this._getParentOffset();
+      }
+
+      var i, item, t, p;
+
+      for ( i = this.items.length - 1; i >= 0; i-- ) {
+        item = this.items[ i ];
+
+        //We ignore calculating positions of all connected containers when we're not over them
+        if ( item.instance !== this.currentContainer && this.currentContainer &&
+          item.item[ 0 ] !== this.currentItem[ 0 ] ) {
+          continue;
+        }
+
+        t = this.options.toleranceElement ?
+          $( this.options.toleranceElement, item.item ) :
+          item.item;
+
+        if ( !fast ) {
+          item.width = t.outerWidth();
+          item.height = t.outerHeight();
+        }
+
+        p = t.offset();
+        item.left = p.left;
+        item.top = p.top;
+      }
+
+      if ( this.options.custom && this.options.custom.refreshContainers ) {
+        this.options.custom.refreshContainers.call( this );
+      } else {
+        for ( i = this.containers.length - 1; i >= 0; i-- ) {
+          p = this.containers[ i ].element.offset();
+          this.containers[ i ].containerCache.left = p.left;
+          this.containers[ i ].containerCache.top = p.top;
+          this.containers[ i ].containerCache.width =
+            this.containers[ i ].element.outerWidth();
+          this.containers[ i ].containerCache.height =
+            this.containers[ i ].element.outerHeight();
+        }
+      }
+
+      return this;
+    },
+
+    _createPlaceholder: function( that ) {
+      that = that || this;
+      var className,
+        o = that.options;
+
+      if ( !o.placeholder || o.placeholder.constructor === String ) {
+        className = o.placeholder;
+        o.placeholder = {
+          element: function() {
+
+            var nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(),
+              element = $( "<" + nodeName + ">", that.document[ 0 ] );
+
+            that._addClass( element, "ui-sortable-placeholder",
+              className || that.currentItem[ 0 ].className )
+              ._removeClass( element, "ui-sortable-helper" );
+
+            if ( nodeName === "tbody" ) {
+              that._createTrPlaceholder(
+                that.currentItem.find( "tr" ).eq( 0 ),
+                $( "<tr>", that.document[ 0 ] ).appendTo( element )
+              );
+            } else if ( nodeName === "tr" ) {
+              that._createTrPlaceholder( that.currentItem, element );
+            } else if ( nodeName === "img" ) {
+              element.attr( "src", that.currentItem.attr( "src" ) );
+            }
+
+            if ( !className ) {
+              element.css( "visibility", "hidden" );
+            }
+
+            return element;
+          },
+          update: function( container, p ) {
+
+            // 1. If a className is set as 'placeholder option, we don't force sizes -
+            // the class is responsible for that
+            // 2. The option 'forcePlaceholderSize can be enabled to force it even if a
+            // class name is specified
+            if ( className && !o.forcePlaceholderSize ) {
+              return;
+            }
+
+            //If the element doesn't have a actual height by itself (without styles coming
+            // from a stylesheet), it receives the inline height from the dragged item
+            if ( !p.height() ) {
+              p.height(
+                that.currentItem.innerHeight() -
+                parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) -
+                parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) );
+            }
+            if ( !p.width() ) {
+              p.width(
+                that.currentItem.innerWidth() -
+                parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) -
+                parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) );
+            }
+          }
+        };
+      }
+
+      //Create the placeholder
+      that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) );
+
+      //Append it after the actual current item
+      that.currentItem.after( that.placeholder );
+
+      //Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+      o.placeholder.update( that, that.placeholder );
+
+    },
+
+    _createTrPlaceholder: function( sourceTr, targetTr ) {
+      var that = this;
+
+      sourceTr.children().each( function() {
+        $( "<td>&#160;</td>", that.document[ 0 ] )
+          .attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+          .appendTo( targetTr );
+      } );
+    },
+
+    _contactContainers: function( event ) {
+      var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom,
+        floating, axis,
+        innermostContainer = null,
+        innermostIndex = null;
+
+      // Get innermost container that intersects with item
+      for ( i = this.containers.length - 1; i >= 0; i-- ) {
+
+        // Never consider a container that's located within the item itself
+        if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) {
+          continue;
+        }
+
+        if ( this._intersectsWith( this.containers[ i ].containerCache ) ) {
+
+          // If we've already found a container and it's more "inner" than this, then continue
+          if ( innermostContainer &&
+            $.contains(
+              this.containers[ i ].element[ 0 ],
+              innermostContainer.element[ 0 ] ) ) {
+            continue;
+          }
+
+          innermostContainer = this.containers[ i ];
+          innermostIndex = i;
+
+        } else {
+
+          // container doesn't intersect. trigger "out" event if necessary
+          if ( this.containers[ i ].containerCache.over ) {
+            this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
+            this.containers[ i ].containerCache.over = 0;
+          }
+        }
+
+      }
+
+      // If no intersecting containers found, return
+      if ( !innermostContainer ) {
+        return;
+      }
+
+      // Move the item into the container if it's not there already
+      if ( this.containers.length === 1 ) {
+        if ( !this.containers[ innermostIndex ].containerCache.over ) {
+          this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+          this.containers[ innermostIndex ].containerCache.over = 1;
+        }
+      } else {
+
+        // When entering a new container, we will find the item with the least distance and
+        // append our item near it
+        dist = 10000;
+        itemWithLeastDistance = null;
+        floating = innermostContainer.floating || this._isFloating( this.currentItem );
+        posProperty = floating ? "left" : "top";
+        sizeProperty = floating ? "width" : "height";
+        axis = floating ? "pageX" : "pageY";
+
+        for ( j = this.items.length - 1; j >= 0; j-- ) {
+          if ( !$.contains(
+              this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] )
+          ) {
+            continue;
+          }
+          if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) {
+            continue;
+          }
+
+          cur = this.items[ j ].item.offset()[ posProperty ];
+          nearBottom = false;
+          if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
+            nearBottom = true;
+          }
+
+          if ( Math.abs( event[ axis ] - cur ) < dist ) {
+            dist = Math.abs( event[ axis ] - cur );
+            itemWithLeastDistance = this.items[ j ];
+            this.direction = nearBottom ? "up" : "down";
+          }
+        }
+
+        //Check if dropOnEmpty is enabled
+        if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) {
+          return;
+        }
+
+        if ( this.currentContainer === this.containers[ innermostIndex ] ) {
+          if ( !this.currentContainer.containerCache.over ) {
+            this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
+            this.currentContainer.containerCache.over = 1;
+          }
+          return;
+        }
+
+        itemWithLeastDistance ?
+          this._rearrange( event, itemWithLeastDistance, null, true ) :
+          this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
+        this._trigger( "change", event, this._uiHash() );
+        this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
+        this.currentContainer = this.containers[ innermostIndex ];
+
+        //Update the placeholder
+        this.options.placeholder.update( this.currentContainer, this.placeholder );
+
+        this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+        this.containers[ innermostIndex ].containerCache.over = 1;
+      }
+
+    },
+
+    _createHelper: function( event ) {
+
+      var o = this.options,
+        helper = $.isFunction( o.helper ) ?
+          $( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) :
+          ( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
+
+      //Add the helper to the DOM if that didn't happen already
+      if ( !helper.parents( "body" ).length ) {
+        $( o.appendTo !== "parent" ?
+          o.appendTo :
+          this.currentItem[ 0 ].parentNode )[ 0 ].appendChild( helper[ 0 ] );
+      }
+
+      if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
+        this._storedCSS = {
+          width: this.currentItem[ 0 ].style.width,
+          height: this.currentItem[ 0 ].style.height,
+          position: this.currentItem.css( "position" ),
+          top: this.currentItem.css( "top" ),
+          left: this.currentItem.css( "left" )
+        };
+      }
+
+      if ( !helper[ 0 ].style.width || o.forceHelperSize ) {
+        helper.width( this.currentItem.width() );
+      }
+      if ( !helper[ 0 ].style.height || o.forceHelperSize ) {
+        helper.height( this.currentItem.height() );
+      }
+
+      return helper;
+
+    },
+
+    _adjustOffsetFromHelper: function( obj ) {
+      if ( typeof obj === "string" ) {
+        obj = obj.split( " " );
+      }
+      if ( $.isArray( obj ) ) {
+        obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
+      }
+      if ( "left" in obj ) {
+        this.offset.click.left = obj.left + this.margins.left;
+      }
+      if ( "right" in obj ) {
+        this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+      }
+      if ( "top" in obj ) {
+        this.offset.click.top = obj.top + this.margins.top;
+      }
+      if ( "bottom" in obj ) {
+        this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+      }
+    },
+
+    _getParentOffset: function() {
+
+      //Get the offsetParent and cache its position
+      this.offsetParent = this.helper.offsetParent();
+      var po = this.offsetParent.offset();
+
+      // This is a special case where we need to modify a offset calculated on start, since the
+      // following happened:
+      // 1. The position of the helper is absolute, so it's position is calculated based on the
+      // next positioned parent
+      // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
+      // the document, which means that the scroll is included in the initial calculation of the
+      // offset of the parent, and never recalculated upon drag
+      if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+        $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
+        po.left += this.scrollParent.scrollLeft();
+        po.top += this.scrollParent.scrollTop();
+      }
+
+      // This needs to be actually done for all browsers, since pageX/pageY includes this
+      // information with an ugly IE fix
+      if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
+        ( this.offsetParent[ 0 ].tagName &&
+          this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
+        po = { top: 0, left: 0 };
+      }
+
+      return {
+        top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+        left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
+      };
+
+    },
+
+    _getRelativeOffset: function() {
+
+      if ( this.cssPosition === "relative" ) {
+        var p = this.currentItem.position();
+        return {
+          top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
+          this.scrollParent.scrollTop(),
+          left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
+          this.scrollParent.scrollLeft()
+        };
+      } else {
+        return { top: 0, left: 0 };
+      }
+
+    },
+
+    _cacheMargins: function() {
+      this.margins = {
+        left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ),
+        top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 )
+      };
+    },
+
+    _cacheHelperProportions: function() {
+      this.helperProportions = {
+        width: this.helper.outerWidth(),
+        height: this.helper.outerHeight()
+      };
+    },
+
+    _setContainment: function() {
+
+      var ce, co, over,
+        o = this.options;
+      if ( o.containment === "parent" ) {
+        o.containment = this.helper[ 0 ].parentNode;
+      }
+      if ( o.containment === "document" || o.containment === "window" ) {
+        this.containment = [
+          0 - this.offset.relative.left - this.offset.parent.left,
+          0 - this.offset.relative.top - this.offset.parent.top,
+          o.containment === "document" ?
+            this.document.width() :
+            this.window.width() - this.helperProportions.width - this.margins.left,
+          ( o.containment === "document" ?
+              ( this.document.height() || document.body.parentNode.scrollHeight ) :
+              this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight
+          ) - this.helperProportions.height - this.margins.top
+        ];
+      }
+
+      if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) {
+        ce = $( o.containment )[ 0 ];
+        co = $( o.containment ).offset();
+        over = ( $( ce ).css( "overflow" ) !== "hidden" );
+
+        this.containment = [
+          co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) +
+          ( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left,
+          co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) +
+          ( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top,
+          co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
+          ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) -
+          ( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) -
+          this.helperProportions.width - this.margins.left,
+          co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
+          ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) -
+          ( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) -
+          this.helperProportions.height - this.margins.top
+        ];
+      }
+
+    },
+
+    _convertPositionTo: function( d, pos ) {
+
+      if ( !pos ) {
+        pos = this.position;
+      }
+      var mod = d === "absolute" ? 1 : -1,
+        scroll = this.cssPosition === "absolute" &&
+        !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+          $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
+          this.offsetParent :
+          this.scrollParent,
+        scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
+
+      return {
+        top: (
+
+          // The absolute mouse position
+          pos.top	+
+
+          // Only for relative positioned nodes: Relative offset from element to offset parent
+          this.offset.relative.top * mod +
+
+          // The offsetParent's offset without borders (offset + border)
+          this.offset.parent.top * mod -
+          ( ( this.cssPosition === "fixed" ?
+            -this.scrollParent.scrollTop() :
+            ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod )
+        ),
+        left: (
+
+          // The absolute mouse position
+          pos.left +
+
+          // Only for relative positioned nodes: Relative offset from element to offset parent
+          this.offset.relative.left * mod +
+
+          // The offsetParent's offset without borders (offset + border)
+          this.offset.parent.left * mod	-
+          ( ( this.cssPosition === "fixed" ?
+            -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 :
+              scroll.scrollLeft() ) * mod )
+        )
+      };
+
+    },
+
+    _generatePosition: function( event ) {
+
+      var top, left,
+        o = this.options,
+        pageX = event.pageX,
+        pageY = event.pageY,
+        scroll = this.cssPosition === "absolute" &&
+        !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+          $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
+          this.offsetParent :
+          this.scrollParent,
+        scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
+
+      // This is another very weird special case that only happens for relative elements:
+      // 1. If the css position is relative
+      // 2. and the scroll parent is the document or similar to the offset parent
+      // we have to refresh the relative offset during the scroll so there are no jumps
+      if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+          this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) {
+        this.offset.relative = this._getRelativeOffset();
+      }
+
+      /*
+       * - Position constraining -
+       * Constrain the position to a mix of grid, containment.
+       */
+
+      if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options
+
+        if ( this.containment ) {
+          if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) {
+            pageX = this.containment[ 0 ] + this.offset.click.left;
+          }
+          if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) {
+            pageY = this.containment[ 1 ] + this.offset.click.top;
+          }
+          if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) {
+            pageX = this.containment[ 2 ] + this.offset.click.left;
+          }
+          if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) {
+            pageY = this.containment[ 3 ] + this.offset.click.top;
+          }
+        }
+
+        if ( o.grid ) {
+          top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) /
+            o.grid[ 1 ] ) * o.grid[ 1 ];
+          pageY = this.containment ?
+            ( ( top - this.offset.click.top >= this.containment[ 1 ] &&
+              top - this.offset.click.top <= this.containment[ 3 ] ) ?
+              top :
+              ( ( top - this.offset.click.top >= this.containment[ 1 ] ) ?
+                top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) :
+            top;
+
+          left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) /
+            o.grid[ 0 ] ) * o.grid[ 0 ];
+          pageX = this.containment ?
+            ( ( left - this.offset.click.left >= this.containment[ 0 ] &&
+              left - this.offset.click.left <= this.containment[ 2 ] ) ?
+              left :
+              ( ( left - this.offset.click.left >= this.containment[ 0 ] ) ?
+                left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) :
+            left;
+        }
+
+      }
+
+      return {
+        top: (
+
+          // The absolute mouse position
+          pageY -
+
+          // Click offset (relative to the element)
+          this.offset.click.top -
+
+          // Only for relative positioned nodes: Relative offset from element to offset parent
+          this.offset.relative.top -
+
+          // The offsetParent's offset without borders (offset + border)
+          this.offset.parent.top +
+          ( ( this.cssPosition === "fixed" ?
+            -this.scrollParent.scrollTop() :
+            ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) )
+        ),
+        left: (
+
+          // The absolute mouse position
+          pageX -
+
+          // Click offset (relative to the element)
+          this.offset.click.left -
+
+          // Only for relative positioned nodes: Relative offset from element to offset parent
+          this.offset.relative.left -
+
+          // The offsetParent's offset without borders (offset + border)
+          this.offset.parent.left +
+          ( ( this.cssPosition === "fixed" ?
+            -this.scrollParent.scrollLeft() :
+            scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
+        )
+      };
+
+    },
+
+    _rearrange: function( event, i, a, hardRefresh ) {
+
+      a ? a[ 0 ].appendChild( this.placeholder[ 0 ] ) :
+        i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ],
+          ( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
+
+      //Various things done here to improve the performance:
+      // 1. we create a setTimeout, that calls refreshPositions
+      // 2. on the instance, we have a counter variable, that get's higher after every append
+      // 3. on the local scope, we copy the counter variable, and check in the timeout,
+      // if it's still the same
+      // 4. this lets only the last addition to the timeout stack through
+      this.counter = this.counter ? ++this.counter : 1;
+      var counter = this.counter;
+
+      this._delay( function() {
+        if ( counter === this.counter ) {
+
+          //Precompute after each DOM insertion, NOT on mousemove
+          this.refreshPositions( !hardRefresh );
+        }
+      } );
+
+    },
+
+    _clear: function( event, noPropagation ) {
+
+      this.reverting = false;
+
+      // We delay all events that have to be triggered to after the point where the placeholder
+      // has been removed and everything else normalized again
+      var i,
+        delayedTriggers = [];
+
+      // We first have to update the dom position of the actual currentItem
+      // Note: don't do it if the current item is already removed (by a user), or it gets
+      // reappended (see #4088)
+      if ( !this._noFinalSort && this.currentItem.parent().length ) {
+        this.placeholder.before( this.currentItem );
+      }
+      this._noFinalSort = null;
+
+      if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) {
+        for ( i in this._storedCSS ) {
+          if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) {
+            this._storedCSS[ i ] = "";
+          }
+        }
+        this.currentItem.css( this._storedCSS );
+        this._removeClass( this.currentItem, "ui-sortable-helper" );
+      } else {
+        this.currentItem.show();
+      }
+
+      if ( this.fromOutside && !noPropagation ) {
+        delayedTriggers.push( function( event ) {
+          this._trigger( "receive", event, this._uiHash( this.fromOutside ) );
+        } );
+      }
+      if ( ( this.fromOutside ||
+          this.domPosition.prev !==
+          this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] ||
+          this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) {
+
+        // Trigger update callback if the DOM position has changed
+        delayedTriggers.push( function( event ) {
+          this._trigger( "update", event, this._uiHash() );
+        } );
+      }
+
+      // Check if the items Container has Changed and trigger appropriate
+      // events.
+      if ( this !== this.currentContainer ) {
+        if ( !noPropagation ) {
+          delayedTriggers.push( function( event ) {
+            this._trigger( "remove", event, this._uiHash() );
+          } );
+          delayedTriggers.push( ( function( c ) {
+            return function( event ) {
+              c._trigger( "receive", event, this._uiHash( this ) );
+            };
+          } ).call( this, this.currentContainer ) );
+          delayedTriggers.push( ( function( c ) {
+            return function( event ) {
+              c._trigger( "update", event, this._uiHash( this ) );
+            };
+          } ).call( this, this.currentContainer ) );
+        }
+      }
+
+      //Post events to containers
+      function delayEvent( type, instance, container ) {
+        return function( event ) {
+          container._trigger( type, event, instance._uiHash( instance ) );
+        };
+      }
+      for ( i = this.containers.length - 1; i >= 0; i-- ) {
+        if ( !noPropagation ) {
+          delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
+        }
+        if ( this.containers[ i ].containerCache.over ) {
+          delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
+          this.containers[ i ].containerCache.over = 0;
+        }
+      }
+
+      //Do what was originally in plugins
+      if ( this.storedCursor ) {
+        this.document.find( "body" ).css( "cursor", this.storedCursor );
+        this.storedStylesheet.remove();
+      }
+      if ( this._storedOpacity ) {
+        this.helper.css( "opacity", this._storedOpacity );
+      }
+      if ( this._storedZIndex ) {
+        this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex );
+      }
+
+      this.dragging = false;
+
+      if ( !noPropagation ) {
+        this._trigger( "beforeStop", event, this._uiHash() );
+      }
+
+      //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
+      // it unbinds ALL events from the original node!
+      this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
+
+      if ( !this.cancelHelperRemoval ) {
+        if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+          this.helper.remove();
+        }
+        this.helper = null;
+      }
+
+      if ( !noPropagation ) {
+        for ( i = 0; i < delayedTriggers.length; i++ ) {
+
+          // Trigger all delayed events
+          delayedTriggers[ i ].call( this, event );
+        }
+        this._trigger( "stop", event, this._uiHash() );
+      }
+
+      this.fromOutside = false;
+      return !this.cancelHelperRemoval;
+
+    },
+
+    _trigger: function() {
+      if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) {
+        this.cancel();
+      }
+    },
+
+    _uiHash: function( _inst ) {
+      var inst = _inst || this;
+      return {
+        helper: inst.helper,
+        placeholder: inst.placeholder || $( [] ),
+        position: inst.position,
+        originalPosition: inst.originalPosition,
+        offset: inst.positionAbs,
+        item: inst.currentItem,
+        sender: _inst ? _inst.element : null
+      };
+    }
+
+  } );
+
+
+
+
+}));
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/less.js b/docs-web/src/main/webapp/src/lib/less.js
index 9b0fa6ba..2db644e7 100644
--- a/docs-web/src/main/webapp/src/lib/less.js
+++ b/docs-web/src/main/webapp/src/lib/less.js
@@ -1,9 +1,10835 @@
+/*!
+ * Less - Leaner CSS v2.7.3
+ * http://lesscss.org
+ *
+ * Copyright (c) 2009-2017, Alexis Sellier <self@cloudhead.net>
+ * Licensed under the Apache-2.0 License.
+ *
+ */
+
+/** * @license Apache-2.0
+ */
+
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.less = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+  var addDataAttr = require("./utils").addDataAttr,
+    browser = require("./browser");
+
+  module.exports = function(window, options) {
+
+    // use options from the current script tag data attribues
+    addDataAttr(options, browser.currentScript(window));
+
+    if (options.isFileProtocol === undefined) {
+      options.isFileProtocol = /^(file|(chrome|safari)(-extension)?|resource|qrc|app):/.test(window.location.protocol);
+    }
+
+    // Load styles asynchronously (default: false)
+    //
+    // This is set to `false` by default, so that the body
+    // doesn't start loading before the stylesheets are parsed.
+    // Setting this to `true` can result in flickering.
+    //
+    options.async = options.async || false;
+    options.fileAsync = options.fileAsync || false;
+
+    // Interval between watch polls
+    options.poll = options.poll || (options.isFileProtocol ? 1000 : 1500);
+
+    options.env = options.env || (window.location.hostname == '127.0.0.1' ||
+    window.location.hostname == '0.0.0.0'   ||
+    window.location.hostname == 'localhost' ||
+    (window.location.port &&
+      window.location.port.length > 0)      ||
+    options.isFileProtocol                   ? 'development'
+      : 'production');
+
+    var dumpLineNumbers = /!dumpLineNumbers:(comments|mediaquery|all)/.exec(window.location.hash);
+    if (dumpLineNumbers) {
+      options.dumpLineNumbers = dumpLineNumbers[1];
+    }
+
+    if (options.useFileCache === undefined) {
+      options.useFileCache = true;
+    }
+
+    if (options.onReady === undefined) {
+      options.onReady = true;
+    }
+
+  };
+
+},{"./browser":3,"./utils":10}],2:[function(require,module,exports){
+  /**
+   * Kicks off less and compiles any stylesheets
+   * used in the browser distributed version of less
+   * to kick-start less using the browser api
+   */
+  /*global window, document */
+
+// shim Promise if required
+  require('promise/polyfill.js');
+
+  var options = window.less || {};
+  require("./add-default-options")(window, options);
+
+  var less = module.exports = require("./index")(window, options);
+
+  window.less = less;
+
+  var css, head, style;
+
+// Always restore page visibility
+  function resolveOrReject(data) {
+    if (data.filename) {
+      console.warn(data);
+    }
+    if (!options.async) {
+      head.removeChild(style);
+    }
+  }
+
+  if (options.onReady) {
+    if (/!watch/.test(window.location.hash)) {
+      less.watch();
+    }
+    // Simulate synchronous stylesheet loading by blocking page rendering
+    if (!options.async) {
+      css = 'body { display: none !important }';
+      head = document.head || document.getElementsByTagName('head')[0];
+      style = document.createElement('style');
+
+      style.type = 'text/css';
+      if (style.styleSheet) {
+        style.styleSheet.cssText = css;
+      } else {
+        style.appendChild(document.createTextNode(css));
+      }
+
+      head.appendChild(style);
+    }
+    less.registerStylesheetsImmediately();
+    less.pageLoadFinished = less.refresh(less.env === 'development').then(resolveOrReject, resolveOrReject);
+  }
+
+},{"./add-default-options":1,"./index":8,"promise/polyfill.js":97}],3:[function(require,module,exports){
+  var utils = require("./utils");
+  module.exports = {
+    createCSS: function (document, styles, sheet) {
+      // Strip the query-string
+      var href = sheet.href || '';
+
+      // If there is no title set, use the filename, minus the extension
+      var id = 'less:' + (sheet.title || utils.extractId(href));
+
+      // If this has already been inserted into the DOM, we may need to replace it
+      var oldStyleNode = document.getElementById(id);
+      var keepOldStyleNode = false;
+
+      // Create a new stylesheet node for insertion or (if necessary) replacement
+      var styleNode = document.createElement('style');
+      styleNode.setAttribute('type', 'text/css');
+      if (sheet.media) {
+        styleNode.setAttribute('media', sheet.media);
+      }
+      styleNode.id = id;
+
+      if (!styleNode.styleSheet) {
+        styleNode.appendChild(document.createTextNode(styles));
+
+        // If new contents match contents of oldStyleNode, don't replace oldStyleNode
+        keepOldStyleNode = (oldStyleNode !== null && oldStyleNode.childNodes.length > 0 && styleNode.childNodes.length > 0 &&
+          oldStyleNode.firstChild.nodeValue === styleNode.firstChild.nodeValue);
+      }
+
+      var head = document.getElementsByTagName('head')[0];
+
+      // If there is no oldStyleNode, just append; otherwise, only append if we need
+      // to replace oldStyleNode with an updated stylesheet
+      if (oldStyleNode === null || keepOldStyleNode === false) {
+        var nextEl = sheet && sheet.nextSibling || null;
+        if (nextEl) {
+          nextEl.parentNode.insertBefore(styleNode, nextEl);
+        } else {
+          head.appendChild(styleNode);
+        }
+      }
+      if (oldStyleNode && keepOldStyleNode === false) {
+        oldStyleNode.parentNode.removeChild(oldStyleNode);
+      }
+
+      // For IE.
+      // This needs to happen *after* the style element is added to the DOM, otherwise IE 7 and 8 may crash.
+      // See http://social.msdn.microsoft.com/Forums/en-US/7e081b65-878a-4c22-8e68-c10d39c2ed32/internet-explorer-crashes-appending-style-element-to-head
+      if (styleNode.styleSheet) {
+        try {
+          styleNode.styleSheet.cssText = styles;
+        } catch (e) {
+          throw new Error("Couldn't reassign styleSheet.cssText.");
+        }
+      }
+    },
+    currentScript: function(window) {
+      var document = window.document;
+      return document.currentScript || (function() {
+        var scripts = document.getElementsByTagName("script");
+        return scripts[scripts.length - 1];
+      })();
+    }
+  };
+
+},{"./utils":10}],4:[function(require,module,exports){
+// Cache system is a bit outdated and could do with work
+
+  module.exports = function(window, options, logger) {
+    var cache = null;
+    if (options.env !== 'development') {
+      try {
+        cache = (typeof window.localStorage === 'undefined') ? null : window.localStorage;
+      } catch (_) {}
+    }
+    return {
+      setCSS: function(path, lastModified, modifyVars, styles) {
+        if (cache) {
+          logger.info('saving ' + path + ' to cache.');
+          try {
+            cache.setItem(path, styles);
+            cache.setItem(path + ':timestamp', lastModified);
+            if (modifyVars) {
+              cache.setItem(path + ':vars', JSON.stringify(modifyVars));
+            }
+          } catch(e) {
+            //TODO - could do with adding more robust error handling
+            logger.error('failed to save "' + path + '" to local storage for caching.');
+          }
+        }
+      },
+      getCSS: function(path, webInfo, modifyVars) {
+        var css       = cache && cache.getItem(path),
+          timestamp = cache && cache.getItem(path + ':timestamp'),
+          vars      = cache && cache.getItem(path + ':vars');
+
+        modifyVars = modifyVars || {};
+
+        if (timestamp && webInfo.lastModified &&
+          (new Date(webInfo.lastModified).valueOf() ===
+            new Date(timestamp).valueOf()) &&
+          (!modifyVars && !vars || JSON.stringify(modifyVars) === vars)) {
+          // Use local copy
+          return css;
+        }
+      }
+    };
+  };
+
+},{}],5:[function(require,module,exports){
+  var utils = require("./utils"),
+    browser = require("./browser");
+
+  module.exports = function(window, less, options) {
+
+    function errorHTML(e, rootHref) {
+      var id = 'less-error-message:' + utils.extractId(rootHref || "");
+      var template = '<li><label>{line}</label><pre class="{class}">{content}</pre></li>';
+      var elem = window.document.createElement('div'), timer, content, errors = [];
+      var filename = e.filename || rootHref;
+      var filenameNoPath = filename.match(/([^\/]+(\?.*)?)$/)[1];
+
+      elem.id        = id;
+      elem.className = "less-error-message";
+
+      content = '<h3>'  + (e.type || "Syntax") + "Error: " + (e.message || 'There is an error in your .less file') +
+        '</h3>' + '<p>in <a href="' + filename   + '">' + filenameNoPath + "</a> ";
+
+      var errorline = function (e, i, classname) {
+        if (e.extract[i] !== undefined) {
+          errors.push(template.replace(/\{line\}/, (parseInt(e.line, 10) || 0) + (i - 1))
+            .replace(/\{class\}/, classname)
+            .replace(/\{content\}/, e.extract[i]));
+        }
+      };
+
+      if (e.extract) {
+        errorline(e, 0, '');
+        errorline(e, 1, 'line');
+        errorline(e, 2, '');
+        content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':</p>' +
+          '<ul>' + errors.join('') + '</ul>';
+      }
+      if (e.stack && (e.extract || options.logLevel >= 4)) {
+        content += '<br/>Stack Trace</br />' + e.stack.split('\n').slice(1).join('<br/>');
+      }
+      elem.innerHTML = content;
+
+      // CSS for error messages
+      browser.createCSS(window.document, [
+        '.less-error-message ul, .less-error-message li {',
+        'list-style-type: none;',
+        'margin-right: 15px;',
+        'padding: 4px 0;',
+        'margin: 0;',
+        '}',
+        '.less-error-message label {',
+        'font-size: 12px;',
+        'margin-right: 15px;',
+        'padding: 4px 0;',
+        'color: #cc7777;',
+        '}',
+        '.less-error-message pre {',
+        'color: #dd6666;',
+        'padding: 4px 0;',
+        'margin: 0;',
+        'display: inline-block;',
+        '}',
+        '.less-error-message pre.line {',
+        'color: #ff0000;',
+        '}',
+        '.less-error-message h3 {',
+        'font-size: 20px;',
+        'font-weight: bold;',
+        'padding: 15px 0 5px 0;',
+        'margin: 0;',
+        '}',
+        '.less-error-message a {',
+        'color: #10a',
+        '}',
+        '.less-error-message .error {',
+        'color: red;',
+        'font-weight: bold;',
+        'padding-bottom: 2px;',
+        'border-bottom: 1px dashed red;',
+        '}'
+      ].join('\n'), { title: 'error-message' });
+
+      elem.style.cssText = [
+        "font-family: Arial, sans-serif",
+        "border: 1px solid #e00",
+        "background-color: #eee",
+        "border-radius: 5px",
+        "-webkit-border-radius: 5px",
+        "-moz-border-radius: 5px",
+        "color: #e00",
+        "padding: 15px",
+        "margin-bottom: 15px"
+      ].join(';');
+
+      if (options.env === 'development') {
+        timer = setInterval(function () {
+          var document = window.document,
+            body = document.body;
+          if (body) {
+            if (document.getElementById(id)) {
+              body.replaceChild(elem, document.getElementById(id));
+            } else {
+              body.insertBefore(elem, body.firstChild);
+            }
+            clearInterval(timer);
+          }
+        }, 10);
+      }
+    }
+
+    function removeErrorHTML(path) {
+      var node = window.document.getElementById('less-error-message:' + utils.extractId(path));
+      if (node) {
+        node.parentNode.removeChild(node);
+      }
+    }
+
+    function removeErrorConsole(path) {
+      //no action
+    }
+
+    function removeError(path) {
+      if (!options.errorReporting || options.errorReporting === "html") {
+        removeErrorHTML(path);
+      } else if (options.errorReporting === "console") {
+        removeErrorConsole(path);
+      } else if (typeof options.errorReporting === 'function') {
+        options.errorReporting("remove", path);
+      }
+    }
+
+    function errorConsole(e, rootHref) {
+      var template = '{line} {content}';
+      var filename = e.filename || rootHref;
+      var errors = [];
+      var content = (e.type || "Syntax") + "Error: " + (e.message || 'There is an error in your .less file') +
+        " in " + filename + " ";
+
+      var errorline = function (e, i, classname) {
+        if (e.extract[i] !== undefined) {
+          errors.push(template.replace(/\{line\}/, (parseInt(e.line, 10) || 0) + (i - 1))
+            .replace(/\{class\}/, classname)
+            .replace(/\{content\}/, e.extract[i]));
+        }
+      };
+
+      if (e.extract) {
+        errorline(e, 0, '');
+        errorline(e, 1, 'line');
+        errorline(e, 2, '');
+        content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':\n' +
+          errors.join('\n');
+      }
+      if (e.stack && (e.extract || options.logLevel >= 4)) {
+        content += '\nStack Trace\n' + e.stack;
+      }
+      less.logger.error(content);
+    }
+
+    function error(e, rootHref) {
+      if (!options.errorReporting || options.errorReporting === "html") {
+        errorHTML(e, rootHref);
+      } else if (options.errorReporting === "console") {
+        errorConsole(e, rootHref);
+      } else if (typeof options.errorReporting === 'function') {
+        options.errorReporting("add", e, rootHref);
+      }
+    }
+
+    return {
+      add: error,
+      remove: removeError
+    };
+  };
+
+},{"./browser":3,"./utils":10}],6:[function(require,module,exports){
+  /*global window, XMLHttpRequest */
+
+  module.exports = function(options, logger) {
+
+    var AbstractFileManager = require("../less/environment/abstract-file-manager.js");
+
+    var fileCache = {};
+
+    //TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
+
+    function getXMLHttpRequest() {
+      if (window.XMLHttpRequest && (window.location.protocol !== "file:" || !("ActiveXObject" in window))) {
+        return new XMLHttpRequest();
+      } else {
+        try {
+          /*global ActiveXObject */
+          return new ActiveXObject("Microsoft.XMLHTTP");
+        } catch (e) {
+          logger.error("browser doesn't support AJAX.");
+          return null;
+        }
+      }
+    }
+
+    var FileManager = function() {
+    };
+
+    FileManager.prototype = new AbstractFileManager();
+
+    FileManager.prototype.alwaysMakePathsAbsolute = function alwaysMakePathsAbsolute() {
+      return true;
+    };
+    FileManager.prototype.join = function join(basePath, laterPath) {
+      if (!basePath) {
+        return laterPath;
+      }
+      return this.extractUrlParts(laterPath, basePath).path;
+    };
+    FileManager.prototype.doXHR = function doXHR(url, type, callback, errback) {
+
+      var xhr = getXMLHttpRequest();
+      var async = options.isFileProtocol ? options.fileAsync : true;
+
+      if (typeof xhr.overrideMimeType === 'function') {
+        xhr.overrideMimeType('text/css');
+      }
+      logger.debug("XHR: Getting '" + url + "'");
+      xhr.open('GET', url, async);
+      xhr.setRequestHeader('Accept', type || 'text/x-less, text/css; q=0.9, */*; q=0.5');
+      xhr.send(null);
+
+      function handleResponse(xhr, callback, errback) {
+        if (xhr.status >= 200 && xhr.status < 300) {
+          callback(xhr.responseText,
+            xhr.getResponseHeader("Last-Modified"));
+        } else if (typeof errback === 'function') {
+          errback(xhr.status, url);
+        }
+      }
+
+      if (options.isFileProtocol && !options.fileAsync) {
+        if (xhr.status === 0 || (xhr.status >= 200 && xhr.status < 300)) {
+          callback(xhr.responseText);
+        } else {
+          errback(xhr.status, url);
+        }
+      } else if (async) {
+        xhr.onreadystatechange = function () {
+          if (xhr.readyState == 4) {
+            handleResponse(xhr, callback, errback);
+          }
+        };
+      } else {
+        handleResponse(xhr, callback, errback);
+      }
+    };
+    FileManager.prototype.supports = function(filename, currentDirectory, options, environment) {
+      return true;
+    };
+
+    FileManager.prototype.clearFileCache = function() {
+      fileCache = {};
+    };
+
+    FileManager.prototype.loadFile = function loadFile(filename, currentDirectory, options, environment, callback) {
+      if (currentDirectory && !this.isPathAbsolute(filename)) {
+        filename = currentDirectory + filename;
+      }
+
+      options = options || {};
+
+      // sheet may be set to the stylesheet for the initial load or a collection of properties including
+      // some context variables for imports
+      var hrefParts = this.extractUrlParts(filename, window.location.href);
+      var href      = hrefParts.url;
+
+      if (options.useFileCache && fileCache[href]) {
+        try {
+          var lessText = fileCache[href];
+          callback(null, { contents: lessText, filename: href, webInfo: { lastModified: new Date() }});
+        } catch (e) {
+          callback({filename: href, message: "Error loading file " + href + " error was " + e.message});
+        }
+        return;
+      }
+
+      this.doXHR(href, options.mime, function doXHRCallback(data, lastModified) {
+        // per file cache
+        fileCache[href] = data;
+
+        // Use remote copy (re-parse)
+        callback(null, { contents: data, filename: href, webInfo: { lastModified: lastModified }});
+      }, function doXHRError(status, url) {
+        callback({ type: 'File', message: "'" + url + "' wasn't found (" + status + ")", href: href });
+      });
+    };
+
+    return FileManager;
+  };
+
+},{"../less/environment/abstract-file-manager.js":15}],7:[function(require,module,exports){
+  module.exports = function() {
+
+    var functionRegistry = require("./../less/functions/function-registry");
+
+    function imageSize() {
+      throw {
+        type: "Runtime",
+        message: "Image size functions are not supported in browser version of less"
+      };
+    }
+
+    var imageFunctions = {
+      "image-size": function(filePathNode) {
+        imageSize(this, filePathNode);
+        return -1;
+      },
+      "image-width": function(filePathNode) {
+        imageSize(this, filePathNode);
+        return -1;
+      },
+      "image-height": function(filePathNode) {
+        imageSize(this, filePathNode);
+        return -1;
+      }
+    };
+
+    functionRegistry.addMultiple(imageFunctions);
+  };
+
+},{"./../less/functions/function-registry":22}],8:[function(require,module,exports){
 //
-// LESS - Leaner CSS v1.3.3
-// http://lesscss.org
-// 
-// Copyright (c) 2009-2013, Alexis Sellier
-// Licensed under the Apache 2.0 License.
+// index.js
+// Should expose the additional browser functions on to the less object
 //
-(function(e,t){function n(t){return e.less[t.split("/")[1]]}function f(){r.env==="development"?(r.optimization=0,r.watchTimer=setInterval(function(){r.watchMode&&g(function(e,t,n,r,i){t&&S(t.toCSS(),r,i.lastModified)})},r.poll)):r.optimization=3}function m(){var e=document.getElementsByTagName("style");for(var t=0;t<e.length;t++)e[t].type.match(p)&&(new r.Parser({filename:document.location.href.replace(/#.*$/,""),dumpLineNumbers:r.dumpLineNumbers})).parse(e[t].innerHTML||"",function(n,r){var i=r.toCSS(),s=e[t];s.type="text/css",s.styleSheet?s.styleSheet.cssText=i:s.innerHTML=i})}function g(e,t){for(var n=0;n<r.sheets.length;n++)w(r.sheets[n],e,t,r.sheets.length-(n+1))}function y(e,t){var n=b(e),r=b(t),i,s,o,u,a="";if(n.hostPart!==r.hostPart)return"";s=Math.max(r.directories.length,n.directories.length);for(i=0;i<s;i++)if(r.directories[i]!==n.directories[i])break;u=r.directories.slice(i),o=n.directories.slice(i);for(i=0;i<u.length-1;i++)a+="../";for(i=0;i<o.length-1;i++)a+=o[i]+"/";return a}function b(e,t){var n=/^((?:[a-z-]+:)?\/\/(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/,r=e.match(n),i={},s=[],o,u;if(!r)throw new Error("Could not parse sheet href - '"+e+"'");if(!r[1]||r[2]){u=t.match(n);if(!u)throw new Error("Could not parse page url - '"+t+"'");r[1]=u[1],r[2]||(r[3]=u[3]+r[3])}if(r[3]){s=r[3].replace("\\","/").split("/");for(o=0;o<s.length;o++)s[o]===".."&&o>0&&(s.splice(o-1,2),o-=2)}return i.hostPart=r[1],i.directories=s,i.path=r[1]+s.join("/"),i.fileUrl=i.path+(r[4]||""),i.url=i.fileUrl+(r[5]||""),i}function w(t,n,i,s){var o=t.contents||{},u=t.files||{},a=b(t.href,e.location.href),f=a.url,c=l&&l.getItem(f),h=l&&l.getItem(f+":timestamp"),p={css:c,timestamp:h},d;r.relativeUrls?r.rootpath?t.entryPath?d=b(r.rootpath+y(a.path,t.entryPath)).path:d=r.rootpath:d=a.path:r.rootpath?d=r.rootpath:t.entryPath?d=t.entryPath:d=a.path,x(f,t.type,function(e,l){v+=e.replace(/@import .+?;/ig,"");if(!i&&p&&l&&(new Date(l)).valueOf()===(new Date(p.timestamp)).valueOf())S(p.css,t),n(null,null,e,t,{local:!0,remaining:s},f);else try{o[f]=e,(new r.Parser({optimization:r.optimization,paths:[a.path],entryPath:t.entryPath||a.path,mime:t.type,filename:f,rootpath:d,relativeUrls:t.relativeUrls,contents:o,files:u,dumpLineNumbers:r.dumpLineNumbers})).parse(e,function(r,i){if(r)return k(r,f);try{n(r,i,e,t,{local:!1,lastModified:l,remaining:s},f),N(document.getElementById("less-error-message:"+E(f)))}catch(r){k(r,f)}})}catch(c){k(c,f)}},function(e,t){throw new Error("Couldn't load "+t+" ("+e+")")})}function E(e){return e.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\.[a-zA-Z]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function S(e,t,n){var r,i=t.href||"",s="less:"+(t.title||E(i));if((r=document.getElementById(s))===null){r=document.createElement("style"),r.type="text/css",t.media&&(r.media=t.media),r.id=s;var o=t&&t.nextSibling||null;(o||document.getElementsByTagName("head")[0]).parentNode.insertBefore(r,o)}if(r.styleSheet)try{r.styleSheet.cssText=e}catch(u){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(e){r.childNodes.length>0?r.firstChild.nodeValue!==e.nodeValue&&r.replaceChild(e,r.firstChild):r.appendChild(e)})(document.createTextNode(e));if(n&&l){C("saving "+i+" to cache.");try{l.setItem(i,e),l.setItem(i+":timestamp",n)}catch(u){C("failed to save")}}}function x(e,t,n,i){function a(t,n,r){t.status>=200&&t.status<300?n(t.responseText,t.getResponseHeader("Last-Modified")):typeof r=="function"&&r(t.status,e)}var s=T(),u=o?r.fileAsync:r.async;typeof s.overrideMimeType=="function"&&s.overrideMimeType("text/css"),s.open("GET",e,u),s.setRequestHeader("Accept",t||"text/x-less, text/css; q=0.9, */*; q=0.5"),s.send(null),o&&!r.fileAsync?s.status===0||s.status>=200&&s.status<300?n(s.responseText):i(s.status,e):u?s.onreadystatechange=function(){s.readyState==4&&a(s,n,i)}:a(s,n,i)}function T(){if(e.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(t){return C("browser doesn't support AJAX."),null}}function N(e){return e&&e.parentNode.removeChild(e)}function C(e){r.env=="development"&&typeof console!="undefined"&&console.log("less: "+e)}function k(e,t){var n="less-error-message:"+E(t),i='<li><label>{line}</label><pre class="{class}">{content}</pre></li>',s=document.createElement("div"),o,u,a=[],f=e.filename||t,l=f.match(/([^\/]+(\?.*)?)$/)[1];s.id=n,s.className="less-error-message",u="<h3>"+(e.message||"There is an error in your .less file")+"</h3>"+'<p>in <a href="'+f+'">'+l+"</a> ";var c=function(e,t,n){e.extract[t]&&a.push(i.replace(/\{line\}/,parseInt(e.line)+(t-1)).replace(/\{class\}/,n).replace(/\{content\}/,e.extract[t]))};e.stack?u+="<br/>"+e.stack.split("\n").slice(1).join("<br/>"):e.extract&&(c(e,0,""),c(e,1,"line"),c(e,2,""),u+="on line "+e.line+", column "+(e.column+1)+":</p>"+"<ul>"+a.join("")+"</ul>"),s.innerHTML=u,S([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #dd6666;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.line {","color: #ff0000;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),s.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),r.env=="development"&&(o=setInterval(function(){document.body&&(document.getElementById(n)?document.body.replaceChild(s,document.getElementById(n)):document.body.insertBefore(s,document.body.firstChild),clearInterval(o))},10))}Array.isArray||(Array.isArray=function(e){return Object.prototype.toString.call(e)==="[object Array]"||e instanceof Array}),Array.prototype.forEach||(Array.prototype.forEach=function(e,t){var n=this.length>>>0;for(var r=0;r<n;r++)r in this&&e.call(t,this[r],r,this)}),Array.prototype.map||(Array.prototype.map=function(e){var t=this.length>>>0,n=new Array(t),r=arguments[1];for(var i=0;i<t;i++)i in this&&(n[i]=e.call(r,this[i],i,this));return n}),Array.prototype.filter||(Array.prototype.filter=function(e){var t=[],n=arguments[1];for(var r=0;r<this.length;r++)e.call(n,this[r])&&t.push(this[r]);return t}),Array.prototype.reduce||(Array.prototype.reduce=function(e){var t=this.length>>>0,n=0;if(t===0&&arguments.length===1)throw new TypeError;if(arguments.length>=2)var r=arguments[1];else do{if(n in this){r=this[n++];break}if(++n>=t)throw new TypeError}while(!0);for(;n<t;n++)n in this&&(r=e.call(null,r,this[n],n,this));return r}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length,n=arguments[1]||0;if(!t)return-1;if(n>=t)return-1;n<0&&(n+=t);for(;n<t;n++){if(!Object.prototype.hasOwnProperty.call(this,n))continue;if(e===this[n])return n}return-1}),Object.keys||(Object.keys=function(e){var t=[];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.push(n);return t}),String.prototype.trim||(String.prototype.trim=function(){return String(this).replace(/^\s\s*/,"").replace(/\s\s*$/,"")});var r,i,s;typeof environment=="object"&&{}.toString.call(environment)==="[object Environment]"?(typeof e=="undefined"?r={}:r=e.less={},i=r.tree={},r.mode="rhino"):typeof e=="undefined"?(r=exports,i=n("./tree"),r.mode="node"):(typeof e.less=="undefined"&&(e.less={}),r=e.less,i=e.less.tree={},r.mode="browser"),r.Parser=function(t){function g(){a=c[u],f=o,h=o}function y(){c[u]=a,o=f,h=o}function b(){o>h&&(c[u]=c[u].slice(o-h),h=o)}function w(e){var t=e.charCodeAt(0);return t===32||t===10||t===9}function E(e){var t,n,r,i,a;if(e instanceof Function)return e.call(p.parsers);if(typeof e=="string")t=s.charAt(o)===e?e:null,r=1,b();else{b();if(!(t=e.exec(c[u])))return null;r=t[0].length}if(t)return S(r),typeof t=="string"?t:t.length===1?t[0]:t}function S(e){var t=o,n=u,r=o+c[u].length,i=o+=e;while(o<r){if(!w(s.charAt(o)))break;o++}return c[u]=c[u].slice(e+(o-i)),h=o,c[u].length===0&&u<c.length-1&&u++,t!==o||n!==u}function x(e,t){var n=E(e);if(!!n)return n;T(t||(typeof e=="string"?"expected '"+e+"' got '"+s.charAt(o)+"'":"unexpected token"))}function T(e,t){var n=new Error(e);throw n.index=o,n.type=t||"Syntax",n}function N(e){return typeof e=="string"?s.charAt(o)===e:e.test(c[u])?!0:!1}function C(e,t){return e.filename&&t.filename&&e.filename!==t.filename?p.imports.contents[e.filename]:s}function k(e,t){for(var n=e,r=-1;n>=0&&t.charAt(n)!=="\n";n--)r++;return{line:typeof e=="number"?(t.slice(0,e).match(/\n/g)||"").length:null,column:r}}function L(e){return r.mode==="browser"||r.mode==="rhino"?e.filename:n("path").resolve(e.filename)}function A(e,t,n){return{lineNumber:k(e,t).line+1,fileName:L(n)}}function O(e,t){var n=C(e,t),r=k(e.index,n),i=r.line,s=r.column,o=n.split("\n");this.type=e.type||"Syntax",this.message=e.message,this.filename=e.filename||t.filename,this.index=e.index,this.line=typeof i=="number"?i+1:null,this.callLine=e.call&&k(e.call,n).line+1,this.callExtract=o[k(e.call,n).line],this.stack=e.stack,this.column=s,this.extract=[o[i-1],o[i],o[i+1]]}var s,o,u,a,f,l,c,h,p,d=this,t=t||{};t.contents||(t.contents={}),t.rootpath=t.rootpath||"",t.files||(t.files={});var v=function(){},m=this.imports={paths:t.paths||[],queue:[],files:t.files,contents:t.contents,mime:t.mime,error:null,push:function(e,n){var i=this;this.queue.push(e),r.Parser.importer(e,this.paths,function(t,r,s){i.queue.splice(i.queue.indexOf(e),1);var o=s in i.files;i.files[s]=r,t&&!i.error&&(i.error=t),n(t,r,o),i.queue.length===0&&v(i.error)},t)}};return this.env=t=t||{},this.optimization="optimization"in this.env?this.env.optimization:1,this.env.filename=this.env.filename||null,p={imports:m,parse:function(e,a){var f,d,m,g,y,b,w=[],S,x=null;o=u=h=l=0,s=e.replace(/\r\n/g,"\n"),s=s.replace(/^\uFEFF/,""),c=function(e){var n=0,r=/(?:@\{[\w-]+\}|[^"'`\{\}\/\(\)\\])+/g,i=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,o=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`]|\\.)*)`/g,u=0,a,f=e[0],l;for(var c=0,h,p;c<s.length;){r.lastIndex=c,(a=r.exec(s))&&a.index===c&&(c+=a[0].length,f.push(a[0])),h=s.charAt(c),i.lastIndex=o.lastIndex=c;if(a=o.exec(s))if(a.index===c){c+=a[0].length,f.push(a[0]);continue}if(!l&&h==="/"){p=s.charAt(c+1);if(p==="/"||p==="*")if(a=i.exec(s))if(a.index===c){c+=a[0].length,f.push(a[0]);continue}}switch(h){case"{":if(!l){u++,f.push(h);break};case"}":if(!l){u--,f.push(h),e[++n]=f=[];break};case"(":if(!l){l=!0,f.push(h);break};case")":if(l){l=!1,f.push(h);break};default:f.push(h)}c++}return u!=0&&(x=new O({index:c-1,type:"Parse",message:u>0?"missing closing `}`":"missing opening `{`",filename:t.filename},t)),e.map(function(e){return e.join("")})}([[]]);if(x)return a(x,t);try{f=new i.Ruleset([],E(this.parsers.primary)),f.root=!0}catch(T){return a(new O(T,t))}f.toCSS=function(e){var s,o,u;return function(s,o){var u=[],a;s=s||{},typeof o=="object"&&!Array.isArray(o)&&(o=Object.keys(o).map(function(e){var t=o[e];return t instanceof i.Value||(t instanceof i.Expression||(t=new i.Expression([t])),t=new i.Value([t])),new i.Rule("@"+e,t,!1,0)}),u=[new i.Ruleset(null,o)]);try{var f=e.call(this,{frames:u}).toCSS([],{compress:s.compress||!1,dumpLineNumbers:t.dumpLineNumbers})}catch(l){throw new O(l,t)}if(a=p.imports.error)throw a instanceof O?a:new O(a,t);return s.yuicompress&&r.mode==="node"?n("ycssmin").cssmin(f):s.compress?f.replace(/(\s)+/g,"$1"):f}}(f.eval);if(o<s.length-1){o=l,b=s.split("\n"),y=(s.slice(0,o).match(/\n/g)||"").length+1;for(var N=o,C=-1;N>=0&&s.charAt(N)!=="\n";N--)C++;x={type:"Parse",message:"Syntax Error on line "+y,index:o,filename:t.filename,line:y,column:C,extract:[b[y-2],b[y-1],b[y]]}}this.imports.queue.length>0?v=function(e){e=x||e,e?a(e):a(null,f)}:a(x,f)},parsers:{primary:function(){var e,t=[];while((e=E(this.mixin.definition)||E(this.rule)||E(this.ruleset)||E(this.mixin.call)||E(this.comment)||E(this.directive))||E(/^[\s\n]+/)||E(/^;+/))e&&t.push(e);return t},comment:function(){var e;if(s.charAt(o)!=="/")return;if(s.charAt(o+1)==="/")return new i.Comment(E(/^\/\/.*/),!0);if(e=E(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new i.Comment(e)},entities:{quoted:function(){var e,t=o,n;s.charAt(t)==="~"&&(t++,n=!0);if(s.charAt(t)!=='"'&&s.charAt(t)!=="'")return;n&&E("~");if(e=E(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new i.Quoted(e[0],e[1]||e[2],n)},keyword:function(){var e;if(e=E(/^[_A-Za-z-][_A-Za-z0-9-]*/))return i.colors.hasOwnProperty(e)?new i.Color(i.colors[e].slice(1)):new i.Keyword(e)},call:function(){var e,n,r,s,a=o;if(!(e=/^([\w-]+|%|progid:[\w\.]+)\(/.exec(c[u])))return;e=e[1],n=e.toLowerCase();if(n==="url")return null;o+=e.length;if(n==="alpha"){s=E(this.alpha);if(typeof s!="undefined")return s}E("("),r=E(this.entities.arguments);if(!E(")"))return;if(e)return new i.Call(e,r,a,t.filename)},arguments:function(){var e=[],t;while(t=E(this.entities.assignment)||E(this.expression)){e.push(t);if(!E(","))break}return e},literal:function(){return E(this.entities.ratio)||E(this.entities.dimension)||E(this.entities.color)||E(this.entities.quoted)||E(this.entities.unicodeDescriptor)},assignment:function(){var e,t;if((e=E(/^\w+(?=\s?=)/i))&&E("=")&&(t=E(this.entity)))return new i.Assignment(e,t)},url:function(){var e;if(s.charAt(o)!=="u"||!E(/^url\(/))return;return e=E(this.entities.quoted)||E(this.entities.variable)||E(/^(?:(?:\\[\(\)'"])|[^\(\)'"])+/)||"",x(")"),new i.URL(e.value!=null||e instanceof i.Variable?e:new i.Anonymous(e),t.rootpath)},variable:function(){var e,n=o;if(s.charAt(o)==="@"&&(e=E(/^@@?[\w-]+/)))return new i.Variable(e,n,t.filename)},variableCurly:function(){var e,n,r=o;if(s.charAt(o)==="@"&&(n=E(/^@\{([\w-]+)\}/)))return new i.Variable("@"+n[1],r,t.filename)},color:function(){var e;if(s.charAt(o)==="#"&&(e=E(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/)))return new i.Color(e[1])},dimension:function(){var e,t=s.charCodeAt(o);if(t>57||t<43||t===47||t==44)return;if(e=E(/^([+-]?\d*\.?\d+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn|dpi|dpcm|dppx|rem|vw|vh|vmin|vm|ch)?/))return new i.Dimension(e[1],e[2])},ratio:function(){var e,t=s.charCodeAt(o);if(t>57||t<48)return;if(e=E(/^(\d+\/\d+)/))return new i.Ratio(e[1])},unicodeDescriptor:function(){var e;if(e=E(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/))return new i.UnicodeDescriptor(e[0])},javascript:function(){var e,t=o,n;s.charAt(t)==="~"&&(t++,n=!0);if(s.charAt(t)!=="`")return;n&&E("~");if(e=E(/^`([^`]*)`/))return new i.JavaScript(e[1],o,n)}},variable:function(){var e;if(s.charAt(o)==="@"&&(e=E(/^(@[\w-]+)\s*:/)))return e[1]},shorthand:function(){var e,t;if(!N(/^[@\w.%-]+\/[@\w.-]+/))return;g();if((e=E(this.entity))&&E("/")&&(t=E(this.entity)))return new i.Shorthand(e,t);y()},mixin:{call:function(){var e=[],n,r,u=[],a=[],f,l,c,h,p,d,v,m=o,b=s.charAt(o),w,S,C=!1;if(b!=="."&&b!=="#")return;g();while(n=E(/^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/))e.push(new i.Element(r,n,o)),r=E(">");if(E("(")){p=[];while(c=E(this.expression)){h=null,S=c;if(c.value.length==1){var k=c.value[0];k instanceof i.Variable&&E(":")&&(p.length>0&&(d&&T("Cannot mix ; and , as delimiter types"),v=!0),S=x(this.expression),h=w=k.name)}p.push(S),a.push({name:h,value:S});if(E(","))continue;if(E(";")||d)v&&T("Cannot mix ; and , as delimiter types"),d=!0,p.length>1&&(S=new i.Value(p)),u.push({name:w,value:S}),w=null,p=[],v=!1}x(")")}f=d?u:a,E(this.important)&&(C=!0);if(e.length>0&&(E(";")||N("}")))return new i.mixin.Call(e,f,m,t.filename,C);y()},definition:function(){var e,t=[],n,r,u,a,f,c=!1;if(s.charAt(o)!=="."&&s.charAt(o)!=="#"||N(/^[^{]*\}/))return;g();if(n=E(/^([#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+)\s*\(/)){e=n[1];do{E(this.comment);if(s.charAt(o)==="."&&E(/^\.{3}/)){c=!0,t.push({variadic:!0});break}if(!(u=E(this.entities.variable)||E(this.entities.literal)||E(this.entities.keyword)))break;if(u instanceof i.Variable)if(E(":"))a=x(this.expression,"expected expression"),t.push({name:u.name,value:a});else{if(E(/^\.{3}/)){t.push({name:u.name,variadic:!0}),c=!0;break}t.push({name:u.name})}else t.push({value:u})}while(E(",")||E(";"));E(")")||(l=o,y()),E(this.comment),E(/^when/)&&(f=x(this.conditions,"expected condition")),r=E(this.block);if(r)return new i.mixin.Definition(e,t,r,f,c);y()}}},entity:function(){return E(this.entities.literal)||E(this.entities.variable)||E(this.entities.url)||E(this.entities.call)||E(this.entities.keyword)||E(this.entities.javascript)||E(this.comment)},end:function(){return E(";")||N("}")},alpha:function(){var e;if(!E(/^\(opacity=/i))return;if(e=E(/^\d+/)||E(this.entities.variable))return x(")"),new i.Alpha(e)},element:function(){var e,t,n,r;n=E(this.combinator),e=E(/^(?:\d+\.\d+|\d+)%/)||E(/^(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/)||E("*")||E("&")||E(this.attribute)||E(/^\([^()@]+\)/)||E(/^[\.#](?=@)/)||E(this.entities.variableCurly),e||E("(")&&(r=E(this.entities.variableCurly)||E(this.entities.variable)||E(this.selector))&&E(")")&&(e=new i.Paren(r));if(e)return new i.Element(n,e,o)},combinator:function(){var e,t=s.charAt(o);if(t===">"||t==="+"||t==="~"||t==="|"){o++;while(s.charAt(o).match(/\s/))o++;return new i.Combinator(t)}return s.charAt(o-1).match(/\s/)?new i.Combinator(" "):new i.Combinator(null)},selector:function(){var e,t,n=[],r,u;if(E("("))return e=E(this.entity),E(")")?new i.Selector([new i.Element("",e,o)]):null;while(t=E(this.element)){r=s.charAt(o),n.push(t);if(r==="{"||r==="}"||r===";"||r===","||r===")")break}if(n.length>0)return new i.Selector(n)},attribute:function(){var e="",t,n,r;if(!E("["))return;if(t=E(/^(?:[_A-Za-z0-9-]|\\.)+/)||E(this.entities.quoted))(r=E(/^[|~*$^]?=/))&&(n=E(this.entities.quoted)||E(/^[\w-]+/))?e=[t,r,n.toCSS?n.toCSS():n].join(""):e=t;if(!E("]"))return;if(e)return"["+e+"]"},block:function(){var e;if(E("{")&&(e=E(this.primary))&&E("}"))return e},ruleset:function(){var e=[],n,r,u,a;g(),t.dumpLineNumbers&&(a=A(o,s,t));while(n=E(this.selector)){e.push(n),E(this.comment);if(!E(","))break;E(this.comment)}if(e.length>0&&(r=E(this.block))){var f=new i.Ruleset(e,r,t.strictImports);return t.dumpLineNumbers&&(f.debugInfo=a),f}l=o,y()},rule:function(){var e,t,n=s.charAt(o),r,a;g();if(n==="."||n==="#"||n==="&")return;if(e=E(this.variable)||E(this.property)){e.charAt(0)!="@"&&(a=/^([^@+\/'"*`(;{}-]*);/.exec(c[u]))?(o+=a[0].length-1,t=new i.Anonymous(a[1])):e==="font"?t=E(this.font):t=E(this.value),r=E(this.important);if(t&&E(this.end))return new i.Rule(e,t,r,f);l=o,y()}},"import":function(){var e,n,r=o;g();var s=E(/^@import(?:-(once))?\s+/);if(s&&(e=E(this.entities.quoted)||E(this.entities.url))){n=E(this.mediaFeatures);if(E(";"))return new i.Import(e,m,n,s[1]==="once",r,t.rootpath)}y()},mediaFeature:function(){var e,t,n=[];do if(e=E(this.entities.keyword))n.push(e);else if(E("(")){t=E(this.property),e=E(this.entity);if(!E(")"))return null;if(t&&e)n.push(new i.Paren(new i.Rule(t,e,null,o,!0)));else{if(!e)return null;n.push(new i.Paren(e))}}while(e);if(n.length>0)return new i.Expression(n)},mediaFeatures:function(){var e,t=[];do if(e=E(this.mediaFeature)){t.push(e);if(!E(","))break}else if(e=E(this.entities.variable)){t.push(e);if(!E(","))break}while(e);return t.length>0?t:null},media:function(){var e,n,r,u;t.dumpLineNumbers&&(u=A(o,s,t));if(E(/^@media/)){e=E(this.mediaFeatures);if(n=E(this.block))return r=new i.Media(n,e),t.dumpLineNumbers&&(r.debugInfo=u),r}},directive:function(){var e,n,r,u,a,f,l,c,h,p;if(s.charAt(o)!=="@")return;if(n=E(this["import"])||E(this.media))return n;g(),e=E(/^@[a-z-]+/);if(!e)return;l=e,e.charAt(1)=="-"&&e.indexOf("-",2)>0&&(l="@"+e.slice(e.indexOf("-",2)+1));switch(l){case"@font-face":c=!0;break;case"@viewport":case"@top-left":case"@top-left-corner":case"@top-center":case"@top-right":case"@top-right-corner":case"@bottom-left":case"@bottom-left-corner":case"@bottom-center":case"@bottom-right":case"@bottom-right-corner":case"@left-top":case"@left-middle":case"@left-bottom":case"@right-top":case"@right-middle":case"@right-bottom":c=!0;break;case"@page":case"@document":case"@supports":case"@keyframes":c=!0,h=!0;break;case"@namespace":p=!0}h&&(e+=" "+(E(/^[^{]+/)||"").trim());if(c){if(r=E(this.block))return new i.Directive(e,r)}else if((n=p?E(this.expression):E(this.entity))&&E(";")){var d=new i.Directive(e,n);return t.dumpLineNumbers&&(d.debugInfo=A(o,s,t)),d}y()},font:function(){var e=[],t=[],n,r,s,o;while(o=E(this.shorthand)||E(this.entity))t.push(o);e.push(new i.Expression(t));if(E(","))while(o=E(this.expression)){e.push(o);if(!E(","))break}return new i.Value(e)},value:function(){var e,t=[],n;while(e=E(this.expression)){t.push(e);if(!E(","))break}if(t.length>0)return new i.Value(t)},important:function(){if(s.charAt(o)==="!")return E(/^! *important/)},sub:function(){var e;if(E("(")&&(e=E(this.expression))&&E(")"))return e},multiplication:function(){var e,t,n,r;if(e=E(this.operand)){while(!N(/^\/[*\/]/)&&(n=E("/")||E("*"))&&(t=E(this.operand)))r=new i.Operation(n,[r||e,t]);return r||e}},addition:function(){var e,t,n,r;if(e=E(this.multiplication)){while((n=E(/^[-+]\s+/)||!w(s.charAt(o-1))&&(E("+")||E("-")))&&(t=E(this.multiplication)))r=new i.Operation(n,[r||e,t]);return r||e}},conditions:function(){var e,t,n=o,r;if(e=E(this.condition)){while(E(",")&&(t=E(this.condition)))r=new i.Condition("or",r||e,t,n);return r||e}},condition:function(){var e,t,n,r,s=o,u=!1;E(/^not/)&&(u=!0),x("(");if(e=E(this.addition)||E(this.entities.keyword)||E(this.entities.quoted))return(r=E(/^(?:>=|=<|[<=>])/))?(t=E(this.addition)||E(this.entities.keyword)||E(this.entities.quoted))?n=new i.Condition(r,e,t,s,u):T("expected expression"):n=new i.Condition("=",e,new i.Keyword("true"),s,u),x(")"),E(/^and/)?new i.Condition("and",n,E(this.condition)):n},operand:function(){var e,t=s.charAt(o+1);s.charAt(o)==="-"&&(t==="@"||t==="(")&&(e=E("-"));var n=E(this.sub)||E(this.entities.dimension)||E(this.entities.color)||E(this.entities.variable)||E(this.entities.call);return e?new i.Operation("*",[new i.Dimension(-1),n]):n},expression:function(){var e,t,n=[],r;while(e=E(this.addition)||E(this.entity))n.push(e);if(n.length>0)return new i.Expression(n)},property:function(){var e;if(e=E(/^(\*?-?[_a-z0-9-]+)\s*:/))return e[1]}}}};if(r.mode==="browser"||r.mode==="rhino")r.Parser.importer=function(e,t,n,r){!/^([a-z-]+:)?\//.test(e)&&t.length>0&&(e=t[0]+e),w({href:e,title:e,type:r.mime,contents:r.contents,files:r.files,rootpath:r.rootpath,entryPath:r.entryPath,relativeUrls:r.relativeUrls},function(e,i,s,o,u,a){e&&typeof r.errback=="function"?r.errback.call(null,a,t,n,r):n.call(null,e,i,a)},!0)};(function(e){function t(t){return e.functions.hsla(t.h,t.s,t.l,t.a)}function n(t,n){return t instanceof e.Dimension&&t.unit=="%"?parseFloat(t.value*n/100):r(t)}function r(t){if(t instanceof e.Dimension)return parseFloat(t.unit=="%"?t.value/100:t.value);if(typeof t=="number")return t;throw{error:"RuntimeError",message:"color functions take numbers as parameters"}}function i(e){return Math.min(1,Math.max(0,e))}e.functions={rgb:function(e,t,n){return this.rgba(e,t,n,1)},rgba:function(t,i,s,o){var u=[t,i,s].map(function(e){return n(e,256)});return o=r(o),new e.Color(u,o)},hsl:function(e,t,n){return this.hsla(e,t,n,1)},hsla:function(e,t,n,i){function u(e){return e=e<0?e+1:e>1?e-1:e,e*6<1?o+(s-o)*e*6:e*2<1?s:e*3<2?o+(s-o)*(2/3-e)*6:o}e=r(e)%360/360,t=r(t),n=r(n),i=r(i);var s=n<=.5?n*(t+1):n+t-n*t,o=n*2-s;return this.rgba(u(e+1/3)*255,u(e)*255,u(e-1/3)*255,i)},hsv:function(e,t,n){return this.hsva(e,t,n,1)},hsva:function(e,t,n,i){e=r(e)%360/360*360,t=r(t),n=r(n),i=r(i);var s,o;s=Math.floor(e/60%6),o=e/60-s;var u=[n,n*(1-t),n*(1-o*t),n*(1-(1-o)*t)],a=[[0,3,1],[2,0,1],[1,0,3],[1,2,0],[3,1,0],[0,1,2]];return this.rgba(u[a[s][0]]*255,u[a[s][1]]*255,u[a[s][2]]*255,i)},hue:function(t){return new e.Dimension(Math.round(t.toHSL().h))},saturation:function(t){return new e.Dimension(Math.round(t.toHSL().s*100),"%")},lightness:function(t){return new e.Dimension(Math.round(t.toHSL().l*100),"%")},red:function(t){return new e.Dimension(t.rgb[0])},green:function(t){return new e.Dimension(t.rgb[1])},blue:function(t){return new e.Dimension(t.rgb[2])},alpha:function(t){return new e.Dimension(t.toHSL().a)},luma:function(t){return new e.Dimension(Math.round((.2126*(t.rgb[0]/255)+.7152*(t.rgb[1]/255)+.0722*(t.rgb[2]/255))*t.alpha*100),"%")},saturate:function(e,n){var r=e.toHSL();return r.s+=n.value/100,r.s=i(r.s),t(r)},desaturate:function(e,n){var r=e.toHSL();return r.s-=n.value/100,r.s=i(r.s),t(r)},lighten:function(e,n){var r=e.toHSL();return r.l+=n.value/100,r.l=i(r.l),t(r)},darken:function(e,n){var r=e.toHSL();return r.l-=n.value/100,r.l=i(r.l),t(r)},fadein:function(e,n){var r=e.toHSL();return r.a+=n.value/100,r.a=i(r.a),t(r)},fadeout:function(e,n){var r=e.toHSL();return r.a-=n.value/100,r.a=i(r.a),t(r)},fade:function(e,n){var r=e.toHSL();return r.a=n.value/100,r.a=i(r.a),t(r)},spin:function(e,n){var r=e.toHSL(),i=(r.h+n.value)%360;return r.h=i<0?360+i:i,t(r)},mix:function(t,n,r){r||(r=new e.Dimension(50));var i=r.value/100,s=i*2-1,o=t.toHSL().a-n.toHSL().a,u=((s*o==-1?s:(s+o)/(1+s*o))+1)/2,a=1-u,f=[t.rgb[0]*u+n.rgb[0]*a,t.rgb[1]*u+n.rgb[1]*a,t.rgb[2]*u+n.rgb[2]*a],l=t.alpha*i+n.alpha*(1-i);return new e.Color(f,l)},greyscale:function(t){return this.desaturate(t,new e.Dimension(100))},contrast:function(e,t,n,r){return e.rgb?(typeof n=="undefined"&&(n=this.rgba(255,255,255,1)),typeof t=="undefined"&&(t=this.rgba(0,0,0,1)),typeof r=="undefined"?r=.43:r=r.value,(.2126*(e.rgb[0]/255)+.7152*(e.rgb[1]/255)+.0722*(e.rgb[2]/255))*e.alpha<r?n:t):null},e:function(t){return new e.Anonymous(t instanceof e.JavaScript?t.evaluated:t)},escape:function(t){return new e.Anonymous(encodeURI(t.value).replace(/=/g,"%3D").replace(/:/g,"%3A").replace(/#/g,"%23").replace(/;/g,"%3B").replace(/\(/g,"%28").replace(/\)/g,"%29"))},"%":function(t){var n=Array.prototype.slice.call(arguments,1),r=t.value;for(var i=0;i<n.length;i++)r=r.replace(/%[sda]/i,function(e){var t=e.match(/s/i)?n[i].value:n[i].toCSS();return e.match(/[A-Z]$/)?encodeURIComponent(t):t});return r=r.replace(/%%/g,"%"),new e.Quoted('"'+r+'"',r)},unit:function(t,n){return new e.Dimension(t.value,n?n.toCSS():"")},round:function(e,t){var n=typeof t=="undefined"?0:t.value;return this._math(function(e){return e.toFixed(n)},e)},ceil:function(e){return this._math(Math.ceil,e)},floor:function(e){return this._math(Math.floor,e)},_math:function(t,n){if(n instanceof e.Dimension)return new e.Dimension(t(parseFloat(n.value)),n.unit);if(typeof n=="number")return t(n);throw{type:"Argument",message:"argument must be a number"}},argb:function(t){return new e.Anonymous(t.toARGB())},percentage:function(t){return new e.Dimension(t.value*100,"%")},color:function(t){if(t instanceof e.Quoted)return new e.Color(t.value.slice(1));throw{type:"Argument",message:"argument must be a string"}},iscolor:function(t){return this._isa(t,e.Color)},isnumber:function(t){return this._isa(t,e.Dimension)},isstring:function(t){return this._isa(t,e.Quoted)},iskeyword:function(t){return this._isa(t,e.Keyword)},isurl:function(t){return this._isa(t,e.URL)},ispixel:function(t){return t instanceof e.Dimension&&t.unit==="px"?e.True:e.False},ispercentage:function(t){return t instanceof e.Dimension&&t.unit==="%"?e.True:e.False},isem:function(t){return t instanceof e.Dimension&&t.unit==="em"?e.True:e.False},_isa:function(t,n){return t instanceof n?e.True:e.False},multiply:function(e,t){var n=e.rgb[0]*t.rgb[0]/255,r=e.rgb[1]*t.rgb[1]/255,i=e.rgb[2]*t.rgb[2]/255;return this.rgb(n,r,i)},screen:function(e,t){var n=255-(255-e.rgb[0])*(255-t.rgb[0])/255,r=255-(255-e.rgb[1])*(255-t.rgb[1])/255,i=255-(255-e.rgb[2])*(255-t.rgb[2])/255;return this.rgb(n,r,i)},overlay:function(e,t){var n=e.rgb[0]<128?2*e.rgb[0]*t.rgb[0]/255:255-2*(255-e.rgb[0])*(255-t.rgb[0])/255,r=e.rgb[1]<128?2*e.rgb[1]*t.rgb[1]/255:255-2*(255-e.rgb[1])*(255-t.rgb[1])/255,i=e.rgb[2]<128?2*e.rgb[2]*t.rgb[2]/255:255-2*(255-e.rgb[2])*(255-t.rgb[2])/255;return this.rgb(n,r,i)},softlight:function(e,t){var n=t.rgb[0]*e.rgb[0]/255,r=n+e.rgb[0]*(255-(255-e.rgb[0])*(255-t.rgb[0])/255-n)/255;n=t.rgb[1]*e.rgb[1]/255;var i=n+e.rgb[1]*(255-(255-e.rgb[1])*(255-t.rgb[1])/255-n)/255;n=t.rgb[2]*e.rgb[2]/255;var s=n+e.rgb[2]*(255-(255-e.rgb[2])*(255-t.rgb[2])/255-n)/255;return this.rgb(r,i,s)},hardlight:function(e,t){var n=t.rgb[0]<128?2*t.rgb[0]*e.rgb[0]/255:255-2*(255-t.rgb[0])*(255-e.rgb[0])/255,r=t.rgb[1]<128?2*t.rgb[1]*e.rgb[1]/255:255-2*(255-t.rgb[1])*(255-e.rgb[1])/255,i=t.rgb[2]<128?2*t.rgb[2]*e.rgb[2]/255:255-2*(255-t.rgb[2])*(255-e.rgb[2])/255;return this.rgb(n,r,i)},difference:function(e,t){var n=Math.abs(e.rgb[0]-t.rgb[0]),r=Math.abs(e.rgb[1]-t.rgb[1]),i=Math.abs(e.rgb[2]-t.rgb[2]);return this.rgb(n,r,i)},exclusion:function(e,t){var n=e.rgb[0]+t.rgb[0]*(255-e.rgb[0]-e.rgb[0])/255,r=e.rgb[1]+t.rgb[1]*(255-e.rgb[1]-e.rgb[1])/255,i=e.rgb[2]+t.rgb[2]*(255-e.rgb[2]-e.rgb[2])/255;return this.rgb(n,r,i)},average:function(e,t){var n=(e.rgb[0]+t.rgb[0])/2,r=(e.rgb[1]+t.rgb[1])/2,i=(e.rgb[2]+t.rgb[2])/2;return this.rgb(n,r,i)},negation:function(e,t){var n=255-Math.abs(255-t.rgb[0]-e.rgb[0]),r=255-Math.abs(255-t.rgb[1]-e.rgb[1]),i=255-Math.abs(255-t.rgb[2]-e.rgb[2]);return this.rgb(n,r,i)},tint:function(e,t){return this.mix(this.rgb(255,255,255),e,t)},shade:function(e,t){return this.mix(this.rgb(0,0,0),e,t)}}})(n("./tree")),function(e){e.colors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgrey:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",grey:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen
-:"#9acd32"}}(n("./tree")),function(e){e.Alpha=function(e){this.value=e},e.Alpha.prototype={toCSS:function(){return"alpha(opacity="+(this.value.toCSS?this.value.toCSS():this.value)+")"},eval:function(e){return this.value.eval&&(this.value=this.value.eval(e)),this}}}(n("../tree")),function(e){e.Anonymous=function(e){this.value=e.value||e},e.Anonymous.prototype={toCSS:function(){return this.value},eval:function(){return this},compare:function(e){if(!e.toCSS)return-1;var t=this.toCSS(),n=e.toCSS();return t===n?0:t<n?-1:1}}}(n("../tree")),function(e){e.Assignment=function(e,t){this.key=e,this.value=t},e.Assignment.prototype={toCSS:function(){return this.key+"="+(this.value.toCSS?this.value.toCSS():this.value)},eval:function(t){return this.value.eval?new e.Assignment(this.key,this.value.eval(t)):this}}}(n("../tree")),function(e){e.Call=function(e,t,n,r){this.name=e,this.args=t,this.index=n,this.filename=r},e.Call.prototype={eval:function(t){var n=this.args.map(function(e){return e.eval(t)}),r;if(this.name in e.functions)try{r=e.functions[this.name].apply(e.functions,n);if(r!=null)return r}catch(i){throw{type:i.type||"Runtime",message:"error evaluating function `"+this.name+"`"+(i.message?": "+i.message:""),index:this.index,filename:this.filename}}return new e.Anonymous(this.name+"("+n.map(function(e){return e.toCSS(t)}).join(", ")+")")},toCSS:function(e){return this.eval(e).toCSS()}}}(n("../tree")),function(e){e.Color=function(e,t){Array.isArray(e)?this.rgb=e:e.length==6?this.rgb=e.match(/.{2}/g).map(function(e){return parseInt(e,16)}):this.rgb=e.split("").map(function(e){return parseInt(e+e,16)}),this.alpha=typeof t=="number"?t:1},e.Color.prototype={eval:function(){return this},toCSS:function(){return this.alpha<1?"rgba("+this.rgb.map(function(e){return Math.round(e)}).concat(this.alpha).join(", ")+")":"#"+this.rgb.map(function(e){return e=Math.round(e),e=(e>255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("")},operate:function(t,n){var r=[];n instanceof e.Color||(n=n.toColor());for(var i=0;i<3;i++)r[i]=e.operate(t,this.rgb[i],n.rgb[i]);return new e.Color(r,this.alpha+n.alpha)},toHSL:function(){var e=this.rgb[0]/255,t=this.rgb[1]/255,n=this.rgb[2]/255,r=this.alpha,i=Math.max(e,t,n),s=Math.min(e,t,n),o,u,a=(i+s)/2,f=i-s;if(i===s)o=u=0;else{u=a>.5?f/(2-i-s):f/(i+s);switch(i){case e:o=(t-n)/f+(t<n?6:0);break;case t:o=(n-e)/f+2;break;case n:o=(e-t)/f+4}o/=6}return{h:o*360,s:u,l:a,a:r}},toARGB:function(){var e=[Math.round(this.alpha*255)].concat(this.rgb);return"#"+e.map(function(e){return e=Math.round(e),e=(e>255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("")},compare:function(e){return e.rgb?e.rgb[0]===this.rgb[0]&&e.rgb[1]===this.rgb[1]&&e.rgb[2]===this.rgb[2]&&e.alpha===this.alpha?0:-1:-1}}}(n("../tree")),function(e){e.Comment=function(e,t){this.value=e,this.silent=!!t},e.Comment.prototype={toCSS:function(e){return e.compress?"":this.value},eval:function(){return this}}}(n("../tree")),function(e){e.Condition=function(e,t,n,r,i){this.op=e.trim(),this.lvalue=t,this.rvalue=n,this.index=r,this.negate=i},e.Condition.prototype.eval=function(e){var t=this.lvalue.eval(e),n=this.rvalue.eval(e),r=this.index,i,i=function(e){switch(e){case"and":return t&&n;case"or":return t||n;default:if(t.compare)i=t.compare(n);else{if(!n.compare)throw{type:"Type",message:"Unable to perform comparison",index:r};i=n.compare(t)}switch(i){case-1:return e==="<"||e==="=<";case 0:return e==="="||e===">="||e==="=<";case 1:return e===">"||e===">="}}}(this.op);return this.negate?!i:i}}(n("../tree")),function(e){e.Dimension=function(e,t){this.value=parseFloat(e),this.unit=t||null},e.Dimension.prototype={eval:function(){return this},toColor:function(){return new e.Color([this.value,this.value,this.value])},toCSS:function(){var e=this.value+this.unit;return e},operate:function(t,n){return new e.Dimension(e.operate(t,this.value,n.value),this.unit||n.unit)},compare:function(t){return t instanceof e.Dimension?t.value>this.value?-1:t.value<this.value?1:t.unit&&this.unit!==t.unit?-1:0:-1}}}(n("../tree")),function(e){e.Directive=function(t,n){this.name=t,Array.isArray(n)?(this.ruleset=new e.Ruleset([],n),this.ruleset.allowImports=!0):this.value=n},e.Directive.prototype={toCSS:function(e,t){return this.ruleset?(this.ruleset.root=!0,this.name+(t.compress?"{":" {\n  ")+this.ruleset.toCSS(e,t).trim().replace(/\n/g,"\n  ")+(t.compress?"}":"\n}\n")):this.name+" "+this.value.toCSS()+";\n"},eval:function(t){var n=this;return this.ruleset&&(t.frames.unshift(this),n=new e.Directive(this.name),n.ruleset=this.ruleset.eval(t),t.frames.shift()),n},variable:function(t){return e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return e.Ruleset.prototype.rulesets.apply(this.ruleset)}}}(n("../tree")),function(e){e.Element=function(t,n,r){this.combinator=t instanceof e.Combinator?t:new e.Combinator(t),typeof n=="string"?this.value=n.trim():n?this.value=n:this.value="",this.index=r},e.Element.prototype.eval=function(t){return new e.Element(this.combinator,this.value.eval?this.value.eval(t):this.value,this.index)},e.Element.prototype.toCSS=function(e){var t=this.value.toCSS?this.value.toCSS(e):this.value;return t==""&&this.combinator.value.charAt(0)=="&"?"":this.combinator.toCSS(e||{})+t},e.Combinator=function(e){e===" "?this.value=" ":this.value=e?e.trim():""},e.Combinator.prototype.toCSS=function(e){return{"":""," ":" ",":":" :","+":e.compress?"+":" + ","~":e.compress?"~":" ~ ",">":e.compress?">":" > ","|":e.compress?"|":" | "}[this.value]}}(n("../tree")),function(e){e.Expression=function(e){this.value=e},e.Expression.prototype={eval:function(t){return this.value.length>1?new e.Expression(this.value.map(function(e){return e.eval(t)})):this.value.length===1?this.value[0].eval(t):this},toCSS:function(e){return this.value.map(function(t){return t.toCSS?t.toCSS(e):""}).join(" ")}}}(n("../tree")),function(e){e.Import=function(t,n,r,i,s,o){var u=this;this.once=i,this.index=s,this._path=t,this.features=r&&new e.Value(r),this.rootpath=o,t instanceof e.Quoted?this.path=/(\.[a-z]*$)|([\?;].*)$/.test(t.value)?t.value:t.value+".less":this.path=t.value.value||t.value,this.css=/css([\?;].*)?$/.test(this.path),this.css||n.push(this.path,function(t,n,r){t&&(t.index=s),r&&u.once&&(u.skip=r),u.root=n||new e.Ruleset([],[])})},e.Import.prototype={toCSS:function(e){var t=this.features?" "+this.features.toCSS(e):"";return this.css?(typeof this._path.value=="string"&&!/^(?:[a-z-]+:|\/)/.test(this._path.value)&&(this._path.value=this.rootpath+this._path.value),"@import "+this._path.toCSS()+t+";\n"):""},eval:function(t){var n,r=this.features&&this.features.eval(t);return this.skip?[]:this.css?this:(n=new e.Ruleset([],this.root.rules.slice(0)),n.evalImports(t),this.features?new e.Media(n.rules,this.features.value):n.rules)}}}(n("../tree")),function(e){e.JavaScript=function(e,t,n){this.escaped=n,this.expression=e,this.index=t},e.JavaScript.prototype={eval:function(t){var n,r=this,i={},s=this.expression.replace(/@\{([\w-]+)\}/g,function(n,i){return e.jsify((new e.Variable("@"+i,r.index)).eval(t))});try{s=new Function("return ("+s+")")}catch(o){throw{message:"JavaScript evaluation error: `"+s+"`",index:this.index}}for(var u in t.frames[0].variables())i[u.slice(1)]={value:t.frames[0].variables()[u].value,toJS:function(){return this.value.eval(t).toCSS()}};try{n=s.call(i)}catch(o){throw{message:"JavaScript evaluation error: '"+o.name+": "+o.message+"'",index:this.index}}return typeof n=="string"?new e.Quoted('"'+n+'"',n,this.escaped,this.index):Array.isArray(n)?new e.Anonymous(n.join(", ")):new e.Anonymous(n)}}}(n("../tree")),function(e){e.Keyword=function(e){this.value=e},e.Keyword.prototype={eval:function(){return this},toCSS:function(){return this.value},compare:function(t){return t instanceof e.Keyword?t.value===this.value?0:1:-1}},e.True=new e.Keyword("true"),e.False=new e.Keyword("false")}(n("../tree")),function(e){e.Media=function(t,n){var r=this.emptySelectors();this.features=new e.Value(n),this.ruleset=new e.Ruleset(r,t),this.ruleset.allowImports=!0},e.Media.prototype={toCSS:function(e,t){var n=this.features.toCSS(t);return this.ruleset.root=e.length===0||e[0].multiMedia,"@media "+n+(t.compress?"{":" {\n  ")+this.ruleset.toCSS(e,t).trim().replace(/\n/g,"\n  ")+(t.compress?"}":"\n}\n")},eval:function(t){t.mediaBlocks||(t.mediaBlocks=[],t.mediaPath=[]);var n=new e.Media([],[]);return this.debugInfo&&(this.ruleset.debugInfo=this.debugInfo,n.debugInfo=this.debugInfo),n.features=this.features.eval(t),t.mediaPath.push(n),t.mediaBlocks.push(n),t.frames.unshift(this.ruleset),n.ruleset=this.ruleset.eval(t),t.frames.shift(),t.mediaPath.pop(),t.mediaPath.length===0?n.evalTop(t):n.evalNested(t)},variable:function(t){return e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return e.Ruleset.prototype.rulesets.apply(this.ruleset)},emptySelectors:function(){var t=new e.Element("","&",0);return[new e.Selector([t])]},evalTop:function(t){var n=this;if(t.mediaBlocks.length>1){var r=this.emptySelectors();n=new e.Ruleset(r,t.mediaBlocks),n.multiMedia=!0}return delete t.mediaBlocks,delete t.mediaPath,n},evalNested:function(t){var n,r,i=t.mediaPath.concat([this]);for(n=0;n<i.length;n++)r=i[n].features instanceof e.Value?i[n].features.value:i[n].features,i[n]=Array.isArray(r)?r:[r];return this.features=new e.Value(this.permute(i).map(function(t){t=t.map(function(t){return t.toCSS?t:new e.Anonymous(t)});for(n=t.length-1;n>0;n--)t.splice(n,0,new e.Anonymous("and"));return new e.Expression(t)})),new e.Ruleset([],[])},permute:function(e){if(e.length===0)return[];if(e.length===1)return e[0];var t=[],n=this.permute(e.slice(1));for(var r=0;r<n.length;r++)for(var i=0;i<e[0].length;i++)t.push([e[0][i]].concat(n[r]));return t},bubbleSelectors:function(t){this.ruleset=new e.Ruleset(t.slice(0),[this.ruleset])}}}(n("../tree")),function(e){e.mixin={},e.mixin.Call=function(t,n,r,i,s){this.selector=new e.Selector(t),this.arguments=n,this.index=r,this.filename=i,this.important=s},e.mixin.Call.prototype={eval:function(t){var n,r,i,s=[],o=!1,u,a,f,l,c;i=this.arguments&&this.arguments.map(function(e){return{name:e.name,value:e.value.eval(t)}});for(u=0;u<t.frames.length;u++)if((n=t.frames[u].find(this.selector)).length>0){c=!0;for(a=0;a<n.length;a++){r=n[a],l=!1;for(f=0;f<t.frames.length;f++)if(!(r instanceof e.mixin.Definition)&&r===(t.frames[f].originalRuleset||t.frames[f])){l=!0;break}if(l)continue;if(r.matchArgs(i,t)){if(!r.matchCondition||r.matchCondition(i,t))try{Array.prototype.push.apply(s,r.eval(t,i,this.important).rules)}catch(h){throw{message:h.message,index:this.index,filename:this.filename,stack:h.stack}}o=!0}}if(o)return s}throw c?{type:"Runtime",message:"No matching definition was found for `"+this.selector.toCSS().trim()+"("+(i?i.map(function(e){var t="";return e.name&&(t+=e.name+":"),e.value.toCSS?t+=e.value.toCSS():t+="???",t}).join(", "):"")+")`",index:this.index,filename:this.filename}:{type:"Name",message:this.selector.toCSS().trim()+" is undefined",index:this.index,filename:this.filename}}},e.mixin.Definition=function(t,n,r,i,s){this.name=t,this.selectors=[new e.Selector([new e.Element(null,t)])],this.params=n,this.condition=i,this.variadic=s,this.arity=n.length,this.rules=r,this._lookups={},this.required=n.reduce(function(e,t){return!t.name||t.name&&!t.value?e+1:e},0),this.parent=e.Ruleset.prototype,this.frames=[]},e.mixin.Definition.prototype={toCSS:function(){return""},variable:function(e){return this.parent.variable.call(this,e)},variables:function(){return this.parent.variables.call(this)},find:function(){return this.parent.find.apply(this,arguments)},rulesets:function(){return this.parent.rulesets.apply(this)},evalParams:function(t,n,r,i){var s=new e.Ruleset(null,[]),o,u,a=this.params.slice(0),f,l,c,h,p,d;if(r){r=r.slice(0);for(f=0;f<r.length;f++){u=r[f];if(h=u&&u.name){p=!1;for(l=0;l<a.length;l++)if(!i[l]&&h===a[l].name){i[l]=u.value.eval(t),s.rules.unshift(new e.Rule(h,u.value.eval(t))),p=!0;break}if(p){r.splice(f,1),f--;continue}throw{type:"Runtime",message:"Named argument for "+this.name+" "+r[f].name+" not found"}}}}d=0;for(f=0;f<a.length;f++){if(i[f])continue;u=r&&r[d];if(h=a[f].name)if(a[f].variadic&&r){o=[];for(l=d;l<r.length;l++)o.push(r[l].value.eval(t));s.rules.unshift(new e.Rule(h,(new e.Expression(o)).eval(t)))}else{c=u&&u.value;if(c)c=c.eval(t);else{if(!a[f].value)throw{type:"Runtime",message:"wrong number of arguments for "+this.name+" ("+r.length+" for "+this.arity+")"};c=a[f].value.eval(n)}s.rules.unshift(new e.Rule(h,c)),i[f]=c}if(a[f].variadic&&r)for(l=d;l<r.length;l++)i[l]=r[l].value.eval(t);d++}return s},eval:function(t,n,r){var i=[],s=this.frames.concat(t.frames),o=this.evalParams(t,{frames:s},n,i),u,a,f,l;return o.rules.unshift(new e.Rule("@arguments",(new e.Expression(i)).eval(t))),a=r?this.parent.makeImportant.apply(this).rules:this.rules.slice(0),l=(new e.Ruleset(null,a)).eval({frames:[this,o].concat(s)}),l.originalRuleset=this,l},matchCondition:function(e,t){return this.condition&&!this.condition.eval({frames:[this.evalParams(t,{frames:this.frames.concat(t.frames)},e,[])].concat(t.frames)})?!1:!0},matchArgs:function(e,t){var n=e&&e.length||0,r,i;if(!this.variadic){if(n<this.required)return!1;if(n>this.params.length)return!1;if(this.required>0&&n>this.params.length)return!1}r=Math.min(n,this.arity);for(var s=0;s<r;s++)if(!this.params[s].name&&!this.params[s].variadic&&e[s].value.eval(t).toCSS()!=this.params[s].value.eval(t).toCSS())return!1;return!0}}}(n("../tree")),function(e){e.Operation=function(e,t){this.op=e.trim(),this.operands=t},e.Operation.prototype.eval=function(t){var n=this.operands[0].eval(t),r=this.operands[1].eval(t),i;if(n instanceof e.Dimension&&r instanceof e.Color){if(this.op!=="*"&&this.op!=="+")throw{name:"OperationError",message:"Can't substract or divide a color from a number"};i=r,r=n,n=i}if(!n.operate)throw{name:"OperationError",message:"Operation on an invalid type"};return n.operate(this.op,r)},e.operate=function(e,t,n){switch(e){case"+":return t+n;case"-":return t-n;case"*":return t*n;case"/":return t/n}}}(n("../tree")),function(e){e.Paren=function(e){this.value=e},e.Paren.prototype={toCSS:function(e){return"("+this.value.toCSS(e)+")"},eval:function(t){return new e.Paren(this.value.eval(t))}}}(n("../tree")),function(e){e.Quoted=function(e,t,n,r){this.escaped=n,this.value=t||"",this.quote=e.charAt(0),this.index=r},e.Quoted.prototype={toCSS:function(){return this.escaped?this.value:this.quote+this.value+this.quote},eval:function(t){var n=this,r=this.value.replace(/`([^`]+)`/g,function(r,i){return(new e.JavaScript(i,n.index,!0)).eval(t).value}).replace(/@\{([\w-]+)\}/g,function(r,i){var s=(new e.Variable("@"+i,n.index)).eval(t);return s instanceof e.Quoted?s.value:s.toCSS()});return new e.Quoted(this.quote+r+this.quote,r,this.escaped,this.index)},compare:function(e){if(!e.toCSS)return-1;var t=this.toCSS(),n=e.toCSS();return t===n?0:t<n?-1:1}}}(n("../tree")),function(e){e.Ratio=function(e){this.value=e},e.Ratio.prototype={toCSS:function(e){return this.value},eval:function(){return this}}}(n("../tree")),function(e){e.Rule=function(t,n,r,i,s){this.name=t,this.value=n instanceof e.Value?n:new e.Value([n]),this.important=r?" "+r.trim():"",this.index=i,this.inline=s||!1,t.charAt(0)==="@"?this.variable=!0:this.variable=!1},e.Rule.prototype.toCSS=function(e){return this.variable?"":this.name+(e.compress?":":": ")+this.value.toCSS(e)+this.important+(this.inline?"":";")},e.Rule.prototype.eval=function(t){return new e.Rule(this.name,this.value.eval(t),this.important,this.index,this.inline)},e.Rule.prototype.makeImportant=function(){return new e.Rule(this.name,this.value,"!important",this.index,this.inline)},e.Shorthand=function(e,t){this.a=e,this.b=t},e.Shorthand.prototype={toCSS:function(e){return this.a.toCSS(e)+"/"+this.b.toCSS(e)},eval:function(){return this}}}(n("../tree")),function(e){e.Ruleset=function(e,t,n){this.selectors=e,this.rules=t,this._lookups={},this.strictImports=n},e.Ruleset.prototype={eval:function(t){var n=this.selectors&&this.selectors.map(function(e){return e.eval(t)}),r=new e.Ruleset(n,this.rules.slice(0),this.strictImports),i;r.originalRuleset=this,r.root=this.root,r.allowImports=this.allowImports,this.debugInfo&&(r.debugInfo=this.debugInfo),t.frames.unshift(r),(r.root||r.allowImports||!r.strictImports)&&r.evalImports(t);for(var s=0;s<r.rules.length;s++)r.rules[s]instanceof e.mixin.Definition&&(r.rules[s].frames=t.frames.slice(0));var o=t.mediaBlocks&&t.mediaBlocks.length||0;for(var s=0;s<r.rules.length;s++)r.rules[s]instanceof e.mixin.Call&&(i=r.rules[s].eval(t),r.rules.splice.apply(r.rules,[s,1].concat(i)),s+=i.length-1,r.resetCache());for(var s=0,u;s<r.rules.length;s++)u=r.rules[s],u instanceof e.mixin.Definition||(r.rules[s]=u.eval?u.eval(t):u);t.frames.shift();if(t.mediaBlocks)for(var s=o;s<t.mediaBlocks.length;s++)t.mediaBlocks[s].bubbleSelectors(n);return r},evalImports:function(t){var n,r;for(n=0;n<this.rules.length;n++)this.rules[n]instanceof e.Import&&(r=this.rules[n].eval(t),typeof r.length=="number"?(this.rules.splice.apply(this.rules,[n,1].concat(r)),n+=r.length-1):this.rules.splice(n,1,r),this.resetCache())},makeImportant:function(){return new e.Ruleset(this.selectors,this.rules.map(function(e){return e.makeImportant?e.makeImportant():e}),this.strictImports)},matchArgs:function(e){return!e||e.length===0},resetCache:function(){this._rulesets=null,this._variables=null,this._lookups={}},variables:function(){return this._variables?this._variables:this._variables=this.rules.reduce(function(t,n){return n instanceof e.Rule&&n.variable===!0&&(t[n.name]=n),t},{})},variable:function(e){return this.variables()[e]},rulesets:function(){return this._rulesets?this._rulesets:this._rulesets=this.rules.filter(function(t){return t instanceof e.Ruleset||t instanceof e.mixin.Definition})},find:function(t,n){n=n||this;var r=[],i,s,o=t.toCSS();return o in this._lookups?this._lookups[o]:(this.rulesets().forEach(function(i){if(i!==n)for(var o=0;o<i.selectors.length;o++)if(s=t.match(i.selectors[o])){t.elements.length>i.selectors[o].elements.length?Array.prototype.push.apply(r,i.find(new e.Selector(t.elements.slice(1)),n)):r.push(i);break}}),this._lookups[o]=r)},toCSS:function(t,n){var r=[],i=[],s=[],o=[],u=[],a,f,l;this.root||this.joinSelectors(u,t,this.selectors);for(var c=0;c<this.rules.length;c++){l=this.rules[c];if(l.rules||l instanceof e.Media)o.push(l.toCSS(u,n));else if(l instanceof e.Directive){var h=l.toCSS(u,n);if(l.name==="@charset"){if(n.charset){l.debugInfo&&(o.push(e.debugInfo(n,l)),o.push((new e.Comment("/* "+h.replace(/\n/g,"")+" */\n")).toCSS(n)));continue}n.charset=!0}o.push(h)}else l instanceof e.Comment?l.silent||(this.root?o.push(l.toCSS(n)):i.push(l.toCSS(n))):l.toCSS&&!l.variable?i.push(l.toCSS(n)):l.value&&!l.variable&&i.push(l.value.toString())}o=o.join("");if(this.root)r.push(i.join(n.compress?"":"\n"));else if(i.length>0){f=e.debugInfo(n,this),a=u.map(function(e){return e.map(function(e){return e.toCSS(n)}).join("").trim()}).join(n.compress?",":",\n");for(var c=i.length-1;c>=0;c--)s.indexOf(i[c])===-1&&s.unshift(i[c]);i=s,r.push(f+a+(n.compress?"{":" {\n  ")+i.join(n.compress?"":"\n  ")+(n.compress?"}":"\n}\n"))}return r.push(o),r.join("")+(n.compress?"\n":"")},joinSelectors:function(e,t,n){for(var r=0;r<n.length;r++)this.joinSelector(e,t,n[r])},joinSelector:function(t,n,r){var i,s,o,u,a,f,l,c,h,p,d,v,m,g,y;for(i=0;i<r.elements.length;i++)f=r.elements[i],f.value==="&"&&(u=!0);if(!u){if(n.length>0)for(i=0;i<n.length;i++)t.push(n[i].concat(r));else t.push([r]);return}g=[],a=[[]];for(i=0;i<r.elements.length;i++){f=r.elements[i];if(f.value!=="&")g.push(f);else{y=[],g.length>0&&this.mergeElementsOnToSelectors(g,a);for(s=0;s<a.length;s++){l=a[s];if(n.length==0)l.length>0&&(l[0].elements=l[0].elements.slice(0),l[0].elements.push(new e.Element(f.combinator,"",0))),y.push(l);else for(o=0;o<n.length;o++)c=n[o],h=[],p=[],v=!0,l.length>0?(h=l.slice(0),m=h.pop(),d=new e.Selector(m.elements.slice(0)),v=!1):d=new e.Selector([]),c.length>1&&(p=p.concat(c.slice(1))),c.length>0&&(v=!1,d.elements.push(new e.Element(f.combinator,c[0].elements[0].value,0)),d.elements=d.elements.concat(c[0].elements.slice(1))),v||h.push(d),h=h.concat(p),y.push(h)}a=y,g=[]}}g.length>0&&this.mergeElementsOnToSelectors(g,a);for(i=0;i<a.length;i++)t.push(a[i])},mergeElementsOnToSelectors:function(t,n){var r,i;if(n.length==0){n.push([new e.Selector(t)]);return}for(r=0;r<n.length;r++)i=n[r],i.length>0?i[i.length-1]=new e.Selector(i[i.length-1].elements.concat(t)):i.push(new e.Selector(t))}}}(n("../tree")),function(e){e.Selector=function(e){this.elements=e},e.Selector.prototype.match=function(e){var t=this.elements,n=t.length,r,i,s,o;r=e.elements.slice(e.elements.length&&e.elements[0].value==="&"?1:0),i=r.length,s=Math.min(n,i);if(i===0||n<i)return!1;for(o=0;o<s;o++)if(t[o].value!==r[o].value)return!1;return!0},e.Selector.prototype.eval=function(t){return new e.Selector(this.elements.map(function(e){return e.eval(t)}))},e.Selector.prototype.toCSS=function(e){return this._css?this._css:(this.elements[0].combinator.value===""?this._css=" ":this._css="",this._css+=this.elements.map(function(t){return typeof t=="string"?" "+t.trim():t.toCSS(e)}).join(""),this._css)}}(n("../tree")),function(e){e.UnicodeDescriptor=function(e){this.value=e},e.UnicodeDescriptor.prototype={toCSS:function(e){return this.value},eval:function(){return this}}}(n("../tree")),function(e){e.URL=function(e,t){this.value=e,this.rootpath=t},e.URL.prototype={toCSS:function(){return"url("+this.value.toCSS()+")"},eval:function(t){var n=this.value.eval(t),r;return typeof n.value=="string"&&!/^(?:[a-z-]+:|\/)/.test(n.value)&&(r=this.rootpath,n.quote||(r=r.replace(/[\(\)'"\s]/g,function(e){return"\\"+e})),n.value=r+n.value),new e.URL(n,this.rootpath)}}}(n("../tree")),function(e){e.Value=function(e){this.value=e,this.is="value"},e.Value.prototype={eval:function(t){return this.value.length===1?this.value[0].eval(t):new e.Value(this.value.map(function(e){return e.eval(t)}))},toCSS:function(e){return this.value.map(function(t){return t.toCSS(e)}).join(e.compress?",":", ")}}}(n("../tree")),function(e){e.Variable=function(e,t,n){this.name=e,this.index=t,this.file=n},e.Variable.prototype={eval:function(t){var n,r,i=this.name;i.indexOf("@@")==0&&(i="@"+(new e.Variable(i.slice(1))).eval(t).value);if(this.evaluating)throw{type:"Name",message:"Recursive variable definition for "+i,filename:this.file,index:this.index};this.evaluating=!0;if(n=e.find(t.frames,function(e){if(r=e.variable(i))return r.value.eval(t)}))return this.evaluating=!1,n;throw{type:"Name",message:"variable "+i+" is undefined",filename:this.file,index:this.index}}}}(n("../tree")),function(e){e.debugInfo=function(t,n){var r="";if(t.dumpLineNumbers&&!t.compress)switch(t.dumpLineNumbers){case"comments":r=e.debugInfo.asComment(n);break;case"mediaquery":r=e.debugInfo.asMediaQuery(n);break;case"all":r=e.debugInfo.asComment(n)+e.debugInfo.asMediaQuery(n)}return r},e.debugInfo.asComment=function(e){return"/* line "+e.debugInfo.lineNumber+", "+e.debugInfo.fileName+" */\n"},e.debugInfo.asMediaQuery=function(e){return"@media -sass-debug-info{filename{font-family:"+("file://"+e.debugInfo.fileName).replace(/[\/:.]/g,"\\$&")+"}line{font-family:\\00003"+e.debugInfo.lineNumber+"}}\n"},e.find=function(e,t){for(var n=0,r;n<e.length;n++)if(r=t.call(e,e[n]))return r;return null},e.jsify=function(e){return Array.isArray(e.value)&&e.value.length>1?"["+e.value.map(function(e){return e.toCSS(!1)}).join(", ")+"]":e.toCSS(!1)}}(n("./tree"));var o=/^(file|chrome(-extension)?|resource|qrc|app):/.test(location.protocol);r.env=r.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||location.hostname=="localhost"||location.port.length>0||o?"development":"production"),r.async=r.async||!1,r.fileAsync=r.fileAsync||!1,r.poll=r.poll||(o?1e3:1500);if(r.functions)for(var u in r.functions)r.tree.functions[u]=r.functions[u];var a=/!dumpLineNumbers:(comments|mediaquery|all)/.exec(location.hash);a&&(r.dumpLineNumbers=a[1]),r.watch=function(){return r.watchMode||(r.env="development",f()),this.watchMode=!0},r.unwatch=function(){return clearInterval(r.watchTimer),this.watchMode=!1},/!watch/.test(location.hash)&&r.watch();var l=null;if(r.env!="development")try{l=typeof e.localStorage=="undefined"?null:e.localStorage}catch(c){}var h=document.getElementsByTagName("link"),p=/^text\/(x-)?less$/;r.sheets=[];for(var d=0;d<h.length;d++)(h[d].rel==="stylesheet/less"||h[d].rel.match(/stylesheet/)&&h[d].type.match(p))&&r.sheets.push(h[d]);var v="";r.modifyVars=function(e){var t=v;for(name in e)t+=(name.slice(0,1)==="@"?"":"@")+name+": "+(e[name].slice(-1)===";"?e[name]:e[name]+";");(new r.Parser).parse(t,function(e,t){S(t.toCSS(),r.sheets[r.sheets.length-1])})},r.refresh=function(e){var t,n;t=n=new Date,g(function(e,r,i,s,o){o.local?C("loading "+s.href+" from cache."):(C("parsed "+s.href+" successfully."),S(r.toCSS(),s,o.lastModified)),C("css for "+s.href+" generated in "+(new Date-n)+"ms"),o.remaining===0&&C("css generated in "+(new Date-t)+"ms"),n=new Date},e),m()},r.refreshStyles=m,r.refresh(r.env==="development"),typeof define=="function"&&define.amd&&define("less",[],function(){return r})})(window);
\ No newline at end of file
+  var addDataAttr = require("./utils").addDataAttr,
+    browser = require("./browser");
+
+  module.exports = function(window, options) {
+    var document = window.document;
+    var less = require('../less')();
+
+    //module.exports = less;
+    less.options = options;
+    var environment = less.environment,
+      FileManager = require("./file-manager")(options, less.logger),
+      fileManager = new FileManager();
+    environment.addFileManager(fileManager);
+    less.FileManager = FileManager;
+
+    require("./log-listener")(less, options);
+    var errors = require("./error-reporting")(window, less, options);
+    var cache = less.cache = options.cache || require("./cache")(window, options, less.logger);
+    require('./image-size')(less.environment);
+
+    //Setup user functions
+    if (options.functions) {
+      less.functions.functionRegistry.addMultiple(options.functions);
+    }
+
+    var typePattern = /^text\/(x-)?less$/;
+
+    function postProcessCSS(styles) { // deprecated, use a plugin for postprocesstasks
+      if (options.postProcessor && typeof options.postProcessor === 'function') {
+        styles = options.postProcessor.call(styles, styles) || styles;
+      }
+      return styles;
+    }
+
+    function clone(obj) {
+      var cloned = {};
+      for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) {
+          cloned[prop] = obj[prop];
+        }
+      }
+      return cloned;
+    }
+
+    // only really needed for phantom
+    function bind(func, thisArg) {
+      var curryArgs = Array.prototype.slice.call(arguments, 2);
+      return function() {
+        var args = curryArgs.concat(Array.prototype.slice.call(arguments, 0));
+        return func.apply(thisArg, args);
+      };
+    }
+
+    function loadStyles(modifyVars) {
+      var styles = document.getElementsByTagName('style'),
+        style;
+
+      for (var i = 0; i < styles.length; i++) {
+        style = styles[i];
+        if (style.type.match(typePattern)) {
+          var instanceOptions = clone(options);
+          instanceOptions.modifyVars = modifyVars;
+          var lessText = style.innerHTML || '';
+          instanceOptions.filename = document.location.href.replace(/#.*$/, '');
+
+          /*jshint loopfunc:true */
+          // use closure to store current style
+          less.render(lessText, instanceOptions,
+            bind(function(style, e, result) {
+              if (e) {
+                errors.add(e, "inline");
+              } else {
+                style.type = 'text/css';
+                if (style.styleSheet) {
+                  style.styleSheet.cssText = result.css;
+                } else {
+                  style.innerHTML = result.css;
+                }
+              }
+            }, null, style));
+        }
+      }
+    }
+
+    function loadStyleSheet(sheet, callback, reload, remaining, modifyVars) {
+
+      var instanceOptions = clone(options);
+      addDataAttr(instanceOptions, sheet);
+      instanceOptions.mime = sheet.type;
+
+      if (modifyVars) {
+        instanceOptions.modifyVars = modifyVars;
+      }
+
+      function loadInitialFileCallback(loadedFile) {
+
+        var data = loadedFile.contents,
+          path = loadedFile.filename,
+          webInfo = loadedFile.webInfo;
+
+        var newFileInfo = {
+          currentDirectory: fileManager.getPath(path),
+          filename: path,
+          rootFilename: path,
+          relativeUrls: instanceOptions.relativeUrls};
+
+        newFileInfo.entryPath = newFileInfo.currentDirectory;
+        newFileInfo.rootpath = instanceOptions.rootpath || newFileInfo.currentDirectory;
+
+        if (webInfo) {
+          webInfo.remaining = remaining;
+
+          var css = cache.getCSS(path, webInfo, instanceOptions.modifyVars);
+          if (!reload && css) {
+            webInfo.local = true;
+            callback(null, css, data, sheet, webInfo, path);
+            return;
+          }
+
+        }
+
+        //TODO add tests around how this behaves when reloading
+        errors.remove(path);
+
+        instanceOptions.rootFileInfo = newFileInfo;
+        less.render(data, instanceOptions, function(e, result) {
+          if (e) {
+            e.href = path;
+            callback(e);
+          } else {
+            result.css = postProcessCSS(result.css);
+            cache.setCSS(sheet.href, webInfo.lastModified, instanceOptions.modifyVars, result.css);
+            callback(null, result.css, data, sheet, webInfo, path);
+          }
+        });
+      }
+
+      fileManager.loadFile(sheet.href, null, instanceOptions, environment, function(e, loadedFile) {
+        if (e) {
+          callback(e);
+          return;
+        }
+        loadInitialFileCallback(loadedFile);
+      });
+    }
+
+    function loadStyleSheets(callback, reload, modifyVars) {
+      for (var i = 0; i < less.sheets.length; i++) {
+        loadStyleSheet(less.sheets[i], callback, reload, less.sheets.length - (i + 1), modifyVars);
+      }
+    }
+
+    function initRunningMode() {
+      if (less.env === 'development') {
+        less.watchTimer = setInterval(function () {
+          if (less.watchMode) {
+            fileManager.clearFileCache();
+            loadStyleSheets(function (e, css, _, sheet, webInfo) {
+              if (e) {
+                errors.add(e, e.href || sheet.href);
+              } else if (css) {
+                browser.createCSS(window.document, css, sheet);
+              }
+            });
+          }
+        }, options.poll);
+      }
+    }
+
+    //
+    // Watch mode
+    //
+    less.watch   = function () {
+      if (!less.watchMode ) {
+        less.env = 'development';
+        initRunningMode();
+      }
+      this.watchMode = true;
+      return true;
+    };
+
+    less.unwatch = function () {clearInterval(less.watchTimer); this.watchMode = false; return false; };
+
+    //
+    // Synchronously get all <link> tags with the 'rel' attribute set to
+    // "stylesheet/less".
+    //
+    less.registerStylesheetsImmediately = function() {
+      var links = document.getElementsByTagName('link');
+      less.sheets = [];
+
+      for (var i = 0; i < links.length; i++) {
+        if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
+            (links[i].type.match(typePattern)))) {
+          less.sheets.push(links[i]);
+        }
+      }
+    };
+
+    //
+    // Asynchronously get all <link> tags with the 'rel' attribute set to
+    // "stylesheet/less", returning a Promise.
+    //
+    less.registerStylesheets = function() {
+      return new Promise(function(resolve, reject) {
+        less.registerStylesheetsImmediately();
+        resolve();
+      });
+    };
+
+    //
+    // With this function, it's possible to alter variables and re-render
+    // CSS without reloading less-files
+    //
+    less.modifyVars = function(record) {
+      return less.refresh(true, record, false);
+    };
+
+    less.refresh = function (reload, modifyVars, clearFileCache) {
+      if ((reload || clearFileCache) && clearFileCache !== false) {
+        fileManager.clearFileCache();
+      }
+      return new Promise(function (resolve, reject) {
+        var startTime, endTime, totalMilliseconds, remainingSheets;
+        startTime = endTime = new Date();
+
+        // Set counter for remaining unprocessed sheets
+        remainingSheets = less.sheets.length;
+
+        if (remainingSheets === 0) {
+
+          endTime = new Date();
+          totalMilliseconds = endTime - startTime;
+          less.logger.info("Less has finished and no sheets were loaded.");
+          resolve({
+            startTime: startTime,
+            endTime: endTime,
+            totalMilliseconds: totalMilliseconds,
+            sheets: less.sheets.length
+          });
+
+        } else {
+          // Relies on less.sheets array, callback seems to be guaranteed to be called for every element of the array
+          loadStyleSheets(function (e, css, _, sheet, webInfo) {
+            if (e) {
+              errors.add(e, e.href || sheet.href);
+              reject(e);
+              return;
+            }
+            if (webInfo.local) {
+              less.logger.info("Loading " + sheet.href + " from cache.");
+            } else {
+              less.logger.info("Rendered " + sheet.href + " successfully.");
+            }
+            browser.createCSS(window.document, css, sheet);
+            less.logger.info("CSS for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms');
+
+            // Count completed sheet
+            remainingSheets--;
+
+            // Check if the last remaining sheet was processed and then call the promise
+            if (remainingSheets === 0) {
+              totalMilliseconds = new Date() - startTime;
+              less.logger.info("Less has finished. CSS generated in " + totalMilliseconds + 'ms');
+              resolve({
+                startTime: startTime,
+                endTime: endTime,
+                totalMilliseconds: totalMilliseconds,
+                sheets: less.sheets.length
+              });
+            }
+            endTime = new Date();
+          }, reload, modifyVars);
+        }
+
+        loadStyles(modifyVars);
+      });
+    };
+
+    less.refreshStyles = loadStyles;
+    return less;
+  };
+
+},{"../less":31,"./browser":3,"./cache":4,"./error-reporting":5,"./file-manager":6,"./image-size":7,"./log-listener":9,"./utils":10}],9:[function(require,module,exports){
+  module.exports = function(less, options) {
+
+    var logLevel_debug = 4,
+      logLevel_info = 3,
+      logLevel_warn = 2,
+      logLevel_error = 1;
+
+    // The amount of logging in the javascript console.
+    // 3 - Debug, information and errors
+    // 2 - Information and errors
+    // 1 - Errors
+    // 0 - None
+    // Defaults to 2
+    options.logLevel = typeof options.logLevel !== 'undefined' ? options.logLevel : (options.env === 'development' ?  logLevel_info : logLevel_error);
+
+    if (!options.loggers) {
+      options.loggers = [{
+        debug: function(msg) {
+          if (options.logLevel >= logLevel_debug) {
+            console.log(msg);
+          }
+        },
+        info: function(msg) {
+          if (options.logLevel >= logLevel_info) {
+            console.log(msg);
+          }
+        },
+        warn: function(msg) {
+          if (options.logLevel >= logLevel_warn) {
+            console.warn(msg);
+          }
+        },
+        error: function(msg) {
+          if (options.logLevel >= logLevel_error) {
+            console.error(msg);
+          }
+        }
+      }];
+    }
+    for (var i = 0; i < options.loggers.length; i++) {
+      less.logger.addListener(options.loggers[i]);
+    }
+  };
+
+},{}],10:[function(require,module,exports){
+  module.exports = {
+    extractId: function(href) {
+      return href.replace(/^[a-z-]+:\/+?[^\/]+/, '')  // Remove protocol & domain
+        .replace(/[\?\&]livereload=\w+/, '')        // Remove LiveReload cachebuster
+        .replace(/^\//, '')                         // Remove root /
+        .replace(/\.[a-zA-Z]+$/, '')                // Remove simple extension
+        .replace(/[^\.\w-]+/g, '-')                 // Replace illegal characters
+        .replace(/\./g, ':');                       // Replace dots with colons(for valid id)
+    },
+    addDataAttr: function(options, tag) {
+      for (var opt in tag.dataset) {
+        if (tag.dataset.hasOwnProperty(opt)) {
+          if (opt === "env" || opt === "dumpLineNumbers" || opt === "rootpath" || opt === "errorReporting") {
+            options[opt] = tag.dataset[opt];
+          } else {
+            try {
+              options[opt] = JSON.parse(tag.dataset[opt]);
+            }
+            catch(_) {}
+          }
+        }
+      }
+    }
+  };
+
+},{}],11:[function(require,module,exports){
+  var contexts = {};
+  module.exports = contexts;
+
+  var copyFromOriginal = function copyFromOriginal(original, destination, propertiesToCopy) {
+    if (!original) { return; }
+
+    for (var i = 0; i < propertiesToCopy.length; i++) {
+      if (original.hasOwnProperty(propertiesToCopy[i])) {
+        destination[propertiesToCopy[i]] = original[propertiesToCopy[i]];
+      }
+    }
+  };
+
+  /*
+ parse is used whilst parsing
+ */
+  var parseCopyProperties = [
+    // options
+    'paths',            // option - unmodified - paths to search for imports on
+    'relativeUrls',     // option - whether to adjust URL's to be relative
+    'rootpath',         // option - rootpath to append to URL's
+    'strictImports',    // option -
+    'insecure',         // option - whether to allow imports from insecure ssl hosts
+    'dumpLineNumbers',  // option - whether to dump line numbers
+    'compress',         // option - whether to compress
+    'syncImport',       // option - whether to import synchronously
+    'chunkInput',       // option - whether to chunk input. more performant but causes parse issues.
+    'mime',             // browser only - mime type for sheet import
+    'useFileCache',     // browser only - whether to use the per file session cache
+    // context
+    'processImports',   // option & context - whether to process imports. if false then imports will not be imported.
+                        // Used by the import manager to stop multiple import visitors being created.
+    'pluginManager'     // Used as the plugin manager for the session
+  ];
+
+  contexts.Parse = function(options) {
+    copyFromOriginal(options, this, parseCopyProperties);
+
+    if (typeof this.paths === "string") { this.paths = [this.paths]; }
+  };
+
+  var evalCopyProperties = [
+    'paths',          // additional include paths
+    'compress',       // whether to compress
+    'ieCompat',       // whether to enforce IE compatibility (IE8 data-uri)
+    'strictMath',     // whether math has to be within parenthesis
+    'strictUnits',    // whether units need to evaluate correctly
+    'sourceMap',      // whether to output a source map
+    'importMultiple', // whether we are currently importing multiple copies
+    'urlArgs',        // whether to add args into url tokens
+    'javascriptEnabled',// option - whether JavaScript is enabled. if undefined, defaults to true
+    'pluginManager',  // Used as the plugin manager for the session
+    'importantScope'  // used to bubble up !important statements
+  ];
+
+  contexts.Eval = function(options, frames) {
+    copyFromOriginal(options, this, evalCopyProperties);
+
+    if (typeof this.paths === "string") { this.paths = [this.paths]; }
+
+    this.frames = frames || [];
+    this.importantScope = this.importantScope || [];
+  };
+
+  contexts.Eval.prototype.inParenthesis = function () {
+    if (!this.parensStack) {
+      this.parensStack = [];
+    }
+    this.parensStack.push(true);
+  };
+
+  contexts.Eval.prototype.outOfParenthesis = function () {
+    this.parensStack.pop();
+  };
+
+  contexts.Eval.prototype.isMathOn = function () {
+    return this.strictMath ? (this.parensStack && this.parensStack.length) : true;
+  };
+
+  contexts.Eval.prototype.isPathRelative = function (path) {
+    return !/^(?:[a-z-]+:|\/|#)/i.test(path);
+  };
+
+  contexts.Eval.prototype.normalizePath = function( path ) {
+    var
+      segments = path.split("/").reverse(),
+      segment;
+
+    path = [];
+    while (segments.length !== 0 ) {
+      segment = segments.pop();
+      switch( segment ) {
+        case ".":
+          break;
+        case "..":
+          if ((path.length === 0) || (path[path.length - 1] === "..")) {
+            path.push( segment );
+          } else {
+            path.pop();
+          }
+          break;
+        default:
+          path.push( segment );
+          break;
+      }
+    }
+
+    return path.join("/");
+  };
+
+//todo - do the same for the toCSS ?
+
+},{}],12:[function(require,module,exports){
+  module.exports = {
+    'aliceblue':'#f0f8ff',
+    'antiquewhite':'#faebd7',
+    'aqua':'#00ffff',
+    'aquamarine':'#7fffd4',
+    'azure':'#f0ffff',
+    'beige':'#f5f5dc',
+    'bisque':'#ffe4c4',
+    'black':'#000000',
+    'blanchedalmond':'#ffebcd',
+    'blue':'#0000ff',
+    'blueviolet':'#8a2be2',
+    'brown':'#a52a2a',
+    'burlywood':'#deb887',
+    'cadetblue':'#5f9ea0',
+    'chartreuse':'#7fff00',
+    'chocolate':'#d2691e',
+    'coral':'#ff7f50',
+    'cornflowerblue':'#6495ed',
+    'cornsilk':'#fff8dc',
+    'crimson':'#dc143c',
+    'cyan':'#00ffff',
+    'darkblue':'#00008b',
+    'darkcyan':'#008b8b',
+    'darkgoldenrod':'#b8860b',
+    'darkgray':'#a9a9a9',
+    'darkgrey':'#a9a9a9',
+    'darkgreen':'#006400',
+    'darkkhaki':'#bdb76b',
+    'darkmagenta':'#8b008b',
+    'darkolivegreen':'#556b2f',
+    'darkorange':'#ff8c00',
+    'darkorchid':'#9932cc',
+    'darkred':'#8b0000',
+    'darksalmon':'#e9967a',
+    'darkseagreen':'#8fbc8f',
+    'darkslateblue':'#483d8b',
+    'darkslategray':'#2f4f4f',
+    'darkslategrey':'#2f4f4f',
+    'darkturquoise':'#00ced1',
+    'darkviolet':'#9400d3',
+    'deeppink':'#ff1493',
+    'deepskyblue':'#00bfff',
+    'dimgray':'#696969',
+    'dimgrey':'#696969',
+    'dodgerblue':'#1e90ff',
+    'firebrick':'#b22222',
+    'floralwhite':'#fffaf0',
+    'forestgreen':'#228b22',
+    'fuchsia':'#ff00ff',
+    'gainsboro':'#dcdcdc',
+    'ghostwhite':'#f8f8ff',
+    'gold':'#ffd700',
+    'goldenrod':'#daa520',
+    'gray':'#808080',
+    'grey':'#808080',
+    'green':'#008000',
+    'greenyellow':'#adff2f',
+    'honeydew':'#f0fff0',
+    'hotpink':'#ff69b4',
+    'indianred':'#cd5c5c',
+    'indigo':'#4b0082',
+    'ivory':'#fffff0',
+    'khaki':'#f0e68c',
+    'lavender':'#e6e6fa',
+    'lavenderblush':'#fff0f5',
+    'lawngreen':'#7cfc00',
+    'lemonchiffon':'#fffacd',
+    'lightblue':'#add8e6',
+    'lightcoral':'#f08080',
+    'lightcyan':'#e0ffff',
+    'lightgoldenrodyellow':'#fafad2',
+    'lightgray':'#d3d3d3',
+    'lightgrey':'#d3d3d3',
+    'lightgreen':'#90ee90',
+    'lightpink':'#ffb6c1',
+    'lightsalmon':'#ffa07a',
+    'lightseagreen':'#20b2aa',
+    'lightskyblue':'#87cefa',
+    'lightslategray':'#778899',
+    'lightslategrey':'#778899',
+    'lightsteelblue':'#b0c4de',
+    'lightyellow':'#ffffe0',
+    'lime':'#00ff00',
+    'limegreen':'#32cd32',
+    'linen':'#faf0e6',
+    'magenta':'#ff00ff',
+    'maroon':'#800000',
+    'mediumaquamarine':'#66cdaa',
+    'mediumblue':'#0000cd',
+    'mediumorchid':'#ba55d3',
+    'mediumpurple':'#9370d8',
+    'mediumseagreen':'#3cb371',
+    'mediumslateblue':'#7b68ee',
+    'mediumspringgreen':'#00fa9a',
+    'mediumturquoise':'#48d1cc',
+    'mediumvioletred':'#c71585',
+    'midnightblue':'#191970',
+    'mintcream':'#f5fffa',
+    'mistyrose':'#ffe4e1',
+    'moccasin':'#ffe4b5',
+    'navajowhite':'#ffdead',
+    'navy':'#000080',
+    'oldlace':'#fdf5e6',
+    'olive':'#808000',
+    'olivedrab':'#6b8e23',
+    'orange':'#ffa500',
+    'orangered':'#ff4500',
+    'orchid':'#da70d6',
+    'palegoldenrod':'#eee8aa',
+    'palegreen':'#98fb98',
+    'paleturquoise':'#afeeee',
+    'palevioletred':'#d87093',
+    'papayawhip':'#ffefd5',
+    'peachpuff':'#ffdab9',
+    'peru':'#cd853f',
+    'pink':'#ffc0cb',
+    'plum':'#dda0dd',
+    'powderblue':'#b0e0e6',
+    'purple':'#800080',
+    'rebeccapurple':'#663399',
+    'red':'#ff0000',
+    'rosybrown':'#bc8f8f',
+    'royalblue':'#4169e1',
+    'saddlebrown':'#8b4513',
+    'salmon':'#fa8072',
+    'sandybrown':'#f4a460',
+    'seagreen':'#2e8b57',
+    'seashell':'#fff5ee',
+    'sienna':'#a0522d',
+    'silver':'#c0c0c0',
+    'skyblue':'#87ceeb',
+    'slateblue':'#6a5acd',
+    'slategray':'#708090',
+    'slategrey':'#708090',
+    'snow':'#fffafa',
+    'springgreen':'#00ff7f',
+    'steelblue':'#4682b4',
+    'tan':'#d2b48c',
+    'teal':'#008080',
+    'thistle':'#d8bfd8',
+    'tomato':'#ff6347',
+    'turquoise':'#40e0d0',
+    'violet':'#ee82ee',
+    'wheat':'#f5deb3',
+    'white':'#ffffff',
+    'whitesmoke':'#f5f5f5',
+    'yellow':'#ffff00',
+    'yellowgreen':'#9acd32'
+  };
+},{}],13:[function(require,module,exports){
+  module.exports = {
+    colors: require("./colors"),
+    unitConversions: require("./unit-conversions")
+  };
+
+},{"./colors":12,"./unit-conversions":14}],14:[function(require,module,exports){
+  module.exports = {
+    length: {
+      'm': 1,
+      'cm': 0.01,
+      'mm': 0.001,
+      'in': 0.0254,
+      'px': 0.0254 / 96,
+      'pt': 0.0254 / 72,
+      'pc': 0.0254 / 72 * 12
+    },
+    duration: {
+      's': 1,
+      'ms': 0.001
+    },
+    angle: {
+      'rad': 1 / (2 * Math.PI),
+      'deg': 1 / 360,
+      'grad': 1 / 400,
+      'turn': 1
+    }
+  };
+},{}],15:[function(require,module,exports){
+  var abstractFileManager = function() {
+  };
+
+  abstractFileManager.prototype.getPath = function (filename) {
+    var j = filename.lastIndexOf('?');
+    if (j > 0) {
+      filename = filename.slice(0, j);
+    }
+    j = filename.lastIndexOf('/');
+    if (j < 0) {
+      j = filename.lastIndexOf('\\');
+    }
+    if (j < 0) {
+      return "";
+    }
+    return filename.slice(0, j + 1);
+  };
+
+  abstractFileManager.prototype.tryAppendExtension = function(path, ext) {
+    return /(\.[a-z]*$)|([\?;].*)$/.test(path) ? path : path + ext;
+  };
+
+  abstractFileManager.prototype.tryAppendLessExtension = function(path) {
+    return this.tryAppendExtension(path, '.less');
+  };
+
+  abstractFileManager.prototype.supportsSync = function() {
+    return false;
+  };
+
+  abstractFileManager.prototype.alwaysMakePathsAbsolute = function() {
+    return false;
+  };
+
+  abstractFileManager.prototype.isPathAbsolute = function(filename) {
+    return (/^(?:[a-z-]+:|\/|\\|#)/i).test(filename);
+  };
+
+  abstractFileManager.prototype.join = function(basePath, laterPath) {
+    if (!basePath) {
+      return laterPath;
+    }
+    return basePath + laterPath;
+  };
+  abstractFileManager.prototype.pathDiff = function pathDiff(url, baseUrl) {
+    // diff between two paths to create a relative path
+
+    var urlParts = this.extractUrlParts(url),
+      baseUrlParts = this.extractUrlParts(baseUrl),
+      i, max, urlDirectories, baseUrlDirectories, diff = "";
+    if (urlParts.hostPart !== baseUrlParts.hostPart) {
+      return "";
+    }
+    max = Math.max(baseUrlParts.directories.length, urlParts.directories.length);
+    for (i = 0; i < max; i++) {
+      if (baseUrlParts.directories[i] !== urlParts.directories[i]) { break; }
+    }
+    baseUrlDirectories = baseUrlParts.directories.slice(i);
+    urlDirectories = urlParts.directories.slice(i);
+    for (i = 0; i < baseUrlDirectories.length - 1; i++) {
+      diff += "../";
+    }
+    for (i = 0; i < urlDirectories.length - 1; i++) {
+      diff += urlDirectories[i] + "/";
+    }
+    return diff;
+  };
+// helper function, not part of API
+  abstractFileManager.prototype.extractUrlParts = function extractUrlParts(url, baseUrl) {
+    // urlParts[1] = protocol://hostname/ OR /
+    // urlParts[2] = / if path relative to host base
+    // urlParts[3] = directories
+    // urlParts[4] = filename
+    // urlParts[5] = parameters
+
+    var urlPartsRegex = /^((?:[a-z-]+:)?\/{2}(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/i,
+      urlParts = url.match(urlPartsRegex),
+      returner = {}, directories = [], i, baseUrlParts;
+
+    if (!urlParts) {
+      throw new Error("Could not parse sheet href - '" + url + "'");
+    }
+
+    // Stylesheets in IE don't always return the full path
+    if (baseUrl && (!urlParts[1] || urlParts[2])) {
+      baseUrlParts = baseUrl.match(urlPartsRegex);
+      if (!baseUrlParts) {
+        throw new Error("Could not parse page url - '" + baseUrl + "'");
+      }
+      urlParts[1] = urlParts[1] || baseUrlParts[1] || "";
+      if (!urlParts[2]) {
+        urlParts[3] = baseUrlParts[3] + urlParts[3];
+      }
+    }
+
+    if (urlParts[3]) {
+      directories = urlParts[3].replace(/\\/g, "/").split("/");
+
+      // extract out . before .. so .. doesn't absorb a non-directory
+      for (i = 0; i < directories.length; i++) {
+        if (directories[i] === ".") {
+          directories.splice(i, 1);
+          i -= 1;
+        }
+      }
+
+      for (i = 0; i < directories.length; i++) {
+        if (directories[i] === ".." && i > 0) {
+          directories.splice(i - 1, 2);
+          i -= 2;
+        }
+      }
+    }
+
+    returner.hostPart = urlParts[1];
+    returner.directories = directories;
+    returner.path = (urlParts[1] || "") + directories.join("/");
+    returner.fileUrl = returner.path + (urlParts[4] || "");
+    returner.url = returner.fileUrl + (urlParts[5] || "");
+    return returner;
+  };
+
+  module.exports = abstractFileManager;
+
+},{}],16:[function(require,module,exports){
+  var logger = require("../logger");
+  var environment = function(externalEnvironment, fileManagers) {
+    this.fileManagers = fileManagers || [];
+    externalEnvironment = externalEnvironment || {};
+
+    var optionalFunctions = ["encodeBase64", "mimeLookup", "charsetLookup", "getSourceMapGenerator"],
+      requiredFunctions = [],
+      functions = requiredFunctions.concat(optionalFunctions);
+
+    for (var i = 0; i < functions.length; i++) {
+      var propName = functions[i],
+        environmentFunc = externalEnvironment[propName];
+      if (environmentFunc) {
+        this[propName] = environmentFunc.bind(externalEnvironment);
+      } else if (i < requiredFunctions.length) {
+        this.warn("missing required function in environment - " + propName);
+      }
+    }
+  };
+
+  environment.prototype.getFileManager = function (filename, currentDirectory, options, environment, isSync) {
+
+    if (!filename) {
+      logger.warn("getFileManager called with no filename.. Please report this issue. continuing.");
+    }
+    if (currentDirectory == null) {
+      logger.warn("getFileManager called with null directory.. Please report this issue. continuing.");
+    }
+
+    var fileManagers = this.fileManagers;
+    if (options.pluginManager) {
+      fileManagers = [].concat(fileManagers).concat(options.pluginManager.getFileManagers());
+    }
+    for (var i = fileManagers.length - 1; i >= 0 ; i--) {
+      var fileManager = fileManagers[i];
+      if (fileManager[isSync ? "supportsSync" : "supports"](filename, currentDirectory, options, environment)) {
+        return fileManager;
+      }
+    }
+    return null;
+  };
+
+  environment.prototype.addFileManager = function (fileManager) {
+    this.fileManagers.push(fileManager);
+  };
+
+  environment.prototype.clearFileManagers = function () {
+    this.fileManagers = [];
+  };
+
+  module.exports = environment;
+
+},{"../logger":33}],17:[function(require,module,exports){
+  var Color = require("../tree/color"),
+    functionRegistry = require("./function-registry");
+
+// Color Blending
+// ref: http://www.w3.org/TR/compositing-1
+
+  function colorBlend(mode, color1, color2) {
+    var ab = color1.alpha, cb, // backdrop
+      as = color2.alpha, cs, // source
+      ar, cr, r = [];        // result
+
+    ar = as + ab * (1 - as);
+    for (var i = 0; i < 3; i++) {
+      cb = color1.rgb[i] / 255;
+      cs = color2.rgb[i] / 255;
+      cr = mode(cb, cs);
+      if (ar) {
+        cr = (as * cs + ab * (cb -
+          as * (cb + cs - cr))) / ar;
+      }
+      r[i] = cr * 255;
+    }
+
+    return new Color(r, ar);
+  }
+
+  var colorBlendModeFunctions = {
+    multiply: function(cb, cs) {
+      return cb * cs;
+    },
+    screen: function(cb, cs) {
+      return cb + cs - cb * cs;
+    },
+    overlay: function(cb, cs) {
+      cb *= 2;
+      return (cb <= 1) ?
+        colorBlendModeFunctions.multiply(cb, cs) :
+        colorBlendModeFunctions.screen(cb - 1, cs);
+    },
+    softlight: function(cb, cs) {
+      var d = 1, e = cb;
+      if (cs > 0.5) {
+        e = 1;
+        d = (cb > 0.25) ? Math.sqrt(cb)
+          : ((16 * cb - 12) * cb + 4) * cb;
+      }
+      return cb - (1 - 2 * cs) * e * (d - cb);
+    },
+    hardlight: function(cb, cs) {
+      return colorBlendModeFunctions.overlay(cs, cb);
+    },
+    difference: function(cb, cs) {
+      return Math.abs(cb - cs);
+    },
+    exclusion: function(cb, cs) {
+      return cb + cs - 2 * cb * cs;
+    },
+
+    // non-w3c functions:
+    average: function(cb, cs) {
+      return (cb + cs) / 2;
+    },
+    negation: function(cb, cs) {
+      return 1 - Math.abs(cb + cs - 1);
+    }
+  };
+
+  for (var f in colorBlendModeFunctions) {
+    if (colorBlendModeFunctions.hasOwnProperty(f)) {
+      colorBlend[f] = colorBlend.bind(null, colorBlendModeFunctions[f]);
+    }
+  }
+
+  functionRegistry.addMultiple(colorBlend);
+
+},{"../tree/color":50,"./function-registry":22}],18:[function(require,module,exports){
+  var Dimension = require("../tree/dimension"),
+    Color = require("../tree/color"),
+    Quoted = require("../tree/quoted"),
+    Anonymous = require("../tree/anonymous"),
+    functionRegistry = require("./function-registry"),
+    colorFunctions;
+
+  function clamp(val) {
+    return Math.min(1, Math.max(0, val));
+  }
+  function hsla(color) {
+    return colorFunctions.hsla(color.h, color.s, color.l, color.a);
+  }
+  function number(n) {
+    if (n instanceof Dimension) {
+      return parseFloat(n.unit.is('%') ? n.value / 100 : n.value);
+    } else if (typeof n === 'number') {
+      return n;
+    } else {
+      throw {
+        type: "Argument",
+        message: "color functions take numbers as parameters"
+      };
+    }
+  }
+  function scaled(n, size) {
+    if (n instanceof Dimension && n.unit.is('%')) {
+      return parseFloat(n.value * size / 100);
+    } else {
+      return number(n);
+    }
+  }
+  colorFunctions = {
+    rgb: function (r, g, b) {
+      return colorFunctions.rgba(r, g, b, 1.0);
+    },
+    rgba: function (r, g, b, a) {
+      var rgb = [r, g, b].map(function (c) { return scaled(c, 255); });
+      a = number(a);
+      return new Color(rgb, a);
+    },
+    hsl: function (h, s, l) {
+      return colorFunctions.hsla(h, s, l, 1.0);
+    },
+    hsla: function (h, s, l, a) {
+
+      var m1, m2;
+
+      function hue(h) {
+        h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
+        if (h * 6 < 1) {
+          return m1 + (m2 - m1) * h * 6;
+        }
+        else if (h * 2 < 1) {
+          return m2;
+        }
+        else if (h * 3 < 2) {
+          return m1 + (m2 - m1) * (2 / 3 - h) * 6;
+        }
+        else {
+          return m1;
+        }
+      }
+
+      h = (number(h) % 360) / 360;
+      s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
+
+      m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
+      m1 = l * 2 - m2;
+
+      return colorFunctions.rgba(hue(h + 1 / 3) * 255,
+        hue(h)       * 255,
+        hue(h - 1 / 3) * 255,
+        a);
+    },
+
+    hsv: function(h, s, v) {
+      return colorFunctions.hsva(h, s, v, 1.0);
+    },
+
+    hsva: function(h, s, v, a) {
+      h = ((number(h) % 360) / 360) * 360;
+      s = number(s); v = number(v); a = number(a);
+
+      var i, f;
+      i = Math.floor((h / 60) % 6);
+      f = (h / 60) - i;
+
+      var vs = [v,
+        v * (1 - s),
+        v * (1 - f * s),
+        v * (1 - (1 - f) * s)];
+      var perm = [[0, 3, 1],
+        [2, 0, 1],
+        [1, 0, 3],
+        [1, 2, 0],
+        [3, 1, 0],
+        [0, 1, 2]];
+
+      return colorFunctions.rgba(vs[perm[i][0]] * 255,
+        vs[perm[i][1]] * 255,
+        vs[perm[i][2]] * 255,
+        a);
+    },
+
+    hue: function (color) {
+      return new Dimension(color.toHSL().h);
+    },
+    saturation: function (color) {
+      return new Dimension(color.toHSL().s * 100, '%');
+    },
+    lightness: function (color) {
+      return new Dimension(color.toHSL().l * 100, '%');
+    },
+    hsvhue: function(color) {
+      return new Dimension(color.toHSV().h);
+    },
+    hsvsaturation: function (color) {
+      return new Dimension(color.toHSV().s * 100, '%');
+    },
+    hsvvalue: function (color) {
+      return new Dimension(color.toHSV().v * 100, '%');
+    },
+    red: function (color) {
+      return new Dimension(color.rgb[0]);
+    },
+    green: function (color) {
+      return new Dimension(color.rgb[1]);
+    },
+    blue: function (color) {
+      return new Dimension(color.rgb[2]);
+    },
+    alpha: function (color) {
+      return new Dimension(color.toHSL().a);
+    },
+    luma: function (color) {
+      return new Dimension(color.luma() * color.alpha * 100, '%');
+    },
+    luminance: function (color) {
+      var luminance =
+        (0.2126 * color.rgb[0] / 255) +
+        (0.7152 * color.rgb[1] / 255) +
+        (0.0722 * color.rgb[2] / 255);
+
+      return new Dimension(luminance * color.alpha * 100, '%');
+    },
+    saturate: function (color, amount, method) {
+      // filter: saturate(3.2);
+      // should be kept as is, so check for color
+      if (!color.rgb) {
+        return null;
+      }
+      var hsl = color.toHSL();
+
+      if (typeof method !== "undefined" && method.value === "relative") {
+        hsl.s +=  hsl.s * amount.value / 100;
+      }
+      else {
+        hsl.s += amount.value / 100;
+      }
+      hsl.s = clamp(hsl.s);
+      return hsla(hsl);
+    },
+    desaturate: function (color, amount, method) {
+      var hsl = color.toHSL();
+
+      if (typeof method !== "undefined" && method.value === "relative") {
+        hsl.s -=  hsl.s * amount.value / 100;
+      }
+      else {
+        hsl.s -= amount.value / 100;
+      }
+      hsl.s = clamp(hsl.s);
+      return hsla(hsl);
+    },
+    lighten: function (color, amount, method) {
+      var hsl = color.toHSL();
+
+      if (typeof method !== "undefined" && method.value === "relative") {
+        hsl.l +=  hsl.l * amount.value / 100;
+      }
+      else {
+        hsl.l += amount.value / 100;
+      }
+      hsl.l = clamp(hsl.l);
+      return hsla(hsl);
+    },
+    darken: function (color, amount, method) {
+      var hsl = color.toHSL();
+
+      if (typeof method !== "undefined" && method.value === "relative") {
+        hsl.l -=  hsl.l * amount.value / 100;
+      }
+      else {
+        hsl.l -= amount.value / 100;
+      }
+      hsl.l = clamp(hsl.l);
+      return hsla(hsl);
+    },
+    fadein: function (color, amount, method) {
+      var hsl = color.toHSL();
+
+      if (typeof method !== "undefined" && method.value === "relative") {
+        hsl.a +=  hsl.a * amount.value / 100;
+      }
+      else {
+        hsl.a += amount.value / 100;
+      }
+      hsl.a = clamp(hsl.a);
+      return hsla(hsl);
+    },
+    fadeout: function (color, amount, method) {
+      var hsl = color.toHSL();
+
+      if (typeof method !== "undefined" && method.value === "relative") {
+        hsl.a -=  hsl.a * amount.value / 100;
+      }
+      else {
+        hsl.a -= amount.value / 100;
+      }
+      hsl.a = clamp(hsl.a);
+      return hsla(hsl);
+    },
+    fade: function (color, amount) {
+      var hsl = color.toHSL();
+
+      hsl.a = amount.value / 100;
+      hsl.a = clamp(hsl.a);
+      return hsla(hsl);
+    },
+    spin: function (color, amount) {
+      var hsl = color.toHSL();
+      var hue = (hsl.h + amount.value) % 360;
+
+      hsl.h = hue < 0 ? 360 + hue : hue;
+
+      return hsla(hsl);
+    },
+    //
+    // Copyright (c) 2006-2009 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
+    // http://sass-lang.com
+    //
+    mix: function (color1, color2, weight) {
+      if (!color1.toHSL || !color2.toHSL) {
+        console.log(color2.type);
+        console.dir(color2);
+      }
+      if (!weight) {
+        weight = new Dimension(50);
+      }
+      var p = weight.value / 100.0;
+      var w = p * 2 - 1;
+      var a = color1.toHSL().a - color2.toHSL().a;
+
+      var w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
+      var w2 = 1 - w1;
+
+      var rgb = [color1.rgb[0] * w1 + color2.rgb[0] * w2,
+        color1.rgb[1] * w1 + color2.rgb[1] * w2,
+        color1.rgb[2] * w1 + color2.rgb[2] * w2];
+
+      var alpha = color1.alpha * p + color2.alpha * (1 - p);
+
+      return new Color(rgb, alpha);
+    },
+    greyscale: function (color) {
+      return colorFunctions.desaturate(color, new Dimension(100));
+    },
+    contrast: function (color, dark, light, threshold) {
+      // filter: contrast(3.2);
+      // should be kept as is, so check for color
+      if (!color.rgb) {
+        return null;
+      }
+      if (typeof light === 'undefined') {
+        light = colorFunctions.rgba(255, 255, 255, 1.0);
+      }
+      if (typeof dark === 'undefined') {
+        dark = colorFunctions.rgba(0, 0, 0, 1.0);
+      }
+      //Figure out which is actually light and dark!
+      if (dark.luma() > light.luma()) {
+        var t = light;
+        light = dark;
+        dark = t;
+      }
+      if (typeof threshold === 'undefined') {
+        threshold = 0.43;
+      } else {
+        threshold = number(threshold);
+      }
+      if (color.luma() < threshold) {
+        return light;
+      } else {
+        return dark;
+      }
+    },
+    argb: function (color) {
+      return new Anonymous(color.toARGB());
+    },
+    color: function(c) {
+      if ((c instanceof Quoted) &&
+        (/^#([a-f0-9]{6}|[a-f0-9]{3})$/i.test(c.value))) {
+        return new Color(c.value.slice(1));
+      }
+      if ((c instanceof Color) || (c = Color.fromKeyword(c.value))) {
+        c.value = undefined;
+        return c;
+      }
+      throw {
+        type:    "Argument",
+        message: "argument must be a color keyword or 3/6 digit hex e.g. #FFF"
+      };
+    },
+    tint: function(color, amount) {
+      return colorFunctions.mix(colorFunctions.rgb(255, 255, 255), color, amount);
+    },
+    shade: function(color, amount) {
+      return colorFunctions.mix(colorFunctions.rgb(0, 0, 0), color, amount);
+    }
+  };
+  functionRegistry.addMultiple(colorFunctions);
+
+},{"../tree/anonymous":46,"../tree/color":50,"../tree/dimension":56,"../tree/quoted":73,"./function-registry":22}],19:[function(require,module,exports){
+  module.exports = function(environment) {
+    var Quoted = require("../tree/quoted"),
+      URL = require("../tree/url"),
+      functionRegistry = require("./function-registry"),
+      fallback = function(functionThis, node) {
+        return new URL(node, functionThis.index, functionThis.currentFileInfo).eval(functionThis.context);
+      },
+      logger = require('../logger');
+
+    functionRegistry.add("data-uri", function(mimetypeNode, filePathNode) {
+
+      if (!filePathNode) {
+        filePathNode = mimetypeNode;
+        mimetypeNode = null;
+      }
+
+      var mimetype = mimetypeNode && mimetypeNode.value;
+      var filePath = filePathNode.value;
+      var currentFileInfo = this.currentFileInfo;
+      var currentDirectory = currentFileInfo.relativeUrls ?
+        currentFileInfo.currentDirectory : currentFileInfo.entryPath;
+
+      var fragmentStart = filePath.indexOf('#');
+      var fragment = '';
+      if (fragmentStart !== -1) {
+        fragment = filePath.slice(fragmentStart);
+        filePath = filePath.slice(0, fragmentStart);
+      }
+
+      var fileManager = environment.getFileManager(filePath, currentDirectory, this.context, environment, true);
+
+      if (!fileManager) {
+        return fallback(this, filePathNode);
+      }
+
+      var useBase64 = false;
+
+      // detect the mimetype if not given
+      if (!mimetypeNode) {
+
+        mimetype = environment.mimeLookup(filePath);
+
+        if (mimetype === "image/svg+xml") {
+          useBase64 = false;
+        } else {
+          // use base 64 unless it's an ASCII or UTF-8 format
+          var charset = environment.charsetLookup(mimetype);
+          useBase64 = ['US-ASCII', 'UTF-8'].indexOf(charset) < 0;
+        }
+        if (useBase64) { mimetype += ';base64'; }
+      }
+      else {
+        useBase64 = /;base64$/.test(mimetype);
+      }
+
+      var fileSync = fileManager.loadFileSync(filePath, currentDirectory, this.context, environment);
+      if (!fileSync.contents) {
+        logger.warn("Skipped data-uri embedding of " + filePath + " because file not found");
+        return fallback(this, filePathNode || mimetypeNode);
+      }
+      var buf = fileSync.contents;
+      if (useBase64 && !environment.encodeBase64) {
+        return fallback(this, filePathNode);
+      }
+
+      buf = useBase64 ? environment.encodeBase64(buf) : encodeURIComponent(buf);
+
+      var uri = "data:" + mimetype + ',' + buf + fragment;
+
+      // IE8 cannot handle a data-uri larger than 32,768 characters. If this is exceeded
+      // and the --ieCompat flag is enabled, return a normal url() instead.
+      var DATA_URI_MAX = 32768;
+      if (uri.length >= DATA_URI_MAX) {
+
+        if (this.context.ieCompat !== false) {
+          logger.warn("Skipped data-uri embedding of " + filePath + " because its size (" + uri.length +
+            " characters) exceeds IE8-safe " + DATA_URI_MAX + " characters!");
+
+          return fallback(this, filePathNode || mimetypeNode);
+        }
+      }
+
+      return new URL(new Quoted('"' + uri + '"', uri, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
+    });
+  };
+
+},{"../logger":33,"../tree/quoted":73,"../tree/url":80,"./function-registry":22}],20:[function(require,module,exports){
+  var Keyword = require("../tree/keyword"),
+    functionRegistry = require("./function-registry");
+
+  var defaultFunc = {
+    eval: function () {
+      var v = this.value_, e = this.error_;
+      if (e) {
+        throw e;
+      }
+      if (v != null) {
+        return v ? Keyword.True : Keyword.False;
+      }
+    },
+    value: function (v) {
+      this.value_ = v;
+    },
+    error: function (e) {
+      this.error_ = e;
+    },
+    reset: function () {
+      this.value_ = this.error_ = null;
+    }
+  };
+
+  functionRegistry.add("default", defaultFunc.eval.bind(defaultFunc));
+
+  module.exports = defaultFunc;
+
+},{"../tree/keyword":65,"./function-registry":22}],21:[function(require,module,exports){
+  var Expression = require("../tree/expression");
+
+  var functionCaller = function(name, context, index, currentFileInfo) {
+    this.name = name.toLowerCase();
+    this.index = index;
+    this.context = context;
+    this.currentFileInfo = currentFileInfo;
+
+    this.func = context.frames[0].functionRegistry.get(this.name);
+  };
+  functionCaller.prototype.isValid = function() {
+    return Boolean(this.func);
+  };
+  functionCaller.prototype.call = function(args) {
+
+    // This code is terrible and should be replaced as per this issue...
+    // https://github.com/less/less.js/issues/2477
+    if (Array.isArray(args)) {
+      args = args.filter(function (item) {
+        if (item.type === "Comment") {
+          return false;
+        }
+        return true;
+      })
+        .map(function(item) {
+          if (item.type === "Expression") {
+            var subNodes = item.value.filter(function (item) {
+              if (item.type === "Comment") {
+                return false;
+              }
+              return true;
+            });
+            if (subNodes.length === 1) {
+              return subNodes[0];
+            } else {
+              return new Expression(subNodes);
+            }
+          }
+          return item;
+        });
+    }
+
+    return this.func.apply(this, args);
+  };
+
+  module.exports = functionCaller;
+
+},{"../tree/expression":59}],22:[function(require,module,exports){
+  function makeRegistry( base ) {
+    return {
+      _data: {},
+      add: function(name, func) {
+        // precautionary case conversion, as later querying of
+        // the registry by function-caller uses lower case as well.
+        name = name.toLowerCase();
+
+        if (this._data.hasOwnProperty(name)) {
+          //TODO warn
+        }
+        this._data[name] = func;
+      },
+      addMultiple: function(functions) {
+        Object.keys(functions).forEach(
+          function(name) {
+            this.add(name, functions[name]);
+          }.bind(this));
+      },
+      get: function(name) {
+        return this._data[name] || ( base && base.get( name ));
+      },
+      inherit : function() {
+        return makeRegistry( this );
+      }
+    };
+  }
+
+  module.exports = makeRegistry( null );
+},{}],23:[function(require,module,exports){
+  module.exports = function(environment) {
+    var functions = {
+      functionRegistry: require("./function-registry"),
+      functionCaller: require("./function-caller")
+    };
+
+    //register functions
+    require("./default");
+    require("./color");
+    require("./color-blending");
+    require("./data-uri")(environment);
+    require("./math");
+    require("./number");
+    require("./string");
+    require("./svg")(environment);
+    require("./types");
+
+    return functions;
+  };
+
+},{"./color":18,"./color-blending":17,"./data-uri":19,"./default":20,"./function-caller":21,"./function-registry":22,"./math":25,"./number":26,"./string":27,"./svg":28,"./types":29}],24:[function(require,module,exports){
+  var Dimension = require("../tree/dimension");
+
+  var MathHelper = function() {
+  };
+  MathHelper._math = function (fn, unit, n) {
+    if (!(n instanceof Dimension)) {
+      throw { type: "Argument", message: "argument must be a number" };
+    }
+    if (unit == null) {
+      unit = n.unit;
+    } else {
+      n = n.unify();
+    }
+    return new Dimension(fn(parseFloat(n.value)), unit);
+  };
+  module.exports = MathHelper;
+},{"../tree/dimension":56}],25:[function(require,module,exports){
+  var functionRegistry = require("./function-registry"),
+    mathHelper = require("./math-helper.js");
+
+  var mathFunctions = {
+    // name,  unit
+    ceil:  null,
+    floor: null,
+    sqrt:  null,
+    abs:   null,
+    tan:   "",
+    sin:   "",
+    cos:   "",
+    atan:  "rad",
+    asin:  "rad",
+    acos:  "rad"
+  };
+
+  for (var f in mathFunctions) {
+    if (mathFunctions.hasOwnProperty(f)) {
+      mathFunctions[f] = mathHelper._math.bind(null, Math[f], mathFunctions[f]);
+    }
+  }
+
+  mathFunctions.round = function (n, f) {
+    var fraction = typeof f === "undefined" ? 0 : f.value;
+    return mathHelper._math(function(num) { return num.toFixed(fraction); }, null, n);
+  };
+
+  functionRegistry.addMultiple(mathFunctions);
+
+},{"./function-registry":22,"./math-helper.js":24}],26:[function(require,module,exports){
+  var Dimension = require("../tree/dimension"),
+    Anonymous = require("../tree/anonymous"),
+    functionRegistry = require("./function-registry"),
+    mathHelper = require("./math-helper.js");
+
+  var minMax = function (isMin, args) {
+    args = Array.prototype.slice.call(args);
+    switch(args.length) {
+      case 0: throw { type: "Argument", message: "one or more arguments required" };
+    }
+    var i, j, current, currentUnified, referenceUnified, unit, unitStatic, unitClone,
+      order  = [], // elems only contains original argument values.
+      values = {}; // key is the unit.toString() for unified Dimension values,
+    // value is the index into the order array.
+    for (i = 0; i < args.length; i++) {
+      current = args[i];
+      if (!(current instanceof Dimension)) {
+        if (Array.isArray(args[i].value)) {
+          Array.prototype.push.apply(args, Array.prototype.slice.call(args[i].value));
+        }
+        continue;
+      }
+      currentUnified = current.unit.toString() === "" && unitClone !== undefined ? new Dimension(current.value, unitClone).unify() : current.unify();
+      unit = currentUnified.unit.toString() === "" && unitStatic !== undefined ? unitStatic : currentUnified.unit.toString();
+      unitStatic = unit !== "" && unitStatic === undefined || unit !== "" && order[0].unify().unit.toString() === "" ? unit : unitStatic;
+      unitClone = unit !== "" && unitClone === undefined ? current.unit.toString() : unitClone;
+      j = values[""] !== undefined && unit !== "" && unit === unitStatic ? values[""] : values[unit];
+      if (j === undefined) {
+        if (unitStatic !== undefined && unit !== unitStatic) {
+          throw{ type: "Argument", message: "incompatible types" };
+        }
+        values[unit] = order.length;
+        order.push(current);
+        continue;
+      }
+      referenceUnified = order[j].unit.toString() === "" && unitClone !== undefined ? new Dimension(order[j].value, unitClone).unify() : order[j].unify();
+      if ( isMin && currentUnified.value < referenceUnified.value ||
+        !isMin && currentUnified.value > referenceUnified.value) {
+        order[j] = current;
+      }
+    }
+    if (order.length == 1) {
+      return order[0];
+    }
+    args = order.map(function (a) { return a.toCSS(this.context); }).join(this.context.compress ? "," : ", ");
+    return new Anonymous((isMin ? "min" : "max") + "(" + args + ")");
+  };
+  functionRegistry.addMultiple({
+    min: function () {
+      return minMax(true, arguments);
+    },
+    max: function () {
+      return minMax(false, arguments);
+    },
+    convert: function (val, unit) {
+      return val.convertTo(unit.value);
+    },
+    pi: function () {
+      return new Dimension(Math.PI);
+    },
+    mod: function(a, b) {
+      return new Dimension(a.value % b.value, a.unit);
+    },
+    pow: function(x, y) {
+      if (typeof x === "number" && typeof y === "number") {
+        x = new Dimension(x);
+        y = new Dimension(y);
+      } else if (!(x instanceof Dimension) || !(y instanceof Dimension)) {
+        throw { type: "Argument", message: "arguments must be numbers" };
+      }
+
+      return new Dimension(Math.pow(x.value, y.value), x.unit);
+    },
+    percentage: function (n) {
+      var result = mathHelper._math(function(num) {
+        return num * 100;
+      }, '%', n);
+
+      return result;
+    }
+  });
+
+},{"../tree/anonymous":46,"../tree/dimension":56,"./function-registry":22,"./math-helper.js":24}],27:[function(require,module,exports){
+  var Quoted = require("../tree/quoted"),
+    Anonymous = require("../tree/anonymous"),
+    JavaScript = require("../tree/javascript"),
+    functionRegistry = require("./function-registry");
+
+  functionRegistry.addMultiple({
+    e: function (str) {
+      return new Anonymous(str instanceof JavaScript ? str.evaluated : str.value);
+    },
+    escape: function (str) {
+      return new Anonymous(
+        encodeURI(str.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B")
+          .replace(/\(/g, "%28").replace(/\)/g, "%29"));
+    },
+    replace: function (string, pattern, replacement, flags) {
+      var result = string.value;
+      replacement = (replacement.type === "Quoted") ?
+        replacement.value : replacement.toCSS();
+      result = result.replace(new RegExp(pattern.value, flags ? flags.value : ''), replacement);
+      return new Quoted(string.quote || '', result, string.escaped);
+    },
+    '%': function (string /* arg, arg, ...*/) {
+      var args = Array.prototype.slice.call(arguments, 1),
+        result = string.value;
+
+      for (var i = 0; i < args.length; i++) {
+        /*jshint loopfunc:true */
+        result = result.replace(/%[sda]/i, function(token) {
+          var value = ((args[i].type === "Quoted") &&
+            token.match(/s/i)) ? args[i].value : args[i].toCSS();
+          return token.match(/[A-Z]$/) ? encodeURIComponent(value) : value;
+        });
+      }
+      result = result.replace(/%%/g, '%');
+      return new Quoted(string.quote || '', result, string.escaped);
+    }
+  });
+
+},{"../tree/anonymous":46,"../tree/javascript":63,"../tree/quoted":73,"./function-registry":22}],28:[function(require,module,exports){
+  module.exports = function(environment) {
+    var Dimension = require("../tree/dimension"),
+      Color = require("../tree/color"),
+      Expression = require("../tree/expression"),
+      Quoted = require("../tree/quoted"),
+      URL = require("../tree/url"),
+      functionRegistry = require("./function-registry");
+
+    functionRegistry.add("svg-gradient", function(direction) {
+
+      var stops,
+        gradientDirectionSvg,
+        gradientType = "linear",
+        rectangleDimension = 'x="0" y="0" width="1" height="1"',
+        renderEnv = {compress: false},
+        returner,
+        directionValue = direction.toCSS(renderEnv),
+        i, color, position, positionValue, alpha;
+
+      function throwArgumentDescriptor() {
+        throw { type: "Argument",
+          message: "svg-gradient expects direction, start_color [start_position], [color position,]...," +
+          " end_color [end_position] or direction, color list" };
+      }
+
+      if (arguments.length == 2) {
+        if (arguments[1].value.length < 2) {
+          throwArgumentDescriptor();
+        }
+        stops = arguments[1].value;
+      } else if (arguments.length < 3) {
+        throwArgumentDescriptor();
+      } else {
+        stops = Array.prototype.slice.call(arguments, 1);
+      }
+
+      switch (directionValue) {
+        case "to bottom":
+          gradientDirectionSvg = 'x1="0%" y1="0%" x2="0%" y2="100%"';
+          break;
+        case "to right":
+          gradientDirectionSvg = 'x1="0%" y1="0%" x2="100%" y2="0%"';
+          break;
+        case "to bottom right":
+          gradientDirectionSvg = 'x1="0%" y1="0%" x2="100%" y2="100%"';
+          break;
+        case "to top right":
+          gradientDirectionSvg = 'x1="0%" y1="100%" x2="100%" y2="0%"';
+          break;
+        case "ellipse":
+        case "ellipse at center":
+          gradientType = "radial";
+          gradientDirectionSvg = 'cx="50%" cy="50%" r="75%"';
+          rectangleDimension = 'x="-50" y="-50" width="101" height="101"';
+          break;
+        default:
+          throw { type: "Argument", message: "svg-gradient direction must be 'to bottom', 'to right'," +
+          " 'to bottom right', 'to top right' or 'ellipse at center'" };
+      }
+      returner = '<?xml version="1.0" ?>' +
+        '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">' +
+        '<' + gradientType + 'Gradient id="gradient" gradientUnits="userSpaceOnUse" ' + gradientDirectionSvg + '>';
+
+      for (i = 0; i < stops.length; i+= 1) {
+        if (stops[i] instanceof Expression) {
+          color = stops[i].value[0];
+          position = stops[i].value[1];
+        } else {
+          color = stops[i];
+          position = undefined;
+        }
+
+        if (!(color instanceof Color) || (!((i === 0 || i + 1 === stops.length) && position === undefined) && !(position instanceof Dimension))) {
+          throwArgumentDescriptor();
+        }
+        positionValue = position ? position.toCSS(renderEnv) : i === 0 ? "0%" : "100%";
+        alpha = color.alpha;
+        returner += '<stop offset="' + positionValue + '" stop-color="' + color.toRGB() + '"' + (alpha < 1 ? ' stop-opacity="' + alpha + '"' : '') + '/>';
+      }
+      returner += '</' + gradientType + 'Gradient>' +
+        '<rect ' + rectangleDimension + ' fill="url(#gradient)" /></svg>';
+
+      returner = encodeURIComponent(returner);
+
+      returner = "data:image/svg+xml," + returner;
+      return new URL(new Quoted("'" + returner + "'", returner, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
+    });
+  };
+
+},{"../tree/color":50,"../tree/dimension":56,"../tree/expression":59,"../tree/quoted":73,"../tree/url":80,"./function-registry":22}],29:[function(require,module,exports){
+  var Keyword = require("../tree/keyword"),
+    DetachedRuleset = require("../tree/detached-ruleset"),
+    Dimension = require("../tree/dimension"),
+    Color = require("../tree/color"),
+    Quoted = require("../tree/quoted"),
+    Anonymous = require("../tree/anonymous"),
+    URL = require("../tree/url"),
+    Operation = require("../tree/operation"),
+    functionRegistry = require("./function-registry");
+
+  var isa = function (n, Type) {
+      return (n instanceof Type) ? Keyword.True : Keyword.False;
+    },
+    isunit = function (n, unit) {
+      if (unit === undefined) {
+        throw { type: "Argument", message: "missing the required second argument to isunit." };
+      }
+      unit = typeof unit.value === "string" ? unit.value : unit;
+      if (typeof unit !== "string") {
+        throw { type: "Argument", message: "Second argument to isunit should be a unit or a string." };
+      }
+      return (n instanceof Dimension) && n.unit.is(unit) ? Keyword.True : Keyword.False;
+    },
+    getItemsFromNode = function(node) {
+      // handle non-array values as an array of length 1
+      // return 'undefined' if index is invalid
+      var items = Array.isArray(node.value) ?
+        node.value : Array(node);
+
+      return items;
+    };
+  functionRegistry.addMultiple({
+    isruleset: function (n) {
+      return isa(n, DetachedRuleset);
+    },
+    iscolor: function (n) {
+      return isa(n, Color);
+    },
+    isnumber: function (n) {
+      return isa(n, Dimension);
+    },
+    isstring: function (n) {
+      return isa(n, Quoted);
+    },
+    iskeyword: function (n) {
+      return isa(n, Keyword);
+    },
+    isurl: function (n) {
+      return isa(n, URL);
+    },
+    ispixel: function (n) {
+      return isunit(n, 'px');
+    },
+    ispercentage: function (n) {
+      return isunit(n, '%');
+    },
+    isem: function (n) {
+      return isunit(n, 'em');
+    },
+    isunit: isunit,
+    unit: function (val, unit) {
+      if (!(val instanceof Dimension)) {
+        throw { type: "Argument",
+          message: "the first argument to unit must be a number" +
+          (val instanceof Operation ? ". Have you forgotten parenthesis?" : "") };
+      }
+      if (unit) {
+        if (unit instanceof Keyword) {
+          unit = unit.value;
+        } else {
+          unit = unit.toCSS();
+        }
+      } else {
+        unit = "";
+      }
+      return new Dimension(val.value, unit);
+    },
+    "get-unit": function (n) {
+      return new Anonymous(n.unit);
+    },
+    extract: function(values, index) {
+      index = index.value - 1; // (1-based index)
+
+      return getItemsFromNode(values)[index];
+    },
+    length: function(values) {
+      return new Dimension(getItemsFromNode(values).length);
+    }
+  });
+
+},{"../tree/anonymous":46,"../tree/color":50,"../tree/detached-ruleset":55,"../tree/dimension":56,"../tree/keyword":65,"../tree/operation":71,"../tree/quoted":73,"../tree/url":80,"./function-registry":22}],30:[function(require,module,exports){
+  var contexts = require("./contexts"),
+    Parser = require('./parser/parser'),
+    FunctionImporter = require('./plugins/function-importer');
+
+  module.exports = function(environment) {
+
+    // FileInfo = {
+    //  'relativeUrls' - option - whether to adjust URL's to be relative
+    //  'filename' - full resolved filename of current file
+    //  'rootpath' - path to append to normal URLs for this node
+    //  'currentDirectory' - path to the current file, absolute
+    //  'rootFilename' - filename of the base file
+    //  'entryPath' - absolute path to the entry file
+    //  'reference' - whether the file should not be output and only output parts that are referenced
+
+    var ImportManager = function(context, rootFileInfo) {
+      this.rootFilename = rootFileInfo.filename;
+      this.paths = context.paths || [];  // Search paths, when importing
+      this.contents = {};             // map - filename to contents of all the files
+      this.contentsIgnoredChars = {}; // map - filename to lines at the beginning of each file to ignore
+      this.mime = context.mime;
+      this.error = null;
+      this.context = context;
+      // Deprecated? Unused outside of here, could be useful.
+      this.queue = [];        // Files which haven't been imported yet
+      this.files = {};        // Holds the imported parse trees.
+    };
+    /**
+     * Add an import to be imported
+     * @param path - the raw path
+     * @param tryAppendLessExtension - whether to try appending the less extension (if the path has no extension)
+     * @param currentFileInfo - the current file info (used for instance to work out relative paths)
+     * @param importOptions - import options
+     * @param callback - callback for when it is imported
+     */
+    ImportManager.prototype.push = function (path, tryAppendLessExtension, currentFileInfo, importOptions, callback) {
+      var importManager = this;
+      this.queue.push(path);
+
+      var fileParsedFunc = function (e, root, fullPath) {
+        importManager.queue.splice(importManager.queue.indexOf(path), 1); // Remove the path from the queue
+
+        var importedEqualsRoot = fullPath === importManager.rootFilename;
+        if (importOptions.optional && e) {
+          callback(null, {rules:[]}, false, null);
+        }
+        else {
+          importManager.files[fullPath] = root;
+          if (e && !importManager.error) { importManager.error = e; }
+          callback(e, root, importedEqualsRoot, fullPath);
+        }
+      };
+
+      var newFileInfo = {
+        relativeUrls: this.context.relativeUrls,
+        entryPath: currentFileInfo.entryPath,
+        rootpath: currentFileInfo.rootpath,
+        rootFilename: currentFileInfo.rootFilename
+      };
+
+      var fileManager = environment.getFileManager(path, currentFileInfo.currentDirectory, this.context, environment);
+
+      if (!fileManager) {
+        fileParsedFunc({ message: "Could not find a file-manager for " + path });
+        return;
+      }
+
+      if (tryAppendLessExtension) {
+        path = fileManager.tryAppendExtension(path, importOptions.plugin ? ".js" : ".less");
+      }
+
+      var loadFileCallback = function(loadedFile) {
+        var resolvedFilename = loadedFile.filename,
+          contents = loadedFile.contents.replace(/^\uFEFF/, '');
+
+        // Pass on an updated rootpath if path of imported file is relative and file
+        // is in a (sub|sup) directory
+        //
+        // Examples:
+        // - If path of imported file is 'module/nav/nav.less' and rootpath is 'less/',
+        //   then rootpath should become 'less/module/nav/'
+        // - If path of imported file is '../mixins.less' and rootpath is 'less/',
+        //   then rootpath should become 'less/../'
+        newFileInfo.currentDirectory = fileManager.getPath(resolvedFilename);
+        if (newFileInfo.relativeUrls) {
+          newFileInfo.rootpath = fileManager.join(
+            (importManager.context.rootpath || ""),
+            fileManager.pathDiff(newFileInfo.currentDirectory, newFileInfo.entryPath));
+
+          if (!fileManager.isPathAbsolute(newFileInfo.rootpath) && fileManager.alwaysMakePathsAbsolute()) {
+            newFileInfo.rootpath = fileManager.join(newFileInfo.entryPath, newFileInfo.rootpath);
+          }
+        }
+        newFileInfo.filename = resolvedFilename;
+
+        var newEnv = new contexts.Parse(importManager.context);
+
+        newEnv.processImports = false;
+        importManager.contents[resolvedFilename] = contents;
+
+        if (currentFileInfo.reference || importOptions.reference) {
+          newFileInfo.reference = true;
+        }
+
+        if (importOptions.plugin) {
+          new FunctionImporter(newEnv, newFileInfo).eval(contents, function (e, root) {
+            fileParsedFunc(e, root, resolvedFilename);
+          });
+        } else if (importOptions.inline) {
+          fileParsedFunc(null, contents, resolvedFilename);
+        } else {
+          new Parser(newEnv, importManager, newFileInfo).parse(contents, function (e, root) {
+            fileParsedFunc(e, root, resolvedFilename);
+          });
+        }
+      };
+
+      var promise = fileManager.loadFile(path, currentFileInfo.currentDirectory, this.context, environment,
+        function(err, loadedFile) {
+          if (err) {
+            fileParsedFunc(err);
+          } else {
+            loadFileCallback(loadedFile);
+          }
+        });
+      if (promise) {
+        promise.then(loadFileCallback, fileParsedFunc);
+      }
+    };
+    return ImportManager;
+  };
+
+},{"./contexts":11,"./parser/parser":38,"./plugins/function-importer":40}],31:[function(require,module,exports){
+  module.exports = function(environment, fileManagers) {
+    var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
+
+    var less = {
+      version: [2, 7, 3],
+      data: require('./data'),
+      tree: require('./tree'),
+      Environment: (Environment = require("./environment/environment")),
+      AbstractFileManager: require("./environment/abstract-file-manager"),
+      environment: (environment = new Environment(environment, fileManagers)),
+      visitors: require('./visitors'),
+      Parser: require('./parser/parser'),
+      functions: require('./functions')(environment),
+      contexts: require("./contexts"),
+      SourceMapOutput: (SourceMapOutput = require('./source-map-output')(environment)),
+      SourceMapBuilder: (SourceMapBuilder = require('./source-map-builder')(SourceMapOutput, environment)),
+      ParseTree: (ParseTree = require('./parse-tree')(SourceMapBuilder)),
+      ImportManager: (ImportManager = require('./import-manager')(environment)),
+      render: require("./render")(environment, ParseTree, ImportManager),
+      parse: require("./parse")(environment, ParseTree, ImportManager),
+      LessError: require('./less-error'),
+      transformTree: require('./transform-tree'),
+      utils: require('./utils'),
+      PluginManager: require('./plugin-manager'),
+      logger: require('./logger')
+    };
+
+    return less;
+  };
+
+},{"./contexts":11,"./data":13,"./environment/abstract-file-manager":15,"./environment/environment":16,"./functions":23,"./import-manager":30,"./less-error":32,"./logger":33,"./parse":35,"./parse-tree":34,"./parser/parser":38,"./plugin-manager":39,"./render":41,"./source-map-builder":42,"./source-map-output":43,"./transform-tree":44,"./tree":62,"./utils":83,"./visitors":87}],32:[function(require,module,exports){
+  var utils = require("./utils");
+
+  var LessError = module.exports = function LessError(e, importManager, currentFilename) {
+
+    Error.call(this);
+
+    var filename = e.filename || currentFilename;
+
+    if (importManager && filename) {
+      var input = importManager.contents[filename],
+        loc = utils.getLocation(e.index, input),
+        line = loc.line,
+        col  = loc.column,
+        callLine = e.call && utils.getLocation(e.call, input).line,
+        lines = input.split('\n');
+
+      this.type = e.type || 'Syntax';
+      this.filename = filename;
+      this.index = e.index;
+      this.line = typeof line === 'number' ? line + 1 : null;
+      this.callLine = callLine + 1;
+      this.callExtract = lines[callLine];
+      this.column = col;
+      this.extract = [
+        lines[line - 1],
+        lines[line],
+        lines[line + 1]
+      ];
+    }
+    this.message = e.message;
+    this.stack = e.stack;
+  };
+
+  if (typeof Object.create === 'undefined') {
+    var F = function () {};
+    F.prototype = Error.prototype;
+    LessError.prototype = new F();
+  } else {
+    LessError.prototype = Object.create(Error.prototype);
+  }
+
+  LessError.prototype.constructor = LessError;
+
+},{"./utils":83}],33:[function(require,module,exports){
+  module.exports = {
+    error: function(msg) {
+      this._fireEvent("error", msg);
+    },
+    warn: function(msg) {
+      this._fireEvent("warn", msg);
+    },
+    info: function(msg) {
+      this._fireEvent("info", msg);
+    },
+    debug: function(msg) {
+      this._fireEvent("debug", msg);
+    },
+    addListener: function(listener) {
+      this._listeners.push(listener);
+    },
+    removeListener: function(listener) {
+      for (var i = 0; i < this._listeners.length; i++) {
+        if (this._listeners[i] === listener) {
+          this._listeners.splice(i, 1);
+          return;
+        }
+      }
+    },
+    _fireEvent: function(type, msg) {
+      for (var i = 0; i < this._listeners.length; i++) {
+        var logFunction = this._listeners[i][type];
+        if (logFunction) {
+          logFunction(msg);
+        }
+      }
+    },
+    _listeners: []
+  };
+
+},{}],34:[function(require,module,exports){
+  var LessError = require('./less-error'),
+    transformTree = require("./transform-tree"),
+    logger = require("./logger");
+
+  module.exports = function(SourceMapBuilder) {
+    var ParseTree = function(root, imports) {
+      this.root = root;
+      this.imports = imports;
+    };
+
+    ParseTree.prototype.toCSS = function(options) {
+      var evaldRoot, result = {}, sourceMapBuilder;
+      try {
+        evaldRoot = transformTree(this.root, options);
+      } catch (e) {
+        throw new LessError(e, this.imports);
+      }
+
+      try {
+        var compress = Boolean(options.compress);
+        if (compress) {
+          logger.warn("The compress option has been deprecated. We recommend you use a dedicated css minifier, for instance see less-plugin-clean-css.");
+        }
+
+        var toCSSOptions = {
+          compress: compress,
+          dumpLineNumbers: options.dumpLineNumbers,
+          strictUnits: Boolean(options.strictUnits),
+          numPrecision: 8};
+
+        if (options.sourceMap) {
+          sourceMapBuilder = new SourceMapBuilder(options.sourceMap);
+          result.css = sourceMapBuilder.toCSS(evaldRoot, toCSSOptions, this.imports);
+        } else {
+          result.css = evaldRoot.toCSS(toCSSOptions);
+        }
+      } catch (e) {
+        throw new LessError(e, this.imports);
+      }
+
+      if (options.pluginManager) {
+        var postProcessors = options.pluginManager.getPostProcessors();
+        for (var i = 0; i < postProcessors.length; i++) {
+          result.css = postProcessors[i].process(result.css, { sourceMap: sourceMapBuilder, options: options, imports: this.imports });
+        }
+      }
+      if (options.sourceMap) {
+        result.map = sourceMapBuilder.getExternalSourceMap();
+      }
+
+      result.imports = [];
+      for (var file in this.imports.files) {
+        if (this.imports.files.hasOwnProperty(file) && file !== this.imports.rootFilename) {
+          result.imports.push(file);
+        }
+      }
+      return result;
+    };
+    return ParseTree;
+  };
+
+},{"./less-error":32,"./logger":33,"./transform-tree":44}],35:[function(require,module,exports){
+  var PromiseConstructor,
+    contexts = require("./contexts"),
+    Parser = require('./parser/parser'),
+    PluginManager = require('./plugin-manager');
+
+  module.exports = function(environment, ParseTree, ImportManager) {
+    var parse = function (input, options, callback) {
+      options = options || {};
+
+      if (typeof options === 'function') {
+        callback = options;
+        options = {};
+      }
+
+      if (!callback) {
+        if (!PromiseConstructor) {
+          PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
+        }
+        var self = this;
+        return new PromiseConstructor(function (resolve, reject) {
+          parse.call(self, input, options, function(err, output) {
+            if (err) {
+              reject(err);
+            } else {
+              resolve(output);
+            }
+          });
+        });
+      } else {
+        var context,
+          rootFileInfo,
+          pluginManager = new PluginManager(this);
+
+        pluginManager.addPlugins(options.plugins);
+        options.pluginManager = pluginManager;
+
+        context = new contexts.Parse(options);
+
+        if (options.rootFileInfo) {
+          rootFileInfo = options.rootFileInfo;
+        } else {
+          var filename = options.filename || "input";
+          var entryPath = filename.replace(/[^\/\\]*$/, "");
+          rootFileInfo = {
+            filename: filename,
+            relativeUrls: context.relativeUrls,
+            rootpath: context.rootpath || "",
+            currentDirectory: entryPath,
+            entryPath: entryPath,
+            rootFilename: filename
+          };
+          // add in a missing trailing slash
+          if (rootFileInfo.rootpath && rootFileInfo.rootpath.slice(-1) !== "/") {
+            rootFileInfo.rootpath += "/";
+          }
+        }
+
+        var imports = new ImportManager(context, rootFileInfo);
+
+        new Parser(context, imports, rootFileInfo)
+          .parse(input, function (e, root) {
+            if (e) { return callback(e); }
+            callback(null, root, imports, options);
+          }, options);
+      }
+    };
+    return parse;
+  };
+
+},{"./contexts":11,"./parser/parser":38,"./plugin-manager":39,"promise":undefined}],36:[function(require,module,exports){
+// Split the input into chunks.
+  module.exports = function (input, fail) {
+    var len = input.length, level = 0, parenLevel = 0,
+      lastOpening, lastOpeningParen, lastMultiComment, lastMultiCommentEndBrace,
+      chunks = [], emitFrom = 0,
+      chunkerCurrentIndex, currentChunkStartIndex, cc, cc2, matched;
+
+    function emitChunk(force) {
+      var len = chunkerCurrentIndex - emitFrom;
+      if (((len < 512) && !force) || !len) {
+        return;
+      }
+      chunks.push(input.slice(emitFrom, chunkerCurrentIndex + 1));
+      emitFrom = chunkerCurrentIndex + 1;
+    }
+
+    for (chunkerCurrentIndex = 0; chunkerCurrentIndex < len; chunkerCurrentIndex++) {
+      cc = input.charCodeAt(chunkerCurrentIndex);
+      if (((cc >= 97) && (cc <= 122)) || (cc < 34)) {
+        // a-z or whitespace
+        continue;
+      }
+
+      switch (cc) {
+        case 40:                        // (
+          parenLevel++;
+          lastOpeningParen = chunkerCurrentIndex;
+          continue;
+        case 41:                        // )
+          if (--parenLevel < 0) {
+            return fail("missing opening `(`", chunkerCurrentIndex);
+          }
+          continue;
+        case 59:                        // ;
+          if (!parenLevel) { emitChunk(); }
+          continue;
+        case 123:                       // {
+          level++;
+          lastOpening = chunkerCurrentIndex;
+          continue;
+        case 125:                       // }
+          if (--level < 0) {
+            return fail("missing opening `{`", chunkerCurrentIndex);
+          }
+          if (!level && !parenLevel) { emitChunk(); }
+          continue;
+        case 92:                        // \
+          if (chunkerCurrentIndex < len - 1) { chunkerCurrentIndex++; continue; }
+          return fail("unescaped `\\`", chunkerCurrentIndex);
+        case 34:
+        case 39:
+        case 96:                        // ", ' and `
+          matched = 0;
+          currentChunkStartIndex = chunkerCurrentIndex;
+          for (chunkerCurrentIndex = chunkerCurrentIndex + 1; chunkerCurrentIndex < len; chunkerCurrentIndex++) {
+            cc2 = input.charCodeAt(chunkerCurrentIndex);
+            if (cc2 > 96) { continue; }
+            if (cc2 == cc) { matched = 1; break; }
+            if (cc2 == 92) {        // \
+              if (chunkerCurrentIndex == len - 1) {
+                return fail("unescaped `\\`", chunkerCurrentIndex);
+              }
+              chunkerCurrentIndex++;
+            }
+          }
+          if (matched) { continue; }
+          return fail("unmatched `" + String.fromCharCode(cc) + "`", currentChunkStartIndex);
+        case 47:                        // /, check for comment
+          if (parenLevel || (chunkerCurrentIndex == len - 1)) { continue; }
+          cc2 = input.charCodeAt(chunkerCurrentIndex + 1);
+          if (cc2 == 47) {
+            // //, find lnfeed
+            for (chunkerCurrentIndex = chunkerCurrentIndex + 2; chunkerCurrentIndex < len; chunkerCurrentIndex++) {
+              cc2 = input.charCodeAt(chunkerCurrentIndex);
+              if ((cc2 <= 13) && ((cc2 == 10) || (cc2 == 13))) { break; }
+            }
+          } else if (cc2 == 42) {
+            // /*, find */
+            lastMultiComment = currentChunkStartIndex = chunkerCurrentIndex;
+            for (chunkerCurrentIndex = chunkerCurrentIndex + 2; chunkerCurrentIndex < len - 1; chunkerCurrentIndex++) {
+              cc2 = input.charCodeAt(chunkerCurrentIndex);
+              if (cc2 == 125) { lastMultiCommentEndBrace = chunkerCurrentIndex; }
+              if (cc2 != 42) { continue; }
+              if (input.charCodeAt(chunkerCurrentIndex + 1) == 47) { break; }
+            }
+            if (chunkerCurrentIndex == len - 1) {
+              return fail("missing closing `*/`", currentChunkStartIndex);
+            }
+            chunkerCurrentIndex++;
+          }
+          continue;
+        case 42:                       // *, check for unmatched */
+          if ((chunkerCurrentIndex < len - 1) && (input.charCodeAt(chunkerCurrentIndex + 1) == 47)) {
+            return fail("unmatched `/*`", chunkerCurrentIndex);
+          }
+          continue;
+      }
+    }
+
+    if (level !== 0) {
+      if ((lastMultiComment > lastOpening) && (lastMultiCommentEndBrace > lastMultiComment)) {
+        return fail("missing closing `}` or `*/`", lastOpening);
+      } else {
+        return fail("missing closing `}`", lastOpening);
+      }
+    } else if (parenLevel !== 0) {
+      return fail("missing closing `)`", lastOpeningParen);
+    }
+
+    emitChunk(true);
+    return chunks;
+  };
+
+},{}],37:[function(require,module,exports){
+  var chunker = require('./chunker');
+
+  module.exports = function() {
+    var input,       // LeSS input string
+      j,           // current chunk
+      saveStack = [],   // holds state for backtracking
+      furthest,    // furthest index the parser has gone to
+      furthestPossibleErrorMessage,// if this is furthest we got to, this is the probably cause
+      chunks,      // chunkified input
+      current,     // current chunk
+      currentPos,  // index of current chunk, in `input`
+      parserInput = {};
+
+    var CHARCODE_SPACE = 32,
+      CHARCODE_TAB = 9,
+      CHARCODE_LF = 10,
+      CHARCODE_CR = 13,
+      CHARCODE_PLUS = 43,
+      CHARCODE_COMMA = 44,
+      CHARCODE_FORWARD_SLASH = 47,
+      CHARCODE_9 = 57;
+
+    function skipWhitespace(length) {
+      var oldi = parserInput.i, oldj = j,
+        curr = parserInput.i - currentPos,
+        endIndex = parserInput.i + current.length - curr,
+        mem = (parserInput.i += length),
+        inp = input,
+        c, nextChar, comment;
+
+      for (; parserInput.i < endIndex; parserInput.i++) {
+        c = inp.charCodeAt(parserInput.i);
+
+        if (parserInput.autoCommentAbsorb && c === CHARCODE_FORWARD_SLASH) {
+          nextChar = inp.charAt(parserInput.i + 1);
+          if (nextChar === '/') {
+            comment = {index: parserInput.i, isLineComment: true};
+            var nextNewLine = inp.indexOf("\n", parserInput.i + 2);
+            if (nextNewLine < 0) {
+              nextNewLine = endIndex;
+            }
+            parserInput.i = nextNewLine;
+            comment.text = inp.substr(comment.index, parserInput.i - comment.index);
+            parserInput.commentStore.push(comment);
+            continue;
+          } else if (nextChar === '*') {
+            var nextStarSlash = inp.indexOf("*/", parserInput.i + 2);
+            if (nextStarSlash >= 0) {
+              comment = {
+                index: parserInput.i,
+                text: inp.substr(parserInput.i, nextStarSlash + 2 - parserInput.i),
+                isLineComment: false
+              };
+              parserInput.i += comment.text.length - 1;
+              parserInput.commentStore.push(comment);
+              continue;
+            }
+          }
+          break;
+        }
+
+        if ((c !== CHARCODE_SPACE) && (c !== CHARCODE_LF) && (c !== CHARCODE_TAB) && (c !== CHARCODE_CR)) {
+          break;
+        }
+      }
+
+      current = current.slice(length + parserInput.i - mem + curr);
+      currentPos = parserInput.i;
+
+      if (!current.length) {
+        if (j < chunks.length - 1) {
+          current = chunks[++j];
+          skipWhitespace(0); // skip space at the beginning of a chunk
+          return true; // things changed
+        }
+        parserInput.finished = true;
+      }
+
+      return oldi !== parserInput.i || oldj !== j;
+    }
+
+    parserInput.save = function() {
+      currentPos = parserInput.i;
+      saveStack.push( { current: current, i: parserInput.i, j: j });
+    };
+    parserInput.restore = function(possibleErrorMessage) {
+
+      if (parserInput.i > furthest || (parserInput.i === furthest && possibleErrorMessage && !furthestPossibleErrorMessage)) {
+        furthest = parserInput.i;
+        furthestPossibleErrorMessage = possibleErrorMessage;
+      }
+      var state = saveStack.pop();
+      current = state.current;
+      currentPos = parserInput.i = state.i;
+      j = state.j;
+    };
+    parserInput.forget = function() {
+      saveStack.pop();
+    };
+    parserInput.isWhitespace = function (offset) {
+      var pos = parserInput.i + (offset || 0),
+        code = input.charCodeAt(pos);
+      return (code === CHARCODE_SPACE || code === CHARCODE_CR || code === CHARCODE_TAB || code === CHARCODE_LF);
+    };
+
+    // Specialization of $(tok)
+    parserInput.$re = function(tok) {
+      if (parserInput.i > currentPos) {
+        current = current.slice(parserInput.i - currentPos);
+        currentPos = parserInput.i;
+      }
+
+      var m = tok.exec(current);
+      if (!m) {
+        return null;
+      }
+
+      skipWhitespace(m[0].length);
+      if (typeof m === "string") {
+        return m;
+      }
+
+      return m.length === 1 ? m[0] : m;
+    };
+
+    parserInput.$char = function(tok) {
+      if (input.charAt(parserInput.i) !== tok) {
+        return null;
+      }
+      skipWhitespace(1);
+      return tok;
+    };
+
+    parserInput.$str = function(tok) {
+      var tokLength = tok.length;
+
+      // https://jsperf.com/string-startswith/21
+      for (var i = 0; i < tokLength; i++) {
+        if (input.charAt(parserInput.i + i) !== tok.charAt(i)) {
+          return null;
+        }
+      }
+
+      skipWhitespace(tokLength);
+      return tok;
+    };
+
+    parserInput.$quoted = function() {
+
+      var startChar = input.charAt(parserInput.i);
+      if (startChar !== "'" && startChar !== '"') {
+        return;
+      }
+      var length = input.length,
+        currentPosition = parserInput.i;
+
+      for (var i = 1; i + currentPosition < length; i++) {
+        var nextChar = input.charAt(i + currentPosition);
+        switch(nextChar) {
+          case "\\":
+            i++;
+            continue;
+          case "\r":
+          case "\n":
+            break;
+          case startChar:
+            var str = input.substr(currentPosition, i + 1);
+            skipWhitespace(i + 1);
+            return str;
+          default:
+        }
+      }
+      return null;
+    };
+
+    parserInput.autoCommentAbsorb = true;
+    parserInput.commentStore = [];
+    parserInput.finished = false;
+
+    // Same as $(), but don't change the state of the parser,
+    // just return the match.
+    parserInput.peek = function(tok) {
+      if (typeof tok === 'string') {
+        // https://jsperf.com/string-startswith/21
+        for (var i = 0; i < tok.length; i++) {
+          if (input.charAt(parserInput.i + i) !== tok.charAt(i)) {
+            return false;
+          }
+        }
+        return true;
+      } else {
+        return tok.test(current);
+      }
+    };
+
+    // Specialization of peek()
+    // TODO remove or change some currentChar calls to peekChar
+    parserInput.peekChar = function(tok) {
+      return input.charAt(parserInput.i) === tok;
+    };
+
+    parserInput.currentChar = function() {
+      return input.charAt(parserInput.i);
+    };
+
+    parserInput.getInput = function() {
+      return input;
+    };
+
+    parserInput.peekNotNumeric = function() {
+      var c = input.charCodeAt(parserInput.i);
+      //Is the first char of the dimension 0-9, '.', '+' or '-'
+      return (c > CHARCODE_9 || c < CHARCODE_PLUS) || c === CHARCODE_FORWARD_SLASH || c === CHARCODE_COMMA;
+    };
+
+    parserInput.start = function(str, chunkInput, failFunction) {
+      input = str;
+      parserInput.i = j = currentPos = furthest = 0;
+
+      // chunking apparently makes things quicker (but my tests indicate
+      // it might actually make things slower in node at least)
+      // and it is a non-perfect parse - it can't recognise
+      // unquoted urls, meaning it can't distinguish comments
+      // meaning comments with quotes or {}() in them get 'counted'
+      // and then lead to parse errors.
+      // In addition if the chunking chunks in the wrong place we might
+      // not be able to parse a parser statement in one go
+      // this is officially deprecated but can be switched on via an option
+      // in the case it causes too much performance issues.
+      if (chunkInput) {
+        chunks = chunker(str, failFunction);
+      } else {
+        chunks = [str];
+      }
+
+      current = chunks[0];
+
+      skipWhitespace(0);
+    };
+
+    parserInput.end = function() {
+      var message,
+        isFinished = parserInput.i >= input.length;
+
+      if (parserInput.i < furthest) {
+        message = furthestPossibleErrorMessage;
+        parserInput.i = furthest;
+      }
+      return {
+        isFinished: isFinished,
+        furthest: parserInput.i,
+        furthestPossibleErrorMessage: message,
+        furthestReachedEnd: parserInput.i >= input.length - 1,
+        furthestChar: input[parserInput.i]
+      };
+    };
+
+    return parserInput;
+  };
+
+},{"./chunker":36}],38:[function(require,module,exports){
+  var LessError = require('../less-error'),
+    tree = require("../tree"),
+    visitors = require("../visitors"),
+    getParserInput = require("./parser-input"),
+    utils = require("../utils");
+
+//
+// less.js - parser
+//
+//    A relatively straight-forward predictive parser.
+//    There is no tokenization/lexing stage, the input is parsed
+//    in one sweep.
+//
+//    To make the parser fast enough to run in the browser, several
+//    optimization had to be made:
+//
+//    - Matching and slicing on a huge input is often cause of slowdowns.
+//      The solution is to chunkify the input into smaller strings.
+//      The chunks are stored in the `chunks` var,
+//      `j` holds the current chunk index, and `currentPos` holds
+//      the index of the current chunk in relation to `input`.
+//      This gives us an almost 4x speed-up.
+//
+//    - In many cases, we don't need to match individual tokens;
+//      for example, if a value doesn't hold any variables, operations
+//      or dynamic references, the parser can effectively 'skip' it,
+//      treating it as a literal.
+//      An example would be '1px solid #000' - which evaluates to itself,
+//      we don't need to know what the individual components are.
+//      The drawback, of course is that you don't get the benefits of
+//      syntax-checking on the CSS. This gives us a 50% speed-up in the parser,
+//      and a smaller speed-up in the code-gen.
+//
+//
+//    Token matching is done with the `$` function, which either takes
+//    a terminal string or regexp, or a non-terminal function to call.
+//    It also takes care of moving all the indices forwards.
+//`
+//
+  var Parser = function Parser(context, imports, fileInfo) {
+    var parsers,
+      parserInput = getParserInput();
+
+    function error(msg, type) {
+      throw new LessError(
+        {
+          index: parserInput.i,
+          filename: fileInfo.filename,
+          type: type || 'Syntax',
+          message: msg
+        },
+        imports
+      );
+    }
+
+    function expect(arg, msg, index) {
+      // some older browsers return typeof 'function' for RegExp
+      var result = (arg instanceof Function) ? arg.call(parsers) : parserInput.$re(arg);
+      if (result) {
+        return result;
+      }
+      error(msg || (typeof arg === 'string' ? "expected '" + arg + "' got '" + parserInput.currentChar() + "'"
+        : "unexpected token"));
+    }
+
+    // Specialization of expect()
+    function expectChar(arg, msg) {
+      if (parserInput.$char(arg)) {
+        return arg;
+      }
+      error(msg || "expected '" + arg + "' got '" + parserInput.currentChar() + "'");
+    }
+
+    function getDebugInfo(index) {
+      var filename = fileInfo.filename;
+
+      return {
+        lineNumber: utils.getLocation(index, parserInput.getInput()).line + 1,
+        fileName: filename
+      };
+    }
+
+    //
+    // The Parser
+    //
+    return {
+
+      //
+      // Parse an input string into an abstract syntax tree,
+      // @param str A string containing 'less' markup
+      // @param callback call `callback` when done.
+      // @param [additionalData] An optional map which can contains vars - a map (key, value) of variables to apply
+      //
+      parse: function (str, callback, additionalData) {
+        var root, error = null, globalVars, modifyVars, ignored, preText = "";
+
+        globalVars = (additionalData && additionalData.globalVars) ? Parser.serializeVars(additionalData.globalVars) + '\n' : '';
+        modifyVars = (additionalData && additionalData.modifyVars) ? '\n' + Parser.serializeVars(additionalData.modifyVars) : '';
+
+        if (context.pluginManager) {
+          var preProcessors = context.pluginManager.getPreProcessors();
+          for (var i = 0; i < preProcessors.length; i++) {
+            str = preProcessors[i].process(str, { context: context, imports: imports, fileInfo: fileInfo });
+          }
+        }
+
+        if (globalVars || (additionalData && additionalData.banner)) {
+          preText = ((additionalData && additionalData.banner) ? additionalData.banner : "") + globalVars;
+          ignored = imports.contentsIgnoredChars;
+          ignored[fileInfo.filename] = ignored[fileInfo.filename] || 0;
+          ignored[fileInfo.filename] += preText.length;
+        }
+
+        str = str.replace(/\r\n?/g, '\n');
+        // Remove potential UTF Byte Order Mark
+        str = preText + str.replace(/^\uFEFF/, '') + modifyVars;
+        imports.contents[fileInfo.filename] = str;
+
+        // Start with the primary rule.
+        // The whole syntax tree is held under a Ruleset node,
+        // with the `root` property set to true, so no `{}` are
+        // output. The callback is called when the input is parsed.
+        try {
+          parserInput.start(str, context.chunkInput, function fail(msg, index) {
+            throw new LessError({
+              index: index,
+              type: 'Parse',
+              message: msg,
+              filename: fileInfo.filename
+            }, imports);
+          });
+
+          root = new(tree.Ruleset)(null, this.parsers.primary());
+          root.root = true;
+          root.firstRoot = true;
+        } catch (e) {
+          return callback(new LessError(e, imports, fileInfo.filename));
+        }
+
+        // If `i` is smaller than the `input.length - 1`,
+        // it means the parser wasn't able to parse the whole
+        // string, so we've got a parsing error.
+        //
+        // We try to extract a \n delimited string,
+        // showing the line where the parse error occurred.
+        // We split it up into two parts (the part which parsed,
+        // and the part which didn't), so we can color them differently.
+        var endInfo = parserInput.end();
+        if (!endInfo.isFinished) {
+
+          var message = endInfo.furthestPossibleErrorMessage;
+
+          if (!message) {
+            message = "Unrecognised input";
+            if (endInfo.furthestChar === '}') {
+              message += ". Possibly missing opening '{'";
+            } else if (endInfo.furthestChar === ')') {
+              message += ". Possibly missing opening '('";
+            } else if (endInfo.furthestReachedEnd) {
+              message += ". Possibly missing something";
+            }
+          }
+
+          error = new LessError({
+            type: "Parse",
+            message: message,
+            index: endInfo.furthest,
+            filename: fileInfo.filename
+          }, imports);
+        }
+
+        var finish = function (e) {
+          e = error || e || imports.error;
+
+          if (e) {
+            if (!(e instanceof LessError)) {
+              e = new LessError(e, imports, fileInfo.filename);
+            }
+
+            return callback(e);
+          }
+          else {
+            return callback(null, root);
+          }
+        };
+
+        if (context.processImports !== false) {
+          new visitors.ImportVisitor(imports, finish)
+            .run(root);
+        } else {
+          return finish();
+        }
+      },
+
+      //
+      // Here in, the parsing rules/functions
+      //
+      // The basic structure of the syntax tree generated is as follows:
+      //
+      //   Ruleset ->  Rule -> Value -> Expression -> Entity
+      //
+      // Here's some Less code:
+      //
+      //    .class {
+      //      color: #fff;
+      //      border: 1px solid #000;
+      //      width: @w + 4px;
+      //      > .child {...}
+      //    }
+      //
+      // And here's what the parse tree might look like:
+      //
+      //     Ruleset (Selector '.class', [
+      //         Rule ("color",  Value ([Expression [Color #fff]]))
+      //         Rule ("border", Value ([Expression [Dimension 1px][Keyword "solid"][Color #000]]))
+      //         Rule ("width",  Value ([Expression [Operation " + " [Variable "@w"][Dimension 4px]]]))
+      //         Ruleset (Selector [Element '>', '.child'], [...])
+      //     ])
+      //
+      //  In general, most rules will try to parse a token with the `$re()` function, and if the return
+      //  value is truly, will return a new node, of the relevant type. Sometimes, we need to check
+      //  first, before parsing, that's when we use `peek()`.
+      //
+      parsers: parsers = {
+        //
+        // The `primary` rule is the *entry* and *exit* point of the parser.
+        // The rules here can appear at any level of the parse tree.
+        //
+        // The recursive nature of the grammar is an interplay between the `block`
+        // rule, which represents `{ ... }`, the `ruleset` rule, and this `primary` rule,
+        // as represented by this simplified grammar:
+        //
+        //     primary  →  (ruleset | rule)+
+        //     ruleset  →  selector+ block
+        //     block    →  '{' primary '}'
+        //
+        // Only at one point is the primary rule not called from the
+        // block rule: at the root level.
+        //
+        primary: function () {
+          var mixin = this.mixin, root = [], node;
+
+          while (true) {
+            while (true) {
+              node = this.comment();
+              if (!node) { break; }
+              root.push(node);
+            }
+            // always process comments before deciding if finished
+            if (parserInput.finished) {
+              break;
+            }
+            if (parserInput.peek('}')) {
+              break;
+            }
+
+            node = this.extendRule();
+            if (node) {
+              root = root.concat(node);
+              continue;
+            }
+
+            node = mixin.definition() || this.rule() || this.ruleset() ||
+              mixin.call() || this.rulesetCall() || this.entities.call() || this.directive();
+            if (node) {
+              root.push(node);
+            } else {
+              var foundSemiColon = false;
+              while (parserInput.$char(";")) {
+                foundSemiColon = true;
+              }
+              if (!foundSemiColon) {
+                break;
+              }
+            }
+          }
+
+          return root;
+        },
+
+        // comments are collected by the main parsing mechanism and then assigned to nodes
+        // where the current structure allows it
+        comment: function () {
+          if (parserInput.commentStore.length) {
+            var comment = parserInput.commentStore.shift();
+            return new(tree.Comment)(comment.text, comment.isLineComment, comment.index, fileInfo);
+          }
+        },
+
+        //
+        // Entities are tokens which can be found inside an Expression
+        //
+        entities: {
+          //
+          // A string, which supports escaping " and '
+          //
+          //     "milky way" 'he\'s the one!'
+          //
+          quoted: function () {
+            var str, index = parserInput.i, isEscaped = false;
+
+            parserInput.save();
+            if (parserInput.$char("~")) {
+              isEscaped = true;
+            }
+            str = parserInput.$quoted();
+            if (!str) {
+              parserInput.restore();
+              return;
+            }
+            parserInput.forget();
+
+            return new(tree.Quoted)(str.charAt(0), str.substr(1, str.length - 2), isEscaped, index, fileInfo);
+          },
+
+          //
+          // A catch-all word, such as:
+          //
+          //     black border-collapse
+          //
+          keyword: function () {
+            var k = parserInput.$char("%") || parserInput.$re(/^[_A-Za-z-][_A-Za-z0-9-]*/);
+            if (k) {
+              return tree.Color.fromKeyword(k) || new(tree.Keyword)(k);
+            }
+          },
+
+          //
+          // A function call
+          //
+          //     rgb(255, 0, 255)
+          //
+          // We also try to catch IE's `alpha()`, but let the `alpha` parser
+          // deal with the details.
+          //
+          // The arguments are parsed with the `entities.arguments` parser.
+          //
+          call: function () {
+            var name, nameLC, args, alpha, index = parserInput.i;
+
+            // http://jsperf.com/case-insensitive-regex-vs-strtolower-then-regex/18
+            if (parserInput.peek(/^url\(/i)) {
+              return;
+            }
+
+            parserInput.save();
+
+            name = parserInput.$re(/^([\w-]+|%|progid:[\w\.]+)\(/);
+            if (!name) { parserInput.forget(); return; }
+
+            name = name[1];
+            nameLC = name.toLowerCase();
+
+            if (nameLC === 'alpha') {
+              alpha = parsers.alpha();
+              if (alpha) {
+                parserInput.forget();
+                return alpha;
+              }
+            }
+
+            args = this.arguments();
+
+            if (! parserInput.$char(')')) {
+              parserInput.restore("Could not parse call arguments or missing ')'");
+              return;
+            }
+
+            parserInput.forget();
+            return new(tree.Call)(name, args, index, fileInfo);
+          },
+          arguments: function () {
+            var argsSemiColon = [], argsComma = [],
+              expressions = [],
+              isSemiColonSeparated, value, arg;
+
+            parserInput.save();
+
+            while (true) {
+
+              arg = parsers.detachedRuleset() || this.assignment() || parsers.expression();
+
+              if (!arg) {
+                break;
+              }
+
+              value = arg;
+
+              if (arg.value && arg.value.length == 1) {
+                value = arg.value[0];
+              }
+
+              if (value) {
+                expressions.push(value);
+              }
+
+              argsComma.push(value);
+
+              if (parserInput.$char(',')) {
+                continue;
+              }
+
+              if (parserInput.$char(';') || isSemiColonSeparated) {
+
+                isSemiColonSeparated = true;
+
+                if (expressions.length > 1) {
+                  value = new(tree.Value)(expressions);
+                }
+                argsSemiColon.push(value);
+
+                expressions = [];
+              }
+            }
+
+            parserInput.forget();
+            return isSemiColonSeparated ? argsSemiColon : argsComma;
+          },
+          literal: function () {
+            return this.dimension() ||
+              this.color() ||
+              this.quoted() ||
+              this.unicodeDescriptor();
+          },
+
+          // Assignments are argument entities for calls.
+          // They are present in ie filter properties as shown below.
+          //
+          //     filter: progid:DXImageTransform.Microsoft.Alpha( *opacity=50* )
+          //
+
+          assignment: function () {
+            var key, value;
+            parserInput.save();
+            key = parserInput.$re(/^\w+(?=\s?=)/i);
+            if (!key) {
+              parserInput.restore();
+              return;
+            }
+            if (!parserInput.$char('=')) {
+              parserInput.restore();
+              return;
+            }
+            value = parsers.entity();
+            if (value) {
+              parserInput.forget();
+              return new(tree.Assignment)(key, value);
+            } else {
+              parserInput.restore();
+            }
+          },
+
+          //
+          // Parse url() tokens
+          //
+          // We use a specific rule for urls, because they don't really behave like
+          // standard function calls. The difference is that the argument doesn't have
+          // to be enclosed within a string, so it can't be parsed as an Expression.
+          //
+          url: function () {
+            var value, index = parserInput.i;
+
+            parserInput.autoCommentAbsorb = false;
+
+            if (!parserInput.$str("url(")) {
+              parserInput.autoCommentAbsorb = true;
+              return;
+            }
+
+            value = this.quoted() || this.variable() ||
+              parserInput.$re(/^(?:(?:\\[\(\)'"])|[^\(\)'"])+/) || "";
+
+            parserInput.autoCommentAbsorb = true;
+
+            expectChar(')');
+
+            return new(tree.URL)((value.value != null || value instanceof tree.Variable) ?
+              value : new(tree.Anonymous)(value), index, fileInfo);
+          },
+
+          //
+          // A Variable entity, such as `@fink`, in
+          //
+          //     width: @fink + 2px
+          //
+          // We use a different parser for variable definitions,
+          // see `parsers.variable`.
+          //
+          variable: function () {
+            var name, index = parserInput.i;
+
+            if (parserInput.currentChar() === '@' && (name = parserInput.$re(/^@@?[\w-]+/))) {
+              return new(tree.Variable)(name, index, fileInfo);
+            }
+          },
+
+          // A variable entity using the protective {} e.g. @{var}
+          variableCurly: function () {
+            var curly, index = parserInput.i;
+
+            if (parserInput.currentChar() === '@' && (curly = parserInput.$re(/^@\{([\w-]+)\}/))) {
+              return new(tree.Variable)("@" + curly[1], index, fileInfo);
+            }
+          },
+
+          //
+          // A Hexadecimal color
+          //
+          //     #4F3C2F
+          //
+          // `rgb` and `hsl` colors are parsed through the `entities.call` parser.
+          //
+          color: function () {
+            var rgb;
+
+            if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/))) {
+              // strip colons, brackets, whitespaces and other characters that should not
+              // definitely be part of color string
+              var colorCandidateString = rgb.input.match(/^#([\w]+).*/);
+              colorCandidateString = colorCandidateString[1];
+              if (!colorCandidateString.match(/^[A-Fa-f0-9]+$/)) { // verify if candidate consists only of allowed HEX characters
+                error("Invalid HEX color code");
+              }
+              return new(tree.Color)(rgb[1], undefined, '#' + colorCandidateString);
+            }
+          },
+
+          colorKeyword: function () {
+            parserInput.save();
+            var autoCommentAbsorb = parserInput.autoCommentAbsorb;
+            parserInput.autoCommentAbsorb = false;
+            var k = parserInput.$re(/^[_A-Za-z-][_A-Za-z0-9-]+/);
+            parserInput.autoCommentAbsorb = autoCommentAbsorb;
+            if (!k) {
+              parserInput.forget();
+              return;
+            }
+            parserInput.restore();
+            var color = tree.Color.fromKeyword(k);
+            if (color) {
+              parserInput.$str(k);
+              return color;
+            }
+          },
+
+          //
+          // A Dimension, that is, a number and a unit
+          //
+          //     0.5em 95%
+          //
+          dimension: function () {
+            if (parserInput.peekNotNumeric()) {
+              return;
+            }
+
+            var value = parserInput.$re(/^([+-]?\d*\.?\d+)(%|[a-z_]+)?/i);
+            if (value) {
+              return new(tree.Dimension)(value[1], value[2]);
+            }
+          },
+
+          //
+          // A unicode descriptor, as is used in unicode-range
+          //
+          // U+0??  or U+00A1-00A9
+          //
+          unicodeDescriptor: function () {
+            var ud;
+
+            ud = parserInput.$re(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/);
+            if (ud) {
+              return new(tree.UnicodeDescriptor)(ud[0]);
+            }
+          },
+
+          //
+          // JavaScript code to be evaluated
+          //
+          //     `window.location.href`
+          //
+          javascript: function () {
+            var js, index = parserInput.i;
+
+            parserInput.save();
+
+            var escape = parserInput.$char("~");
+            var jsQuote = parserInput.$char("`");
+
+            if (!jsQuote) {
+              parserInput.restore();
+              return;
+            }
+
+            js = parserInput.$re(/^[^`]*`/);
+            if (js) {
+              parserInput.forget();
+              return new(tree.JavaScript)(js.substr(0, js.length - 1), Boolean(escape), index, fileInfo);
+            }
+            parserInput.restore("invalid javascript definition");
+          }
+        },
+
+        //
+        // The variable part of a variable definition. Used in the `rule` parser
+        //
+        //     @fink:
+        //
+        variable: function () {
+          var name;
+
+          if (parserInput.currentChar() === '@' && (name = parserInput.$re(/^(@[\w-]+)\s*:/))) { return name[1]; }
+        },
+
+        //
+        // The variable part of a variable definition. Used in the `rule` parser
+        //
+        //     @fink();
+        //
+        rulesetCall: function () {
+          var name;
+
+          if (parserInput.currentChar() === '@' && (name = parserInput.$re(/^(@[\w-]+)\(\s*\)\s*;/))) {
+            return new tree.RulesetCall(name[1]);
+          }
+        },
+
+        //
+        // extend syntax - used to extend selectors
+        //
+        extend: function(isRule) {
+          var elements, e, index = parserInput.i, option, extendList, extend;
+
+          if (!parserInput.$str(isRule ? "&:extend(" : ":extend(")) {
+            return;
+          }
+
+          do {
+            option = null;
+            elements = null;
+            while (! (option = parserInput.$re(/^(all)(?=\s*(\)|,))/))) {
+              e = this.element();
+              if (!e) {
+                break;
+              }
+              if (elements) {
+                elements.push(e);
+              } else {
+                elements = [ e ];
+              }
+            }
+
+            option = option && option[1];
+            if (!elements) {
+              error("Missing target selector for :extend().");
+            }
+            extend = new(tree.Extend)(new(tree.Selector)(elements), option, index, fileInfo);
+            if (extendList) {
+              extendList.push(extend);
+            } else {
+              extendList = [ extend ];
+            }
+          } while (parserInput.$char(","));
+
+          expect(/^\)/);
+
+          if (isRule) {
+            expect(/^;/);
+          }
+
+          return extendList;
+        },
+
+        //
+        // extendRule - used in a rule to extend all the parent selectors
+        //
+        extendRule: function() {
+          return this.extend(true);
+        },
+
+        //
+        // Mixins
+        //
+        mixin: {
+          //
+          // A Mixin call, with an optional argument list
+          //
+          //     #mixins > .square(#fff);
+          //     .rounded(4px, black);
+          //     .button;
+          //
+          // The `while` loop is there because mixins can be
+          // namespaced, but we only support the child and descendant
+          // selector for now.
+          //
+          call: function () {
+            var s = parserInput.currentChar(), important = false, index = parserInput.i, elemIndex,
+              elements, elem, e, c, args;
+
+            if (s !== '.' && s !== '#') { return; }
+
+            parserInput.save(); // stop us absorbing part of an invalid selector
+
+            while (true) {
+              elemIndex = parserInput.i;
+              e = parserInput.$re(/^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/);
+              if (!e) {
+                break;
+              }
+              elem = new(tree.Element)(c, e, elemIndex, fileInfo);
+              if (elements) {
+                elements.push(elem);
+              } else {
+                elements = [ elem ];
+              }
+              c = parserInput.$char('>');
+            }
+
+            if (elements) {
+              if (parserInput.$char('(')) {
+                args = this.args(true).args;
+                expectChar(')');
+              }
+
+              if (parsers.important()) {
+                important = true;
+              }
+
+              if (parsers.end()) {
+                parserInput.forget();
+                return new(tree.mixin.Call)(elements, args, index, fileInfo, important);
+              }
+            }
+
+            parserInput.restore();
+          },
+          args: function (isCall) {
+            var entities = parsers.entities,
+              returner = { args:null, variadic: false },
+              expressions = [], argsSemiColon = [], argsComma = [],
+              isSemiColonSeparated, expressionContainsNamed, name, nameLoop,
+              value, arg, expand;
+
+            parserInput.save();
+
+            while (true) {
+              if (isCall) {
+                arg = parsers.detachedRuleset() || parsers.expression();
+              } else {
+                parserInput.commentStore.length = 0;
+                if (parserInput.$str("...")) {
+                  returner.variadic = true;
+                  if (parserInput.$char(";") && !isSemiColonSeparated) {
+                    isSemiColonSeparated = true;
+                  }
+                  (isSemiColonSeparated ? argsSemiColon : argsComma)
+                    .push({ variadic: true });
+                  break;
+                }
+                arg = entities.variable() || entities.literal() || entities.keyword();
+              }
+
+              if (!arg) {
+                break;
+              }
+
+              nameLoop = null;
+              if (arg.throwAwayComments) {
+                arg.throwAwayComments();
+              }
+              value = arg;
+              var val = null;
+
+              if (isCall) {
+                // Variable
+                if (arg.value && arg.value.length == 1) {
+                  val = arg.value[0];
+                }
+              } else {
+                val = arg;
+              }
+
+              if (val && val instanceof tree.Variable) {
+                if (parserInput.$char(':')) {
+                  if (expressions.length > 0) {
+                    if (isSemiColonSeparated) {
+                      error("Cannot mix ; and , as delimiter types");
+                    }
+                    expressionContainsNamed = true;
+                  }
+
+                  value = parsers.detachedRuleset() || parsers.expression();
+
+                  if (!value) {
+                    if (isCall) {
+                      error("could not understand value for named argument");
+                    } else {
+                      parserInput.restore();
+                      returner.args = [];
+                      return returner;
+                    }
+                  }
+                  nameLoop = (name = val.name);
+                } else if (parserInput.$str("...")) {
+                  if (!isCall) {
+                    returner.variadic = true;
+                    if (parserInput.$char(";") && !isSemiColonSeparated) {
+                      isSemiColonSeparated = true;
+                    }
+                    (isSemiColonSeparated ? argsSemiColon : argsComma)
+                      .push({ name: arg.name, variadic: true });
+                    break;
+                  } else {
+                    expand = true;
+                  }
+                } else if (!isCall) {
+                  name = nameLoop = val.name;
+                  value = null;
+                }
+              }
+
+              if (value) {
+                expressions.push(value);
+              }
+
+              argsComma.push({ name:nameLoop, value:value, expand:expand });
+
+              if (parserInput.$char(',')) {
+                continue;
+              }
+
+              if (parserInput.$char(';') || isSemiColonSeparated) {
+
+                if (expressionContainsNamed) {
+                  error("Cannot mix ; and , as delimiter types");
+                }
+
+                isSemiColonSeparated = true;
+
+                if (expressions.length > 1) {
+                  value = new(tree.Value)(expressions);
+                }
+                argsSemiColon.push({ name:name, value:value, expand:expand });
+
+                name = null;
+                expressions = [];
+                expressionContainsNamed = false;
+              }
+            }
+
+            parserInput.forget();
+            returner.args = isSemiColonSeparated ? argsSemiColon : argsComma;
+            return returner;
+          },
+          //
+          // A Mixin definition, with a list of parameters
+          //
+          //     .rounded (@radius: 2px, @color) {
+          //        ...
+          //     }
+          //
+          // Until we have a finer grained state-machine, we have to
+          // do a look-ahead, to make sure we don't have a mixin call.
+          // See the `rule` function for more information.
+          //
+          // We start by matching `.rounded (`, and then proceed on to
+          // the argument list, which has optional default values.
+          // We store the parameters in `params`, with a `value` key,
+          // if there is a value, such as in the case of `@radius`.
+          //
+          // Once we've got our params list, and a closing `)`, we parse
+          // the `{...}` block.
+          //
+          definition: function () {
+            var name, params = [], match, ruleset, cond, variadic = false;
+            if ((parserInput.currentChar() !== '.' && parserInput.currentChar() !== '#') ||
+              parserInput.peek(/^[^{]*\}/)) {
+              return;
+            }
+
+            parserInput.save();
+
+            match = parserInput.$re(/^([#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+)\s*\(/);
+            if (match) {
+              name = match[1];
+
+              var argInfo = this.args(false);
+              params = argInfo.args;
+              variadic = argInfo.variadic;
+
+              // .mixincall("@{a}");
+              // looks a bit like a mixin definition..
+              // also
+              // .mixincall(@a: {rule: set;});
+              // so we have to be nice and restore
+              if (!parserInput.$char(')')) {
+                parserInput.restore("Missing closing ')'");
+                return;
+              }
+
+              parserInput.commentStore.length = 0;
+
+              if (parserInput.$str("when")) { // Guard
+                cond = expect(parsers.conditions, 'expected condition');
+              }
+
+              ruleset = parsers.block();
+
+              if (ruleset) {
+                parserInput.forget();
+                return new(tree.mixin.Definition)(name, params, ruleset, cond, variadic);
+              } else {
+                parserInput.restore();
+              }
+            } else {
+              parserInput.forget();
+            }
+          }
+        },
+
+        //
+        // Entities are the smallest recognized token,
+        // and can be found inside a rule's value.
+        //
+        entity: function () {
+          var entities = this.entities;
+
+          return this.comment() || entities.literal() || entities.variable() || entities.url() ||
+            entities.call()    || entities.keyword()  || entities.javascript();
+        },
+
+        //
+        // A Rule terminator. Note that we use `peek()` to check for '}',
+        // because the `block` rule will be expecting it, but we still need to make sure
+        // it's there, if ';' was omitted.
+        //
+        end: function () {
+          return parserInput.$char(';') || parserInput.peek('}');
+        },
+
+        //
+        // IE's alpha function
+        //
+        //     alpha(opacity=88)
+        //
+        alpha: function () {
+          var value;
+
+          // http://jsperf.com/case-insensitive-regex-vs-strtolower-then-regex/18
+          if (! parserInput.$re(/^opacity=/i)) { return; }
+          value = parserInput.$re(/^\d+/);
+          if (!value) {
+            value = expect(this.entities.variable, "Could not parse alpha");
+          }
+          expectChar(')');
+          return new(tree.Alpha)(value);
+        },
+
+        //
+        // A Selector Element
+        //
+        //     div
+        //     + h1
+        //     #socks
+        //     input[type="text"]
+        //
+        // Elements are the building blocks for Selectors,
+        // they are made out of a `Combinator` (see combinator rule),
+        // and an element name, such as a tag a class, or `*`.
+        //
+        element: function () {
+          var e, c, v, index = parserInput.i;
+
+          c = this.combinator();
+
+          e = parserInput.$re(/^(?:\d+\.\d+|\d+)%/) ||
+            parserInput.$re(/^(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/) ||
+            parserInput.$char('*') || parserInput.$char('&') || this.attribute() ||
+            parserInput.$re(/^\([^&()@]+\)/) ||  parserInput.$re(/^[\.#:](?=@)/) ||
+            this.entities.variableCurly();
+
+          if (! e) {
+            parserInput.save();
+            if (parserInput.$char('(')) {
+              if ((v = this.selector()) && parserInput.$char(')')) {
+                e = new(tree.Paren)(v);
+                parserInput.forget();
+              } else {
+                parserInput.restore("Missing closing ')'");
+              }
+            } else {
+              parserInput.forget();
+            }
+          }
+
+          if (e) { return new(tree.Element)(c, e, index, fileInfo); }
+        },
+
+        //
+        // Combinators combine elements together, in a Selector.
+        //
+        // Because our parser isn't white-space sensitive, special care
+        // has to be taken, when parsing the descendant combinator, ` `,
+        // as it's an empty space. We have to check the previous character
+        // in the input, to see if it's a ` ` character. More info on how
+        // we deal with this in *combinator.js*.
+        //
+        combinator: function () {
+          var c = parserInput.currentChar();
+
+          if (c === '/') {
+            parserInput.save();
+            var slashedCombinator = parserInput.$re(/^\/[a-z]+\//i);
+            if (slashedCombinator) {
+              parserInput.forget();
+              return new(tree.Combinator)(slashedCombinator);
+            }
+            parserInput.restore();
+          }
+
+          if (c === '>' || c === '+' || c === '~' || c === '|' || c === '^') {
+            parserInput.i++;
+            if (c === '^' && parserInput.currentChar() === '^') {
+              c = '^^';
+              parserInput.i++;
+            }
+            while (parserInput.isWhitespace()) { parserInput.i++; }
+            return new(tree.Combinator)(c);
+          } else if (parserInput.isWhitespace(-1)) {
+            return new(tree.Combinator)(" ");
+          } else {
+            return new(tree.Combinator)(null);
+          }
+        },
+        //
+        // A CSS selector (see selector below)
+        // with less extensions e.g. the ability to extend and guard
+        //
+        lessSelector: function () {
+          return this.selector(true);
+        },
+        //
+        // A CSS Selector
+        //
+        //     .class > div + h1
+        //     li a:hover
+        //
+        // Selectors are made out of one or more Elements, see above.
+        //
+        selector: function (isLess) {
+          var index = parserInput.i, elements, extendList, c, e, allExtends, when, condition;
+
+          while ((isLess && (extendList = this.extend())) || (isLess && (when = parserInput.$str("when"))) || (e = this.element())) {
+            if (when) {
+              condition = expect(this.conditions, 'expected condition');
+            } else if (condition) {
+              error("CSS guard can only be used at the end of selector");
+            } else if (extendList) {
+              if (allExtends) {
+                allExtends = allExtends.concat(extendList);
+              } else {
+                allExtends = extendList;
+              }
+            } else {
+              if (allExtends) { error("Extend can only be used at the end of selector"); }
+              c = parserInput.currentChar();
+              if (elements) {
+                elements.push(e);
+              } else {
+                elements = [ e ];
+              }
+              e = null;
+            }
+            if (c === '{' || c === '}' || c === ';' || c === ',' || c === ')') {
+              break;
+            }
+          }
+
+          if (elements) { return new(tree.Selector)(elements, allExtends, condition, index, fileInfo); }
+          if (allExtends) { error("Extend must be used to extend a selector, it cannot be used on its own"); }
+        },
+        attribute: function () {
+          if (! parserInput.$char('[')) { return; }
+
+          var entities = this.entities,
+            key, val, op;
+
+          if (!(key = entities.variableCurly())) {
+            key = expect(/^(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/);
+          }
+
+          op = parserInput.$re(/^[|~*$^]?=/);
+          if (op) {
+            val = entities.quoted() || parserInput.$re(/^[0-9]+%/) || parserInput.$re(/^[\w-]+/) || entities.variableCurly();
+          }
+
+          expectChar(']');
+
+          return new(tree.Attribute)(key, op, val);
+        },
+
+        //
+        // The `block` rule is used by `ruleset` and `mixin.definition`.
+        // It's a wrapper around the `primary` rule, with added `{}`.
+        //
+        block: function () {
+          var content;
+          if (parserInput.$char('{') && (content = this.primary()) && parserInput.$char('}')) {
+            return content;
+          }
+        },
+
+        blockRuleset: function() {
+          var block = this.block();
+
+          if (block) {
+            block = new tree.Ruleset(null, block);
+          }
+          return block;
+        },
+
+        detachedRuleset: function() {
+          var blockRuleset = this.blockRuleset();
+          if (blockRuleset) {
+            return new tree.DetachedRuleset(blockRuleset);
+          }
+        },
+
+        //
+        // div, .class, body > p {...}
+        //
+        ruleset: function () {
+          var selectors, s, rules, debugInfo;
+
+          parserInput.save();
+
+          if (context.dumpLineNumbers) {
+            debugInfo = getDebugInfo(parserInput.i);
+          }
+
+          while (true) {
+            s = this.lessSelector();
+            if (!s) {
+              break;
+            }
+            if (selectors) {
+              selectors.push(s);
+            } else {
+              selectors = [ s ];
+            }
+            parserInput.commentStore.length = 0;
+            if (s.condition && selectors.length > 1) {
+              error("Guards are only currently allowed on a single selector.");
+            }
+            if (! parserInput.$char(',')) { break; }
+            if (s.condition) {
+              error("Guards are only currently allowed on a single selector.");
+            }
+            parserInput.commentStore.length = 0;
+          }
+
+          if (selectors && (rules = this.block())) {
+            parserInput.forget();
+            var ruleset = new(tree.Ruleset)(selectors, rules, context.strictImports);
+            if (context.dumpLineNumbers) {
+              ruleset.debugInfo = debugInfo;
+            }
+            return ruleset;
+          } else {
+            parserInput.restore();
+          }
+        },
+        rule: function (tryAnonymous) {
+          var name, value, startOfRule = parserInput.i, c = parserInput.currentChar(), important, merge, isVariable;
+
+          if (c === '.' || c === '#' || c === '&' || c === ':') { return; }
+
+          parserInput.save();
+
+          name = this.variable() || this.ruleProperty();
+          if (name) {
+            isVariable = typeof name === "string";
+
+            if (isVariable) {
+              value = this.detachedRuleset();
+            }
+
+            parserInput.commentStore.length = 0;
+            if (!value) {
+              // a name returned by this.ruleProperty() is always an array of the form:
+              // [string-1, ..., string-n, ""] or [string-1, ..., string-n, "+"]
+              // where each item is a tree.Keyword or tree.Variable
+              merge = !isVariable && name.length > 1 && name.pop().value;
+
+              // prefer to try to parse first if its a variable or we are compressing
+              // but always fallback on the other one
+              var tryValueFirst = !tryAnonymous && (context.compress || isVariable);
+
+              if (tryValueFirst) {
+                value = this.value();
+              }
+              if (!value) {
+                value = this.anonymousValue();
+                if (value) {
+                  parserInput.forget();
+                  // anonymous values absorb the end ';' which is required for them to work
+                  return new (tree.Rule)(name, value, false, merge, startOfRule, fileInfo);
+                }
+              }
+              if (!tryValueFirst && !value) {
+                value = this.value();
+              }
+
+              important = this.important();
+            }
+
+            if (value && this.end()) {
+              parserInput.forget();
+              return new (tree.Rule)(name, value, important, merge, startOfRule, fileInfo);
+            } else {
+              parserInput.restore();
+              if (value && !tryAnonymous) {
+                return this.rule(true);
+              }
+            }
+          } else {
+            parserInput.forget();
+          }
+        },
+        anonymousValue: function () {
+          var match = parserInput.$re(/^([^@+\/'"*`(;{}-]*);/);
+          if (match) {
+            return new(tree.Anonymous)(match[1]);
+          }
+        },
+
+        //
+        // An @import directive
+        //
+        //     @import "lib";
+        //
+        // Depending on our environment, importing is done differently:
+        // In the browser, it's an XHR request, in Node, it would be a
+        // file-system operation. The function used for importing is
+        // stored in `import`, which we pass to the Import constructor.
+        //
+        "import": function () {
+          var path, features, index = parserInput.i;
+
+          var dir = parserInput.$re(/^@import?\s+/);
+
+          if (dir) {
+            var options = (dir ? this.importOptions() : null) || {};
+
+            if ((path = this.entities.quoted() || this.entities.url())) {
+              features = this.mediaFeatures();
+
+              if (!parserInput.$char(';')) {
+                parserInput.i = index;
+                error("missing semi-colon or unrecognised media features on import");
+              }
+              features = features && new(tree.Value)(features);
+              return new(tree.Import)(path, features, options, index, fileInfo);
+            }
+            else {
+              parserInput.i = index;
+              error("malformed import statement");
+            }
+          }
+        },
+
+        importOptions: function() {
+          var o, options = {}, optionName, value;
+
+          // list of options, surrounded by parens
+          if (! parserInput.$char('(')) { return null; }
+          do {
+            o = this.importOption();
+            if (o) {
+              optionName = o;
+              value = true;
+              switch(optionName) {
+                case "css":
+                  optionName = "less";
+                  value = false;
+                  break;
+                case "once":
+                  optionName = "multiple";
+                  value = false;
+                  break;
+              }
+              options[optionName] = value;
+              if (! parserInput.$char(',')) { break; }
+            }
+          } while (o);
+          expectChar(')');
+          return options;
+        },
+
+        importOption: function() {
+          var opt = parserInput.$re(/^(less|css|multiple|once|inline|reference|optional)/);
+          if (opt) {
+            return opt[1];
+          }
+        },
+
+        mediaFeature: function () {
+          var entities = this.entities, nodes = [], e, p;
+          parserInput.save();
+          do {
+            e = entities.keyword() || entities.variable();
+            if (e) {
+              nodes.push(e);
+            } else if (parserInput.$char('(')) {
+              p = this.property();
+              e = this.value();
+              if (parserInput.$char(')')) {
+                if (p && e) {
+                  nodes.push(new(tree.Paren)(new(tree.Rule)(p, e, null, null, parserInput.i, fileInfo, true)));
+                } else if (e) {
+                  nodes.push(new(tree.Paren)(e));
+                } else {
+                  error("badly formed media feature definition");
+                }
+              } else {
+                error("Missing closing ')'", "Parse");
+              }
+            }
+          } while (e);
+
+          parserInput.forget();
+          if (nodes.length > 0) {
+            return new(tree.Expression)(nodes);
+          }
+        },
+
+        mediaFeatures: function () {
+          var entities = this.entities, features = [], e;
+          do {
+            e = this.mediaFeature();
+            if (e) {
+              features.push(e);
+              if (! parserInput.$char(',')) { break; }
+            } else {
+              e = entities.variable();
+              if (e) {
+                features.push(e);
+                if (! parserInput.$char(',')) { break; }
+              }
+            }
+          } while (e);
+
+          return features.length > 0 ? features : null;
+        },
+
+        media: function () {
+          var features, rules, media, debugInfo, index = parserInput.i;
+
+          if (context.dumpLineNumbers) {
+            debugInfo = getDebugInfo(index);
+          }
+
+          parserInput.save();
+
+          if (parserInput.$str("@media")) {
+            features = this.mediaFeatures();
+
+            rules = this.block();
+
+            if (!rules) {
+              error("media definitions require block statements after any features");
+            }
+
+            parserInput.forget();
+
+            media = new(tree.Media)(rules, features, index, fileInfo);
+            if (context.dumpLineNumbers) {
+              media.debugInfo = debugInfo;
+            }
+
+            return media;
+          }
+
+          parserInput.restore();
+        },
+
+        //
+        // A @plugin directive, used to import compiler extensions dynamically.
+        //
+        //     @plugin "lib";
+        //
+        // Depending on our environment, importing is done differently:
+        // In the browser, it's an XHR request, in Node, it would be a
+        // file-system operation. The function used for importing is
+        // stored in `import`, which we pass to the Import constructor.
+        //
+        plugin: function () {
+          var path,
+            index = parserInput.i,
+            dir   = parserInput.$re(/^@plugin?\s+/);
+
+          if (dir) {
+            var options = { plugin : true };
+
+            if ((path = this.entities.quoted() || this.entities.url())) {
+
+              if (!parserInput.$char(';')) {
+                parserInput.i = index;
+                error("missing semi-colon on plugin");
+              }
+
+              return new(tree.Import)(path, null, options, index, fileInfo);
+            }
+            else {
+              parserInput.i = index;
+              error("malformed plugin statement");
+            }
+          }
+        },
+
+        //
+        // A CSS Directive
+        //
+        //     @charset "utf-8";
+        //
+        directive: function () {
+          var index = parserInput.i, name, value, rules, nonVendorSpecificName,
+            hasIdentifier, hasExpression, hasUnknown, hasBlock = true, isRooted = true;
+
+          if (parserInput.currentChar() !== '@') { return; }
+
+          value = this['import']() || this.plugin() || this.media();
+          if (value) {
+            return value;
+          }
+
+          parserInput.save();
+
+          name = parserInput.$re(/^@[a-z-]+/);
+
+          if (!name) { return; }
+
+          nonVendorSpecificName = name;
+          if (name.charAt(1) == '-' && name.indexOf('-', 2) > 0) {
+            nonVendorSpecificName = "@" + name.slice(name.indexOf('-', 2) + 1);
+          }
+
+          switch(nonVendorSpecificName) {
+            case "@charset":
+              hasIdentifier = true;
+              hasBlock = false;
+              break;
+            case "@namespace":
+              hasExpression = true;
+              hasBlock = false;
+              break;
+            case "@keyframes":
+            case "@counter-style":
+              hasIdentifier = true;
+              break;
+            case "@document":
+            case "@supports":
+              hasUnknown = true;
+              isRooted = false;
+              break;
+            default:
+              hasUnknown = true;
+              break;
+          }
+
+          parserInput.commentStore.length = 0;
+
+          if (hasIdentifier) {
+            value = this.entity();
+            if (!value) {
+              error("expected " + name + " identifier");
+            }
+          } else if (hasExpression) {
+            value = this.expression();
+            if (!value) {
+              error("expected " + name + " expression");
+            }
+          } else if (hasUnknown) {
+            value = (parserInput.$re(/^[^{;]+/) || '').trim();
+            hasBlock = (parserInput.currentChar() == '{');
+            if (value) {
+              value = new(tree.Anonymous)(value);
+            }
+          }
+
+          if (hasBlock) {
+            rules = this.blockRuleset();
+          }
+
+          if (rules || (!hasBlock && value && parserInput.$char(';'))) {
+            parserInput.forget();
+            return new (tree.Directive)(name, value, rules, index, fileInfo,
+              context.dumpLineNumbers ? getDebugInfo(index) : null,
+              isRooted
+            );
+          }
+
+          parserInput.restore("directive options not recognised");
+        },
+
+        //
+        // A Value is a comma-delimited list of Expressions
+        //
+        //     font-family: Baskerville, Georgia, serif;
+        //
+        // In a Rule, a Value represents everything after the `:`,
+        // and before the `;`.
+        //
+        value: function () {
+          var e, expressions = [];
+
+          do {
+            e = this.expression();
+            if (e) {
+              expressions.push(e);
+              if (! parserInput.$char(',')) { break; }
+            }
+          } while (e);
+
+          if (expressions.length > 0) {
+            return new(tree.Value)(expressions);
+          }
+        },
+        important: function () {
+          if (parserInput.currentChar() === '!') {
+            return parserInput.$re(/^! *important/);
+          }
+        },
+        sub: function () {
+          var a, e;
+
+          parserInput.save();
+          if (parserInput.$char('(')) {
+            a = this.addition();
+            if (a && parserInput.$char(')')) {
+              parserInput.forget();
+              e = new(tree.Expression)([a]);
+              e.parens = true;
+              return e;
+            }
+            parserInput.restore("Expected ')'");
+            return;
+          }
+          parserInput.restore();
+        },
+        multiplication: function () {
+          var m, a, op, operation, isSpaced;
+          m = this.operand();
+          if (m) {
+            isSpaced = parserInput.isWhitespace(-1);
+            while (true) {
+              if (parserInput.peek(/^\/[*\/]/)) {
+                break;
+              }
+
+              parserInput.save();
+
+              op = parserInput.$char('/') || parserInput.$char('*');
+
+              if (!op) { parserInput.forget(); break; }
+
+              a = this.operand();
+
+              if (!a) { parserInput.restore(); break; }
+              parserInput.forget();
+
+              m.parensInOp = true;
+              a.parensInOp = true;
+              operation = new(tree.Operation)(op, [operation || m, a], isSpaced);
+              isSpaced = parserInput.isWhitespace(-1);
+            }
+            return operation || m;
+          }
+        },
+        addition: function () {
+          var m, a, op, operation, isSpaced;
+          m = this.multiplication();
+          if (m) {
+            isSpaced = parserInput.isWhitespace(-1);
+            while (true) {
+              op = parserInput.$re(/^[-+]\s+/) || (!isSpaced && (parserInput.$char('+') || parserInput.$char('-')));
+              if (!op) {
+                break;
+              }
+              a = this.multiplication();
+              if (!a) {
+                break;
+              }
+
+              m.parensInOp = true;
+              a.parensInOp = true;
+              operation = new(tree.Operation)(op, [operation || m, a], isSpaced);
+              isSpaced = parserInput.isWhitespace(-1);
+            }
+            return operation || m;
+          }
+        },
+        conditions: function () {
+          var a, b, index = parserInput.i, condition;
+
+          a = this.condition();
+          if (a) {
+            while (true) {
+              if (!parserInput.peek(/^,\s*(not\s*)?\(/) || !parserInput.$char(',')) {
+                break;
+              }
+              b = this.condition();
+              if (!b) {
+                break;
+              }
+              condition = new(tree.Condition)('or', condition || a, b, index);
+            }
+            return condition || a;
+          }
+        },
+        condition: function () {
+          var result, logical, next;
+          function or() {
+            return parserInput.$str("or");
+          }
+
+          result = this.conditionAnd(this);
+          if (!result) {
+            return ;
+          }
+          logical = or();
+          if (logical) {
+            next = this.condition();
+            if (next) {
+              result = new(tree.Condition)(logical, result, next);
+            } else {
+              return ;
+            }
+          }
+          return result;
+        },
+        conditionAnd: function () {
+          var result, logical, next;
+          function insideCondition(me) {
+            return me.negatedCondition() || me.parenthesisCondition();
+          }
+          function and() {
+            return parserInput.$str("and");
+          }
+
+          result = insideCondition(this);
+          if (!result) {
+            return ;
+          }
+          logical = and();
+          if (logical) {
+            next = this.conditionAnd();
+            if (next) {
+              result = new(tree.Condition)(logical, result, next);
+            } else {
+              return ;
+            }
+          }
+          return result;
+        },
+        negatedCondition: function () {
+          if (parserInput.$str("not")) {
+            var result = this.parenthesisCondition();
+            if (result) {
+              result.negate = !result.negate;
+            }
+            return result;
+          }
+        },
+        parenthesisCondition: function () {
+          function tryConditionFollowedByParenthesis(me) {
+            var body;
+            parserInput.save();
+            body = me.condition();
+            if (!body) {
+              parserInput.restore();
+              return ;
+            }
+            if (!parserInput.$char(')')) {
+              parserInput.restore();
+              return ;
+            }
+            parserInput.forget();
+            return body;
+          }
+
+          var body;
+          parserInput.save();
+          if (!parserInput.$str("(")) {
+            parserInput.restore();
+            return ;
+          }
+          body = tryConditionFollowedByParenthesis(this);
+          if (body) {
+            parserInput.forget();
+            return body;
+          }
+
+          body = this.atomicCondition();
+          if (!body) {
+            parserInput.restore();
+            return ;
+          }
+          if (!parserInput.$char(')')) {
+            parserInput.restore("expected ')' got '" + parserInput.currentChar() + "'");
+            return ;
+          }
+          parserInput.forget();
+          return body;
+        },
+        atomicCondition: function () {
+          var entities = this.entities, index = parserInput.i, a, b, c, op;
+
+          a = this.addition() || entities.keyword() || entities.quoted();
+          if (a) {
+            if (parserInput.$char('>')) {
+              if (parserInput.$char('=')) {
+                op = ">=";
+              } else {
+                op = '>';
+              }
+            } else
+            if (parserInput.$char('<')) {
+              if (parserInput.$char('=')) {
+                op = "<=";
+              } else {
+                op = '<';
+              }
+            } else
+            if (parserInput.$char('=')) {
+              if (parserInput.$char('>')) {
+                op = "=>";
+              } else if (parserInput.$char('<')) {
+                op = '=<';
+              } else {
+                op = '=';
+              }
+            }
+            if (op) {
+              b = this.addition() || entities.keyword() || entities.quoted();
+              if (b) {
+                c = new(tree.Condition)(op, a, b, index, false);
+              } else {
+                error('expected expression');
+              }
+            } else {
+              c = new(tree.Condition)('=', a, new(tree.Keyword)('true'), index, false);
+            }
+            return c;
+          }
+        },
+
+        //
+        // An operand is anything that can be part of an operation,
+        // such as a Color, or a Variable
+        //
+        operand: function () {
+          var entities = this.entities, negate;
+
+          if (parserInput.peek(/^-[@\(]/)) {
+            negate = parserInput.$char('-');
+          }
+
+          var o = this.sub() || entities.dimension() ||
+            entities.color() || entities.variable() ||
+            entities.call() || entities.colorKeyword();
+
+          if (negate) {
+            o.parensInOp = true;
+            o = new(tree.Negative)(o);
+          }
+
+          return o;
+        },
+
+        //
+        // Expressions either represent mathematical operations,
+        // or white-space delimited Entities.
+        //
+        //     1px solid black
+        //     @var * 2
+        //
+        expression: function () {
+          var entities = [], e, delim;
+
+          do {
+            e = this.comment();
+            if (e) {
+              entities.push(e);
+              continue;
+            }
+            e = this.addition() || this.entity();
+            if (e) {
+              entities.push(e);
+              // operations do not allow keyword "/" dimension (e.g. small/20px) so we support that here
+              if (!parserInput.peek(/^\/[\/*]/)) {
+                delim = parserInput.$char('/');
+                if (delim) {
+                  entities.push(new(tree.Anonymous)(delim));
+                }
+              }
+            }
+          } while (e);
+          if (entities.length > 0) {
+            return new(tree.Expression)(entities);
+          }
+        },
+        property: function () {
+          var name = parserInput.$re(/^(\*?-?[_a-zA-Z0-9-]+)\s*:/);
+          if (name) {
+            return name[1];
+          }
+        },
+        ruleProperty: function () {
+          var name = [], index = [], s, k;
+
+          parserInput.save();
+
+          var simpleProperty = parserInput.$re(/^([_a-zA-Z0-9-]+)\s*:/);
+          if (simpleProperty) {
+            name = [new(tree.Keyword)(simpleProperty[1])];
+            parserInput.forget();
+            return name;
+          }
+
+          function match(re) {
+            var i = parserInput.i,
+              chunk = parserInput.$re(re);
+            if (chunk) {
+              index.push(i);
+              return name.push(chunk[1]);
+            }
+          }
+
+          match(/^(\*?)/);
+          while (true) {
+            if (!match(/^((?:[\w-]+)|(?:@\{[\w-]+\}))/)) {
+              break;
+            }
+          }
+
+          if ((name.length > 1) && match(/^((?:\+_|\+)?)\s*:/)) {
+            parserInput.forget();
+
+            // at last, we have the complete match now. move forward,
+            // convert name particles to tree objects and return:
+            if (name[0] === '') {
+              name.shift();
+              index.shift();
+            }
+            for (k = 0; k < name.length; k++) {
+              s = name[k];
+              name[k] = (s.charAt(0) !== '@') ?
+                new(tree.Keyword)(s) :
+                new(tree.Variable)('@' + s.slice(2, -1),
+                  index[k], fileInfo);
+            }
+            return name;
+          }
+          parserInput.restore();
+        }
+      }
+    };
+  };
+  Parser.serializeVars = function(vars) {
+    var s = '';
+
+    for (var name in vars) {
+      if (Object.hasOwnProperty.call(vars, name)) {
+        var value = vars[name];
+        s += ((name[0] === '@') ? '' : '@') + name + ': ' + value +
+          ((String(value).slice(-1) === ';') ? '' : ';');
+      }
+    }
+
+    return s;
+  };
+
+  module.exports = Parser;
+
+},{"../less-error":32,"../tree":62,"../utils":83,"../visitors":87,"./parser-input":37}],39:[function(require,module,exports){
+  /**
+   * Plugin Manager
+   */
+  var PluginManager = function(less) {
+    this.less = less;
+    this.visitors = [];
+    this.preProcessors = [];
+    this.postProcessors = [];
+    this.installedPlugins = [];
+    this.fileManagers = [];
+  };
+  /**
+   * Adds all the plugins in the array
+   * @param {Array} plugins
+   */
+  PluginManager.prototype.addPlugins = function(plugins) {
+    if (plugins) {
+      for (var i = 0; i < plugins.length; i++) {
+        this.addPlugin(plugins[i]);
+      }
+    }
+  };
+  /**
+   *
+   * @param plugin
+   */
+  PluginManager.prototype.addPlugin = function(plugin) {
+    this.installedPlugins.push(plugin);
+    plugin.install(this.less, this);
+  };
+  /**
+   * Adds a visitor. The visitor object has options on itself to determine
+   * when it should run.
+   * @param visitor
+   */
+  PluginManager.prototype.addVisitor = function(visitor) {
+    this.visitors.push(visitor);
+  };
+  /**
+   * Adds a pre processor object
+   * @param {object} preProcessor
+   * @param {number} priority - guidelines 1 = before import, 1000 = import, 2000 = after import
+   */
+  PluginManager.prototype.addPreProcessor = function(preProcessor, priority) {
+    var indexToInsertAt;
+    for (indexToInsertAt = 0; indexToInsertAt < this.preProcessors.length; indexToInsertAt++) {
+      if (this.preProcessors[indexToInsertAt].priority >= priority) {
+        break;
+      }
+    }
+    this.preProcessors.splice(indexToInsertAt, 0, {preProcessor: preProcessor, priority: priority});
+  };
+  /**
+   * Adds a post processor object
+   * @param {object} postProcessor
+   * @param {number} priority - guidelines 1 = before compression, 1000 = compression, 2000 = after compression
+   */
+  PluginManager.prototype.addPostProcessor = function(postProcessor, priority) {
+    var indexToInsertAt;
+    for (indexToInsertAt = 0; indexToInsertAt < this.postProcessors.length; indexToInsertAt++) {
+      if (this.postProcessors[indexToInsertAt].priority >= priority) {
+        break;
+      }
+    }
+    this.postProcessors.splice(indexToInsertAt, 0, {postProcessor: postProcessor, priority: priority});
+  };
+  /**
+   *
+   * @param manager
+   */
+  PluginManager.prototype.addFileManager = function(manager) {
+    this.fileManagers.push(manager);
+  };
+  /**
+   *
+   * @returns {Array}
+   * @private
+   */
+  PluginManager.prototype.getPreProcessors = function() {
+    var preProcessors = [];
+    for (var i = 0; i < this.preProcessors.length; i++) {
+      preProcessors.push(this.preProcessors[i].preProcessor);
+    }
+    return preProcessors;
+  };
+  /**
+   *
+   * @returns {Array}
+   * @private
+   */
+  PluginManager.prototype.getPostProcessors = function() {
+    var postProcessors = [];
+    for (var i = 0; i < this.postProcessors.length; i++) {
+      postProcessors.push(this.postProcessors[i].postProcessor);
+    }
+    return postProcessors;
+  };
+  /**
+   *
+   * @returns {Array}
+   * @private
+   */
+  PluginManager.prototype.getVisitors = function() {
+    return this.visitors;
+  };
+  /**
+   *
+   * @returns {Array}
+   * @private
+   */
+  PluginManager.prototype.getFileManagers = function() {
+    return this.fileManagers;
+  };
+  module.exports = PluginManager;
+
+},{}],40:[function(require,module,exports){
+  var LessError = require('../less-error'),
+    tree = require("../tree");
+
+  var FunctionImporter = module.exports = function FunctionImporter(context, fileInfo) {
+    this.fileInfo = fileInfo;
+  };
+
+  FunctionImporter.prototype.eval = function(contents, callback) {
+    var loaded = {},
+      loader,
+      registry;
+
+    registry = {
+      add: function(name, func) {
+        loaded[name] = func;
+      },
+      addMultiple: function(functions) {
+        Object.keys(functions).forEach(function(name) {
+          loaded[name] = functions[name];
+        });
+      }
+    };
+
+    try {
+      loader = new Function("functions", "tree", "fileInfo", contents);
+      loader(registry, tree, this.fileInfo);
+    } catch(e) {
+      callback(new LessError({
+        message: "Plugin evaluation error: '" + e.name + ': ' + e.message.replace(/["]/g, "'") + "'" ,
+        filename: this.fileInfo.filename
+      }), null );
+    }
+
+    callback(null, { functions: loaded });
+  };
+
+},{"../less-error":32,"../tree":62}],41:[function(require,module,exports){
+  var PromiseConstructor;
+
+  module.exports = function(environment, ParseTree, ImportManager) {
+    var render = function (input, options, callback) {
+      if (typeof options === 'function') {
+        callback = options;
+        options = {};
+      }
+
+      if (!callback) {
+        if (!PromiseConstructor) {
+          PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
+        }
+        var self = this;
+        return new PromiseConstructor(function (resolve, reject) {
+          render.call(self, input, options, function(err, output) {
+            if (err) {
+              reject(err);
+            } else {
+              resolve(output);
+            }
+          });
+        });
+      } else {
+        this.parse(input, options, function(err, root, imports, options) {
+          if (err) { return callback(err); }
+
+          var result;
+          try {
+            var parseTree = new ParseTree(root, imports);
+            result = parseTree.toCSS(options);
+          }
+          catch (err) { return callback(err); }
+
+          callback(null, result);
+        });
+      }
+    };
+
+    return render;
+  };
+
+},{"promise":undefined}],42:[function(require,module,exports){
+  module.exports = function (SourceMapOutput, environment) {
+
+    var SourceMapBuilder = function (options) {
+      this.options = options;
+    };
+
+    SourceMapBuilder.prototype.toCSS = function(rootNode, options, imports) {
+      var sourceMapOutput = new SourceMapOutput(
+        {
+          contentsIgnoredCharsMap: imports.contentsIgnoredChars,
+          rootNode: rootNode,
+          contentsMap: imports.contents,
+          sourceMapFilename: this.options.sourceMapFilename,
+          sourceMapURL: this.options.sourceMapURL,
+          outputFilename: this.options.sourceMapOutputFilename,
+          sourceMapBasepath: this.options.sourceMapBasepath,
+          sourceMapRootpath: this.options.sourceMapRootpath,
+          outputSourceFiles: this.options.outputSourceFiles,
+          sourceMapGenerator: this.options.sourceMapGenerator,
+          sourceMapFileInline: this.options.sourceMapFileInline
+        });
+
+      var css = sourceMapOutput.toCSS(options);
+      this.sourceMap = sourceMapOutput.sourceMap;
+      this.sourceMapURL = sourceMapOutput.sourceMapURL;
+      if (this.options.sourceMapInputFilename) {
+        this.sourceMapInputFilename = sourceMapOutput.normalizeFilename(this.options.sourceMapInputFilename);
+      }
+      return css + this.getCSSAppendage();
+    };
+
+    SourceMapBuilder.prototype.getCSSAppendage = function() {
+
+      var sourceMapURL = this.sourceMapURL;
+      if (this.options.sourceMapFileInline) {
+        if (this.sourceMap === undefined) {
+          return "";
+        }
+        sourceMapURL = "data:application/json;base64," + environment.encodeBase64(this.sourceMap);
+      }
+
+      if (sourceMapURL) {
+        return "/*# sourceMappingURL=" + sourceMapURL + " */";
+      }
+      return "";
+    };
+
+    SourceMapBuilder.prototype.getExternalSourceMap = function() {
+      return this.sourceMap;
+    };
+    SourceMapBuilder.prototype.setExternalSourceMap = function(sourceMap) {
+      this.sourceMap = sourceMap;
+    };
+
+    SourceMapBuilder.prototype.isInline = function() {
+      return this.options.sourceMapFileInline;
+    };
+    SourceMapBuilder.prototype.getSourceMapURL = function() {
+      return this.sourceMapURL;
+    };
+    SourceMapBuilder.prototype.getOutputFilename = function() {
+      return this.options.sourceMapOutputFilename;
+    };
+    SourceMapBuilder.prototype.getInputFilename = function() {
+      return this.sourceMapInputFilename;
+    };
+
+    return SourceMapBuilder;
+  };
+
+},{}],43:[function(require,module,exports){
+  module.exports = function (environment) {
+
+    var SourceMapOutput = function (options) {
+      this._css = [];
+      this._rootNode = options.rootNode;
+      this._contentsMap = options.contentsMap;
+      this._contentsIgnoredCharsMap = options.contentsIgnoredCharsMap;
+      if (options.sourceMapFilename) {
+        this._sourceMapFilename = options.sourceMapFilename.replace(/\\/g, '/');
+      }
+      this._outputFilename = options.outputFilename;
+      this.sourceMapURL = options.sourceMapURL;
+      if (options.sourceMapBasepath) {
+        this._sourceMapBasepath = options.sourceMapBasepath.replace(/\\/g, '/');
+      }
+      if (options.sourceMapRootpath) {
+        this._sourceMapRootpath = options.sourceMapRootpath.replace(/\\/g, '/');
+        if (this._sourceMapRootpath.charAt(this._sourceMapRootpath.length - 1) !== '/') {
+          this._sourceMapRootpath += '/';
+        }
+      } else {
+        this._sourceMapRootpath = "";
+      }
+      this._outputSourceFiles = options.outputSourceFiles;
+      this._sourceMapGeneratorConstructor = environment.getSourceMapGenerator();
+
+      this._lineNumber = 0;
+      this._column = 0;
+    };
+
+    SourceMapOutput.prototype.normalizeFilename = function(filename) {
+      filename = filename.replace(/\\/g, '/');
+
+      if (this._sourceMapBasepath && filename.indexOf(this._sourceMapBasepath) === 0) {
+        filename = filename.substring(this._sourceMapBasepath.length);
+        if (filename.charAt(0) === '\\' || filename.charAt(0) === '/') {
+          filename = filename.substring(1);
+        }
+      }
+      return (this._sourceMapRootpath || "") + filename;
+    };
+
+    SourceMapOutput.prototype.add = function(chunk, fileInfo, index, mapLines) {
+
+      //ignore adding empty strings
+      if (!chunk) {
+        return;
+      }
+
+      var lines,
+        sourceLines,
+        columns,
+        sourceColumns,
+        i;
+
+      if (fileInfo) {
+        var inputSource = this._contentsMap[fileInfo.filename];
+
+        // remove vars/banner added to the top of the file
+        if (this._contentsIgnoredCharsMap[fileInfo.filename]) {
+          // adjust the index
+          index -= this._contentsIgnoredCharsMap[fileInfo.filename];
+          if (index < 0) { index = 0; }
+          // adjust the source
+          inputSource = inputSource.slice(this._contentsIgnoredCharsMap[fileInfo.filename]);
+        }
+        inputSource = inputSource.substring(0, index);
+        sourceLines = inputSource.split("\n");
+        sourceColumns = sourceLines[sourceLines.length - 1];
+      }
+
+      lines = chunk.split("\n");
+      columns = lines[lines.length - 1];
+
+      if (fileInfo) {
+        if (!mapLines) {
+          this._sourceMapGenerator.addMapping({ generated: { line: this._lineNumber + 1, column: this._column},
+            original: { line: sourceLines.length, column: sourceColumns.length},
+            source: this.normalizeFilename(fileInfo.filename)});
+        } else {
+          for (i = 0; i < lines.length; i++) {
+            this._sourceMapGenerator.addMapping({ generated: { line: this._lineNumber + i + 1, column: i === 0 ? this._column : 0},
+              original: { line: sourceLines.length + i, column: i === 0 ? sourceColumns.length : 0},
+              source: this.normalizeFilename(fileInfo.filename)});
+          }
+        }
+      }
+
+      if (lines.length === 1) {
+        this._column += columns.length;
+      } else {
+        this._lineNumber += lines.length - 1;
+        this._column = columns.length;
+      }
+
+      this._css.push(chunk);
+    };
+
+    SourceMapOutput.prototype.isEmpty = function() {
+      return this._css.length === 0;
+    };
+
+    SourceMapOutput.prototype.toCSS = function(context) {
+      this._sourceMapGenerator = new this._sourceMapGeneratorConstructor({ file: this._outputFilename, sourceRoot: null });
+
+      if (this._outputSourceFiles) {
+        for (var filename in this._contentsMap) {
+          if (this._contentsMap.hasOwnProperty(filename)) {
+            var source = this._contentsMap[filename];
+            if (this._contentsIgnoredCharsMap[filename]) {
+              source = source.slice(this._contentsIgnoredCharsMap[filename]);
+            }
+            this._sourceMapGenerator.setSourceContent(this.normalizeFilename(filename), source);
+          }
+        }
+      }
+
+      this._rootNode.genCSS(context, this);
+
+      if (this._css.length > 0) {
+        var sourceMapURL,
+          sourceMapContent = JSON.stringify(this._sourceMapGenerator.toJSON());
+
+        if (this.sourceMapURL) {
+          sourceMapURL = this.sourceMapURL;
+        } else if (this._sourceMapFilename) {
+          sourceMapURL = this._sourceMapFilename;
+        }
+        this.sourceMapURL = sourceMapURL;
+
+        this.sourceMap = sourceMapContent;
+      }
+
+      return this._css.join('');
+    };
+
+    return SourceMapOutput;
+  };
+
+},{}],44:[function(require,module,exports){
+  var contexts = require("./contexts"),
+    visitor = require("./visitors"),
+    tree = require("./tree");
+
+  module.exports = function(root, options) {
+    options = options || {};
+    var evaldRoot,
+      variables = options.variables,
+      evalEnv = new contexts.Eval(options);
+
+    //
+    // Allows setting variables with a hash, so:
+    //
+    //   `{ color: new tree.Color('#f01') }` will become:
+    //
+    //   new tree.Rule('@color',
+    //     new tree.Value([
+    //       new tree.Expression([
+    //         new tree.Color('#f01')
+    //       ])
+    //     ])
+    //   )
+    //
+    if (typeof variables === 'object' && !Array.isArray(variables)) {
+      variables = Object.keys(variables).map(function (k) {
+        var value = variables[k];
+
+        if (! (value instanceof tree.Value)) {
+          if (! (value instanceof tree.Expression)) {
+            value = new tree.Expression([value]);
+          }
+          value = new tree.Value([value]);
+        }
+        return new tree.Rule('@' + k, value, false, null, 0);
+      });
+      evalEnv.frames = [new tree.Ruleset(null, variables)];
+    }
+
+    var preEvalVisitors = [],
+      visitors = [
+        new visitor.JoinSelectorVisitor(),
+        new visitor.MarkVisibleSelectorsVisitor(true),
+        new visitor.ExtendVisitor(),
+        new visitor.ToCSSVisitor({compress: Boolean(options.compress)})
+      ], i;
+
+    if (options.pluginManager) {
+      var pluginVisitors = options.pluginManager.getVisitors();
+      for (i = 0; i < pluginVisitors.length; i++) {
+        var pluginVisitor = pluginVisitors[i];
+        if (pluginVisitor.isPreEvalVisitor) {
+          preEvalVisitors.push(pluginVisitor);
+        } else {
+          if (pluginVisitor.isPreVisitor) {
+            visitors.splice(0, 0, pluginVisitor);
+          } else {
+            visitors.push(pluginVisitor);
+          }
+        }
+      }
+    }
+
+    for (i = 0; i < preEvalVisitors.length; i++) {
+      preEvalVisitors[i].run(root);
+    }
+
+    evaldRoot = root.eval(evalEnv);
+
+    for (i = 0; i < visitors.length; i++) {
+      visitors[i].run(evaldRoot);
+    }
+
+    return evaldRoot;
+  };
+
+},{"./contexts":11,"./tree":62,"./visitors":87}],45:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Alpha = function (val) {
+    this.value = val;
+  };
+  Alpha.prototype = new Node();
+  Alpha.prototype.type = "Alpha";
+
+  Alpha.prototype.accept = function (visitor) {
+    this.value = visitor.visit(this.value);
+  };
+  Alpha.prototype.eval = function (context) {
+    if (this.value.eval) { return new Alpha(this.value.eval(context)); }
+    return this;
+  };
+  Alpha.prototype.genCSS = function (context, output) {
+    output.add("alpha(opacity=");
+
+    if (this.value.genCSS) {
+      this.value.genCSS(context, output);
+    } else {
+      output.add(this.value);
+    }
+
+    output.add(")");
+  };
+
+  module.exports = Alpha;
+
+},{"./node":70}],46:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike, visibilityInfo) {
+    this.value = value;
+    this.index = index;
+    this.mapLines = mapLines;
+    this.currentFileInfo = currentFileInfo;
+    this.rulesetLike = (typeof rulesetLike === 'undefined') ? false : rulesetLike;
+    this.allowRoot = true;
+    this.copyVisibilityInfo(visibilityInfo);
+  };
+  Anonymous.prototype = new Node();
+  Anonymous.prototype.type = "Anonymous";
+  Anonymous.prototype.eval = function () {
+    return new Anonymous(this.value, this.index, this.currentFileInfo, this.mapLines, this.rulesetLike, this.visibilityInfo());
+  };
+  Anonymous.prototype.compare = function (other) {
+    return other.toCSS && this.toCSS() === other.toCSS() ? 0 : undefined;
+  };
+  Anonymous.prototype.isRulesetLike = function() {
+    return this.rulesetLike;
+  };
+  Anonymous.prototype.genCSS = function (context, output) {
+    output.add(this.value, this.currentFileInfo, this.index, this.mapLines);
+  };
+  module.exports = Anonymous;
+
+},{"./node":70}],47:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Assignment = function (key, val) {
+    this.key = key;
+    this.value = val;
+  };
+
+  Assignment.prototype = new Node();
+  Assignment.prototype.type = "Assignment";
+  Assignment.prototype.accept = function (visitor) {
+    this.value = visitor.visit(this.value);
+  };
+  Assignment.prototype.eval = function (context) {
+    if (this.value.eval) {
+      return new Assignment(this.key, this.value.eval(context));
+    }
+    return this;
+  };
+  Assignment.prototype.genCSS = function (context, output) {
+    output.add(this.key + '=');
+    if (this.value.genCSS) {
+      this.value.genCSS(context, output);
+    } else {
+      output.add(this.value);
+    }
+  };
+  module.exports = Assignment;
+
+},{"./node":70}],48:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Attribute = function (key, op, value) {
+    this.key = key;
+    this.op = op;
+    this.value = value;
+  };
+  Attribute.prototype = new Node();
+  Attribute.prototype.type = "Attribute";
+  Attribute.prototype.eval = function (context) {
+    return new Attribute(this.key.eval ? this.key.eval(context) : this.key,
+      this.op, (this.value && this.value.eval) ? this.value.eval(context) : this.value);
+  };
+  Attribute.prototype.genCSS = function (context, output) {
+    output.add(this.toCSS(context));
+  };
+  Attribute.prototype.toCSS = function (context) {
+    var value = this.key.toCSS ? this.key.toCSS(context) : this.key;
+
+    if (this.op) {
+      value += this.op;
+      value += (this.value.toCSS ? this.value.toCSS(context) : this.value);
+    }
+
+    return '[' + value + ']';
+  };
+  module.exports = Attribute;
+
+},{"./node":70}],49:[function(require,module,exports){
+  var Node = require("./node"),
+    FunctionCaller = require("../functions/function-caller");
+//
+// A function call node.
+//
+  var Call = function (name, args, index, currentFileInfo) {
+    this.name = name;
+    this.args = args;
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+  };
+  Call.prototype = new Node();
+  Call.prototype.type = "Call";
+  Call.prototype.accept = function (visitor) {
+    if (this.args) {
+      this.args = visitor.visitArray(this.args);
+    }
+  };
+//
+// When evaluating a function call,
+// we either find the function in the functionRegistry,
+// in which case we call it, passing the  evaluated arguments,
+// if this returns null or we cannot find the function, we
+// simply print it out as it appeared originally [2].
+//
+// The reason why we evaluate the arguments, is in the case where
+// we try to pass a variable to a function, like: `saturate(@color)`.
+// The function should receive the value, not the variable.
+//
+  Call.prototype.eval = function (context) {
+    var args = this.args.map(function (a) { return a.eval(context); }),
+      result, funcCaller = new FunctionCaller(this.name, context, this.index, this.currentFileInfo);
+
+    if (funcCaller.isValid()) {
+      try {
+        result = funcCaller.call(args);
+      } catch (e) {
+        throw { type: e.type || "Runtime",
+          message: "error evaluating function `" + this.name + "`" +
+          (e.message ? ': ' + e.message : ''),
+          index: this.index, filename: this.currentFileInfo.filename };
+      }
+
+      if (result != null) {
+        result.index = this.index;
+        result.currentFileInfo = this.currentFileInfo;
+        return result;
+      }
+    }
+
+    return new Call(this.name, args, this.index, this.currentFileInfo);
+  };
+  Call.prototype.genCSS = function (context, output) {
+    output.add(this.name + "(", this.currentFileInfo, this.index);
+
+    for (var i = 0; i < this.args.length; i++) {
+      this.args[i].genCSS(context, output);
+      if (i + 1 < this.args.length) {
+        output.add(", ");
+      }
+    }
+
+    output.add(")");
+  };
+  module.exports = Call;
+
+},{"../functions/function-caller":21,"./node":70}],50:[function(require,module,exports){
+  var Node = require("./node"),
+    colors = require("../data/colors");
+
+//
+// RGB Colors - #ff0014, #eee
+//
+  var Color = function (rgb, a, originalForm) {
+    //
+    // The end goal here, is to parse the arguments
+    // into an integer triplet, such as `128, 255, 0`
+    //
+    // This facilitates operations and conversions.
+    //
+    if (Array.isArray(rgb)) {
+      this.rgb = rgb;
+    } else if (rgb.length == 6) {
+      this.rgb = rgb.match(/.{2}/g).map(function (c) {
+        return parseInt(c, 16);
+      });
+    } else {
+      this.rgb = rgb.split('').map(function (c) {
+        return parseInt(c + c, 16);
+      });
+    }
+    this.alpha = typeof a === 'number' ? a : 1;
+    if (typeof originalForm !== 'undefined') {
+      this.value = originalForm;
+    }
+  };
+
+  Color.prototype = new Node();
+  Color.prototype.type = "Color";
+
+  function clamp(v, max) {
+    return Math.min(Math.max(v, 0), max);
+  }
+
+  function toHex(v) {
+    return '#' + v.map(function (c) {
+      c = clamp(Math.round(c), 255);
+      return (c < 16 ? '0' : '') + c.toString(16);
+    }).join('');
+  }
+
+  Color.prototype.luma = function () {
+    var r = this.rgb[0] / 255,
+      g = this.rgb[1] / 255,
+      b = this.rgb[2] / 255;
+
+    r = (r <= 0.03928) ? r / 12.92 : Math.pow(((r + 0.055) / 1.055), 2.4);
+    g = (g <= 0.03928) ? g / 12.92 : Math.pow(((g + 0.055) / 1.055), 2.4);
+    b = (b <= 0.03928) ? b / 12.92 : Math.pow(((b + 0.055) / 1.055), 2.4);
+
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b;
+  };
+  Color.prototype.genCSS = function (context, output) {
+    output.add(this.toCSS(context));
+  };
+  Color.prototype.toCSS = function (context, doNotCompress) {
+    var compress = context && context.compress && !doNotCompress, color, alpha;
+
+    // `value` is set if this color was originally
+    // converted from a named color string so we need
+    // to respect this and try to output named color too.
+    if (this.value) {
+      return this.value;
+    }
+
+    // If we have some transparency, the only way to represent it
+    // is via `rgba`. Otherwise, we use the hex representation,
+    // which has better compatibility with older browsers.
+    // Values are capped between `0` and `255`, rounded and zero-padded.
+    alpha = this.fround(context, this.alpha);
+    if (alpha < 1) {
+      return "rgba(" + this.rgb.map(function (c) {
+        return clamp(Math.round(c), 255);
+      }).concat(clamp(alpha, 1))
+        .join(',' + (compress ? '' : ' ')) + ")";
+    }
+
+    color = this.toRGB();
+
+    if (compress) {
+      var splitcolor = color.split('');
+
+      // Convert color to short format
+      if (splitcolor[1] === splitcolor[2] && splitcolor[3] === splitcolor[4] && splitcolor[5] === splitcolor[6]) {
+        color = '#' + splitcolor[1] + splitcolor[3] + splitcolor[5];
+      }
+    }
+
+    return color;
+  };
+
+//
+// Operations have to be done per-channel, if not,
+// channels will spill onto each other. Once we have
+// our result, in the form of an integer triplet,
+// we create a new Color node to hold the result.
+//
+  Color.prototype.operate = function (context, op, other) {
+    var rgb = [];
+    var alpha = this.alpha * (1 - other.alpha) + other.alpha;
+    for (var c = 0; c < 3; c++) {
+      rgb[c] = this._operate(context, op, this.rgb[c], other.rgb[c]);
+    }
+    return new Color(rgb, alpha);
+  };
+  Color.prototype.toRGB = function () {
+    return toHex(this.rgb);
+  };
+  Color.prototype.toHSL = function () {
+    var r = this.rgb[0] / 255,
+      g = this.rgb[1] / 255,
+      b = this.rgb[2] / 255,
+      a = this.alpha;
+
+    var max = Math.max(r, g, b), min = Math.min(r, g, b);
+    var h, s, l = (max + min) / 2, d = max - min;
+
+    if (max === min) {
+      h = s = 0;
+    } else {
+      s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+
+      switch (max) {
+        case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+        case g: h = (b - r) / d + 2;               break;
+        case b: h = (r - g) / d + 4;               break;
+      }
+      h /= 6;
+    }
+    return { h: h * 360, s: s, l: l, a: a };
+  };
+//Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
+  Color.prototype.toHSV = function () {
+    var r = this.rgb[0] / 255,
+      g = this.rgb[1] / 255,
+      b = this.rgb[2] / 255,
+      a = this.alpha;
+
+    var max = Math.max(r, g, b), min = Math.min(r, g, b);
+    var h, s, v = max;
+
+    var d = max - min;
+    if (max === 0) {
+      s = 0;
+    } else {
+      s = d / max;
+    }
+
+    if (max === min) {
+      h = 0;
+    } else {
+      switch(max) {
+        case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+        case g: h = (b - r) / d + 2; break;
+        case b: h = (r - g) / d + 4; break;
+      }
+      h /= 6;
+    }
+    return { h: h * 360, s: s, v: v, a: a };
+  };
+  Color.prototype.toARGB = function () {
+    return toHex([this.alpha * 255].concat(this.rgb));
+  };
+  Color.prototype.compare = function (x) {
+    return (x.rgb &&
+      x.rgb[0] === this.rgb[0] &&
+      x.rgb[1] === this.rgb[1] &&
+      x.rgb[2] === this.rgb[2] &&
+      x.alpha  === this.alpha) ? 0 : undefined;
+  };
+
+  Color.fromKeyword = function(keyword) {
+    var c, key = keyword.toLowerCase();
+    if (colors.hasOwnProperty(key)) {
+      c = new Color(colors[key].slice(1));
+    }
+    else if (key === "transparent") {
+      c = new Color([0, 0, 0], 0);
+    }
+
+    if (c) {
+      c.value = keyword;
+      return c;
+    }
+  };
+  module.exports = Color;
+
+},{"../data/colors":12,"./node":70}],51:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Combinator = function (value) {
+    if (value === ' ') {
+      this.value = ' ';
+      this.emptyOrWhitespace = true;
+    } else {
+      this.value = value ? value.trim() : "";
+      this.emptyOrWhitespace = this.value === "";
+    }
+  };
+  Combinator.prototype = new Node();
+  Combinator.prototype.type = "Combinator";
+  var _noSpaceCombinators = {
+    '': true,
+    ' ': true,
+    '|': true
+  };
+  Combinator.prototype.genCSS = function (context, output) {
+    var spaceOrEmpty = (context.compress || _noSpaceCombinators[this.value]) ? '' : ' ';
+    output.add(spaceOrEmpty + this.value + spaceOrEmpty);
+  };
+  module.exports = Combinator;
+
+},{"./node":70}],52:[function(require,module,exports){
+  var Node = require("./node"),
+    getDebugInfo = require("./debug-info");
+
+  var Comment = function (value, isLineComment, index, currentFileInfo) {
+    this.value = value;
+    this.isLineComment = isLineComment;
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+    this.allowRoot = true;
+  };
+  Comment.prototype = new Node();
+  Comment.prototype.type = "Comment";
+  Comment.prototype.genCSS = function (context, output) {
+    if (this.debugInfo) {
+      output.add(getDebugInfo(context, this), this.currentFileInfo, this.index);
+    }
+    output.add(this.value);
+  };
+  Comment.prototype.isSilent = function(context) {
+    var isCompressed = context.compress && this.value[2] !== "!";
+    return this.isLineComment || isCompressed;
+  };
+  module.exports = Comment;
+
+},{"./debug-info":54,"./node":70}],53:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Condition = function (op, l, r, i, negate) {
+    this.op = op.trim();
+    this.lvalue = l;
+    this.rvalue = r;
+    this.index = i;
+    this.negate = negate;
+  };
+  Condition.prototype = new Node();
+  Condition.prototype.type = "Condition";
+  Condition.prototype.accept = function (visitor) {
+    this.lvalue = visitor.visit(this.lvalue);
+    this.rvalue = visitor.visit(this.rvalue);
+  };
+  Condition.prototype.eval = function (context) {
+    var result = (function (op, a, b) {
+      switch (op) {
+        case 'and': return a && b;
+        case 'or':  return a || b;
+        default:
+          switch (Node.compare(a, b)) {
+            case -1:
+              return op === '<' || op === '=<' || op === '<=';
+            case 0:
+              return op === '=' || op === '>=' || op === '=<' || op === '<=';
+            case 1:
+              return op === '>' || op === '>=';
+            default:
+              return false;
+          }
+      }
+    })(this.op, this.lvalue.eval(context), this.rvalue.eval(context));
+
+    return this.negate ? !result : result;
+  };
+  module.exports = Condition;
+
+},{"./node":70}],54:[function(require,module,exports){
+  var debugInfo = function(context, ctx, lineSeparator) {
+    var result = "";
+    if (context.dumpLineNumbers && !context.compress) {
+      switch(context.dumpLineNumbers) {
+        case 'comments':
+          result = debugInfo.asComment(ctx);
+          break;
+        case 'mediaquery':
+          result = debugInfo.asMediaQuery(ctx);
+          break;
+        case 'all':
+          result = debugInfo.asComment(ctx) + (lineSeparator || "") + debugInfo.asMediaQuery(ctx);
+          break;
+      }
+    }
+    return result;
+  };
+
+  debugInfo.asComment = function(ctx) {
+    return '/* line ' + ctx.debugInfo.lineNumber + ', ' + ctx.debugInfo.fileName + ' */\n';
+  };
+
+  debugInfo.asMediaQuery = function(ctx) {
+    var filenameWithProtocol = ctx.debugInfo.fileName;
+    if (!/^[a-z]+:\/\//i.test(filenameWithProtocol)) {
+      filenameWithProtocol = 'file://' + filenameWithProtocol;
+    }
+    return '@media -sass-debug-info{filename{font-family:' +
+      filenameWithProtocol.replace(/([.:\/\\])/g, function (a) {
+        if (a == '\\') {
+          a = '\/';
+        }
+        return '\\' + a;
+      }) +
+      '}line{font-family:\\00003' + ctx.debugInfo.lineNumber + '}}\n';
+  };
+
+  module.exports = debugInfo;
+
+},{}],55:[function(require,module,exports){
+  var Node = require("./node"),
+    contexts = require("../contexts");
+
+  var DetachedRuleset = function (ruleset, frames) {
+    this.ruleset = ruleset;
+    this.frames = frames;
+  };
+  DetachedRuleset.prototype = new Node();
+  DetachedRuleset.prototype.type = "DetachedRuleset";
+  DetachedRuleset.prototype.evalFirst = true;
+  DetachedRuleset.prototype.accept = function (visitor) {
+    this.ruleset = visitor.visit(this.ruleset);
+  };
+  DetachedRuleset.prototype.eval = function (context) {
+    var frames = this.frames || context.frames.slice(0);
+    return new DetachedRuleset(this.ruleset, frames);
+  };
+  DetachedRuleset.prototype.callEval = function (context) {
+    return this.ruleset.eval(this.frames ? new contexts.Eval(context, this.frames.concat(context.frames)) : context);
+  };
+  module.exports = DetachedRuleset;
+
+},{"../contexts":11,"./node":70}],56:[function(require,module,exports){
+  var Node = require("./node"),
+    unitConversions = require("../data/unit-conversions"),
+    Unit = require("./unit"),
+    Color = require("./color");
+
+//
+// A number with a unit
+//
+  var Dimension = function (value, unit) {
+    this.value = parseFloat(value);
+    this.unit = (unit && unit instanceof Unit) ? unit :
+      new Unit(unit ? [unit] : undefined);
+  };
+
+  Dimension.prototype = new Node();
+  Dimension.prototype.type = "Dimension";
+  Dimension.prototype.accept = function (visitor) {
+    this.unit = visitor.visit(this.unit);
+  };
+  Dimension.prototype.eval = function (context) {
+    return this;
+  };
+  Dimension.prototype.toColor = function () {
+    return new Color([this.value, this.value, this.value]);
+  };
+  Dimension.prototype.genCSS = function (context, output) {
+    if ((context && context.strictUnits) && !this.unit.isSingular()) {
+      throw new Error("Multiple units in dimension. Correct the units or use the unit function. Bad unit: " + this.unit.toString());
+    }
+
+    var value = this.fround(context, this.value),
+      strValue = String(value);
+
+    if (value !== 0 && value < 0.000001 && value > -0.000001) {
+      // would be output 1e-6 etc.
+      strValue = value.toFixed(20).replace(/0+$/, "");
+    }
+
+    if (context && context.compress) {
+      // Zero values doesn't need a unit
+      if (value === 0 && this.unit.isLength()) {
+        output.add(strValue);
+        return;
+      }
+
+      // Float values doesn't need a leading zero
+      if (value > 0 && value < 1) {
+        strValue = (strValue).substr(1);
+      }
+    }
+
+    output.add(strValue);
+    this.unit.genCSS(context, output);
+  };
+
+// In an operation between two Dimensions,
+// we default to the first Dimension's unit,
+// so `1px + 2` will yield `3px`.
+  Dimension.prototype.operate = function (context, op, other) {
+    /*jshint noempty:false */
+    var value = this._operate(context, op, this.value, other.value),
+      unit = this.unit.clone();
+
+    if (op === '+' || op === '-') {
+      if (unit.numerator.length === 0 && unit.denominator.length === 0) {
+        unit = other.unit.clone();
+        if (this.unit.backupUnit) {
+          unit.backupUnit = this.unit.backupUnit;
+        }
+      } else if (other.unit.numerator.length === 0 && unit.denominator.length === 0) {
+        // do nothing
+      } else {
+        other = other.convertTo(this.unit.usedUnits());
+
+        if (context.strictUnits && other.unit.toString() !== unit.toString()) {
+          throw new Error("Incompatible units. Change the units or use the unit function. Bad units: '" + unit.toString() +
+            "' and '" + other.unit.toString() + "'.");
+        }
+
+        value = this._operate(context, op, this.value, other.value);
+      }
+    } else if (op === '*') {
+      unit.numerator = unit.numerator.concat(other.unit.numerator).sort();
+      unit.denominator = unit.denominator.concat(other.unit.denominator).sort();
+      unit.cancel();
+    } else if (op === '/') {
+      unit.numerator = unit.numerator.concat(other.unit.denominator).sort();
+      unit.denominator = unit.denominator.concat(other.unit.numerator).sort();
+      unit.cancel();
+    }
+    return new Dimension(value, unit);
+  };
+  Dimension.prototype.compare = function (other) {
+    var a, b;
+
+    if (!(other instanceof Dimension)) {
+      return undefined;
+    }
+
+    if (this.unit.isEmpty() || other.unit.isEmpty()) {
+      a = this;
+      b = other;
+    } else {
+      a = this.unify();
+      b = other.unify();
+      if (a.unit.compare(b.unit) !== 0) {
+        return undefined;
+      }
+    }
+
+    return Node.numericCompare(a.value, b.value);
+  };
+  Dimension.prototype.unify = function () {
+    return this.convertTo({ length: 'px', duration: 's', angle: 'rad' });
+  };
+  Dimension.prototype.convertTo = function (conversions) {
+    var value = this.value, unit = this.unit.clone(),
+      i, groupName, group, targetUnit, derivedConversions = {}, applyUnit;
+
+    if (typeof conversions === 'string') {
+      for (i in unitConversions) {
+        if (unitConversions[i].hasOwnProperty(conversions)) {
+          derivedConversions = {};
+          derivedConversions[i] = conversions;
+        }
+      }
+      conversions = derivedConversions;
+    }
+    applyUnit = function (atomicUnit, denominator) {
+      /* jshint loopfunc:true */
+      if (group.hasOwnProperty(atomicUnit)) {
+        if (denominator) {
+          value = value / (group[atomicUnit] / group[targetUnit]);
+        } else {
+          value = value * (group[atomicUnit] / group[targetUnit]);
+        }
+
+        return targetUnit;
+      }
+
+      return atomicUnit;
+    };
+
+    for (groupName in conversions) {
+      if (conversions.hasOwnProperty(groupName)) {
+        targetUnit = conversions[groupName];
+        group = unitConversions[groupName];
+
+        unit.map(applyUnit);
+      }
+    }
+
+    unit.cancel();
+
+    return new Dimension(value, unit);
+  };
+  module.exports = Dimension;
+
+},{"../data/unit-conversions":14,"./color":50,"./node":70,"./unit":79}],57:[function(require,module,exports){
+  var Node = require("./node"),
+    Selector = require("./selector"),
+    Ruleset = require("./ruleset");
+
+  var Directive = function (name, value, rules, index, currentFileInfo, debugInfo, isRooted, visibilityInfo) {
+    var i;
+
+    this.name  = name;
+    this.value = value;
+    if (rules) {
+      if (Array.isArray(rules)) {
+        this.rules = rules;
+      } else {
+        this.rules = [rules];
+        this.rules[0].selectors = (new Selector([], null, null, this.index, currentFileInfo)).createEmptySelectors();
+      }
+      for (i = 0; i < this.rules.length; i++) {
+        this.rules[i].allowImports = true;
+      }
+    }
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+    this.debugInfo = debugInfo;
+    this.isRooted = isRooted || false;
+    this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
+  };
+
+  Directive.prototype = new Node();
+  Directive.prototype.type = "Directive";
+  Directive.prototype.accept = function (visitor) {
+    var value = this.value, rules = this.rules;
+    if (rules) {
+      this.rules = visitor.visitArray(rules);
+    }
+    if (value) {
+      this.value = visitor.visit(value);
+    }
+  };
+  Directive.prototype.isRulesetLike = function() {
+    return this.rules || !this.isCharset();
+  };
+  Directive.prototype.isCharset = function() {
+    return "@charset" === this.name;
+  };
+  Directive.prototype.genCSS = function (context, output) {
+    var value = this.value, rules = this.rules;
+    output.add(this.name, this.currentFileInfo, this.index);
+    if (value) {
+      output.add(' ');
+      value.genCSS(context, output);
+    }
+    if (rules) {
+      this.outputRuleset(context, output, rules);
+    } else {
+      output.add(';');
+    }
+  };
+  Directive.prototype.eval = function (context) {
+    var mediaPathBackup, mediaBlocksBackup, value = this.value, rules = this.rules;
+
+    //media stored inside other directive should not bubble over it
+    //backpup media bubbling information
+    mediaPathBackup = context.mediaPath;
+    mediaBlocksBackup = context.mediaBlocks;
+    //deleted media bubbling information
+    context.mediaPath = [];
+    context.mediaBlocks = [];
+
+    if (value) {
+      value = value.eval(context);
+    }
+    if (rules) {
+      // assuming that there is only one rule at this point - that is how parser constructs the rule
+      rules = [rules[0].eval(context)];
+      rules[0].root = true;
+    }
+    //restore media bubbling information
+    context.mediaPath = mediaPathBackup;
+    context.mediaBlocks = mediaBlocksBackup;
+
+    return new Directive(this.name, value, rules,
+      this.index, this.currentFileInfo, this.debugInfo, this.isRooted, this.visibilityInfo());
+  };
+  Directive.prototype.variable = function (name) {
+    if (this.rules) {
+      // assuming that there is only one rule at this point - that is how parser constructs the rule
+      return Ruleset.prototype.variable.call(this.rules[0], name);
+    }
+  };
+  Directive.prototype.find = function () {
+    if (this.rules) {
+      // assuming that there is only one rule at this point - that is how parser constructs the rule
+      return Ruleset.prototype.find.apply(this.rules[0], arguments);
+    }
+  };
+  Directive.prototype.rulesets = function () {
+    if (this.rules) {
+      // assuming that there is only one rule at this point - that is how parser constructs the rule
+      return Ruleset.prototype.rulesets.apply(this.rules[0]);
+    }
+  };
+  Directive.prototype.outputRuleset = function (context, output, rules) {
+    var ruleCnt = rules.length, i;
+    context.tabLevel = (context.tabLevel | 0) + 1;
+
+    // Compressed
+    if (context.compress) {
+      output.add('{');
+      for (i = 0; i < ruleCnt; i++) {
+        rules[i].genCSS(context, output);
+      }
+      output.add('}');
+      context.tabLevel--;
+      return;
+    }
+
+    // Non-compressed
+    var tabSetStr = '\n' + Array(context.tabLevel).join("  "), tabRuleStr = tabSetStr + "  ";
+    if (!ruleCnt) {
+      output.add(" {" + tabSetStr + '}');
+    } else {
+      output.add(" {" + tabRuleStr);
+      rules[0].genCSS(context, output);
+      for (i = 1; i < ruleCnt; i++) {
+        output.add(tabRuleStr);
+        rules[i].genCSS(context, output);
+      }
+      output.add(tabSetStr + '}');
+    }
+
+    context.tabLevel--;
+  };
+  module.exports = Directive;
+
+},{"./node":70,"./ruleset":76,"./selector":77}],58:[function(require,module,exports){
+  var Node = require("./node"),
+    Paren = require("./paren"),
+    Combinator = require("./combinator");
+
+  var Element = function (combinator, value, index, currentFileInfo, info) {
+    this.combinator = combinator instanceof Combinator ?
+      combinator : new Combinator(combinator);
+
+    if (typeof value === 'string') {
+      this.value = value.trim();
+    } else if (value) {
+      this.value = value;
+    } else {
+      this.value = "";
+    }
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+    this.copyVisibilityInfo(info);
+  };
+  Element.prototype = new Node();
+  Element.prototype.type = "Element";
+  Element.prototype.accept = function (visitor) {
+    var value = this.value;
+    this.combinator = visitor.visit(this.combinator);
+    if (typeof value === "object") {
+      this.value = visitor.visit(value);
+    }
+  };
+  Element.prototype.eval = function (context) {
+    return new Element(this.combinator,
+      this.value.eval ? this.value.eval(context) : this.value,
+      this.index,
+      this.currentFileInfo, this.visibilityInfo());
+  };
+  Element.prototype.clone = function () {
+    return new Element(this.combinator,
+      this.value,
+      this.index,
+      this.currentFileInfo, this.visibilityInfo());
+  };
+  Element.prototype.genCSS = function (context, output) {
+    output.add(this.toCSS(context), this.currentFileInfo, this.index);
+  };
+  Element.prototype.toCSS = function (context) {
+    context = context || {};
+    var value = this.value, firstSelector = context.firstSelector;
+    if (value instanceof Paren) {
+      // selector in parens should not be affected by outer selector
+      // flags (breaks only interpolated selectors - see #1973)
+      context.firstSelector = true;
+    }
+    value = value.toCSS ? value.toCSS(context) : value;
+    context.firstSelector = firstSelector;
+    if (value === '' && this.combinator.value.charAt(0) === '&') {
+      return '';
+    } else {
+      return this.combinator.toCSS(context) + value;
+    }
+  };
+  module.exports = Element;
+
+},{"./combinator":51,"./node":70,"./paren":72}],59:[function(require,module,exports){
+  var Node = require("./node"),
+    Paren = require("./paren"),
+    Comment = require("./comment");
+
+  var Expression = function (value) {
+    this.value = value;
+    if (!value) {
+      throw new Error("Expression requires an array parameter");
+    }
+  };
+  Expression.prototype = new Node();
+  Expression.prototype.type = "Expression";
+  Expression.prototype.accept = function (visitor) {
+    this.value = visitor.visitArray(this.value);
+  };
+  Expression.prototype.eval = function (context) {
+    var returnValue,
+      inParenthesis = this.parens && !this.parensInOp,
+      doubleParen = false;
+    if (inParenthesis) {
+      context.inParenthesis();
+    }
+    if (this.value.length > 1) {
+      returnValue = new Expression(this.value.map(function (e) {
+        return e.eval(context);
+      }));
+    } else if (this.value.length === 1) {
+      if (this.value[0].parens && !this.value[0].parensInOp) {
+        doubleParen = true;
+      }
+      returnValue = this.value[0].eval(context);
+    } else {
+      returnValue = this;
+    }
+    if (inParenthesis) {
+      context.outOfParenthesis();
+    }
+    if (this.parens && this.parensInOp && !(context.isMathOn()) && !doubleParen) {
+      returnValue = new Paren(returnValue);
+    }
+    return returnValue;
+  };
+  Expression.prototype.genCSS = function (context, output) {
+    for (var i = 0; i < this.value.length; i++) {
+      this.value[i].genCSS(context, output);
+      if (i + 1 < this.value.length) {
+        output.add(" ");
+      }
+    }
+  };
+  Expression.prototype.throwAwayComments = function () {
+    this.value = this.value.filter(function(v) {
+      return !(v instanceof Comment);
+    });
+  };
+  module.exports = Expression;
+
+},{"./comment":52,"./node":70,"./paren":72}],60:[function(require,module,exports){
+  var Node = require("./node"),
+    Selector = require("./selector");
+
+  var Extend = function Extend(selector, option, index, currentFileInfo, visibilityInfo) {
+    this.selector = selector;
+    this.option = option;
+    this.index = index;
+    this.object_id = Extend.next_id++;
+    this.parent_ids = [this.object_id];
+    this.currentFileInfo = currentFileInfo || {};
+    this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
+
+    switch(option) {
+      case "all":
+        this.allowBefore = true;
+        this.allowAfter = true;
+        break;
+      default:
+        this.allowBefore = false;
+        this.allowAfter = false;
+        break;
+    }
+  };
+  Extend.next_id = 0;
+
+  Extend.prototype = new Node();
+  Extend.prototype.type = "Extend";
+  Extend.prototype.accept = function (visitor) {
+    this.selector = visitor.visit(this.selector);
+  };
+  Extend.prototype.eval = function (context) {
+    return new Extend(this.selector.eval(context), this.option, this.index, this.currentFileInfo, this.visibilityInfo());
+  };
+  Extend.prototype.clone = function (context) {
+    return new Extend(this.selector, this.option, this.index, this.currentFileInfo, this.visibilityInfo());
+  };
+//it concatenates (joins) all selectors in selector array
+  Extend.prototype.findSelfSelectors = function (selectors) {
+    var selfElements = [],
+      i,
+      selectorElements;
+
+    for (i = 0; i < selectors.length; i++) {
+      selectorElements = selectors[i].elements;
+      // duplicate the logic in genCSS function inside the selector node.
+      // future TODO - move both logics into the selector joiner visitor
+      if (i > 0 && selectorElements.length && selectorElements[0].combinator.value === "") {
+        selectorElements[0].combinator.value = ' ';
+      }
+      selfElements = selfElements.concat(selectors[i].elements);
+    }
+
+    this.selfSelectors = [new Selector(selfElements)];
+    this.selfSelectors[0].copyVisibilityInfo(this.visibilityInfo());
+  };
+  module.exports = Extend;
+
+},{"./node":70,"./selector":77}],61:[function(require,module,exports){
+  var Node = require("./node"),
+    Media = require("./media"),
+    URL = require("./url"),
+    Quoted = require("./quoted"),
+    Ruleset = require("./ruleset"),
+    Anonymous = require("./anonymous");
+
+//
+// CSS @import node
+//
+// The general strategy here is that we don't want to wait
+// for the parsing to be completed, before we start importing
+// the file. That's because in the context of a browser,
+// most of the time will be spent waiting for the server to respond.
+//
+// On creation, we push the import path to our import queue, though
+// `import,push`, we also pass it a callback, which it'll call once
+// the file has been fetched, and parsed.
+//
+  var Import = function (path, features, options, index, currentFileInfo, visibilityInfo) {
+    this.options = options;
+    this.index = index;
+    this.path = path;
+    this.features = features;
+    this.currentFileInfo = currentFileInfo;
+    this.allowRoot = true;
+
+    if (this.options.less !== undefined || this.options.inline) {
+      this.css = !this.options.less || this.options.inline;
+    } else {
+      var pathValue = this.getPath();
+      if (pathValue && /[#\.\&\?\/]css([\?;].*)?$/.test(pathValue)) {
+        this.css = true;
+      }
+    }
+    this.copyVisibilityInfo(visibilityInfo);
+  };
+
+//
+// The actual import node doesn't return anything, when converted to CSS.
+// The reason is that it's used at the evaluation stage, so that the rules
+// it imports can be treated like any other rules.
+//
+// In `eval`, we make sure all Import nodes get evaluated, recursively, so
+// we end up with a flat structure, which can easily be imported in the parent
+// ruleset.
+//
+  Import.prototype = new Node();
+  Import.prototype.type = "Import";
+  Import.prototype.accept = function (visitor) {
+    if (this.features) {
+      this.features = visitor.visit(this.features);
+    }
+    this.path = visitor.visit(this.path);
+    if (!this.options.plugin && !this.options.inline && this.root) {
+      this.root = visitor.visit(this.root);
+    }
+  };
+  Import.prototype.genCSS = function (context, output) {
+    if (this.css && this.path.currentFileInfo.reference === undefined) {
+      output.add("@import ", this.currentFileInfo, this.index);
+      this.path.genCSS(context, output);
+      if (this.features) {
+        output.add(" ");
+        this.features.genCSS(context, output);
+      }
+      output.add(';');
+    }
+  };
+  Import.prototype.getPath = function () {
+    return (this.path instanceof URL) ?
+      this.path.value.value : this.path.value;
+  };
+  Import.prototype.isVariableImport = function () {
+    var path = this.path;
+    if (path instanceof URL) {
+      path = path.value;
+    }
+    if (path instanceof Quoted) {
+      return path.containsVariables();
+    }
+
+    return true;
+  };
+  Import.prototype.evalForImport = function (context) {
+    var path = this.path;
+
+    if (path instanceof URL) {
+      path = path.value;
+    }
+
+    return new Import(path.eval(context), this.features, this.options, this.index, this.currentFileInfo, this.visibilityInfo());
+  };
+  Import.prototype.evalPath = function (context) {
+    var path = this.path.eval(context);
+    var rootpath = this.currentFileInfo && this.currentFileInfo.rootpath;
+
+    if (!(path instanceof URL)) {
+      if (rootpath) {
+        var pathValue = path.value;
+        // Add the base path if the import is relative
+        if (pathValue && context.isPathRelative(pathValue)) {
+          path.value = rootpath + pathValue;
+        }
+      }
+      path.value = context.normalizePath(path.value);
+    }
+
+    return path;
+  };
+  Import.prototype.eval = function (context) {
+    var result = this.doEval(context);
+    if (this.options.reference || this.blocksVisibility()) {
+      if (result.length || result.length === 0) {
+        result.forEach(function (node) {
+            node.addVisibilityBlock();
+          }
+        );
+      } else {
+        result.addVisibilityBlock();
+      }
+    }
+    return result;
+  };
+  Import.prototype.doEval = function (context) {
+    var ruleset, registry,
+      features = this.features && this.features.eval(context);
+
+    if (this.options.plugin) {
+      registry = context.frames[0] && context.frames[0].functionRegistry;
+      if ( registry && this.root && this.root.functions ) {
+        registry.addMultiple( this.root.functions );
+      }
+      return [];
+    }
+
+    if (this.skip) {
+      if (typeof this.skip === "function") {
+        this.skip = this.skip();
+      }
+      if (this.skip) {
+        return [];
+      }
+    }
+    if (this.options.inline) {
+      var contents = new Anonymous(this.root, 0,
+        {
+          filename: this.importedFilename,
+          reference: this.path.currentFileInfo && this.path.currentFileInfo.reference
+        }, true, true);
+
+      return this.features ? new Media([contents], this.features.value) : [contents];
+    } else if (this.css) {
+      var newImport = new Import(this.evalPath(context), features, this.options, this.index);
+      if (!newImport.css && this.error) {
+        throw this.error;
+      }
+      return newImport;
+    } else {
+      ruleset = new Ruleset(null, this.root.rules.slice(0));
+      ruleset.evalImports(context);
+
+      return this.features ? new Media(ruleset.rules, this.features.value) : ruleset.rules;
+    }
+  };
+  module.exports = Import;
+
+},{"./anonymous":46,"./media":66,"./node":70,"./quoted":73,"./ruleset":76,"./url":80}],62:[function(require,module,exports){
+  var tree = {};
+
+  tree.Node = require('./node');
+  tree.Alpha = require('./alpha');
+  tree.Color = require('./color');
+  tree.Directive = require('./directive');
+  tree.DetachedRuleset = require('./detached-ruleset');
+  tree.Operation = require('./operation');
+  tree.Dimension = require('./dimension');
+  tree.Unit = require('./unit');
+  tree.Keyword = require('./keyword');
+  tree.Variable = require('./variable');
+  tree.Ruleset = require('./ruleset');
+  tree.Element = require('./element');
+  tree.Attribute = require('./attribute');
+  tree.Combinator = require('./combinator');
+  tree.Selector = require('./selector');
+  tree.Quoted = require('./quoted');
+  tree.Expression = require('./expression');
+  tree.Rule = require('./rule');
+  tree.Call = require('./call');
+  tree.URL = require('./url');
+  tree.Import = require('./import');
+  tree.mixin = {
+    Call: require('./mixin-call'),
+    Definition: require('./mixin-definition')
+  };
+  tree.Comment = require('./comment');
+  tree.Anonymous = require('./anonymous');
+  tree.Value = require('./value');
+  tree.JavaScript = require('./javascript');
+  tree.Assignment = require('./assignment');
+  tree.Condition = require('./condition');
+  tree.Paren = require('./paren');
+  tree.Media = require('./media');
+  tree.UnicodeDescriptor = require('./unicode-descriptor');
+  tree.Negative = require('./negative');
+  tree.Extend = require('./extend');
+  tree.RulesetCall = require('./ruleset-call');
+
+  module.exports = tree;
+
+},{"./alpha":45,"./anonymous":46,"./assignment":47,"./attribute":48,"./call":49,"./color":50,"./combinator":51,"./comment":52,"./condition":53,"./detached-ruleset":55,"./dimension":56,"./directive":57,"./element":58,"./expression":59,"./extend":60,"./import":61,"./javascript":63,"./keyword":65,"./media":66,"./mixin-call":67,"./mixin-definition":68,"./negative":69,"./node":70,"./operation":71,"./paren":72,"./quoted":73,"./rule":74,"./ruleset":76,"./ruleset-call":75,"./selector":77,"./unicode-descriptor":78,"./unit":79,"./url":80,"./value":81,"./variable":82}],63:[function(require,module,exports){
+  var JsEvalNode = require("./js-eval-node"),
+    Dimension = require("./dimension"),
+    Quoted = require("./quoted"),
+    Anonymous = require("./anonymous");
+
+  var JavaScript = function (string, escaped, index, currentFileInfo) {
+    this.escaped = escaped;
+    this.expression = string;
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+  };
+  JavaScript.prototype = new JsEvalNode();
+  JavaScript.prototype.type = "JavaScript";
+  JavaScript.prototype.eval = function(context) {
+    var result = this.evaluateJavaScript(this.expression, context);
+
+    if (typeof result === 'number') {
+      return new Dimension(result);
+    } else if (typeof result === 'string') {
+      return new Quoted('"' + result + '"', result, this.escaped, this.index);
+    } else if (Array.isArray(result)) {
+      return new Anonymous(result.join(', '));
+    } else {
+      return new Anonymous(result);
+    }
+  };
+
+  module.exports = JavaScript;
+
+},{"./anonymous":46,"./dimension":56,"./js-eval-node":64,"./quoted":73}],64:[function(require,module,exports){
+  var Node = require("./node"),
+    Variable = require("./variable");
+
+  var JsEvalNode = function() {
+  };
+  JsEvalNode.prototype = new Node();
+
+  JsEvalNode.prototype.evaluateJavaScript = function (expression, context) {
+    var result,
+      that = this,
+      evalContext = {};
+
+    if (context.javascriptEnabled !== undefined && !context.javascriptEnabled) {
+      throw { message: "You are using JavaScript, which has been disabled.",
+        filename: this.currentFileInfo.filename,
+        index: this.index };
+    }
+
+    expression = expression.replace(/@\{([\w-]+)\}/g, function (_, name) {
+      return that.jsify(new Variable('@' + name, that.index, that.currentFileInfo).eval(context));
+    });
+
+    try {
+      expression = new Function('return (' + expression + ')');
+    } catch (e) {
+      throw { message: "JavaScript evaluation error: " + e.message + " from `" + expression + "`" ,
+        filename: this.currentFileInfo.filename,
+        index: this.index };
+    }
+
+    var variables = context.frames[0].variables();
+    for (var k in variables) {
+      if (variables.hasOwnProperty(k)) {
+        /*jshint loopfunc:true */
+        evalContext[k.slice(1)] = {
+          value: variables[k].value,
+          toJS: function () {
+            return this.value.eval(context).toCSS();
+          }
+        };
+      }
+    }
+
+    try {
+      result = expression.call(evalContext);
+    } catch (e) {
+      throw { message: "JavaScript evaluation error: '" + e.name + ': ' + e.message.replace(/["]/g, "'") + "'" ,
+        filename: this.currentFileInfo.filename,
+        index: this.index };
+    }
+    return result;
+  };
+  JsEvalNode.prototype.jsify = function (obj) {
+    if (Array.isArray(obj.value) && (obj.value.length > 1)) {
+      return '[' + obj.value.map(function (v) { return v.toCSS(); }).join(', ') + ']';
+    } else {
+      return obj.toCSS();
+    }
+  };
+
+  module.exports = JsEvalNode;
+
+},{"./node":70,"./variable":82}],65:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Keyword = function (value) { this.value = value; };
+  Keyword.prototype = new Node();
+  Keyword.prototype.type = "Keyword";
+  Keyword.prototype.genCSS = function (context, output) {
+    if (this.value === '%') { throw { type: "Syntax", message: "Invalid % without number" }; }
+    output.add(this.value);
+  };
+
+  Keyword.True = new Keyword('true');
+  Keyword.False = new Keyword('false');
+
+  module.exports = Keyword;
+
+},{"./node":70}],66:[function(require,module,exports){
+  var Ruleset = require("./ruleset"),
+    Value = require("./value"),
+    Selector = require("./selector"),
+    Anonymous = require("./anonymous"),
+    Expression = require("./expression"),
+    Directive = require("./directive");
+
+  var Media = function (value, features, index, currentFileInfo, visibilityInfo) {
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+
+    var selectors = (new Selector([], null, null, this.index, this.currentFileInfo)).createEmptySelectors();
+
+    this.features = new Value(features);
+    this.rules = [new Ruleset(selectors, value)];
+    this.rules[0].allowImports = true;
+    this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
+  };
+  Media.prototype = new Directive();
+  Media.prototype.type = "Media";
+  Media.prototype.isRulesetLike = true;
+  Media.prototype.accept = function (visitor) {
+    if (this.features) {
+      this.features = visitor.visit(this.features);
+    }
+    if (this.rules) {
+      this.rules = visitor.visitArray(this.rules);
+    }
+  };
+  Media.prototype.genCSS = function (context, output) {
+    output.add('@media ', this.currentFileInfo, this.index);
+    this.features.genCSS(context, output);
+    this.outputRuleset(context, output, this.rules);
+  };
+  Media.prototype.eval = function (context) {
+    if (!context.mediaBlocks) {
+      context.mediaBlocks = [];
+      context.mediaPath = [];
+    }
+
+    var media = new Media(null, [], this.index, this.currentFileInfo, this.visibilityInfo());
+    if (this.debugInfo) {
+      this.rules[0].debugInfo = this.debugInfo;
+      media.debugInfo = this.debugInfo;
+    }
+    var strictMathBypass = false;
+    if (!context.strictMath) {
+      strictMathBypass = true;
+      context.strictMath = true;
+    }
+    try {
+      media.features = this.features.eval(context);
+    }
+    finally {
+      if (strictMathBypass) {
+        context.strictMath = false;
+      }
+    }
+
+    context.mediaPath.push(media);
+    context.mediaBlocks.push(media);
+
+    this.rules[0].functionRegistry = context.frames[0].functionRegistry.inherit();
+    context.frames.unshift(this.rules[0]);
+    media.rules = [this.rules[0].eval(context)];
+    context.frames.shift();
+
+    context.mediaPath.pop();
+
+    return context.mediaPath.length === 0 ? media.evalTop(context) :
+      media.evalNested(context);
+  };
+  Media.prototype.evalTop = function (context) {
+    var result = this;
+
+    // Render all dependent Media blocks.
+    if (context.mediaBlocks.length > 1) {
+      var selectors = (new Selector([], null, null, this.index, this.currentFileInfo)).createEmptySelectors();
+      result = new Ruleset(selectors, context.mediaBlocks);
+      result.multiMedia = true;
+      result.copyVisibilityInfo(this.visibilityInfo());
+    }
+
+    delete context.mediaBlocks;
+    delete context.mediaPath;
+
+    return result;
+  };
+  Media.prototype.evalNested = function (context) {
+    var i, value,
+      path = context.mediaPath.concat([this]);
+
+    // Extract the media-query conditions separated with `,` (OR).
+    for (i = 0; i < path.length; i++) {
+      value = path[i].features instanceof Value ?
+        path[i].features.value : path[i].features;
+      path[i] = Array.isArray(value) ? value : [value];
+    }
+
+    // Trace all permutations to generate the resulting media-query.
+    //
+    // (a, b and c) with nested (d, e) ->
+    //    a and d
+    //    a and e
+    //    b and c and d
+    //    b and c and e
+    this.features = new Value(this.permute(path).map(function (path) {
+      path = path.map(function (fragment) {
+        return fragment.toCSS ? fragment : new Anonymous(fragment);
+      });
+
+      for (i = path.length - 1; i > 0; i--) {
+        path.splice(i, 0, new Anonymous("and"));
+      }
+
+      return new Expression(path);
+    }));
+
+    // Fake a tree-node that doesn't output anything.
+    return new Ruleset([], []);
+  };
+  Media.prototype.permute = function (arr) {
+    if (arr.length === 0) {
+      return [];
+    } else if (arr.length === 1) {
+      return arr[0];
+    } else {
+      var result = [];
+      var rest = this.permute(arr.slice(1));
+      for (var i = 0; i < rest.length; i++) {
+        for (var j = 0; j < arr[0].length; j++) {
+          result.push([arr[0][j]].concat(rest[i]));
+        }
+      }
+      return result;
+    }
+  };
+  Media.prototype.bubbleSelectors = function (selectors) {
+    if (!selectors) {
+      return;
+    }
+    this.rules = [new Ruleset(selectors.slice(0), [this.rules[0]])];
+  };
+  module.exports = Media;
+
+},{"./anonymous":46,"./directive":57,"./expression":59,"./ruleset":76,"./selector":77,"./value":81}],67:[function(require,module,exports){
+  var Node = require("./node"),
+    Selector = require("./selector"),
+    MixinDefinition = require("./mixin-definition"),
+    defaultFunc = require("../functions/default");
+
+  var MixinCall = function (elements, args, index, currentFileInfo, important) {
+    this.selector = new Selector(elements);
+    this.arguments = args || [];
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+    this.important = important;
+    this.allowRoot = true;
+  };
+  MixinCall.prototype = new Node();
+  MixinCall.prototype.type = "MixinCall";
+  MixinCall.prototype.accept = function (visitor) {
+    if (this.selector) {
+      this.selector = visitor.visit(this.selector);
+    }
+    if (this.arguments.length) {
+      this.arguments = visitor.visitArray(this.arguments);
+    }
+  };
+  MixinCall.prototype.eval = function (context) {
+    var mixins, mixin, mixinPath, args = [], arg, argValue,
+      rules = [], match = false, i, m, f, isRecursive, isOneFound,
+      candidates = [], candidate, conditionResult = [], defaultResult, defFalseEitherCase = -1,
+      defNone = 0, defTrue = 1, defFalse = 2, count, originalRuleset, noArgumentsFilter;
+
+    function calcDefGroup(mixin, mixinPath) {
+      var f, p, namespace;
+
+      for (f = 0; f < 2; f++) {
+        conditionResult[f] = true;
+        defaultFunc.value(f);
+        for (p = 0; p < mixinPath.length && conditionResult[f]; p++) {
+          namespace = mixinPath[p];
+          if (namespace.matchCondition) {
+            conditionResult[f] = conditionResult[f] && namespace.matchCondition(null, context);
+          }
+        }
+        if (mixin.matchCondition) {
+          conditionResult[f] = conditionResult[f] && mixin.matchCondition(args, context);
+        }
+      }
+      if (conditionResult[0] || conditionResult[1]) {
+        if (conditionResult[0] != conditionResult[1]) {
+          return conditionResult[1] ?
+            defTrue : defFalse;
+        }
+
+        return defNone;
+      }
+      return defFalseEitherCase;
+    }
+
+    for (i = 0; i < this.arguments.length; i++) {
+      arg = this.arguments[i];
+      argValue = arg.value.eval(context);
+      if (arg.expand && Array.isArray(argValue.value)) {
+        argValue = argValue.value;
+        for (m = 0; m < argValue.length; m++) {
+          args.push({value: argValue[m]});
+        }
+      } else {
+        args.push({name: arg.name, value: argValue});
+      }
+    }
+
+    noArgumentsFilter = function(rule) {return rule.matchArgs(null, context);};
+
+    for (i = 0; i < context.frames.length; i++) {
+      if ((mixins = context.frames[i].find(this.selector, null, noArgumentsFilter)).length > 0) {
+        isOneFound = true;
+
+        // To make `default()` function independent of definition order we have two "subpasses" here.
+        // At first we evaluate each guard *twice* (with `default() == true` and `default() == false`),
+        // and build candidate list with corresponding flags. Then, when we know all possible matches,
+        // we make a final decision.
+
+        for (m = 0; m < mixins.length; m++) {
+          mixin = mixins[m].rule;
+          mixinPath = mixins[m].path;
+          isRecursive = false;
+          for (f = 0; f < context.frames.length; f++) {
+            if ((!(mixin instanceof MixinDefinition)) && mixin === (context.frames[f].originalRuleset || context.frames[f])) {
+              isRecursive = true;
+              break;
+            }
+          }
+          if (isRecursive) {
+            continue;
+          }
+
+          if (mixin.matchArgs(args, context)) {
+            candidate = {mixin: mixin, group: calcDefGroup(mixin, mixinPath)};
+
+            if (candidate.group !== defFalseEitherCase) {
+              candidates.push(candidate);
+            }
+
+            match = true;
+          }
+        }
+
+        defaultFunc.reset();
+
+        count = [0, 0, 0];
+        for (m = 0; m < candidates.length; m++) {
+          count[candidates[m].group]++;
+        }
+
+        if (count[defNone] > 0) {
+          defaultResult = defFalse;
+        } else {
+          defaultResult = defTrue;
+          if ((count[defTrue] + count[defFalse]) > 1) {
+            throw { type: 'Runtime',
+              message: 'Ambiguous use of `default()` found when matching for `' + this.format(args) + '`',
+              index: this.index, filename: this.currentFileInfo.filename };
+          }
+        }
+
+        for (m = 0; m < candidates.length; m++) {
+          candidate = candidates[m].group;
+          if ((candidate === defNone) || (candidate === defaultResult)) {
+            try {
+              mixin = candidates[m].mixin;
+              if (!(mixin instanceof MixinDefinition)) {
+                originalRuleset = mixin.originalRuleset || mixin;
+                mixin = new MixinDefinition("", [], mixin.rules, null, false, null, originalRuleset.visibilityInfo());
+                mixin.originalRuleset = originalRuleset;
+              }
+              var newRules = mixin.evalCall(context, args, this.important).rules;
+              this._setVisibilityToReplacement(newRules);
+              Array.prototype.push.apply(rules, newRules);
+            } catch (e) {
+              throw { message: e.message, index: this.index, filename: this.currentFileInfo.filename, stack: e.stack };
+            }
+          }
+        }
+
+        if (match) {
+          return rules;
+        }
+      }
+    }
+    if (isOneFound) {
+      throw { type:    'Runtime',
+        message: 'No matching definition was found for `' + this.format(args) + '`',
+        index:   this.index, filename: this.currentFileInfo.filename };
+    } else {
+      throw { type:    'Name',
+        message: this.selector.toCSS().trim() + " is undefined",
+        index:   this.index, filename: this.currentFileInfo.filename };
+    }
+  };
+
+  MixinCall.prototype._setVisibilityToReplacement = function (replacement) {
+    var i, rule;
+    if (this.blocksVisibility()) {
+      for (i = 0; i < replacement.length; i++) {
+        rule = replacement[i];
+        rule.addVisibilityBlock();
+      }
+    }
+  };
+  MixinCall.prototype.format = function (args) {
+    return this.selector.toCSS().trim() + '(' +
+      (args ? args.map(function (a) {
+        var argValue = "";
+        if (a.name) {
+          argValue += a.name + ":";
+        }
+        if (a.value.toCSS) {
+          argValue += a.value.toCSS();
+        } else {
+          argValue += "???";
+        }
+        return argValue;
+      }).join(', ') : "") + ")";
+  };
+  module.exports = MixinCall;
+
+},{"../functions/default":20,"./mixin-definition":68,"./node":70,"./selector":77}],68:[function(require,module,exports){
+  var Selector = require("./selector"),
+    Element = require("./element"),
+    Ruleset = require("./ruleset"),
+    Rule = require("./rule"),
+    Expression = require("./expression"),
+    contexts = require("../contexts");
+
+  var Definition = function (name, params, rules, condition, variadic, frames, visibilityInfo) {
+    this.name = name;
+    this.selectors = [new Selector([new Element(null, name, this.index, this.currentFileInfo)])];
+    this.params = params;
+    this.condition = condition;
+    this.variadic = variadic;
+    this.arity = params.length;
+    this.rules = rules;
+    this._lookups = {};
+    var optionalParameters = [];
+    this.required = params.reduce(function (count, p) {
+      if (!p.name || (p.name && !p.value)) {
+        return count + 1;
+      }
+      else {
+        optionalParameters.push(p.name);
+        return count;
+      }
+    }, 0);
+    this.optionalParameters = optionalParameters;
+    this.frames = frames;
+    this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
+  };
+  Definition.prototype = new Ruleset();
+  Definition.prototype.type = "MixinDefinition";
+  Definition.prototype.evalFirst = true;
+  Definition.prototype.accept = function (visitor) {
+    if (this.params && this.params.length) {
+      this.params = visitor.visitArray(this.params);
+    }
+    this.rules = visitor.visitArray(this.rules);
+    if (this.condition) {
+      this.condition = visitor.visit(this.condition);
+    }
+  };
+  Definition.prototype.evalParams = function (context, mixinEnv, args, evaldArguments) {
+    /*jshint boss:true */
+    var frame = new Ruleset(null, null),
+      varargs, arg,
+      params = this.params.slice(0),
+      i, j, val, name, isNamedFound, argIndex, argsLength = 0;
+
+    if (mixinEnv.frames && mixinEnv.frames[0] && mixinEnv.frames[0].functionRegistry) {
+      frame.functionRegistry = mixinEnv.frames[0].functionRegistry.inherit();
+    }
+    mixinEnv = new contexts.Eval(mixinEnv, [frame].concat(mixinEnv.frames));
+
+    if (args) {
+      args = args.slice(0);
+      argsLength = args.length;
+
+      for (i = 0; i < argsLength; i++) {
+        arg = args[i];
+        if (name = (arg && arg.name)) {
+          isNamedFound = false;
+          for (j = 0; j < params.length; j++) {
+            if (!evaldArguments[j] && name === params[j].name) {
+              evaldArguments[j] = arg.value.eval(context);
+              frame.prependRule(new Rule(name, arg.value.eval(context)));
+              isNamedFound = true;
+              break;
+            }
+          }
+          if (isNamedFound) {
+            args.splice(i, 1);
+            i--;
+            continue;
+          } else {
+            throw { type: 'Runtime', message: "Named argument for " + this.name +
+            ' ' + args[i].name + ' not found' };
+          }
+        }
+      }
+    }
+    argIndex = 0;
+    for (i = 0; i < params.length; i++) {
+      if (evaldArguments[i]) { continue; }
+
+      arg = args && args[argIndex];
+
+      if (name = params[i].name) {
+        if (params[i].variadic) {
+          varargs = [];
+          for (j = argIndex; j < argsLength; j++) {
+            varargs.push(args[j].value.eval(context));
+          }
+          frame.prependRule(new Rule(name, new Expression(varargs).eval(context)));
+        } else {
+          val = arg && arg.value;
+          if (val) {
+            val = val.eval(context);
+          } else if (params[i].value) {
+            val = params[i].value.eval(mixinEnv);
+            frame.resetCache();
+          } else {
+            throw { type: 'Runtime', message: "wrong number of arguments for " + this.name +
+            ' (' + argsLength + ' for ' + this.arity + ')' };
+          }
+
+          frame.prependRule(new Rule(name, val));
+          evaldArguments[i] = val;
+        }
+      }
+
+      if (params[i].variadic && args) {
+        for (j = argIndex; j < argsLength; j++) {
+          evaldArguments[j] = args[j].value.eval(context);
+        }
+      }
+      argIndex++;
+    }
+
+    return frame;
+  };
+  Definition.prototype.makeImportant = function() {
+    var rules = !this.rules ? this.rules : this.rules.map(function (r) {
+      if (r.makeImportant) {
+        return r.makeImportant(true);
+      } else {
+        return r;
+      }
+    });
+    var result = new Definition(this.name, this.params, rules, this.condition, this.variadic, this.frames);
+    return result;
+  };
+  Definition.prototype.eval = function (context) {
+    return new Definition(this.name, this.params, this.rules, this.condition, this.variadic, this.frames || context.frames.slice(0));
+  };
+  Definition.prototype.evalCall = function (context, args, important) {
+    var _arguments = [],
+      mixinFrames = this.frames ? this.frames.concat(context.frames) : context.frames,
+      frame = this.evalParams(context, new contexts.Eval(context, mixinFrames), args, _arguments),
+      rules, ruleset;
+
+    frame.prependRule(new Rule('@arguments', new Expression(_arguments).eval(context)));
+
+    rules = this.rules.slice(0);
+
+    ruleset = new Ruleset(null, rules);
+    ruleset.originalRuleset = this;
+    ruleset = ruleset.eval(new contexts.Eval(context, [this, frame].concat(mixinFrames)));
+    if (important) {
+      ruleset = ruleset.makeImportant();
+    }
+    return ruleset;
+  };
+  Definition.prototype.matchCondition = function (args, context) {
+    if (this.condition && !this.condition.eval(
+        new contexts.Eval(context,
+          [this.evalParams(context, /* the parameter variables*/
+            new contexts.Eval(context, this.frames ? this.frames.concat(context.frames) : context.frames), args, [])]
+            .concat(this.frames || []) // the parent namespace/mixin frames
+            .concat(context.frames)))) { // the current environment frames
+      return false;
+    }
+    return true;
+  };
+  Definition.prototype.matchArgs = function (args, context) {
+    var allArgsCnt = (args && args.length) || 0, len, optionalParameters = this.optionalParameters;
+    var requiredArgsCnt = !args ? 0 : args.reduce(function (count, p) {
+      if (optionalParameters.indexOf(p.name) < 0) {
+        return count + 1;
+      } else {
+        return count;
+      }
+    }, 0);
+
+    if (! this.variadic) {
+      if (requiredArgsCnt < this.required) {
+        return false;
+      }
+      if (allArgsCnt > this.params.length) {
+        return false;
+      }
+    } else {
+      if (requiredArgsCnt < (this.required - 1)) {
+        return false;
+      }
+    }
+
+    // check patterns
+    len = Math.min(requiredArgsCnt, this.arity);
+
+    for (var i = 0; i < len; i++) {
+      if (!this.params[i].name && !this.params[i].variadic) {
+        if (args[i].value.eval(context).toCSS() != this.params[i].value.eval(context).toCSS()) {
+          return false;
+        }
+      }
+    }
+    return true;
+  };
+  module.exports = Definition;
+
+},{"../contexts":11,"./element":58,"./expression":59,"./rule":74,"./ruleset":76,"./selector":77}],69:[function(require,module,exports){
+  var Node = require("./node"),
+    Operation = require("./operation"),
+    Dimension = require("./dimension");
+
+  var Negative = function (node) {
+    this.value = node;
+  };
+  Negative.prototype = new Node();
+  Negative.prototype.type = "Negative";
+  Negative.prototype.genCSS = function (context, output) {
+    output.add('-');
+    this.value.genCSS(context, output);
+  };
+  Negative.prototype.eval = function (context) {
+    if (context.isMathOn()) {
+      return (new Operation('*', [new Dimension(-1), this.value])).eval(context);
+    }
+    return new Negative(this.value.eval(context));
+  };
+  module.exports = Negative;
+
+},{"./dimension":56,"./node":70,"./operation":71}],70:[function(require,module,exports){
+  var Node = function() {
+  };
+  Node.prototype.toCSS = function (context) {
+    var strs = [];
+    this.genCSS(context, {
+      add: function(chunk, fileInfo, index) {
+        strs.push(chunk);
+      },
+      isEmpty: function () {
+        return strs.length === 0;
+      }
+    });
+    return strs.join('');
+  };
+  Node.prototype.genCSS = function (context, output) {
+    output.add(this.value);
+  };
+  Node.prototype.accept = function (visitor) {
+    this.value = visitor.visit(this.value);
+  };
+  Node.prototype.eval = function () { return this; };
+  Node.prototype._operate = function (context, op, a, b) {
+    switch (op) {
+      case '+': return a + b;
+      case '-': return a - b;
+      case '*': return a * b;
+      case '/': return a / b;
+    }
+  };
+  Node.prototype.fround = function(context, value) {
+    var precision = context && context.numPrecision;
+    //add "epsilon" to ensure numbers like 1.000000005 (represented as 1.000000004999....) are properly rounded...
+    return (precision == null) ? value : Number((value + 2e-16).toFixed(precision));
+  };
+  Node.compare = function (a, b) {
+    /* returns:
+     -1: a < b
+     0: a = b
+     1: a > b
+     and *any* other value for a != b (e.g. undefined, NaN, -2 etc.) */
+
+    if ((a.compare) &&
+      // for "symmetric results" force toCSS-based comparison
+      // of Quoted or Anonymous if either value is one of those
+      !(b.type === "Quoted" || b.type === "Anonymous")) {
+      return a.compare(b);
+    } else if (b.compare) {
+      return -b.compare(a);
+    } else if (a.type !== b.type) {
+      return undefined;
+    }
+
+    a = a.value;
+    b = b.value;
+    if (!Array.isArray(a)) {
+      return a === b ? 0 : undefined;
+    }
+    if (a.length !== b.length) {
+      return undefined;
+    }
+    for (var i = 0; i < a.length; i++) {
+      if (Node.compare(a[i], b[i]) !== 0) {
+        return undefined;
+      }
+    }
+    return 0;
+  };
+
+  Node.numericCompare = function (a, b) {
+    return a  <  b ? -1
+      : a === b ?  0
+        : a  >  b ?  1 : undefined;
+  };
+// Returns true if this node represents root of ast imported by reference
+  Node.prototype.blocksVisibility = function () {
+    if (this.visibilityBlocks == null) {
+      this.visibilityBlocks = 0;
+    }
+    return this.visibilityBlocks !== 0;
+  };
+  Node.prototype.addVisibilityBlock = function () {
+    if (this.visibilityBlocks == null) {
+      this.visibilityBlocks = 0;
+    }
+    this.visibilityBlocks = this.visibilityBlocks + 1;
+  };
+  Node.prototype.removeVisibilityBlock = function () {
+    if (this.visibilityBlocks == null) {
+      this.visibilityBlocks = 0;
+    }
+    this.visibilityBlocks = this.visibilityBlocks - 1;
+  };
+//Turns on node visibility - if called node will be shown in output regardless
+//of whether it comes from import by reference or not
+  Node.prototype.ensureVisibility = function () {
+    this.nodeVisible = true;
+  };
+//Turns off node visibility - if called node will NOT be shown in output regardless
+//of whether it comes from import by reference or not
+  Node.prototype.ensureInvisibility = function () {
+    this.nodeVisible = false;
+  };
+// return values:
+// false - the node must not be visible
+// true - the node must be visible
+// undefined or null - the node has the same visibility as its parent
+  Node.prototype.isVisible = function () {
+    return this.nodeVisible;
+  };
+  Node.prototype.visibilityInfo = function() {
+    return {
+      visibilityBlocks: this.visibilityBlocks,
+      nodeVisible: this.nodeVisible
+    };
+  };
+  Node.prototype.copyVisibilityInfo = function(info) {
+    if (!info) {
+      return;
+    }
+    this.visibilityBlocks = info.visibilityBlocks;
+    this.nodeVisible = info.nodeVisible;
+  };
+  module.exports = Node;
+
+},{}],71:[function(require,module,exports){
+  var Node = require("./node"),
+    Color = require("./color"),
+    Dimension = require("./dimension");
+
+  var Operation = function (op, operands, isSpaced) {
+    this.op = op.trim();
+    this.operands = operands;
+    this.isSpaced = isSpaced;
+  };
+  Operation.prototype = new Node();
+  Operation.prototype.type = "Operation";
+  Operation.prototype.accept = function (visitor) {
+    this.operands = visitor.visit(this.operands);
+  };
+  Operation.prototype.eval = function (context) {
+    var a = this.operands[0].eval(context),
+      b = this.operands[1].eval(context);
+
+    if (context.isMathOn()) {
+      if (a instanceof Dimension && b instanceof Color) {
+        a = a.toColor();
+      }
+      if (b instanceof Dimension && a instanceof Color) {
+        b = b.toColor();
+      }
+      if (!a.operate) {
+        throw { type: "Operation",
+          message: "Operation on an invalid type" };
+      }
+
+      return a.operate(context, this.op, b);
+    } else {
+      return new Operation(this.op, [a, b], this.isSpaced);
+    }
+  };
+  Operation.prototype.genCSS = function (context, output) {
+    this.operands[0].genCSS(context, output);
+    if (this.isSpaced) {
+      output.add(" ");
+    }
+    output.add(this.op);
+    if (this.isSpaced) {
+      output.add(" ");
+    }
+    this.operands[1].genCSS(context, output);
+  };
+
+  module.exports = Operation;
+
+},{"./color":50,"./dimension":56,"./node":70}],72:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Paren = function (node) {
+    this.value = node;
+  };
+  Paren.prototype = new Node();
+  Paren.prototype.type = "Paren";
+  Paren.prototype.genCSS = function (context, output) {
+    output.add('(');
+    this.value.genCSS(context, output);
+    output.add(')');
+  };
+  Paren.prototype.eval = function (context) {
+    return new Paren(this.value.eval(context));
+  };
+  module.exports = Paren;
+
+},{"./node":70}],73:[function(require,module,exports){
+  var Node = require("./node"),
+    JsEvalNode = require("./js-eval-node"),
+    Variable = require("./variable");
+
+  var Quoted = function (str, content, escaped, index, currentFileInfo) {
+    this.escaped = (escaped == null) ? true : escaped;
+    this.value = content || '';
+    this.quote = str.charAt(0);
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+  };
+  Quoted.prototype = new JsEvalNode();
+  Quoted.prototype.type = "Quoted";
+  Quoted.prototype.genCSS = function (context, output) {
+    if (!this.escaped) {
+      output.add(this.quote, this.currentFileInfo, this.index);
+    }
+    output.add(this.value);
+    if (!this.escaped) {
+      output.add(this.quote);
+    }
+  };
+  Quoted.prototype.containsVariables = function() {
+    return this.value.match(/(`([^`]+)`)|@\{([\w-]+)\}/);
+  };
+  Quoted.prototype.eval = function (context) {
+    var that = this, value = this.value;
+    var javascriptReplacement = function (_, exp) {
+      return String(that.evaluateJavaScript(exp, context));
+    };
+    var interpolationReplacement = function (_, name) {
+      var v = new Variable('@' + name, that.index, that.currentFileInfo).eval(context, true);
+      return (v instanceof Quoted) ? v.value : v.toCSS();
+    };
+    function iterativeReplace(value, regexp, replacementFnc) {
+      var evaluatedValue = value;
+      do {
+        value = evaluatedValue;
+        evaluatedValue = value.replace(regexp, replacementFnc);
+      } while (value !== evaluatedValue);
+      return evaluatedValue;
+    }
+    value = iterativeReplace(value, /`([^`]+)`/g, javascriptReplacement);
+    value = iterativeReplace(value, /@\{([\w-]+)\}/g, interpolationReplacement);
+    return new Quoted(this.quote + value + this.quote, value, this.escaped, this.index, this.currentFileInfo);
+  };
+  Quoted.prototype.compare = function (other) {
+    // when comparing quoted strings allow the quote to differ
+    if (other.type === "Quoted" && !this.escaped && !other.escaped) {
+      return Node.numericCompare(this.value, other.value);
+    } else {
+      return other.toCSS && this.toCSS() === other.toCSS() ? 0 : undefined;
+    }
+  };
+  module.exports = Quoted;
+
+},{"./js-eval-node":64,"./node":70,"./variable":82}],74:[function(require,module,exports){
+  var Node = require("./node"),
+    Value = require("./value"),
+    Keyword = require("./keyword");
+
+  var Rule = function (name, value, important, merge, index, currentFileInfo, inline, variable) {
+    this.name = name;
+    this.value = (value instanceof Node) ? value : new Value([value]); //value instanceof tree.Value || value instanceof tree.Ruleset ??
+    this.important = important ? ' ' + important.trim() : '';
+    this.merge = merge;
+    this.index = index;
+    this.currentFileInfo = currentFileInfo;
+    this.inline = inline || false;
+    this.variable = (variable !== undefined) ? variable
+      : (name.charAt && (name.charAt(0) === '@'));
+    this.allowRoot = true;
+  };
+
+  function evalName(context, name) {
+    var value = "", i, n = name.length,
+      output = {add: function (s) {value += s;}};
+    for (i = 0; i < n; i++) {
+      name[i].eval(context).genCSS(context, output);
+    }
+    return value;
+  }
+
+  Rule.prototype = new Node();
+  Rule.prototype.type = "Rule";
+  Rule.prototype.genCSS = function (context, output) {
+    output.add(this.name + (context.compress ? ':' : ': '), this.currentFileInfo, this.index);
+    try {
+      this.value.genCSS(context, output);
+    }
+    catch(e) {
+      e.index = this.index;
+      e.filename = this.currentFileInfo.filename;
+      throw e;
+    }
+    output.add(this.important + ((this.inline || (context.lastRule && context.compress)) ? "" : ";"), this.currentFileInfo, this.index);
+  };
+  Rule.prototype.eval = function (context) {
+    var strictMathBypass = false, name = this.name, evaldValue, variable = this.variable;
+    if (typeof name !== "string") {
+      // expand 'primitive' name directly to get
+      // things faster (~10% for benchmark.less):
+      name = (name.length === 1) && (name[0] instanceof Keyword) ?
+        name[0].value : evalName(context, name);
+      variable = false; // never treat expanded interpolation as new variable name
+    }
+    if (name === "font" && !context.strictMath) {
+      strictMathBypass = true;
+      context.strictMath = true;
+    }
+    try {
+      context.importantScope.push({});
+      evaldValue = this.value.eval(context);
+
+      if (!this.variable && evaldValue.type === "DetachedRuleset") {
+        throw { message: "Rulesets cannot be evaluated on a property.",
+          index: this.index, filename: this.currentFileInfo.filename };
+      }
+      var important = this.important,
+        importantResult = context.importantScope.pop();
+      if (!important && importantResult.important) {
+        important = importantResult.important;
+      }
+
+      return new Rule(name,
+        evaldValue,
+        important,
+        this.merge,
+        this.index, this.currentFileInfo, this.inline,
+        variable);
+    }
+    catch(e) {
+      if (typeof e.index !== 'number') {
+        e.index = this.index;
+        e.filename = this.currentFileInfo.filename;
+      }
+      throw e;
+    }
+    finally {
+      if (strictMathBypass) {
+        context.strictMath = false;
+      }
+    }
+  };
+  Rule.prototype.makeImportant = function () {
+    return new Rule(this.name,
+      this.value,
+      "!important",
+      this.merge,
+      this.index, this.currentFileInfo, this.inline);
+  };
+
+  module.exports = Rule;
+},{"./keyword":65,"./node":70,"./value":81}],75:[function(require,module,exports){
+  var Node = require("./node"),
+    Variable = require("./variable");
+
+  var RulesetCall = function (variable) {
+    this.variable = variable;
+    this.allowRoot = true;
+  };
+  RulesetCall.prototype = new Node();
+  RulesetCall.prototype.type = "RulesetCall";
+  RulesetCall.prototype.eval = function (context) {
+    var detachedRuleset = new Variable(this.variable).eval(context);
+    return detachedRuleset.callEval(context);
+  };
+  module.exports = RulesetCall;
+
+},{"./node":70,"./variable":82}],76:[function(require,module,exports){
+  var Node = require("./node"),
+    Rule = require("./rule"),
+    Selector = require("./selector"),
+    Element = require("./element"),
+    Paren = require("./paren"),
+    contexts = require("../contexts"),
+    globalFunctionRegistry = require("../functions/function-registry"),
+    defaultFunc = require("../functions/default"),
+    getDebugInfo = require("./debug-info");
+
+  var Ruleset = function (selectors, rules, strictImports, visibilityInfo) {
+    this.selectors = selectors;
+    this.rules = rules;
+    this._lookups = {};
+    this.strictImports = strictImports;
+    this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
+  };
+  Ruleset.prototype = new Node();
+  Ruleset.prototype.type = "Ruleset";
+  Ruleset.prototype.isRuleset = true;
+  Ruleset.prototype.isRulesetLike = true;
+  Ruleset.prototype.accept = function (visitor) {
+    if (this.paths) {
+      this.paths = visitor.visitArray(this.paths, true);
+    } else if (this.selectors) {
+      this.selectors = visitor.visitArray(this.selectors);
+    }
+    if (this.rules && this.rules.length) {
+      this.rules = visitor.visitArray(this.rules);
+    }
+  };
+  Ruleset.prototype.eval = function (context) {
+    var thisSelectors = this.selectors, selectors,
+      selCnt, selector, i, hasOnePassingSelector = false;
+
+    if (thisSelectors && (selCnt = thisSelectors.length)) {
+      selectors = [];
+      defaultFunc.error({
+        type: "Syntax",
+        message: "it is currently only allowed in parametric mixin guards,"
+      });
+      for (i = 0; i < selCnt; i++) {
+        selector = thisSelectors[i].eval(context);
+        selectors.push(selector);
+        if (selector.evaldCondition) {
+          hasOnePassingSelector = true;
+        }
+      }
+      defaultFunc.reset();
+    } else {
+      hasOnePassingSelector = true;
+    }
+
+    var rules = this.rules ? this.rules.slice(0) : null,
+      ruleset = new Ruleset(selectors, rules, this.strictImports, this.visibilityInfo()),
+      rule, subRule;
+
+    ruleset.originalRuleset = this;
+    ruleset.root = this.root;
+    ruleset.firstRoot = this.firstRoot;
+    ruleset.allowImports = this.allowImports;
+
+    if (this.debugInfo) {
+      ruleset.debugInfo = this.debugInfo;
+    }
+
+    if (!hasOnePassingSelector) {
+      rules.length = 0;
+    }
+
+    // inherit a function registry from the frames stack when possible;
+    // otherwise from the global registry
+    ruleset.functionRegistry = (function (frames) {
+      var i = 0,
+        n = frames.length,
+        found;
+      for ( ; i !== n ; ++i ) {
+        found = frames[ i ].functionRegistry;
+        if ( found ) { return found; }
+      }
+      return globalFunctionRegistry;
+    }(context.frames)).inherit();
+
+    // push the current ruleset to the frames stack
+    var ctxFrames = context.frames;
+    ctxFrames.unshift(ruleset);
+
+    // currrent selectors
+    var ctxSelectors = context.selectors;
+    if (!ctxSelectors) {
+      context.selectors = ctxSelectors = [];
+    }
+    ctxSelectors.unshift(this.selectors);
+
+    // Evaluate imports
+    if (ruleset.root || ruleset.allowImports || !ruleset.strictImports) {
+      ruleset.evalImports(context);
+    }
+
+    // Store the frames around mixin definitions,
+    // so they can be evaluated like closures when the time comes.
+    var rsRules = ruleset.rules, rsRuleCnt = rsRules ? rsRules.length : 0;
+    for (i = 0; i < rsRuleCnt; i++) {
+      if (rsRules[i].evalFirst) {
+        rsRules[i] = rsRules[i].eval(context);
+      }
+    }
+
+    var mediaBlockCount = (context.mediaBlocks && context.mediaBlocks.length) || 0;
+
+    // Evaluate mixin calls.
+    for (i = 0; i < rsRuleCnt; i++) {
+      if (rsRules[i].type === "MixinCall") {
+        /*jshint loopfunc:true */
+        rules = rsRules[i].eval(context).filter(function(r) {
+          if ((r instanceof Rule) && r.variable) {
+            // do not pollute the scope if the variable is
+            // already there. consider returning false here
+            // but we need a way to "return" variable from mixins
+            return !(ruleset.variable(r.name));
+          }
+          return true;
+        });
+        rsRules.splice.apply(rsRules, [i, 1].concat(rules));
+        rsRuleCnt += rules.length - 1;
+        i += rules.length - 1;
+        ruleset.resetCache();
+      } else if (rsRules[i].type === "RulesetCall") {
+        /*jshint loopfunc:true */
+        rules = rsRules[i].eval(context).rules.filter(function(r) {
+          if ((r instanceof Rule) && r.variable) {
+            // do not pollute the scope at all
+            return false;
+          }
+          return true;
+        });
+        rsRules.splice.apply(rsRules, [i, 1].concat(rules));
+        rsRuleCnt += rules.length - 1;
+        i += rules.length - 1;
+        ruleset.resetCache();
+      }
+    }
+
+    // Evaluate everything else
+    for (i = 0; i < rsRules.length; i++) {
+      rule = rsRules[i];
+      if (!rule.evalFirst) {
+        rsRules[i] = rule = rule.eval ? rule.eval(context) : rule;
+      }
+    }
+
+    // Evaluate everything else
+    for (i = 0; i < rsRules.length; i++) {
+      rule = rsRules[i];
+      // for rulesets, check if it is a css guard and can be removed
+      if (rule instanceof Ruleset && rule.selectors && rule.selectors.length === 1) {
+        // check if it can be folded in (e.g. & where)
+        if (rule.selectors[0].isJustParentSelector()) {
+          rsRules.splice(i--, 1);
+
+          for (var j = 0; j < rule.rules.length; j++) {
+            subRule = rule.rules[j];
+            subRule.copyVisibilityInfo(rule.visibilityInfo());
+            if (!(subRule instanceof Rule) || !subRule.variable) {
+              rsRules.splice(++i, 0, subRule);
+            }
+          }
+        }
+      }
+    }
+
+    // Pop the stack
+    ctxFrames.shift();
+    ctxSelectors.shift();
+
+    if (context.mediaBlocks) {
+      for (i = mediaBlockCount; i < context.mediaBlocks.length; i++) {
+        context.mediaBlocks[i].bubbleSelectors(selectors);
+      }
+    }
+
+    return ruleset;
+  };
+  Ruleset.prototype.evalImports = function(context) {
+    var rules = this.rules, i, importRules;
+    if (!rules) { return; }
+
+    for (i = 0; i < rules.length; i++) {
+      if (rules[i].type === "Import") {
+        importRules = rules[i].eval(context);
+        if (importRules && (importRules.length || importRules.length === 0)) {
+          rules.splice.apply(rules, [i, 1].concat(importRules));
+          i+= importRules.length - 1;
+        } else {
+          rules.splice(i, 1, importRules);
+        }
+        this.resetCache();
+      }
+    }
+  };
+  Ruleset.prototype.makeImportant = function() {
+    var result = new Ruleset(this.selectors, this.rules.map(function (r) {
+      if (r.makeImportant) {
+        return r.makeImportant();
+      } else {
+        return r;
+      }
+    }), this.strictImports, this.visibilityInfo());
+
+    return result;
+  };
+  Ruleset.prototype.matchArgs = function (args) {
+    return !args || args.length === 0;
+  };
+// lets you call a css selector with a guard
+  Ruleset.prototype.matchCondition = function (args, context) {
+    var lastSelector = this.selectors[this.selectors.length - 1];
+    if (!lastSelector.evaldCondition) {
+      return false;
+    }
+    if (lastSelector.condition &&
+      !lastSelector.condition.eval(
+        new contexts.Eval(context,
+          context.frames))) {
+      return false;
+    }
+    return true;
+  };
+  Ruleset.prototype.resetCache = function () {
+    this._rulesets = null;
+    this._variables = null;
+    this._lookups = {};
+  };
+  Ruleset.prototype.variables = function () {
+    if (!this._variables) {
+      this._variables = !this.rules ? {} : this.rules.reduce(function (hash, r) {
+        if (r instanceof Rule && r.variable === true) {
+          hash[r.name] = r;
+        }
+        // when evaluating variables in an import statement, imports have not been eval'd
+        // so we need to go inside import statements.
+        // guard against root being a string (in the case of inlined less)
+        if (r.type === "Import" && r.root && r.root.variables) {
+          var vars = r.root.variables();
+          for (var name in vars) {
+            if (vars.hasOwnProperty(name)) {
+              hash[name] = vars[name];
+            }
+          }
+        }
+        return hash;
+      }, {});
+    }
+    return this._variables;
+  };
+  Ruleset.prototype.variable = function (name) {
+    return this.variables()[name];
+  };
+  Ruleset.prototype.rulesets = function () {
+    if (!this.rules) { return []; }
+
+    var filtRules = [], rules = this.rules, cnt = rules.length,
+      i, rule;
+
+    for (i = 0; i < cnt; i++) {
+      rule = rules[i];
+      if (rule.isRuleset) {
+        filtRules.push(rule);
+      }
+    }
+
+    return filtRules;
+  };
+  Ruleset.prototype.prependRule = function (rule) {
+    var rules = this.rules;
+    if (rules) {
+      rules.unshift(rule);
+    } else {
+      this.rules = [ rule ];
+    }
+  };
+  Ruleset.prototype.find = function (selector, self, filter) {
+    self = self || this;
+    var rules = [], match, foundMixins,
+      key = selector.toCSS();
+
+    if (key in this._lookups) { return this._lookups[key]; }
+
+    this.rulesets().forEach(function (rule) {
+      if (rule !== self) {
+        for (var j = 0; j < rule.selectors.length; j++) {
+          match = selector.match(rule.selectors[j]);
+          if (match) {
+            if (selector.elements.length > match) {
+              if (!filter || filter(rule)) {
+                foundMixins = rule.find(new Selector(selector.elements.slice(match)), self, filter);
+                for (var i = 0; i < foundMixins.length; ++i) {
+                  foundMixins[i].path.push(rule);
+                }
+                Array.prototype.push.apply(rules, foundMixins);
+              }
+            } else {
+              rules.push({ rule: rule, path: []});
+            }
+            break;
+          }
+        }
+      }
+    });
+    this._lookups[key] = rules;
+    return rules;
+  };
+  Ruleset.prototype.genCSS = function (context, output) {
+    var i, j,
+      charsetRuleNodes = [],
+      ruleNodes = [],
+      debugInfo,     // Line number debugging
+      rule,
+      path;
+
+    context.tabLevel = (context.tabLevel || 0);
+
+    if (!this.root) {
+      context.tabLevel++;
+    }
+
+    var tabRuleStr = context.compress ? '' : Array(context.tabLevel + 1).join("  "),
+      tabSetStr = context.compress ? '' : Array(context.tabLevel).join("  "),
+      sep;
+
+    function isRulesetLikeNode(rule) {
+      // if it has nested rules, then it should be treated like a ruleset
+      // medias and comments do not have nested rules, but should be treated like rulesets anyway
+      // some directives and anonymous nodes are ruleset like, others are not
+      if (typeof rule.isRulesetLike === "boolean") {
+        return rule.isRulesetLike;
+      } else if (typeof rule.isRulesetLike === "function") {
+        return rule.isRulesetLike();
+      }
+
+      //anything else is assumed to be a rule
+      return false;
+    }
+
+    var charsetNodeIndex = 0;
+    var importNodeIndex = 0;
+    for (i = 0; i < this.rules.length; i++) {
+      rule = this.rules[i];
+      if (rule.type === "Comment") {
+        if (importNodeIndex === i) {
+          importNodeIndex++;
+        }
+        ruleNodes.push(rule);
+      } else if (rule.isCharset && rule.isCharset()) {
+        ruleNodes.splice(charsetNodeIndex, 0, rule);
+        charsetNodeIndex++;
+        importNodeIndex++;
+      } else if (rule.type === "Import") {
+        ruleNodes.splice(importNodeIndex, 0, rule);
+        importNodeIndex++;
+      } else {
+        ruleNodes.push(rule);
+      }
+    }
+    ruleNodes = charsetRuleNodes.concat(ruleNodes);
+
+    // If this is the root node, we don't render
+    // a selector, or {}.
+    if (!this.root) {
+      debugInfo = getDebugInfo(context, this, tabSetStr);
+
+      if (debugInfo) {
+        output.add(debugInfo);
+        output.add(tabSetStr);
+      }
+
+      var paths = this.paths, pathCnt = paths.length,
+        pathSubCnt;
+
+      sep = context.compress ? ',' : (',\n' + tabSetStr);
+
+      for (i = 0; i < pathCnt; i++) {
+        path = paths[i];
+        if (!(pathSubCnt = path.length)) { continue; }
+        if (i > 0) { output.add(sep); }
+
+        context.firstSelector = true;
+        path[0].genCSS(context, output);
+
+        context.firstSelector = false;
+        for (j = 1; j < pathSubCnt; j++) {
+          path[j].genCSS(context, output);
+        }
+      }
+
+      output.add((context.compress ? '{' : ' {\n') + tabRuleStr);
+    }
+
+    // Compile rules and rulesets
+    for (i = 0; i < ruleNodes.length; i++) {
+      rule = ruleNodes[i];
+
+      if (i + 1 === ruleNodes.length) {
+        context.lastRule = true;
+      }
+
+      var currentLastRule = context.lastRule;
+      if (isRulesetLikeNode(rule)) {
+        context.lastRule = false;
+      }
+
+      if (rule.genCSS) {
+        rule.genCSS(context, output);
+      } else if (rule.value) {
+        output.add(rule.value.toString());
+      }
+
+      context.lastRule = currentLastRule;
+
+      if (!context.lastRule) {
+        output.add(context.compress ? '' : ('\n' + tabRuleStr));
+      } else {
+        context.lastRule = false;
+      }
+    }
+
+    if (!this.root) {
+      output.add((context.compress ? '}' : '\n' + tabSetStr + '}'));
+      context.tabLevel--;
+    }
+
+    if (!output.isEmpty() && !context.compress && this.firstRoot) {
+      output.add('\n');
+    }
+  };
+
+  Ruleset.prototype.joinSelectors = function (paths, context, selectors) {
+    for (var s = 0; s < selectors.length; s++) {
+      this.joinSelector(paths, context, selectors[s]);
+    }
+  };
+
+  Ruleset.prototype.joinSelector = function (paths, context, selector) {
+
+    function createParenthesis(elementsToPak, originalElement) {
+      var replacementParen, j;
+      if (elementsToPak.length === 0) {
+        replacementParen = new Paren(elementsToPak[0]);
+      } else {
+        var insideParent = [];
+        for (j = 0; j < elementsToPak.length; j++) {
+          insideParent.push(new Element(null, elementsToPak[j], originalElement.index, originalElement.currentFileInfo));
+        }
+        replacementParen = new Paren(new Selector(insideParent));
+      }
+      return replacementParen;
+    }
+
+    function createSelector(containedElement, originalElement) {
+      var element, selector;
+      element = new Element(null, containedElement, originalElement.index, originalElement.currentFileInfo);
+      selector = new Selector([element]);
+      return selector;
+    }
+
+    // joins selector path from `beginningPath` with selector path in `addPath`
+    // `replacedElement` contains element that is being replaced by `addPath`
+    // returns concatenated path
+    function addReplacementIntoPath(beginningPath, addPath, replacedElement, originalSelector) {
+      var newSelectorPath, lastSelector, newJoinedSelector;
+      // our new selector path
+      newSelectorPath = [];
+
+      //construct the joined selector - if & is the first thing this will be empty,
+      // if not newJoinedSelector will be the last set of elements in the selector
+      if (beginningPath.length > 0) {
+        newSelectorPath = beginningPath.slice(0);
+        lastSelector = newSelectorPath.pop();
+        newJoinedSelector = originalSelector.createDerived(lastSelector.elements.slice(0));
+      }
+      else {
+        newJoinedSelector = originalSelector.createDerived([]);
+      }
+
+      if (addPath.length > 0) {
+        // /deep/ is a combinator that is valid without anything in front of it
+        // so if the & does not have a combinator that is "" or " " then
+        // and there is a combinator on the parent, then grab that.
+        // this also allows + a { & .b { .a & { ... though not sure why you would want to do that
+        var combinator = replacedElement.combinator, parentEl = addPath[0].elements[0];
+        if (combinator.emptyOrWhitespace && !parentEl.combinator.emptyOrWhitespace) {
+          combinator = parentEl.combinator;
+        }
+        // join the elements so far with the first part of the parent
+        newJoinedSelector.elements.push(new Element(combinator, parentEl.value, replacedElement.index, replacedElement.currentFileInfo));
+        newJoinedSelector.elements = newJoinedSelector.elements.concat(addPath[0].elements.slice(1));
+      }
+
+      // now add the joined selector - but only if it is not empty
+      if (newJoinedSelector.elements.length !== 0) {
+        newSelectorPath.push(newJoinedSelector);
+      }
+
+      //put together the parent selectors after the join (e.g. the rest of the parent)
+      if (addPath.length > 1) {
+        var restOfPath = addPath.slice(1);
+        restOfPath = restOfPath.map(function (selector) {
+          return selector.createDerived(selector.elements, []);
+        });
+        newSelectorPath = newSelectorPath.concat(restOfPath);
+      }
+      return newSelectorPath;
+    }
+
+    // joins selector path from `beginningPath` with every selector path in `addPaths` array
+    // `replacedElement` contains element that is being replaced by `addPath`
+    // returns array with all concatenated paths
+    function addAllReplacementsIntoPath( beginningPath, addPaths, replacedElement, originalSelector, result) {
+      var j;
+      for (j = 0; j < beginningPath.length; j++) {
+        var newSelectorPath = addReplacementIntoPath(beginningPath[j], addPaths, replacedElement, originalSelector);
+        result.push(newSelectorPath);
+      }
+      return result;
+    }
+
+    function mergeElementsOnToSelectors(elements, selectors) {
+      var i, sel;
+
+      if (elements.length === 0) {
+        return ;
+      }
+      if (selectors.length === 0) {
+        selectors.push([ new Selector(elements) ]);
+        return;
+      }
+
+      for (i = 0; i < selectors.length; i++) {
+        sel = selectors[i];
+
+        // if the previous thing in sel is a parent this needs to join on to it
+        if (sel.length > 0) {
+          sel[sel.length - 1] = sel[sel.length - 1].createDerived(sel[sel.length - 1].elements.concat(elements));
+        }
+        else {
+          sel.push(new Selector(elements));
+        }
+      }
+    }
+
+    // replace all parent selectors inside `inSelector` by content of `context` array
+    // resulting selectors are returned inside `paths` array
+    // returns true if `inSelector` contained at least one parent selector
+    function replaceParentSelector(paths, context, inSelector) {
+      // The paths are [[Selector]]
+      // The first list is a list of comma separated selectors
+      // The inner list is a list of inheritance separated selectors
+      // e.g.
+      // .a, .b {
+      //   .c {
+      //   }
+      // }
+      // == [[.a] [.c]] [[.b] [.c]]
+      //
+      var i, j, k, currentElements, newSelectors, selectorsMultiplied, sel, el, hadParentSelector = false, length, lastSelector;
+      function findNestedSelector(element) {
+        var maybeSelector;
+        if (element.value.type !== 'Paren') {
+          return null;
+        }
+
+        maybeSelector = element.value.value;
+        if (maybeSelector.type !== 'Selector') {
+          return null;
+        }
+
+        return maybeSelector;
+      }
+
+      // the elements from the current selector so far
+      currentElements = [];
+      // the current list of new selectors to add to the path.
+      // We will build it up. We initiate it with one empty selector as we "multiply" the new selectors
+      // by the parents
+      newSelectors = [
+        []
+      ];
+
+      for (i = 0; i < inSelector.elements.length; i++) {
+        el = inSelector.elements[i];
+        // non parent reference elements just get added
+        if (el.value !== "&") {
+          var nestedSelector = findNestedSelector(el);
+          if (nestedSelector != null) {
+            // merge the current list of non parent selector elements
+            // on to the current list of selectors to add
+            mergeElementsOnToSelectors(currentElements, newSelectors);
+
+            var nestedPaths = [], replaced, replacedNewSelectors = [];
+            replaced = replaceParentSelector(nestedPaths, context, nestedSelector);
+            hadParentSelector = hadParentSelector || replaced;
+            //the nestedPaths array should have only one member - replaceParentSelector does not multiply selectors
+            for (k = 0; k < nestedPaths.length; k++) {
+              var replacementSelector = createSelector(createParenthesis(nestedPaths[k], el), el);
+              addAllReplacementsIntoPath(newSelectors, [replacementSelector], el, inSelector, replacedNewSelectors);
+            }
+            newSelectors = replacedNewSelectors;
+            currentElements = [];
+
+          } else {
+            currentElements.push(el);
+          }
+
+        } else {
+          hadParentSelector = true;
+          // the new list of selectors to add
+          selectorsMultiplied = [];
+
+          // merge the current list of non parent selector elements
+          // on to the current list of selectors to add
+          mergeElementsOnToSelectors(currentElements, newSelectors);
+
+          // loop through our current selectors
+          for (j = 0; j < newSelectors.length; j++) {
+            sel = newSelectors[j];
+            // if we don't have any parent paths, the & might be in a mixin so that it can be used
+            // whether there are parents or not
+            if (context.length === 0) {
+              // the combinator used on el should now be applied to the next element instead so that
+              // it is not lost
+              if (sel.length > 0) {
+                sel[0].elements.push(new Element(el.combinator, '', el.index, el.currentFileInfo));
+              }
+              selectorsMultiplied.push(sel);
+            }
+            else {
+              // and the parent selectors
+              for (k = 0; k < context.length; k++) {
+                // We need to put the current selectors
+                // then join the last selector's elements on to the parents selectors
+                var newSelectorPath = addReplacementIntoPath(sel, context[k], el, inSelector);
+                // add that to our new set of selectors
+                selectorsMultiplied.push(newSelectorPath);
+              }
+            }
+          }
+
+          // our new selectors has been multiplied, so reset the state
+          newSelectors = selectorsMultiplied;
+          currentElements = [];
+        }
+      }
+
+      // if we have any elements left over (e.g. .a& .b == .b)
+      // add them on to all the current selectors
+      mergeElementsOnToSelectors(currentElements, newSelectors);
+
+      for (i = 0; i < newSelectors.length; i++) {
+        length = newSelectors[i].length;
+        if (length > 0) {
+          paths.push(newSelectors[i]);
+          lastSelector = newSelectors[i][length - 1];
+          newSelectors[i][length - 1] = lastSelector.createDerived(lastSelector.elements, inSelector.extendList);
+          //newSelectors[i][length - 1].copyVisibilityInfo(inSelector.visibilityInfo());
+        }
+      }
+
+      return hadParentSelector;
+    }
+
+    function deriveSelector(visibilityInfo, deriveFrom) {
+      var newSelector = deriveFrom.createDerived(deriveFrom.elements, deriveFrom.extendList, deriveFrom.evaldCondition);
+      newSelector.copyVisibilityInfo(visibilityInfo);
+      return newSelector;
+    }
+
+    // joinSelector code follows
+    var i, newPaths, hadParentSelector;
+
+    newPaths = [];
+    hadParentSelector = replaceParentSelector(newPaths, context, selector);
+
+    if (!hadParentSelector) {
+      if (context.length > 0) {
+        newPaths = [];
+        for (i = 0; i < context.length; i++) {
+          //var concatenated = [];
+          //context[i].forEach(function(entry) {
+          //    var newEntry = entry.createDerived(entry.elements, entry.extendList, entry.evaldCondition);
+          //    newEntry.copyVisibilityInfo(selector.visibilityInfo());
+          //    concatenated.push(newEntry);
+          //}, this);
+          var concatenated = context[i].map(deriveSelector.bind(this, selector.visibilityInfo()));
+
+          concatenated.push(selector);
+          newPaths.push(concatenated);
+        }
+      }
+      else {
+        newPaths = [[selector]];
+      }
+    }
+
+    for (i = 0; i < newPaths.length; i++) {
+      paths.push(newPaths[i]);
+    }
+
+  };
+  module.exports = Ruleset;
+
+},{"../contexts":11,"../functions/default":20,"../functions/function-registry":22,"./debug-info":54,"./element":58,"./node":70,"./paren":72,"./rule":74,"./selector":77}],77:[function(require,module,exports){
+  var Node = require("./node"),
+    Element = require("./element");
+
+  var Selector = function (elements, extendList, condition, index, currentFileInfo, visibilityInfo) {
+    this.elements = elements;
+    this.extendList = extendList;
+    this.condition = condition;
+    this.currentFileInfo = currentFileInfo || {};
+    if (!condition) {
+      this.evaldCondition = true;
+    }
+    this.copyVisibilityInfo(visibilityInfo);
+  };
+  Selector.prototype = new Node();
+  Selector.prototype.type = "Selector";
+  Selector.prototype.accept = function (visitor) {
+    if (this.elements) {
+      this.elements = visitor.visitArray(this.elements);
+    }
+    if (this.extendList) {
+      this.extendList = visitor.visitArray(this.extendList);
+    }
+    if (this.condition) {
+      this.condition = visitor.visit(this.condition);
+    }
+  };
+  Selector.prototype.createDerived = function(elements, extendList, evaldCondition) {
+    var info = this.visibilityInfo();
+    evaldCondition = (evaldCondition != null) ? evaldCondition : this.evaldCondition;
+    var newSelector = new Selector(elements, extendList || this.extendList, null, this.index, this.currentFileInfo, info);
+    newSelector.evaldCondition = evaldCondition;
+    newSelector.mediaEmpty = this.mediaEmpty;
+    return newSelector;
+  };
+  Selector.prototype.createEmptySelectors = function() {
+    var el = new Element('', '&', this.index, this.currentFileInfo),
+      sels = [new Selector([el], null, null, this.index, this.currentFileInfo)];
+    sels[0].mediaEmpty = true;
+    return sels;
+  };
+  Selector.prototype.match = function (other) {
+    var elements = this.elements,
+      len = elements.length,
+      olen, i;
+
+    other.CacheElements();
+
+    olen = other._elements.length;
+    if (olen === 0 || len < olen) {
+      return 0;
+    } else {
+      for (i = 0; i < olen; i++) {
+        if (elements[i].value !== other._elements[i]) {
+          return 0;
+        }
+      }
+    }
+
+    return olen; // return number of matched elements
+  };
+  Selector.prototype.CacheElements = function() {
+    if (this._elements) {
+      return;
+    }
+
+    var elements = this.elements.map( function(v) {
+      return v.combinator.value + (v.value.value || v.value);
+    }).join("").match(/[,&#\*\.\w-]([\w-]|(\\.))*/g);
+
+    if (elements) {
+      if (elements[0] === "&") {
+        elements.shift();
+      }
+    } else {
+      elements = [];
+    }
+
+    this._elements = elements;
+  };
+  Selector.prototype.isJustParentSelector = function() {
+    return !this.mediaEmpty &&
+      this.elements.length === 1 &&
+      this.elements[0].value === '&' &&
+      (this.elements[0].combinator.value === ' ' || this.elements[0].combinator.value === '');
+  };
+  Selector.prototype.eval = function (context) {
+    var evaldCondition = this.condition && this.condition.eval(context),
+      elements = this.elements, extendList = this.extendList;
+
+    elements = elements && elements.map(function (e) { return e.eval(context); });
+    extendList = extendList && extendList.map(function(extend) { return extend.eval(context); });
+
+    return this.createDerived(elements, extendList, evaldCondition);
+  };
+  Selector.prototype.genCSS = function (context, output) {
+    var i, element;
+    if ((!context || !context.firstSelector) && this.elements[0].combinator.value === "") {
+      output.add(' ', this.currentFileInfo, this.index);
+    }
+    if (!this._css) {
+      //TODO caching? speed comparison?
+      for (i = 0; i < this.elements.length; i++) {
+        element = this.elements[i];
+        element.genCSS(context, output);
+      }
+    }
+  };
+  Selector.prototype.getIsOutput = function() {
+    return this.evaldCondition;
+  };
+  module.exports = Selector;
+
+},{"./element":58,"./node":70}],78:[function(require,module,exports){
+  var Node = require("./node");
+
+  var UnicodeDescriptor = function (value) {
+    this.value = value;
+  };
+  UnicodeDescriptor.prototype = new Node();
+  UnicodeDescriptor.prototype.type = "UnicodeDescriptor";
+
+  module.exports = UnicodeDescriptor;
+
+},{"./node":70}],79:[function(require,module,exports){
+  var Node = require("./node"),
+    unitConversions = require("../data/unit-conversions");
+
+  var Unit = function (numerator, denominator, backupUnit) {
+    this.numerator = numerator ? numerator.slice(0).sort() : [];
+    this.denominator = denominator ? denominator.slice(0).sort() : [];
+    if (backupUnit) {
+      this.backupUnit = backupUnit;
+    } else if (numerator && numerator.length) {
+      this.backupUnit = numerator[0];
+    }
+  };
+
+  Unit.prototype = new Node();
+  Unit.prototype.type = "Unit";
+  Unit.prototype.clone = function () {
+    return new Unit(this.numerator.slice(0), this.denominator.slice(0), this.backupUnit);
+  };
+  Unit.prototype.genCSS = function (context, output) {
+    // Dimension checks the unit is singular and throws an error if in strict math mode.
+    var strictUnits = context && context.strictUnits;
+    if (this.numerator.length === 1) {
+      output.add(this.numerator[0]); // the ideal situation
+    } else if (!strictUnits && this.backupUnit) {
+      output.add(this.backupUnit);
+    } else if (!strictUnits && this.denominator.length) {
+      output.add(this.denominator[0]);
+    }
+  };
+  Unit.prototype.toString = function () {
+    var i, returnStr = this.numerator.join("*");
+    for (i = 0; i < this.denominator.length; i++) {
+      returnStr += "/" + this.denominator[i];
+    }
+    return returnStr;
+  };
+  Unit.prototype.compare = function (other) {
+    return this.is(other.toString()) ? 0 : undefined;
+  };
+  Unit.prototype.is = function (unitString) {
+    return this.toString().toUpperCase() === unitString.toUpperCase();
+  };
+  Unit.prototype.isLength = function () {
+    return Boolean(this.toCSS().match(/px|em|%|in|cm|mm|pc|pt|ex/));
+  };
+  Unit.prototype.isEmpty = function () {
+    return this.numerator.length === 0 && this.denominator.length === 0;
+  };
+  Unit.prototype.isSingular = function() {
+    return this.numerator.length <= 1 && this.denominator.length === 0;
+  };
+  Unit.prototype.map = function(callback) {
+    var i;
+
+    for (i = 0; i < this.numerator.length; i++) {
+      this.numerator[i] = callback(this.numerator[i], false);
+    }
+
+    for (i = 0; i < this.denominator.length; i++) {
+      this.denominator[i] = callback(this.denominator[i], true);
+    }
+  };
+  Unit.prototype.usedUnits = function() {
+    var group, result = {}, mapUnit, groupName;
+
+    mapUnit = function (atomicUnit) {
+      /*jshint loopfunc:true */
+      if (group.hasOwnProperty(atomicUnit) && !result[groupName]) {
+        result[groupName] = atomicUnit;
+      }
+
+      return atomicUnit;
+    };
+
+    for (groupName in unitConversions) {
+      if (unitConversions.hasOwnProperty(groupName)) {
+        group = unitConversions[groupName];
+
+        this.map(mapUnit);
+      }
+    }
+
+    return result;
+  };
+  Unit.prototype.cancel = function () {
+    var counter = {}, atomicUnit, i;
+
+    for (i = 0; i < this.numerator.length; i++) {
+      atomicUnit = this.numerator[i];
+      counter[atomicUnit] = (counter[atomicUnit] || 0) + 1;
+    }
+
+    for (i = 0; i < this.denominator.length; i++) {
+      atomicUnit = this.denominator[i];
+      counter[atomicUnit] = (counter[atomicUnit] || 0) - 1;
+    }
+
+    this.numerator = [];
+    this.denominator = [];
+
+    for (atomicUnit in counter) {
+      if (counter.hasOwnProperty(atomicUnit)) {
+        var count = counter[atomicUnit];
+
+        if (count > 0) {
+          for (i = 0; i < count; i++) {
+            this.numerator.push(atomicUnit);
+          }
+        } else if (count < 0) {
+          for (i = 0; i < -count; i++) {
+            this.denominator.push(atomicUnit);
+          }
+        }
+      }
+    }
+
+    this.numerator.sort();
+    this.denominator.sort();
+  };
+  module.exports = Unit;
+
+},{"../data/unit-conversions":14,"./node":70}],80:[function(require,module,exports){
+  var Node = require("./node");
+
+  var URL = function (val, index, currentFileInfo, isEvald) {
+    this.value = val;
+    this.currentFileInfo = currentFileInfo;
+    this.index = index;
+    this.isEvald = isEvald;
+  };
+  URL.prototype = new Node();
+  URL.prototype.type = "Url";
+  URL.prototype.accept = function (visitor) {
+    this.value = visitor.visit(this.value);
+  };
+  URL.prototype.genCSS = function (context, output) {
+    output.add("url(");
+    this.value.genCSS(context, output);
+    output.add(")");
+  };
+  URL.prototype.eval = function (context) {
+    var val = this.value.eval(context),
+      rootpath;
+
+    if (!this.isEvald) {
+      // Add the base path if the URL is relative
+      rootpath = this.currentFileInfo && this.currentFileInfo.rootpath;
+      if (rootpath &&
+        typeof val.value === "string" &&
+        context.isPathRelative(val.value)) {
+
+        if (!val.quote) {
+          rootpath = rootpath.replace(/[\(\)'"\s]/g, function(match) { return "\\" + match; });
+        }
+        val.value = rootpath + val.value;
+      }
+
+      val.value = context.normalizePath(val.value);
+
+      // Add url args if enabled
+      if (context.urlArgs) {
+        if (!val.value.match(/^\s*data:/)) {
+          var delimiter = val.value.indexOf('?') === -1 ? '?' : '&';
+          var urlArgs = delimiter + context.urlArgs;
+          if (val.value.indexOf('#') !== -1) {
+            val.value = val.value.replace('#', urlArgs + '#');
+          } else {
+            val.value += urlArgs;
+          }
+        }
+      }
+    }
+
+    return new URL(val, this.index, this.currentFileInfo, true);
+  };
+  module.exports = URL;
+
+},{"./node":70}],81:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Value = function (value) {
+    this.value = value;
+    if (!value) {
+      throw new Error("Value requires an array argument");
+    }
+  };
+  Value.prototype = new Node();
+  Value.prototype.type = "Value";
+  Value.prototype.accept = function (visitor) {
+    if (this.value) {
+      this.value = visitor.visitArray(this.value);
+    }
+  };
+  Value.prototype.eval = function (context) {
+    if (this.value.length === 1) {
+      return this.value[0].eval(context);
+    } else {
+      return new Value(this.value.map(function (v) {
+        return v.eval(context);
+      }));
+    }
+  };
+  Value.prototype.genCSS = function (context, output) {
+    var i;
+    for (i = 0; i < this.value.length; i++) {
+      this.value[i].genCSS(context, output);
+      if (i + 1 < this.value.length) {
+        output.add((context && context.compress) ? ',' : ', ');
+      }
+    }
+  };
+  module.exports = Value;
+
+},{"./node":70}],82:[function(require,module,exports){
+  var Node = require("./node");
+
+  var Variable = function (name, index, currentFileInfo) {
+    this.name = name;
+    this.index = index;
+    this.currentFileInfo = currentFileInfo || {};
+  };
+  Variable.prototype = new Node();
+  Variable.prototype.type = "Variable";
+  Variable.prototype.eval = function (context) {
+    var variable, name = this.name;
+
+    if (name.indexOf('@@') === 0) {
+      name = '@' + new Variable(name.slice(1), this.index, this.currentFileInfo).eval(context).value;
+    }
+
+    if (this.evaluating) {
+      throw { type: 'Name',
+        message: "Recursive variable definition for " + name,
+        filename: this.currentFileInfo.filename,
+        index: this.index };
+    }
+
+    this.evaluating = true;
+
+    variable = this.find(context.frames, function (frame) {
+      var v = frame.variable(name);
+      if (v) {
+        if (v.important) {
+          var importantScope = context.importantScope[context.importantScope.length - 1];
+          importantScope.important = v.important;
+        }
+        return v.value.eval(context);
+      }
+    });
+    if (variable) {
+      this.evaluating = false;
+      return variable;
+    } else {
+      throw { type: 'Name',
+        message: "variable " + name + " is undefined",
+        filename: this.currentFileInfo.filename,
+        index: this.index };
+    }
+  };
+  Variable.prototype.find = function (obj, fun) {
+    for (var i = 0, r; i < obj.length; i++) {
+      r = fun.call(obj, obj[i]);
+      if (r) { return r; }
+    }
+    return null;
+  };
+  module.exports = Variable;
+
+},{"./node":70}],83:[function(require,module,exports){
+  module.exports = {
+    getLocation: function(index, inputStream) {
+      var n = index + 1,
+        line = null,
+        column = -1;
+
+      while (--n >= 0 && inputStream.charAt(n) !== '\n') {
+        column++;
+      }
+
+      if (typeof index === 'number') {
+        line = (inputStream.slice(0, index).match(/\n/g) || "").length;
+      }
+
+      return {
+        line: line,
+        column: column
+      };
+    }
+  };
+
+},{}],84:[function(require,module,exports){
+  var tree = require("../tree"),
+    Visitor = require("./visitor"),
+    logger = require("../logger");
+
+  /*jshint loopfunc:true */
+
+  var ExtendFinderVisitor = function() {
+    this._visitor = new Visitor(this);
+    this.contexts = [];
+    this.allExtendsStack = [[]];
+  };
+
+  ExtendFinderVisitor.prototype = {
+    run: function (root) {
+      root = this._visitor.visit(root);
+      root.allExtends = this.allExtendsStack[0];
+      return root;
+    },
+    visitRule: function (ruleNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+    visitMixinDefinition: function (mixinDefinitionNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+    visitRuleset: function (rulesetNode, visitArgs) {
+      if (rulesetNode.root) {
+        return;
+      }
+
+      var i, j, extend, allSelectorsExtendList = [], extendList;
+
+      // get &:extend(.a); rules which apply to all selectors in this ruleset
+      var rules = rulesetNode.rules, ruleCnt = rules ? rules.length : 0;
+      for (i = 0; i < ruleCnt; i++) {
+        if (rulesetNode.rules[i] instanceof tree.Extend) {
+          allSelectorsExtendList.push(rules[i]);
+          rulesetNode.extendOnEveryPath = true;
+        }
+      }
+
+      // now find every selector and apply the extends that apply to all extends
+      // and the ones which apply to an individual extend
+      var paths = rulesetNode.paths;
+      for (i = 0; i < paths.length; i++) {
+        var selectorPath = paths[i],
+          selector = selectorPath[selectorPath.length - 1],
+          selExtendList = selector.extendList;
+
+        extendList = selExtendList ? selExtendList.slice(0).concat(allSelectorsExtendList)
+          : allSelectorsExtendList;
+
+        if (extendList) {
+          extendList = extendList.map(function(allSelectorsExtend) {
+            return allSelectorsExtend.clone();
+          });
+        }
+
+        for (j = 0; j < extendList.length; j++) {
+          this.foundExtends = true;
+          extend = extendList[j];
+          extend.findSelfSelectors(selectorPath);
+          extend.ruleset = rulesetNode;
+          if (j === 0) { extend.firstExtendOnThisSelectorPath = true; }
+          this.allExtendsStack[this.allExtendsStack.length - 1].push(extend);
+        }
+      }
+
+      this.contexts.push(rulesetNode.selectors);
+    },
+    visitRulesetOut: function (rulesetNode) {
+      if (!rulesetNode.root) {
+        this.contexts.length = this.contexts.length - 1;
+      }
+    },
+    visitMedia: function (mediaNode, visitArgs) {
+      mediaNode.allExtends = [];
+      this.allExtendsStack.push(mediaNode.allExtends);
+    },
+    visitMediaOut: function (mediaNode) {
+      this.allExtendsStack.length = this.allExtendsStack.length - 1;
+    },
+    visitDirective: function (directiveNode, visitArgs) {
+      directiveNode.allExtends = [];
+      this.allExtendsStack.push(directiveNode.allExtends);
+    },
+    visitDirectiveOut: function (directiveNode) {
+      this.allExtendsStack.length = this.allExtendsStack.length - 1;
+    }
+  };
+
+  var ProcessExtendsVisitor = function() {
+    this._visitor = new Visitor(this);
+  };
+
+  ProcessExtendsVisitor.prototype = {
+    run: function(root) {
+      var extendFinder = new ExtendFinderVisitor();
+      this.extendIndices = {};
+      extendFinder.run(root);
+      if (!extendFinder.foundExtends) { return root; }
+      root.allExtends = root.allExtends.concat(this.doExtendChaining(root.allExtends, root.allExtends));
+      this.allExtendsStack = [root.allExtends];
+      var newRoot = this._visitor.visit(root);
+      this.checkExtendsForNonMatched(root.allExtends);
+      return newRoot;
+    },
+    checkExtendsForNonMatched: function(extendList) {
+      var indices = this.extendIndices;
+      extendList.filter(function(extend) {
+        return !extend.hasFoundMatches && extend.parent_ids.length == 1;
+      }).forEach(function(extend) {
+        var selector = "_unknown_";
+        try {
+          selector = extend.selector.toCSS({});
+        }
+        catch(_) {}
+
+        if (!indices[extend.index + ' ' + selector]) {
+          indices[extend.index + ' ' + selector] = true;
+          logger.warn("extend '" + selector + "' has no matches");
+        }
+      });
+    },
+    doExtendChaining: function (extendsList, extendsListTarget, iterationCount) {
+      //
+      // chaining is different from normal extension.. if we extend an extend then we are not just copying, altering
+      // and pasting the selector we would do normally, but we are also adding an extend with the same target selector
+      // this means this new extend can then go and alter other extends
+      //
+      // this method deals with all the chaining work - without it, extend is flat and doesn't work on other extend selectors
+      // this is also the most expensive.. and a match on one selector can cause an extension of a selector we had already
+      // processed if we look at each selector at a time, as is done in visitRuleset
+
+      var extendIndex, targetExtendIndex, matches, extendsToAdd = [], newSelector, extendVisitor = this, selectorPath,
+        extend, targetExtend, newExtend;
+
+      iterationCount = iterationCount || 0;
+
+      //loop through comparing every extend with every target extend.
+      // a target extend is the one on the ruleset we are looking at copy/edit/pasting in place
+      // e.g.  .a:extend(.b) {}  and .b:extend(.c) {} then the first extend extends the second one
+      // and the second is the target.
+      // the separation into two lists allows us to process a subset of chains with a bigger set, as is the
+      // case when processing media queries
+      for (extendIndex = 0; extendIndex < extendsList.length; extendIndex++) {
+        for (targetExtendIndex = 0; targetExtendIndex < extendsListTarget.length; targetExtendIndex++) {
+
+          extend = extendsList[extendIndex];
+          targetExtend = extendsListTarget[targetExtendIndex];
+
+          // look for circular references
+          if ( extend.parent_ids.indexOf( targetExtend.object_id ) >= 0 ) { continue; }
+
+          // find a match in the target extends self selector (the bit before :extend)
+          selectorPath = [targetExtend.selfSelectors[0]];
+          matches = extendVisitor.findMatch(extend, selectorPath);
+
+          if (matches.length) {
+            extend.hasFoundMatches = true;
+
+            // we found a match, so for each self selector..
+            extend.selfSelectors.forEach(function(selfSelector) {
+              var info = targetExtend.visibilityInfo();
+
+              // process the extend as usual
+              newSelector = extendVisitor.extendSelector(matches, selectorPath, selfSelector, extend.isVisible());
+
+              // but now we create a new extend from it
+              newExtend = new(tree.Extend)(targetExtend.selector, targetExtend.option, 0, targetExtend.currentFileInfo, info);
+              newExtend.selfSelectors = newSelector;
+
+              // add the extend onto the list of extends for that selector
+              newSelector[newSelector.length - 1].extendList = [newExtend];
+
+              // record that we need to add it.
+              extendsToAdd.push(newExtend);
+              newExtend.ruleset = targetExtend.ruleset;
+
+              //remember its parents for circular references
+              newExtend.parent_ids = newExtend.parent_ids.concat(targetExtend.parent_ids, extend.parent_ids);
+
+              // only process the selector once.. if we have :extend(.a,.b) then multiple
+              // extends will look at the same selector path, so when extending
+              // we know that any others will be duplicates in terms of what is added to the css
+              if (targetExtend.firstExtendOnThisSelectorPath) {
+                newExtend.firstExtendOnThisSelectorPath = true;
+                targetExtend.ruleset.paths.push(newSelector);
+              }
+            });
+          }
+        }
+      }
+
+      if (extendsToAdd.length) {
+        // try to detect circular references to stop a stack overflow.
+        // may no longer be needed.
+        this.extendChainCount++;
+        if (iterationCount > 100) {
+          var selectorOne = "{unable to calculate}";
+          var selectorTwo = "{unable to calculate}";
+          try {
+            selectorOne = extendsToAdd[0].selfSelectors[0].toCSS();
+            selectorTwo = extendsToAdd[0].selector.toCSS();
+          }
+          catch(e) {}
+          throw { message: "extend circular reference detected. One of the circular extends is currently:" +
+          selectorOne + ":extend(" + selectorTwo + ")"};
+        }
+
+        // now process the new extends on the existing rules so that we can handle a extending b extending c extending
+        // d extending e...
+        return extendsToAdd.concat(extendVisitor.doExtendChaining(extendsToAdd, extendsListTarget, iterationCount + 1));
+      } else {
+        return extendsToAdd;
+      }
+    },
+    visitRule: function (ruleNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+    visitMixinDefinition: function (mixinDefinitionNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+    visitSelector: function (selectorNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+    visitRuleset: function (rulesetNode, visitArgs) {
+      if (rulesetNode.root) {
+        return;
+      }
+      var matches, pathIndex, extendIndex, allExtends = this.allExtendsStack[this.allExtendsStack.length - 1],
+        selectorsToAdd = [], extendVisitor = this, selectorPath;
+
+      // look at each selector path in the ruleset, find any extend matches and then copy, find and replace
+
+      for (extendIndex = 0; extendIndex < allExtends.length; extendIndex++) {
+        for (pathIndex = 0; pathIndex < rulesetNode.paths.length; pathIndex++) {
+          selectorPath = rulesetNode.paths[pathIndex];
+
+          // extending extends happens initially, before the main pass
+          if (rulesetNode.extendOnEveryPath) { continue; }
+          var extendList = selectorPath[selectorPath.length - 1].extendList;
+          if (extendList && extendList.length) { continue; }
+
+          matches = this.findMatch(allExtends[extendIndex], selectorPath);
+
+          if (matches.length) {
+            allExtends[extendIndex].hasFoundMatches = true;
+
+            allExtends[extendIndex].selfSelectors.forEach(function(selfSelector) {
+              var extendedSelectors;
+              extendedSelectors = extendVisitor.extendSelector(matches, selectorPath, selfSelector, allExtends[extendIndex].isVisible());
+              selectorsToAdd.push(extendedSelectors);
+            });
+          }
+        }
+      }
+      rulesetNode.paths = rulesetNode.paths.concat(selectorsToAdd);
+    },
+    findMatch: function (extend, haystackSelectorPath) {
+      //
+      // look through the haystack selector path to try and find the needle - extend.selector
+      // returns an array of selector matches that can then be replaced
+      //
+      var haystackSelectorIndex, hackstackSelector, hackstackElementIndex, haystackElement,
+        targetCombinator, i,
+        extendVisitor = this,
+        needleElements = extend.selector.elements,
+        potentialMatches = [], potentialMatch, matches = [];
+
+      // loop through the haystack elements
+      for (haystackSelectorIndex = 0; haystackSelectorIndex < haystackSelectorPath.length; haystackSelectorIndex++) {
+        hackstackSelector = haystackSelectorPath[haystackSelectorIndex];
+
+        for (hackstackElementIndex = 0; hackstackElementIndex < hackstackSelector.elements.length; hackstackElementIndex++) {
+
+          haystackElement = hackstackSelector.elements[hackstackElementIndex];
+
+          // if we allow elements before our match we can add a potential match every time. otherwise only at the first element.
+          if (extend.allowBefore || (haystackSelectorIndex === 0 && hackstackElementIndex === 0)) {
+            potentialMatches.push({pathIndex: haystackSelectorIndex, index: hackstackElementIndex, matched: 0,
+              initialCombinator: haystackElement.combinator});
+          }
+
+          for (i = 0; i < potentialMatches.length; i++) {
+            potentialMatch = potentialMatches[i];
+
+            // selectors add " " onto the first element. When we use & it joins the selectors together, but if we don't
+            // then each selector in haystackSelectorPath has a space before it added in the toCSS phase. so we need to
+            // work out what the resulting combinator will be
+            targetCombinator = haystackElement.combinator.value;
+            if (targetCombinator === '' && hackstackElementIndex === 0) {
+              targetCombinator = ' ';
+            }
+
+            // if we don't match, null our match to indicate failure
+            if (!extendVisitor.isElementValuesEqual(needleElements[potentialMatch.matched].value, haystackElement.value) ||
+              (potentialMatch.matched > 0 && needleElements[potentialMatch.matched].combinator.value !== targetCombinator)) {
+              potentialMatch = null;
+            } else {
+              potentialMatch.matched++;
+            }
+
+            // if we are still valid and have finished, test whether we have elements after and whether these are allowed
+            if (potentialMatch) {
+              potentialMatch.finished = potentialMatch.matched === needleElements.length;
+              if (potentialMatch.finished &&
+                (!extend.allowAfter &&
+                  (hackstackElementIndex + 1 < hackstackSelector.elements.length || haystackSelectorIndex + 1 < haystackSelectorPath.length))) {
+                potentialMatch = null;
+              }
+            }
+            // if null we remove, if not, we are still valid, so either push as a valid match or continue
+            if (potentialMatch) {
+              if (potentialMatch.finished) {
+                potentialMatch.length = needleElements.length;
+                potentialMatch.endPathIndex = haystackSelectorIndex;
+                potentialMatch.endPathElementIndex = hackstackElementIndex + 1; // index after end of match
+                potentialMatches.length = 0; // we don't allow matches to overlap, so start matching again
+                matches.push(potentialMatch);
+              }
+            } else {
+              potentialMatches.splice(i, 1);
+              i--;
+            }
+          }
+        }
+      }
+      return matches;
+    },
+    isElementValuesEqual: function(elementValue1, elementValue2) {
+      if (typeof elementValue1 === "string" || typeof elementValue2 === "string") {
+        return elementValue1 === elementValue2;
+      }
+      if (elementValue1 instanceof tree.Attribute) {
+        if (elementValue1.op !== elementValue2.op || elementValue1.key !== elementValue2.key) {
+          return false;
+        }
+        if (!elementValue1.value || !elementValue2.value) {
+          if (elementValue1.value || elementValue2.value) {
+            return false;
+          }
+          return true;
+        }
+        elementValue1 = elementValue1.value.value || elementValue1.value;
+        elementValue2 = elementValue2.value.value || elementValue2.value;
+        return elementValue1 === elementValue2;
+      }
+      elementValue1 = elementValue1.value;
+      elementValue2 = elementValue2.value;
+      if (elementValue1 instanceof tree.Selector) {
+        if (!(elementValue2 instanceof tree.Selector) || elementValue1.elements.length !== elementValue2.elements.length) {
+          return false;
+        }
+        for (var i = 0; i  < elementValue1.elements.length; i++) {
+          if (elementValue1.elements[i].combinator.value !== elementValue2.elements[i].combinator.value) {
+            if (i !== 0 || (elementValue1.elements[i].combinator.value || ' ') !== (elementValue2.elements[i].combinator.value || ' ')) {
+              return false;
+            }
+          }
+          if (!this.isElementValuesEqual(elementValue1.elements[i].value, elementValue2.elements[i].value)) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return false;
+    },
+    extendSelector:function (matches, selectorPath, replacementSelector, isVisible) {
+
+      //for a set of matches, replace each match with the replacement selector
+
+      var currentSelectorPathIndex = 0,
+        currentSelectorPathElementIndex = 0,
+        path = [],
+        matchIndex,
+        selector,
+        firstElement,
+        match,
+        newElements;
+
+      for (matchIndex = 0; matchIndex < matches.length; matchIndex++) {
+        match = matches[matchIndex];
+        selector = selectorPath[match.pathIndex];
+        firstElement = new tree.Element(
+          match.initialCombinator,
+          replacementSelector.elements[0].value,
+          replacementSelector.elements[0].index,
+          replacementSelector.elements[0].currentFileInfo
+        );
+
+        if (match.pathIndex > currentSelectorPathIndex && currentSelectorPathElementIndex > 0) {
+          path[path.length - 1].elements = path[path.length - 1]
+            .elements.concat(selectorPath[currentSelectorPathIndex].elements.slice(currentSelectorPathElementIndex));
+          currentSelectorPathElementIndex = 0;
+          currentSelectorPathIndex++;
+        }
+
+        newElements = selector.elements
+          .slice(currentSelectorPathElementIndex, match.index)
+          .concat([firstElement])
+          .concat(replacementSelector.elements.slice(1));
+
+        if (currentSelectorPathIndex === match.pathIndex && matchIndex > 0) {
+          path[path.length - 1].elements =
+            path[path.length - 1].elements.concat(newElements);
+        } else {
+          path = path.concat(selectorPath.slice(currentSelectorPathIndex, match.pathIndex));
+
+          path.push(new tree.Selector(
+            newElements
+          ));
+        }
+        currentSelectorPathIndex = match.endPathIndex;
+        currentSelectorPathElementIndex = match.endPathElementIndex;
+        if (currentSelectorPathElementIndex >= selectorPath[currentSelectorPathIndex].elements.length) {
+          currentSelectorPathElementIndex = 0;
+          currentSelectorPathIndex++;
+        }
+      }
+
+      if (currentSelectorPathIndex < selectorPath.length && currentSelectorPathElementIndex > 0) {
+        path[path.length - 1].elements = path[path.length - 1]
+          .elements.concat(selectorPath[currentSelectorPathIndex].elements.slice(currentSelectorPathElementIndex));
+        currentSelectorPathIndex++;
+      }
+
+      path = path.concat(selectorPath.slice(currentSelectorPathIndex, selectorPath.length));
+      path = path.map(function (currentValue) {
+        // we can re-use elements here, because the visibility property matters only for selectors
+        var derived = currentValue.createDerived(currentValue.elements);
+        if (isVisible) {
+          derived.ensureVisibility();
+        } else {
+          derived.ensureInvisibility();
+        }
+        return derived;
+      });
+      return path;
+    },
+    visitMedia: function (mediaNode, visitArgs) {
+      var newAllExtends = mediaNode.allExtends.concat(this.allExtendsStack[this.allExtendsStack.length - 1]);
+      newAllExtends = newAllExtends.concat(this.doExtendChaining(newAllExtends, mediaNode.allExtends));
+      this.allExtendsStack.push(newAllExtends);
+    },
+    visitMediaOut: function (mediaNode) {
+      var lastIndex = this.allExtendsStack.length - 1;
+      this.allExtendsStack.length = lastIndex;
+    },
+    visitDirective: function (directiveNode, visitArgs) {
+      var newAllExtends = directiveNode.allExtends.concat(this.allExtendsStack[this.allExtendsStack.length - 1]);
+      newAllExtends = newAllExtends.concat(this.doExtendChaining(newAllExtends, directiveNode.allExtends));
+      this.allExtendsStack.push(newAllExtends);
+    },
+    visitDirectiveOut: function (directiveNode) {
+      var lastIndex = this.allExtendsStack.length - 1;
+      this.allExtendsStack.length = lastIndex;
+    }
+  };
+
+  module.exports = ProcessExtendsVisitor;
+
+},{"../logger":33,"../tree":62,"./visitor":91}],85:[function(require,module,exports){
+  function ImportSequencer(onSequencerEmpty) {
+    this.imports = [];
+    this.variableImports = [];
+    this._onSequencerEmpty = onSequencerEmpty;
+    this._currentDepth = 0;
+  }
+
+  ImportSequencer.prototype.addImport = function(callback) {
+    var importSequencer = this,
+      importItem = {
+        callback: callback,
+        args: null,
+        isReady: false
+      };
+    this.imports.push(importItem);
+    return function() {
+      importItem.args = Array.prototype.slice.call(arguments, 0);
+      importItem.isReady = true;
+      importSequencer.tryRun();
+    };
+  };
+
+  ImportSequencer.prototype.addVariableImport = function(callback) {
+    this.variableImports.push(callback);
+  };
+
+  ImportSequencer.prototype.tryRun = function() {
+    this._currentDepth++;
+    try {
+      while (true) {
+        while (this.imports.length > 0) {
+          var importItem = this.imports[0];
+          if (!importItem.isReady) {
+            return;
+          }
+          this.imports = this.imports.slice(1);
+          importItem.callback.apply(null, importItem.args);
+        }
+        if (this.variableImports.length === 0) {
+          break;
+        }
+        var variableImport = this.variableImports[0];
+        this.variableImports = this.variableImports.slice(1);
+        variableImport();
+      }
+    } finally {
+      this._currentDepth--;
+    }
+    if (this._currentDepth === 0 && this._onSequencerEmpty) {
+      this._onSequencerEmpty();
+    }
+  };
+
+  module.exports = ImportSequencer;
+
+},{}],86:[function(require,module,exports){
+  var contexts = require("../contexts"),
+    Visitor = require("./visitor"),
+    ImportSequencer = require("./import-sequencer");
+
+  var ImportVisitor = function(importer, finish) {
+
+    this._visitor = new Visitor(this);
+    this._importer = importer;
+    this._finish = finish;
+    this.context = new contexts.Eval();
+    this.importCount = 0;
+    this.onceFileDetectionMap = {};
+    this.recursionDetector = {};
+    this._sequencer = new ImportSequencer(this._onSequencerEmpty.bind(this));
+  };
+
+  ImportVisitor.prototype = {
+    isReplacing: false,
+    run: function (root) {
+      try {
+        // process the contents
+        this._visitor.visit(root);
+      }
+      catch(e) {
+        this.error = e;
+      }
+
+      this.isFinished = true;
+      this._sequencer.tryRun();
+    },
+    _onSequencerEmpty: function() {
+      if (!this.isFinished) {
+        return;
+      }
+      this._finish(this.error);
+    },
+    visitImport: function (importNode, visitArgs) {
+      var inlineCSS = importNode.options.inline;
+
+      if (!importNode.css || inlineCSS) {
+
+        var context = new contexts.Eval(this.context, this.context.frames.slice(0));
+        var importParent = context.frames[0];
+
+        this.importCount++;
+        if (importNode.isVariableImport()) {
+          this._sequencer.addVariableImport(this.processImportNode.bind(this, importNode, context, importParent));
+        } else {
+          this.processImportNode(importNode, context, importParent);
+        }
+      }
+      visitArgs.visitDeeper = false;
+    },
+    processImportNode: function(importNode, context, importParent) {
+      var evaldImportNode,
+        inlineCSS = importNode.options.inline;
+
+      try {
+        evaldImportNode = importNode.evalForImport(context);
+      } catch(e) {
+        if (!e.filename) { e.index = importNode.index; e.filename = importNode.currentFileInfo.filename; }
+        // attempt to eval properly and treat as css
+        importNode.css = true;
+        // if that fails, this error will be thrown
+        importNode.error = e;
+      }
+
+      if (evaldImportNode && (!evaldImportNode.css || inlineCSS)) {
+
+        if (evaldImportNode.options.multiple) {
+          context.importMultiple = true;
+        }
+
+        // try appending if we haven't determined if it is css or not
+        var tryAppendLessExtension = evaldImportNode.css === undefined;
+
+        for (var i = 0; i < importParent.rules.length; i++) {
+          if (importParent.rules[i] === importNode) {
+            importParent.rules[i] = evaldImportNode;
+            break;
+          }
+        }
+
+        var onImported = this.onImported.bind(this, evaldImportNode, context),
+          sequencedOnImported = this._sequencer.addImport(onImported);
+
+        this._importer.push(evaldImportNode.getPath(), tryAppendLessExtension, evaldImportNode.currentFileInfo,
+          evaldImportNode.options, sequencedOnImported);
+      } else {
+        this.importCount--;
+        if (this.isFinished) {
+          this._sequencer.tryRun();
+        }
+      }
+    },
+    onImported: function (importNode, context, e, root, importedAtRoot, fullPath) {
+      if (e) {
+        if (!e.filename) {
+          e.index = importNode.index; e.filename = importNode.currentFileInfo.filename;
+        }
+        this.error = e;
+      }
+
+      var importVisitor = this,
+        inlineCSS = importNode.options.inline,
+        isPlugin = importNode.options.plugin,
+        isOptional = importNode.options.optional,
+        duplicateImport = importedAtRoot || fullPath in importVisitor.recursionDetector;
+
+      if (!context.importMultiple) {
+        if (duplicateImport) {
+          importNode.skip = true;
+        } else {
+          importNode.skip = function() {
+            if (fullPath in importVisitor.onceFileDetectionMap) {
+              return true;
+            }
+            importVisitor.onceFileDetectionMap[fullPath] = true;
+            return false;
+          };
+        }
+      }
+
+      if (!fullPath && isOptional) {
+        importNode.skip = true;
+      }
+
+      if (root) {
+        importNode.root = root;
+        importNode.importedFilename = fullPath;
+
+        if (!inlineCSS && !isPlugin && (context.importMultiple || !duplicateImport)) {
+          importVisitor.recursionDetector[fullPath] = true;
+
+          var oldContext = this.context;
+          this.context = context;
+          try {
+            this._visitor.visit(root);
+          } catch (e) {
+            this.error = e;
+          }
+          this.context = oldContext;
+        }
+      }
+
+      importVisitor.importCount--;
+
+      if (importVisitor.isFinished) {
+        importVisitor._sequencer.tryRun();
+      }
+    },
+    visitRule: function (ruleNode, visitArgs) {
+      if (ruleNode.value.type === "DetachedRuleset") {
+        this.context.frames.unshift(ruleNode);
+      } else {
+        visitArgs.visitDeeper = false;
+      }
+    },
+    visitRuleOut : function(ruleNode) {
+      if (ruleNode.value.type === "DetachedRuleset") {
+        this.context.frames.shift();
+      }
+    },
+    visitDirective: function (directiveNode, visitArgs) {
+      this.context.frames.unshift(directiveNode);
+    },
+    visitDirectiveOut: function (directiveNode) {
+      this.context.frames.shift();
+    },
+    visitMixinDefinition: function (mixinDefinitionNode, visitArgs) {
+      this.context.frames.unshift(mixinDefinitionNode);
+    },
+    visitMixinDefinitionOut: function (mixinDefinitionNode) {
+      this.context.frames.shift();
+    },
+    visitRuleset: function (rulesetNode, visitArgs) {
+      this.context.frames.unshift(rulesetNode);
+    },
+    visitRulesetOut: function (rulesetNode) {
+      this.context.frames.shift();
+    },
+    visitMedia: function (mediaNode, visitArgs) {
+      this.context.frames.unshift(mediaNode.rules[0]);
+    },
+    visitMediaOut: function (mediaNode) {
+      this.context.frames.shift();
+    }
+  };
+  module.exports = ImportVisitor;
+
+},{"../contexts":11,"./import-sequencer":85,"./visitor":91}],87:[function(require,module,exports){
+  var visitors = {
+    Visitor: require("./visitor"),
+    ImportVisitor: require('./import-visitor'),
+    MarkVisibleSelectorsVisitor: require("./set-tree-visibility-visitor"),
+    ExtendVisitor: require('./extend-visitor'),
+    JoinSelectorVisitor: require('./join-selector-visitor'),
+    ToCSSVisitor: require('./to-css-visitor')
+  };
+
+  module.exports = visitors;
+
+},{"./extend-visitor":84,"./import-visitor":86,"./join-selector-visitor":88,"./set-tree-visibility-visitor":89,"./to-css-visitor":90,"./visitor":91}],88:[function(require,module,exports){
+  var Visitor = require("./visitor");
+
+  var JoinSelectorVisitor = function() {
+    this.contexts = [[]];
+    this._visitor = new Visitor(this);
+  };
+
+  JoinSelectorVisitor.prototype = {
+    run: function (root) {
+      return this._visitor.visit(root);
+    },
+    visitRule: function (ruleNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+    visitMixinDefinition: function (mixinDefinitionNode, visitArgs) {
+      visitArgs.visitDeeper = false;
+    },
+
+    visitRuleset: function (rulesetNode, visitArgs) {
+      var context = this.contexts[this.contexts.length - 1],
+        paths = [], selectors;
+
+      this.contexts.push(paths);
+
+      if (! rulesetNode.root) {
+        selectors = rulesetNode.selectors;
+        if (selectors) {
+          selectors = selectors.filter(function(selector) { return selector.getIsOutput(); });
+          rulesetNode.selectors = selectors.length ? selectors : (selectors = null);
+          if (selectors) { rulesetNode.joinSelectors(paths, context, selectors); }
+        }
+        if (!selectors) { rulesetNode.rules = null; }
+        rulesetNode.paths = paths;
+      }
+    },
+    visitRulesetOut: function (rulesetNode) {
+      this.contexts.length = this.contexts.length - 1;
+    },
+    visitMedia: function (mediaNode, visitArgs) {
+      var context = this.contexts[this.contexts.length - 1];
+      mediaNode.rules[0].root = (context.length === 0 || context[0].multiMedia);
+    },
+    visitDirective: function (directiveNode, visitArgs) {
+      var context = this.contexts[this.contexts.length - 1];
+      if (directiveNode.rules && directiveNode.rules.length) {
+        directiveNode.rules[0].root = (directiveNode.isRooted || context.length === 0 || null);
+      }
+    }
+  };
+
+  module.exports = JoinSelectorVisitor;
+
+},{"./visitor":91}],89:[function(require,module,exports){
+  var SetTreeVisibilityVisitor = function(visible) {
+    this.visible = visible;
+  };
+  SetTreeVisibilityVisitor.prototype.run = function(root) {
+    this.visit(root);
+  };
+  SetTreeVisibilityVisitor.prototype.visitArray = function(nodes) {
+    if (!nodes) {
+      return nodes;
+    }
+
+    var cnt = nodes.length, i;
+    for (i = 0; i < cnt; i++) {
+      this.visit(nodes[i]);
+    }
+    return nodes;
+  };
+  SetTreeVisibilityVisitor.prototype.visit = function(node) {
+    if (!node) {
+      return node;
+    }
+    if (node.constructor === Array) {
+      return this.visitArray(node);
+    }
+
+    if (!node.blocksVisibility || node.blocksVisibility()) {
+      return node;
+    }
+    if (this.visible) {
+      node.ensureVisibility();
+    } else {
+      node.ensureInvisibility();
+    }
+
+    node.accept(this);
+    return node;
+  };
+  module.exports = SetTreeVisibilityVisitor;
+},{}],90:[function(require,module,exports){
+  var tree = require("../tree"),
+    Visitor = require("./visitor");
+
+  var CSSVisitorUtils = function(context) {
+    this._visitor = new Visitor(this);
+    this._context = context;
+  };
+
+  CSSVisitorUtils.prototype = {
+    containsSilentNonBlockedChild: function(bodyRules) {
+      var rule;
+      if (bodyRules == null) {
+        return false;
+      }
+      for (var r = 0; r < bodyRules.length; r++) {
+        rule = bodyRules[r];
+        if (rule.isSilent && rule.isSilent(this._context) && !rule.blocksVisibility()) {
+          //the directive contains something that was referenced (likely by extend)
+          //therefore it needs to be shown in output too
+          return true;
+        }
+      }
+      return false;
+    },
+
+    keepOnlyVisibleChilds: function(owner) {
+      if (owner == null || owner.rules == null) {
+        return ;
+      }
+
+      owner.rules = owner.rules.filter(function(thing) {
+          return thing.isVisible();
+        }
+      );
+    },
+
+    isEmpty: function(owner) {
+      if (owner == null || owner.rules == null) {
+        return true;
+      }
+      return owner.rules.length === 0;
+    },
+
+    hasVisibleSelector: function(rulesetNode) {
+      if (rulesetNode == null || rulesetNode.paths == null) {
+        return false;
+      }
+      return rulesetNode.paths.length > 0;
+    },
+
+    resolveVisibility: function (node, originalRules) {
+      if (!node.blocksVisibility()) {
+        if (this.isEmpty(node) && !this.containsSilentNonBlockedChild(originalRules)) {
+          return ;
+        }
+
+        return node;
+      }
+
+      var compiledRulesBody = node.rules[0];
+      this.keepOnlyVisibleChilds(compiledRulesBody);
+
+      if (this.isEmpty(compiledRulesBody)) {
+        return ;
+      }
+
+      node.ensureVisibility();
+      node.removeVisibilityBlock();
+
+      return node;
+    },
+
+    isVisibleRuleset: function(rulesetNode) {
+      if (rulesetNode.firstRoot) {
+        return true;
+      }
+
+      if (this.isEmpty(rulesetNode)) {
+        return false;
+      }
+
+      if (!rulesetNode.root && !this.hasVisibleSelector(rulesetNode)) {
+        return false;
+      }
+
+      return true;
+    }
+
+  };
+
+  var ToCSSVisitor = function(context) {
+    this._visitor = new Visitor(this);
+    this._context = context;
+    this.utils = new CSSVisitorUtils(context);
+  };
+
+  ToCSSVisitor.prototype = {
+    isReplacing: true,
+    run: function (root) {
+      return this._visitor.visit(root);
+    },
+
+    visitRule: function (ruleNode, visitArgs) {
+      if (ruleNode.blocksVisibility() || ruleNode.variable) {
+        return;
+      }
+      return ruleNode;
+    },
+
+    visitMixinDefinition: function (mixinNode, visitArgs) {
+      // mixin definitions do not get eval'd - this means they keep state
+      // so we have to clear that state here so it isn't used if toCSS is called twice
+      mixinNode.frames = [];
+    },
+
+    visitExtend: function (extendNode, visitArgs) {
+    },
+
+    visitComment: function (commentNode, visitArgs) {
+      if (commentNode.blocksVisibility() || commentNode.isSilent(this._context)) {
+        return;
+      }
+      return commentNode;
+    },
+
+    visitMedia: function(mediaNode, visitArgs) {
+      var originalRules = mediaNode.rules[0].rules;
+      mediaNode.accept(this._visitor);
+      visitArgs.visitDeeper = false;
+
+      return this.utils.resolveVisibility(mediaNode, originalRules);
+    },
+
+    visitImport: function (importNode, visitArgs) {
+      if (importNode.blocksVisibility()) {
+        return ;
+      }
+      return importNode;
+    },
+
+    visitDirective: function(directiveNode, visitArgs) {
+      if (directiveNode.rules && directiveNode.rules.length) {
+        return this.visitDirectiveWithBody(directiveNode, visitArgs);
+      } else {
+        return this.visitDirectiveWithoutBody(directiveNode, visitArgs);
+      }
+    },
+
+    visitDirectiveWithBody: function(directiveNode, visitArgs) {
+      //if there is only one nested ruleset and that one has no path, then it is
+      //just fake ruleset
+      function hasFakeRuleset(directiveNode) {
+        var bodyRules = directiveNode.rules;
+        return bodyRules.length === 1 && (!bodyRules[0].paths || bodyRules[0].paths.length === 0);
+      }
+      function getBodyRules(directiveNode) {
+        var nodeRules = directiveNode.rules;
+        if (hasFakeRuleset(directiveNode)) {
+          return nodeRules[0].rules;
+        }
+
+        return nodeRules;
+      }
+      //it is still true that it is only one ruleset in array
+      //this is last such moment
+      //process childs
+      var originalRules = getBodyRules(directiveNode);
+      directiveNode.accept(this._visitor);
+      visitArgs.visitDeeper = false;
+
+      if (!this.utils.isEmpty(directiveNode)) {
+        this._mergeRules(directiveNode.rules[0].rules);
+      }
+
+      return this.utils.resolveVisibility(directiveNode, originalRules);
+    },
+
+    visitDirectiveWithoutBody: function(directiveNode, visitArgs) {
+      if (directiveNode.blocksVisibility()) {
+        return;
+      }
+
+      if (directiveNode.name === "@charset") {
+        // Only output the debug info together with subsequent @charset definitions
+        // a comment (or @media statement) before the actual @charset directive would
+        // be considered illegal css as it has to be on the first line
+        if (this.charset) {
+          if (directiveNode.debugInfo) {
+            var comment = new tree.Comment("/* " + directiveNode.toCSS(this._context).replace(/\n/g, "") + " */\n");
+            comment.debugInfo = directiveNode.debugInfo;
+            return this._visitor.visit(comment);
+          }
+          return;
+        }
+        this.charset = true;
+      }
+
+      return directiveNode;
+    },
+
+    checkValidNodes: function(rules, isRoot) {
+      if (!rules) {
+        return;
+      }
+
+      for (var i = 0; i < rules.length; i++) {
+        var ruleNode = rules[i];
+        if (isRoot && ruleNode instanceof tree.Rule && !ruleNode.variable) {
+          throw { message: "Properties must be inside selector blocks. They cannot be in the root",
+            index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+        }
+        if (ruleNode instanceof tree.Call) {
+          throw { message: "Function '" + ruleNode.name + "' is undefined",
+            index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+        }
+        if (ruleNode.type && !ruleNode.allowRoot) {
+          throw { message: ruleNode.type + " node returned by a function is not valid here",
+            index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+        }
+      }
+    },
+
+    visitRuleset: function (rulesetNode, visitArgs) {
+      //at this point rulesets are nested into each other
+      var rule, rulesets = [];
+
+      this.checkValidNodes(rulesetNode.rules, rulesetNode.firstRoot);
+
+      if (! rulesetNode.root) {
+        //remove invisible paths
+        this._compileRulesetPaths(rulesetNode);
+
+        // remove rulesets from this ruleset body and compile them separately
+        var nodeRules = rulesetNode.rules, nodeRuleCnt = nodeRules ? nodeRules.length : 0;
+        for (var i = 0; i < nodeRuleCnt; ) {
+          rule = nodeRules[i];
+          if (rule && rule.rules) {
+            // visit because we are moving them out from being a child
+            rulesets.push(this._visitor.visit(rule));
+            nodeRules.splice(i, 1);
+            nodeRuleCnt--;
+            continue;
+          }
+          i++;
+        }
+        // accept the visitor to remove rules and refactor itself
+        // then we can decide nogw whether we want it or not
+        // compile body
+        if (nodeRuleCnt > 0) {
+          rulesetNode.accept(this._visitor);
+        } else {
+          rulesetNode.rules = null;
+        }
+        visitArgs.visitDeeper = false;
+
+      } else { //if (! rulesetNode.root) {
+        rulesetNode.accept(this._visitor);
+        visitArgs.visitDeeper = false;
+      }
+
+      if (rulesetNode.rules) {
+        this._mergeRules(rulesetNode.rules);
+        this._removeDuplicateRules(rulesetNode.rules);
+      }
+
+      //now decide whether we keep the ruleset
+      if (this.utils.isVisibleRuleset(rulesetNode)) {
+        rulesetNode.ensureVisibility();
+        rulesets.splice(0, 0, rulesetNode);
+      }
+
+      if (rulesets.length === 1) {
+        return rulesets[0];
+      }
+      return rulesets;
+    },
+
+    _compileRulesetPaths: function(rulesetNode) {
+      if (rulesetNode.paths) {
+        rulesetNode.paths = rulesetNode.paths
+          .filter(function(p) {
+            var i;
+            if (p[0].elements[0].combinator.value === ' ') {
+              p[0].elements[0].combinator = new(tree.Combinator)('');
+            }
+            for (i = 0; i < p.length; i++) {
+              if (p[i].isVisible() && p[i].getIsOutput()) {
+                return true;
+              }
+            }
+            return false;
+          });
+      }
+    },
+
+    _removeDuplicateRules: function(rules) {
+      if (!rules) { return; }
+
+      // remove duplicates
+      var ruleCache = {},
+        ruleList, rule, i;
+
+      for (i = rules.length - 1; i >= 0 ; i--) {
+        rule = rules[i];
+        if (rule instanceof tree.Rule) {
+          if (!ruleCache[rule.name]) {
+            ruleCache[rule.name] = rule;
+          } else {
+            ruleList = ruleCache[rule.name];
+            if (ruleList instanceof tree.Rule) {
+              ruleList = ruleCache[rule.name] = [ruleCache[rule.name].toCSS(this._context)];
+            }
+            var ruleCSS = rule.toCSS(this._context);
+            if (ruleList.indexOf(ruleCSS) !== -1) {
+              rules.splice(i, 1);
+            } else {
+              ruleList.push(ruleCSS);
+            }
+          }
+        }
+      }
+    },
+
+    _mergeRules: function (rules) {
+      if (!rules) { return; }
+
+      var groups = {},
+        parts,
+        rule,
+        key;
+
+      for (var i = 0; i < rules.length; i++) {
+        rule = rules[i];
+
+        if ((rule instanceof tree.Rule) && rule.merge) {
+          key = [rule.name,
+            rule.important ? "!" : ""].join(",");
+
+          if (!groups[key]) {
+            groups[key] = [];
+          } else {
+            rules.splice(i--, 1);
+          }
+
+          groups[key].push(rule);
+        }
+      }
+
+      Object.keys(groups).map(function (k) {
+
+        function toExpression(values) {
+          return new (tree.Expression)(values.map(function (p) {
+            return p.value;
+          }));
+        }
+
+        function toValue(values) {
+          return new (tree.Value)(values.map(function (p) {
+            return p;
+          }));
+        }
+
+        parts = groups[k];
+
+        if (parts.length > 1) {
+          rule = parts[0];
+          var spacedGroups = [];
+          var lastSpacedGroup = [];
+          parts.map(function (p) {
+            if (p.merge === "+") {
+              if (lastSpacedGroup.length > 0) {
+                spacedGroups.push(toExpression(lastSpacedGroup));
+              }
+              lastSpacedGroup = [];
+            }
+            lastSpacedGroup.push(p);
+          });
+          spacedGroups.push(toExpression(lastSpacedGroup));
+          rule.value = toValue(spacedGroups);
+        }
+      });
+    },
+
+    visitAnonymous: function(anonymousNode, visitArgs) {
+      if (anonymousNode.blocksVisibility()) {
+        return ;
+      }
+      anonymousNode.accept(this._visitor);
+      return anonymousNode;
+    }
+  };
+
+  module.exports = ToCSSVisitor;
+
+},{"../tree":62,"./visitor":91}],91:[function(require,module,exports){
+  var tree = require("../tree");
+
+  var _visitArgs = { visitDeeper: true },
+    _hasIndexed = false;
+
+  function _noop(node) {
+    return node;
+  }
+
+  function indexNodeTypes(parent, ticker) {
+    // add .typeIndex to tree node types for lookup table
+    var key, child;
+    for (key in parent) {
+      if (parent.hasOwnProperty(key)) {
+        child = parent[key];
+        switch (typeof child) {
+          case "function":
+            // ignore bound functions directly on tree which do not have a prototype
+            // or aren't nodes
+            if (child.prototype && child.prototype.type) {
+              child.prototype.typeIndex = ticker++;
+            }
+            break;
+          case "object":
+            ticker = indexNodeTypes(child, ticker);
+            break;
+        }
+      }
+    }
+    return ticker;
+  }
+
+  var Visitor = function(implementation) {
+    this._implementation = implementation;
+    this._visitFnCache = [];
+
+    if (!_hasIndexed) {
+      indexNodeTypes(tree, 1);
+      _hasIndexed = true;
+    }
+  };
+
+  Visitor.prototype = {
+    visit: function(node) {
+      if (!node) {
+        return node;
+      }
+
+      var nodeTypeIndex = node.typeIndex;
+      if (!nodeTypeIndex) {
+        return node;
+      }
+
+      var visitFnCache = this._visitFnCache,
+        impl = this._implementation,
+        aryIndx = nodeTypeIndex << 1,
+        outAryIndex = aryIndx | 1,
+        func = visitFnCache[aryIndx],
+        funcOut = visitFnCache[outAryIndex],
+        visitArgs = _visitArgs,
+        fnName;
+
+      visitArgs.visitDeeper = true;
+
+      if (!func) {
+        fnName = "visit" + node.type;
+        func = impl[fnName] || _noop;
+        funcOut = impl[fnName + "Out"] || _noop;
+        visitFnCache[aryIndx] = func;
+        visitFnCache[outAryIndex] = funcOut;
+      }
+
+      if (func !== _noop) {
+        var newNode = func.call(impl, node, visitArgs);
+        if (impl.isReplacing) {
+          node = newNode;
+        }
+      }
+
+      if (visitArgs.visitDeeper && node && node.accept) {
+        node.accept(this);
+      }
+
+      if (funcOut != _noop) {
+        funcOut.call(impl, node);
+      }
+
+      return node;
+    },
+    visitArray: function(nodes, nonReplacing) {
+      if (!nodes) {
+        return nodes;
+      }
+
+      var cnt = nodes.length, i;
+
+      // Non-replacing
+      if (nonReplacing || !this._implementation.isReplacing) {
+        for (i = 0; i < cnt; i++) {
+          this.visit(nodes[i]);
+        }
+        return nodes;
+      }
+
+      // Replacing
+      var out = [];
+      for (i = 0; i < cnt; i++) {
+        var evald = this.visit(nodes[i]);
+        if (evald === undefined) { continue; }
+        if (!evald.splice) {
+          out.push(evald);
+        } else if (evald.length) {
+          this.flatten(evald, out);
+        }
+      }
+      return out;
+    },
+    flatten: function(arr, out) {
+      if (!out) {
+        out = [];
+      }
+
+      var cnt, i, item,
+        nestedCnt, j, nestedItem;
+
+      for (i = 0, cnt = arr.length; i < cnt; i++) {
+        item = arr[i];
+        if (item === undefined) {
+          continue;
+        }
+        if (!item.splice) {
+          out.push(item);
+          continue;
+        }
+
+        for (j = 0, nestedCnt = item.length; j < nestedCnt; j++) {
+          nestedItem = item[j];
+          if (nestedItem === undefined) {
+            continue;
+          }
+          if (!nestedItem.splice) {
+            out.push(nestedItem);
+          } else if (nestedItem.length) {
+            this.flatten(nestedItem, out);
+          }
+        }
+      }
+
+      return out;
+    }
+  };
+  module.exports = Visitor;
+
+},{"../tree":62}],92:[function(require,module,exports){
+  "use strict";
+
+// rawAsap provides everything we need except exception management.
+  var rawAsap = require("./raw");
+// RawTasks are recycled to reduce GC churn.
+  var freeTasks = [];
+// We queue errors to ensure they are thrown in right order (FIFO).
+// Array-as-queue is good enough here, since we are just dealing with exceptions.
+  var pendingErrors = [];
+  var requestErrorThrow = rawAsap.makeRequestCallFromTimer(throwFirstError);
+
+  function throwFirstError() {
+    if (pendingErrors.length) {
+      throw pendingErrors.shift();
+    }
+  }
+
+  /**
+   * Calls a task as soon as possible after returning, in its own event, with priority
+   * over other events like animation, reflow, and repaint. An error thrown from an
+   * event will not interrupt, nor even substantially slow down the processing of
+   * other events, but will be rather postponed to a lower priority event.
+   * @param {{call}} task A callable object, typically a function that takes no
+   * arguments.
+   */
+  module.exports = asap;
+  function asap(task) {
+    var rawTask;
+    if (freeTasks.length) {
+      rawTask = freeTasks.pop();
+    } else {
+      rawTask = new RawTask();
+    }
+    rawTask.task = task;
+    rawAsap(rawTask);
+  }
+
+// We wrap tasks with recyclable task objects.  A task object implements
+// `call`, just like a function.
+  function RawTask() {
+    this.task = null;
+  }
+
+// The sole purpose of wrapping the task is to catch the exception and recycle
+// the task object after its single use.
+  RawTask.prototype.call = function () {
+    try {
+      this.task.call();
+    } catch (error) {
+      if (asap.onerror) {
+        // This hook exists purely for testing purposes.
+        // Its name will be periodically randomized to break any code that
+        // depends on its existence.
+        asap.onerror(error);
+      } else {
+        // In a web browser, exceptions are not fatal. However, to avoid
+        // slowing down the queue of pending tasks, we rethrow the error in a
+        // lower priority turn.
+        pendingErrors.push(error);
+        requestErrorThrow();
+      }
+    } finally {
+      this.task = null;
+      freeTasks[freeTasks.length] = this;
+    }
+  };
+
+},{"./raw":93}],93:[function(require,module,exports){
+  (function (global){
+    "use strict";
+
+// Use the fastest means possible to execute a task in its own turn, with
+// priority over other events including IO, animation, reflow, and redraw
+// events in browsers.
+//
+// An exception thrown by a task will permanently interrupt the processing of
+// subsequent tasks. The higher level `asap` function ensures that if an
+// exception is thrown by a task, that the task queue will continue flushing as
+// soon as possible, but if you use `rawAsap` directly, you are responsible to
+// either ensure that no exceptions are thrown from your task, or to manually
+// call `rawAsap.requestFlush` if an exception is thrown.
+    module.exports = rawAsap;
+    function rawAsap(task) {
+      if (!queue.length) {
+        requestFlush();
+        flushing = true;
+      }
+      // Equivalent to push, but avoids a function call.
+      queue[queue.length] = task;
+    }
+
+    var queue = [];
+// Once a flush has been requested, no further calls to `requestFlush` are
+// necessary until the next `flush` completes.
+    var flushing = false;
+// `requestFlush` is an implementation-specific method that attempts to kick
+// off a `flush` event as quickly as possible. `flush` will attempt to exhaust
+// the event queue before yielding to the browser's own event loop.
+    var requestFlush;
+// The position of the next task to execute in the task queue. This is
+// preserved between calls to `flush` so that it can be resumed if
+// a task throws an exception.
+    var index = 0;
+// If a task schedules additional tasks recursively, the task queue can grow
+// unbounded. To prevent memory exhaustion, the task queue will periodically
+// truncate already-completed tasks.
+    var capacity = 1024;
+
+// The flush function processes all tasks that have been scheduled with
+// `rawAsap` unless and until one of those tasks throws an exception.
+// If a task throws an exception, `flush` ensures that its state will remain
+// consistent and will resume where it left off when called again.
+// However, `flush` does not make any arrangements to be called again if an
+// exception is thrown.
+    function flush() {
+      while (index < queue.length) {
+        var currentIndex = index;
+        // Advance the index before calling the task. This ensures that we will
+        // begin flushing on the next task the task throws an error.
+        index = index + 1;
+        queue[currentIndex].call();
+        // Prevent leaking memory for long chains of recursive calls to `asap`.
+        // If we call `asap` within tasks scheduled by `asap`, the queue will
+        // grow, but to avoid an O(n) walk for every task we execute, we don't
+        // shift tasks off the queue after they have been executed.
+        // Instead, we periodically shift 1024 tasks off the queue.
+        if (index > capacity) {
+          // Manually shift all values starting at the index back to the
+          // beginning of the queue.
+          for (var scan = 0, newLength = queue.length - index; scan < newLength; scan++) {
+            queue[scan] = queue[scan + index];
+          }
+          queue.length -= index;
+          index = 0;
+        }
+      }
+      queue.length = 0;
+      index = 0;
+      flushing = false;
+    }
+
+// `requestFlush` is implemented using a strategy based on data collected from
+// every available SauceLabs Selenium web driver worker at time of writing.
+// https://docs.google.com/spreadsheets/d/1mG-5UYGup5qxGdEMWkhP6BWCz053NUb2E1QoUTU16uA/edit#gid=783724593
+
+// Safari 6 and 6.1 for desktop, iPad, and iPhone are the only browsers that
+// have WebKitMutationObserver but not un-prefixed MutationObserver.
+// Must use `global` or `self` instead of `window` to work in both frames and web
+// workers. `global` is a provision of Browserify, Mr, Mrs, or Mop.
+
+    /* globals self */
+    var scope = typeof global !== "undefined" ? global : self;
+    var BrowserMutationObserver = scope.MutationObserver || scope.WebKitMutationObserver;
+
+// MutationObservers are desirable because they have high priority and work
+// reliably everywhere they are implemented.
+// They are implemented in all modern browsers.
+//
+// - Android 4-4.3
+// - Chrome 26-34
+// - Firefox 14-29
+// - Internet Explorer 11
+// - iPad Safari 6-7.1
+// - iPhone Safari 7-7.1
+// - Safari 6-7
+    if (typeof BrowserMutationObserver === "function") {
+      requestFlush = makeRequestCallFromMutationObserver(flush);
+
+// MessageChannels are desirable because they give direct access to the HTML
+// task queue, are implemented in Internet Explorer 10, Safari 5.0-1, and Opera
+// 11-12, and in web workers in many engines.
+// Although message channels yield to any queued rendering and IO tasks, they
+// would be better than imposing the 4ms delay of timers.
+// However, they do not work reliably in Internet Explorer or Safari.
+
+// Internet Explorer 10 is the only browser that has setImmediate but does
+// not have MutationObservers.
+// Although setImmediate yields to the browser's renderer, it would be
+// preferrable to falling back to setTimeout since it does not have
+// the minimum 4ms penalty.
+// Unfortunately there appears to be a bug in Internet Explorer 10 Mobile (and
+// Desktop to a lesser extent) that renders both setImmediate and
+// MessageChannel useless for the purposes of ASAP.
+// https://github.com/kriskowal/q/issues/396
+
+// Timers are implemented universally.
+// We fall back to timers in workers in most engines, and in foreground
+// contexts in the following browsers.
+// However, note that even this simple case requires nuances to operate in a
+// broad spectrum of browsers.
+//
+// - Firefox 3-13
+// - Internet Explorer 6-9
+// - iPad Safari 4.3
+// - Lynx 2.8.7
+    } else {
+      requestFlush = makeRequestCallFromTimer(flush);
+    }
+
+// `requestFlush` requests that the high priority event queue be flushed as
+// soon as possible.
+// This is useful to prevent an error thrown in a task from stalling the event
+// queue if the exception handled by Node.js’s
+// `process.on("uncaughtException")` or by a domain.
+    rawAsap.requestFlush = requestFlush;
+
+// To request a high priority event, we induce a mutation observer by toggling
+// the text of a text node between "1" and "-1".
+    function makeRequestCallFromMutationObserver(callback) {
+      var toggle = 1;
+      var observer = new BrowserMutationObserver(callback);
+      var node = document.createTextNode("");
+      observer.observe(node, {characterData: true});
+      return function requestCall() {
+        toggle = -toggle;
+        node.data = toggle;
+      };
+    }
+
+// The message channel technique was discovered by Malte Ubl and was the
+// original foundation for this library.
+// http://www.nonblocking.io/2011/06/windownexttick.html
+
+// Safari 6.0.5 (at least) intermittently fails to create message ports on a
+// page's first load. Thankfully, this version of Safari supports
+// MutationObservers, so we don't need to fall back in that case.
+
+// function makeRequestCallFromMessageChannel(callback) {
+//     var channel = new MessageChannel();
+//     channel.port1.onmessage = callback;
+//     return function requestCall() {
+//         channel.port2.postMessage(0);
+//     };
+// }
+
+// For reasons explained above, we are also unable to use `setImmediate`
+// under any circumstances.
+// Even if we were, there is another bug in Internet Explorer 10.
+// It is not sufficient to assign `setImmediate` to `requestFlush` because
+// `setImmediate` must be called *by name* and therefore must be wrapped in a
+// closure.
+// Never forget.
+
+// function makeRequestCallFromSetImmediate(callback) {
+//     return function requestCall() {
+//         setImmediate(callback);
+//     };
+// }
+
+// Safari 6.0 has a problem where timers will get lost while the user is
+// scrolling. This problem does not impact ASAP because Safari 6.0 supports
+// mutation observers, so that implementation is used instead.
+// However, if we ever elect to use timers in Safari, the prevalent work-around
+// is to add a scroll event listener that calls for a flush.
+
+// `setTimeout` does not call the passed callback if the delay is less than
+// approximately 7 in web workers in Firefox 8 through 18, and sometimes not
+// even then.
+
+    function makeRequestCallFromTimer(callback) {
+      return function requestCall() {
+        // We dispatch a timeout with a specified delay of 0 for engines that
+        // can reliably accommodate that request. This will usually be snapped
+        // to a 4 milisecond delay, but once we're flushing, there's no delay
+        // between events.
+        var timeoutHandle = setTimeout(handleTimer, 0);
+        // However, since this timer gets frequently dropped in Firefox
+        // workers, we enlist an interval handle that will try to fire
+        // an event 20 times per second until it succeeds.
+        var intervalHandle = setInterval(handleTimer, 50);
+
+        function handleTimer() {
+          // Whichever timer succeeds will cancel both timers and
+          // execute the callback.
+          clearTimeout(timeoutHandle);
+          clearInterval(intervalHandle);
+          callback();
+        }
+      };
+    }
+
+// This is for `asap.js` only.
+// Its name will be periodically randomized to break any code that depends on
+// its existence.
+    rawAsap.makeRequestCallFromTimer = makeRequestCallFromTimer;
+
+// ASAP was originally a nextTick shim included in Q. This was factored out
+// into this ASAP package. It was later adapted to RSVP which made further
+// amendments. These decisions, particularly to marginalize MessageChannel and
+// to capture the MutationObserver implementation in a closure, were integrated
+// back into ASAP proper.
+// https://github.com/tildeio/rsvp.js/blob/cddf7232546a9cf858524b75cde6f9edf72620a7/lib/rsvp/asap.js
+
+  }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],94:[function(require,module,exports){
+  'use strict';
+
+  var asap = require('asap/raw');
+
+  function noop() {}
+
+// States:
+//
+// 0 - pending
+// 1 - fulfilled with _value
+// 2 - rejected with _value
+// 3 - adopted the state of another promise, _value
+//
+// once the state is no longer pending (0) it is immutable
+
+// All `_` prefixed properties will be reduced to `_{random number}`
+// at build time to obfuscate them and discourage their use.
+// We don't use symbols or Object.defineProperty to fully hide them
+// because the performance isn't good enough.
+
+
+// to avoid using try/catch inside critical functions, we
+// extract them to here.
+  var LAST_ERROR = null;
+  var IS_ERROR = {};
+  function getThen(obj) {
+    try {
+      return obj.then;
+    } catch (ex) {
+      LAST_ERROR = ex;
+      return IS_ERROR;
+    }
+  }
+
+  function tryCallOne(fn, a) {
+    try {
+      return fn(a);
+    } catch (ex) {
+      LAST_ERROR = ex;
+      return IS_ERROR;
+    }
+  }
+  function tryCallTwo(fn, a, b) {
+    try {
+      fn(a, b);
+    } catch (ex) {
+      LAST_ERROR = ex;
+      return IS_ERROR;
+    }
+  }
+
+  module.exports = Promise;
+
+  function Promise(fn) {
+    if (typeof this !== 'object') {
+      throw new TypeError('Promises must be constructed via new');
+    }
+    if (typeof fn !== 'function') {
+      throw new TypeError('Promise constructor\'s argument is not a function');
+    }
+    this._40 = 0;
+    this._65 = 0;
+    this._55 = null;
+    this._72 = null;
+    if (fn === noop) return;
+    doResolve(fn, this);
+  }
+  Promise._37 = null;
+  Promise._87 = null;
+  Promise._61 = noop;
+
+  Promise.prototype.then = function(onFulfilled, onRejected) {
+    if (this.constructor !== Promise) {
+      return safeThen(this, onFulfilled, onRejected);
+    }
+    var res = new Promise(noop);
+    handle(this, new Handler(onFulfilled, onRejected, res));
+    return res;
+  };
+
+  function safeThen(self, onFulfilled, onRejected) {
+    return new self.constructor(function (resolve, reject) {
+      var res = new Promise(noop);
+      res.then(resolve, reject);
+      handle(self, new Handler(onFulfilled, onRejected, res));
+    });
+  }
+  function handle(self, deferred) {
+    while (self._65 === 3) {
+      self = self._55;
+    }
+    if (Promise._37) {
+      Promise._37(self);
+    }
+    if (self._65 === 0) {
+      if (self._40 === 0) {
+        self._40 = 1;
+        self._72 = deferred;
+        return;
+      }
+      if (self._40 === 1) {
+        self._40 = 2;
+        self._72 = [self._72, deferred];
+        return;
+      }
+      self._72.push(deferred);
+      return;
+    }
+    handleResolved(self, deferred);
+  }
+
+  function handleResolved(self, deferred) {
+    asap(function() {
+      var cb = self._65 === 1 ? deferred.onFulfilled : deferred.onRejected;
+      if (cb === null) {
+        if (self._65 === 1) {
+          resolve(deferred.promise, self._55);
+        } else {
+          reject(deferred.promise, self._55);
+        }
+        return;
+      }
+      var ret = tryCallOne(cb, self._55);
+      if (ret === IS_ERROR) {
+        reject(deferred.promise, LAST_ERROR);
+      } else {
+        resolve(deferred.promise, ret);
+      }
+    });
+  }
+  function resolve(self, newValue) {
+    // Promise Resolution Procedure: https://github.com/promises-aplus/promises-spec#the-promise-resolution-procedure
+    if (newValue === self) {
+      return reject(
+        self,
+        new TypeError('A promise cannot be resolved with itself.')
+      );
+    }
+    if (
+      newValue &&
+      (typeof newValue === 'object' || typeof newValue === 'function')
+    ) {
+      var then = getThen(newValue);
+      if (then === IS_ERROR) {
+        return reject(self, LAST_ERROR);
+      }
+      if (
+        then === self.then &&
+        newValue instanceof Promise
+      ) {
+        self._65 = 3;
+        self._55 = newValue;
+        finale(self);
+        return;
+      } else if (typeof then === 'function') {
+        doResolve(then.bind(newValue), self);
+        return;
+      }
+    }
+    self._65 = 1;
+    self._55 = newValue;
+    finale(self);
+  }
+
+  function reject(self, newValue) {
+    self._65 = 2;
+    self._55 = newValue;
+    if (Promise._87) {
+      Promise._87(self, newValue);
+    }
+    finale(self);
+  }
+  function finale(self) {
+    if (self._40 === 1) {
+      handle(self, self._72);
+      self._72 = null;
+    }
+    if (self._40 === 2) {
+      for (var i = 0; i < self._72.length; i++) {
+        handle(self, self._72[i]);
+      }
+      self._72 = null;
+    }
+  }
+
+  function Handler(onFulfilled, onRejected, promise){
+    this.onFulfilled = typeof onFulfilled === 'function' ? onFulfilled : null;
+    this.onRejected = typeof onRejected === 'function' ? onRejected : null;
+    this.promise = promise;
+  }
+
+  /**
+   * Take a potentially misbehaving resolver function and make sure
+   * onFulfilled and onRejected are only called once.
+   *
+   * Makes no guarantees about asynchrony.
+   */
+  function doResolve(fn, promise) {
+    var done = false;
+    var res = tryCallTwo(fn, function (value) {
+      if (done) return;
+      done = true;
+      resolve(promise, value);
+    }, function (reason) {
+      if (done) return;
+      done = true;
+      reject(promise, reason);
+    });
+    if (!done && res === IS_ERROR) {
+      done = true;
+      reject(promise, LAST_ERROR);
+    }
+  }
+
+},{"asap/raw":93}],95:[function(require,module,exports){
+  'use strict';
+
+//This file contains the ES6 extensions to the core Promises/A+ API
+
+  var Promise = require('./core.js');
+
+  module.exports = Promise;
+
+  /* Static Functions */
+
+  var TRUE = valuePromise(true);
+  var FALSE = valuePromise(false);
+  var NULL = valuePromise(null);
+  var UNDEFINED = valuePromise(undefined);
+  var ZERO = valuePromise(0);
+  var EMPTYSTRING = valuePromise('');
+
+  function valuePromise(value) {
+    var p = new Promise(Promise._61);
+    p._65 = 1;
+    p._55 = value;
+    return p;
+  }
+  Promise.resolve = function (value) {
+    if (value instanceof Promise) return value;
+
+    if (value === null) return NULL;
+    if (value === undefined) return UNDEFINED;
+    if (value === true) return TRUE;
+    if (value === false) return FALSE;
+    if (value === 0) return ZERO;
+    if (value === '') return EMPTYSTRING;
+
+    if (typeof value === 'object' || typeof value === 'function') {
+      try {
+        var then = value.then;
+        if (typeof then === 'function') {
+          return new Promise(then.bind(value));
+        }
+      } catch (ex) {
+        return new Promise(function (resolve, reject) {
+          reject(ex);
+        });
+      }
+    }
+    return valuePromise(value);
+  };
+
+  Promise.all = function (arr) {
+    var args = Array.prototype.slice.call(arr);
+
+    return new Promise(function (resolve, reject) {
+      if (args.length === 0) return resolve([]);
+      var remaining = args.length;
+      function res(i, val) {
+        if (val && (typeof val === 'object' || typeof val === 'function')) {
+          if (val instanceof Promise && val.then === Promise.prototype.then) {
+            while (val._65 === 3) {
+              val = val._55;
+            }
+            if (val._65 === 1) return res(i, val._55);
+            if (val._65 === 2) reject(val._55);
+            val.then(function (val) {
+              res(i, val);
+            }, reject);
+            return;
+          } else {
+            var then = val.then;
+            if (typeof then === 'function') {
+              var p = new Promise(then.bind(val));
+              p.then(function (val) {
+                res(i, val);
+              }, reject);
+              return;
+            }
+          }
+        }
+        args[i] = val;
+        if (--remaining === 0) {
+          resolve(args);
+        }
+      }
+      for (var i = 0; i < args.length; i++) {
+        res(i, args[i]);
+      }
+    });
+  };
+
+  Promise.reject = function (value) {
+    return new Promise(function (resolve, reject) {
+      reject(value);
+    });
+  };
+
+  Promise.race = function (values) {
+    return new Promise(function (resolve, reject) {
+      values.forEach(function(value){
+        Promise.resolve(value).then(resolve, reject);
+      });
+    });
+  };
+
+  /* Prototype Methods */
+
+  Promise.prototype['catch'] = function (onRejected) {
+    return this.then(null, onRejected);
+  };
+
+},{"./core.js":94}],96:[function(require,module,exports){
+// should work in any browser without browserify
+
+  if (typeof Promise.prototype.done !== 'function') {
+    Promise.prototype.done = function (onFulfilled, onRejected) {
+      var self = arguments.length ? this.then.apply(this, arguments) : this
+      self.then(null, function (err) {
+        setTimeout(function () {
+          throw err
+        }, 0)
+      })
+    }
+  }
+},{}],97:[function(require,module,exports){
+// not "use strict" so we can declare global "Promise"
+
+  var asap = require('asap');
+
+  if (typeof Promise === 'undefined') {
+    Promise = require('./lib/core.js')
+    require('./lib/es6-extensions.js')
+  }
+
+  require('./polyfill-done.js');
+
+},{"./lib/core.js":94,"./lib/es6-extensions.js":95,"./polyfill-done.js":96,"asap":92}]},{},[2])(2)
+});
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/lib/underscore.js b/docs-web/src/main/webapp/src/lib/underscore.js
index 3533323d..e9b2d6b6 100644
--- a/docs-web/src/main/webapp/src/lib/underscore.js
+++ b/docs-web/src/main/webapp/src/lib/underscore.js
@@ -1,5 +1,1548 @@
-//     Underscore.js 1.5.2
+//     Underscore.js 1.8.3
 //     http://underscorejs.org
-//     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
-(function(){var n=this,t=n._,r={},e=Array.prototype,u=Object.prototype,i=Function.prototype,a=e.push,o=e.slice,c=e.concat,l=u.toString,f=u.hasOwnProperty,s=e.forEach,p=e.map,h=e.reduce,v=e.reduceRight,g=e.filter,d=e.every,m=e.some,y=e.indexOf,b=e.lastIndexOf,x=Array.isArray,w=Object.keys,_=i.bind,j=function(n){return n instanceof j?n:this instanceof j?(this._wrapped=n,void 0):new j(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=j),exports._=j):n._=j,j.VERSION="1.5.2";var A=j.each=j.forEach=function(n,t,e){if(null!=n)if(s&&n.forEach===s)n.forEach(t,e);else if(n.length===+n.length){for(var u=0,i=n.length;i>u;u++)if(t.call(e,n[u],u,n)===r)return}else for(var a=j.keys(n),u=0,i=a.length;i>u;u++)if(t.call(e,n[a[u]],a[u],n)===r)return};j.map=j.collect=function(n,t,r){var e=[];return null==n?e:p&&n.map===p?n.map(t,r):(A(n,function(n,u,i){e.push(t.call(r,n,u,i))}),e)};var E="Reduce of empty array with no initial value";j.reduce=j.foldl=j.inject=function(n,t,r,e){var u=arguments.length>2;if(null==n&&(n=[]),h&&n.reduce===h)return e&&(t=j.bind(t,e)),u?n.reduce(t,r):n.reduce(t);if(A(n,function(n,i,a){u?r=t.call(e,r,n,i,a):(r=n,u=!0)}),!u)throw new TypeError(E);return r},j.reduceRight=j.foldr=function(n,t,r,e){var u=arguments.length>2;if(null==n&&(n=[]),v&&n.reduceRight===v)return e&&(t=j.bind(t,e)),u?n.reduceRight(t,r):n.reduceRight(t);var i=n.length;if(i!==+i){var a=j.keys(n);i=a.length}if(A(n,function(o,c,l){c=a?a[--i]:--i,u?r=t.call(e,r,n[c],c,l):(r=n[c],u=!0)}),!u)throw new TypeError(E);return r},j.find=j.detect=function(n,t,r){var e;return O(n,function(n,u,i){return t.call(r,n,u,i)?(e=n,!0):void 0}),e},j.filter=j.select=function(n,t,r){var e=[];return null==n?e:g&&n.filter===g?n.filter(t,r):(A(n,function(n,u,i){t.call(r,n,u,i)&&e.push(n)}),e)},j.reject=function(n,t,r){return j.filter(n,function(n,e,u){return!t.call(r,n,e,u)},r)},j.every=j.all=function(n,t,e){t||(t=j.identity);var u=!0;return null==n?u:d&&n.every===d?n.every(t,e):(A(n,function(n,i,a){return(u=u&&t.call(e,n,i,a))?void 0:r}),!!u)};var O=j.some=j.any=function(n,t,e){t||(t=j.identity);var u=!1;return null==n?u:m&&n.some===m?n.some(t,e):(A(n,function(n,i,a){return u||(u=t.call(e,n,i,a))?r:void 0}),!!u)};j.contains=j.include=function(n,t){return null==n?!1:y&&n.indexOf===y?n.indexOf(t)!=-1:O(n,function(n){return n===t})},j.invoke=function(n,t){var r=o.call(arguments,2),e=j.isFunction(t);return j.map(n,function(n){return(e?t:n[t]).apply(n,r)})},j.pluck=function(n,t){return j.map(n,function(n){return n[t]})},j.where=function(n,t,r){return j.isEmpty(t)?r?void 0:[]:j[r?"find":"filter"](n,function(n){for(var r in t)if(t[r]!==n[r])return!1;return!0})},j.findWhere=function(n,t){return j.where(n,t,!0)},j.max=function(n,t,r){if(!t&&j.isArray(n)&&n[0]===+n[0]&&n.length<65535)return Math.max.apply(Math,n);if(!t&&j.isEmpty(n))return-1/0;var e={computed:-1/0,value:-1/0};return A(n,function(n,u,i){var a=t?t.call(r,n,u,i):n;a>e.computed&&(e={value:n,computed:a})}),e.value},j.min=function(n,t,r){if(!t&&j.isArray(n)&&n[0]===+n[0]&&n.length<65535)return Math.min.apply(Math,n);if(!t&&j.isEmpty(n))return 1/0;var e={computed:1/0,value:1/0};return A(n,function(n,u,i){var a=t?t.call(r,n,u,i):n;a<e.computed&&(e={value:n,computed:a})}),e.value},j.shuffle=function(n){var t,r=0,e=[];return A(n,function(n){t=j.random(r++),e[r-1]=e[t],e[t]=n}),e},j.sample=function(n,t,r){return arguments.length<2||r?n[j.random(n.length-1)]:j.shuffle(n).slice(0,Math.max(0,t))};var k=function(n){return j.isFunction(n)?n:function(t){return t[n]}};j.sortBy=function(n,t,r){var e=k(t);return j.pluck(j.map(n,function(n,t,u){return{value:n,index:t,criteria:e.call(r,n,t,u)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={},i=null==r?j.identity:k(r);return A(t,function(r,a){var o=i.call(e,r,a,t);n(u,o,r)}),u}};j.groupBy=F(function(n,t,r){(j.has(n,t)?n[t]:n[t]=[]).push(r)}),j.indexBy=F(function(n,t,r){n[t]=r}),j.countBy=F(function(n,t){j.has(n,t)?n[t]++:n[t]=1}),j.sortedIndex=function(n,t,r,e){r=null==r?j.identity:k(r);for(var u=r.call(e,t),i=0,a=n.length;a>i;){var o=i+a>>>1;r.call(e,n[o])<u?i=o+1:a=o}return i},j.toArray=function(n){return n?j.isArray(n)?o.call(n):n.length===+n.length?j.map(n,j.identity):j.values(n):[]},j.size=function(n){return null==n?0:n.length===+n.length?n.length:j.keys(n).length},j.first=j.head=j.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:o.call(n,0,t)},j.initial=function(n,t,r){return o.call(n,0,n.length-(null==t||r?1:t))},j.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:o.call(n,Math.max(n.length-t,0))},j.rest=j.tail=j.drop=function(n,t,r){return o.call(n,null==t||r?1:t)},j.compact=function(n){return j.filter(n,j.identity)};var M=function(n,t,r){return t&&j.every(n,j.isArray)?c.apply(r,n):(A(n,function(n){j.isArray(n)||j.isArguments(n)?t?a.apply(r,n):M(n,t,r):r.push(n)}),r)};j.flatten=function(n,t){return M(n,t,[])},j.without=function(n){return j.difference(n,o.call(arguments,1))},j.uniq=j.unique=function(n,t,r,e){j.isFunction(t)&&(e=r,r=t,t=!1);var u=r?j.map(n,r,e):n,i=[],a=[];return A(u,function(r,e){(t?e&&a[a.length-1]===r:j.contains(a,r))||(a.push(r),i.push(n[e]))}),i},j.union=function(){return j.uniq(j.flatten(arguments,!0))},j.intersection=function(n){var t=o.call(arguments,1);return j.filter(j.uniq(n),function(n){return j.every(t,function(t){return j.indexOf(t,n)>=0})})},j.difference=function(n){var t=c.apply(e,o.call(arguments,1));return j.filter(n,function(n){return!j.contains(t,n)})},j.zip=function(){for(var n=j.max(j.pluck(arguments,"length").concat(0)),t=new Array(n),r=0;n>r;r++)t[r]=j.pluck(arguments,""+r);return t},j.object=function(n,t){if(null==n)return{};for(var r={},e=0,u=n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},j.indexOf=function(n,t,r){if(null==n)return-1;var e=0,u=n.length;if(r){if("number"!=typeof r)return e=j.sortedIndex(n,t),n[e]===t?e:-1;e=0>r?Math.max(0,u+r):r}if(y&&n.indexOf===y)return n.indexOf(t,r);for(;u>e;e++)if(n[e]===t)return e;return-1},j.lastIndexOf=function(n,t,r){if(null==n)return-1;var e=null!=r;if(b&&n.lastIndexOf===b)return e?n.lastIndexOf(t,r):n.lastIndexOf(t);for(var u=e?r:n.length;u--;)if(n[u]===t)return u;return-1},j.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=arguments[2]||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=0,i=new Array(e);e>u;)i[u++]=n,n+=r;return i};var R=function(){};j.bind=function(n,t){var r,e;if(_&&n.bind===_)return _.apply(n,o.call(arguments,1));if(!j.isFunction(n))throw new TypeError;return r=o.call(arguments,2),e=function(){if(!(this instanceof e))return n.apply(t,r.concat(o.call(arguments)));R.prototype=n.prototype;var u=new R;R.prototype=null;var i=n.apply(u,r.concat(o.call(arguments)));return Object(i)===i?i:u}},j.partial=function(n){var t=o.call(arguments,1);return function(){return n.apply(this,t.concat(o.call(arguments)))}},j.bindAll=function(n){var t=o.call(arguments,1);if(0===t.length)throw new Error("bindAll must be passed function names");return A(t,function(t){n[t]=j.bind(n[t],n)}),n},j.memoize=function(n,t){var r={};return t||(t=j.identity),function(){var e=t.apply(this,arguments);return j.has(r,e)?r[e]:r[e]=n.apply(this,arguments)}},j.delay=function(n,t){var r=o.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},j.defer=function(n){return j.delay.apply(j,[n,1].concat(o.call(arguments,1)))},j.throttle=function(n,t,r){var e,u,i,a=null,o=0;r||(r={});var c=function(){o=r.leading===!1?0:new Date,a=null,i=n.apply(e,u)};return function(){var l=new Date;o||r.leading!==!1||(o=l);var f=t-(l-o);return e=this,u=arguments,0>=f?(clearTimeout(a),a=null,o=l,i=n.apply(e,u)):a||r.trailing===!1||(a=setTimeout(c,f)),i}},j.debounce=function(n,t,r){var e,u,i,a,o;return function(){i=this,u=arguments,a=new Date;var c=function(){var l=new Date-a;t>l?e=setTimeout(c,t-l):(e=null,r||(o=n.apply(i,u)))},l=r&&!e;return e||(e=setTimeout(c,t)),l&&(o=n.apply(i,u)),o}},j.once=function(n){var t,r=!1;return function(){return r?t:(r=!0,t=n.apply(this,arguments),n=null,t)}},j.wrap=function(n,t){return function(){var r=[n];return a.apply(r,arguments),t.apply(this,r)}},j.compose=function(){var n=arguments;return function(){for(var t=arguments,r=n.length-1;r>=0;r--)t=[n[r].apply(this,t)];return t[0]}},j.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},j.keys=w||function(n){if(n!==Object(n))throw new TypeError("Invalid object");var t=[];for(var r in n)j.has(n,r)&&t.push(r);return t},j.values=function(n){for(var t=j.keys(n),r=t.length,e=new Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},j.pairs=function(n){for(var t=j.keys(n),r=t.length,e=new Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},j.invert=function(n){for(var t={},r=j.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},j.functions=j.methods=function(n){var t=[];for(var r in n)j.isFunction(n[r])&&t.push(r);return t.sort()},j.extend=function(n){return A(o.call(arguments,1),function(t){if(t)for(var r in t)n[r]=t[r]}),n},j.pick=function(n){var t={},r=c.apply(e,o.call(arguments,1));return A(r,function(r){r in n&&(t[r]=n[r])}),t},j.omit=function(n){var t={},r=c.apply(e,o.call(arguments,1));for(var u in n)j.contains(r,u)||(t[u]=n[u]);return t},j.defaults=function(n){return A(o.call(arguments,1),function(t){if(t)for(var r in t)n[r]===void 0&&(n[r]=t[r])}),n},j.clone=function(n){return j.isObject(n)?j.isArray(n)?n.slice():j.extend({},n):n},j.tap=function(n,t){return t(n),n};var S=function(n,t,r,e){if(n===t)return 0!==n||1/n==1/t;if(null==n||null==t)return n===t;n instanceof j&&(n=n._wrapped),t instanceof j&&(t=t._wrapped);var u=l.call(n);if(u!=l.call(t))return!1;switch(u){case"[object String]":return n==String(t);case"[object Number]":return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case"[object Date]":case"[object Boolean]":return+n==+t;case"[object RegExp]":return n.source==t.source&&n.global==t.global&&n.multiline==t.multiline&&n.ignoreCase==t.ignoreCase}if("object"!=typeof n||"object"!=typeof t)return!1;for(var i=r.length;i--;)if(r[i]==n)return e[i]==t;var a=n.constructor,o=t.constructor;if(a!==o&&!(j.isFunction(a)&&a instanceof a&&j.isFunction(o)&&o instanceof o))return!1;r.push(n),e.push(t);var c=0,f=!0;if("[object Array]"==u){if(c=n.length,f=c==t.length)for(;c--&&(f=S(n[c],t[c],r,e)););}else{for(var s in n)if(j.has(n,s)&&(c++,!(f=j.has(t,s)&&S(n[s],t[s],r,e))))break;if(f){for(s in t)if(j.has(t,s)&&!c--)break;f=!c}}return r.pop(),e.pop(),f};j.isEqual=function(n,t){return S(n,t,[],[])},j.isEmpty=function(n){if(null==n)return!0;if(j.isArray(n)||j.isString(n))return 0===n.length;for(var t in n)if(j.has(n,t))return!1;return!0},j.isElement=function(n){return!(!n||1!==n.nodeType)},j.isArray=x||function(n){return"[object Array]"==l.call(n)},j.isObject=function(n){return n===Object(n)},A(["Arguments","Function","String","Number","Date","RegExp"],function(n){j["is"+n]=function(t){return l.call(t)=="[object "+n+"]"}}),j.isArguments(arguments)||(j.isArguments=function(n){return!(!n||!j.has(n,"callee"))}),"function"!=typeof/./&&(j.isFunction=function(n){return"function"==typeof n}),j.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},j.isNaN=function(n){return j.isNumber(n)&&n!=+n},j.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"==l.call(n)},j.isNull=function(n){return null===n},j.isUndefined=function(n){return n===void 0},j.has=function(n,t){return f.call(n,t)},j.noConflict=function(){return n._=t,this},j.identity=function(n){return n},j.times=function(n,t,r){for(var e=Array(Math.max(0,n)),u=0;n>u;u++)e[u]=t.call(r,u);return e},j.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))};var I={escape:{"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"}};I.unescape=j.invert(I.escape);var T={escape:new RegExp("["+j.keys(I.escape).join("")+"]","g"),unescape:new RegExp("("+j.keys(I.unescape).join("|")+")","g")};j.each(["escape","unescape"],function(n){j[n]=function(t){return null==t?"":(""+t).replace(T[n],function(t){return I[n][t]})}}),j.result=function(n,t){if(null==n)return void 0;var r=n[t];return j.isFunction(r)?r.call(n):r},j.mixin=function(n){A(j.functions(n),function(t){var r=j[t]=n[t];j.prototype[t]=function(){var n=[this._wrapped];return a.apply(n,arguments),z.call(this,r.apply(j,n))}})};var N=0;j.uniqueId=function(n){var t=++N+"";return n?n+t:t},j.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var q=/(.)^/,B={"'":"'","\\":"\\","\r":"r","\n":"n","	":"t","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\t|\u2028|\u2029/g;j.template=function(n,t,r){var e;r=j.defaults({},r,j.templateSettings);var u=new RegExp([(r.escape||q).source,(r.interpolate||q).source,(r.evaluate||q).source].join("|")+"|$","g"),i=0,a="__p+='";n.replace(u,function(t,r,e,u,o){return a+=n.slice(i,o).replace(D,function(n){return"\\"+B[n]}),r&&(a+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'"),e&&(a+="'+\n((__t=("+e+"))==null?'':__t)+\n'"),u&&(a+="';\n"+u+"\n__p+='"),i=o+t.length,t}),a+="';\n",r.variable||(a="with(obj||{}){\n"+a+"}\n"),a="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+a+"return __p;\n";try{e=new Function(r.variable||"obj","_",a)}catch(o){throw o.source=a,o}if(t)return e(t,j);var c=function(n){return e.call(this,n,j)};return c.source="function("+(r.variable||"obj")+"){\n"+a+"}",c},j.chain=function(n){return j(n).chain()};var z=function(n){return this._chain?j(n).chain():n};j.mixin(j),A(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=e[n];j.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!=n&&"splice"!=n||0!==r.length||delete r[0],z.call(this,r)}}),A(["concat","join","slice"],function(n){var t=e[n];j.prototype[n]=function(){return z.call(this,t.apply(this._wrapped,arguments))}}),j.extend(j.prototype,{chain:function(){return this._chain=!0,this},value:function(){return this._wrapped}})}).call(this);
\ No newline at end of file
+
+(function() {
+
+  // Baseline setup
+  // --------------
+
+  // Establish the root object, `window` in the browser, or `exports` on the server.
+  var root = this;
+
+  // Save the previous value of the `_` variable.
+  var previousUnderscore = root._;
+
+  // Save bytes in the minified (but not gzipped) version:
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+  // Create quick reference variables for speed access to core prototypes.
+  var
+    push             = ArrayProto.push,
+    slice            = ArrayProto.slice,
+    toString         = ObjProto.toString,
+    hasOwnProperty   = ObjProto.hasOwnProperty;
+
+  // All **ECMAScript 5** native function implementations that we hope to use
+  // are declared here.
+  var
+    nativeIsArray      = Array.isArray,
+    nativeKeys         = Object.keys,
+    nativeBind         = FuncProto.bind,
+    nativeCreate       = Object.create;
+
+  // Naked function reference for surrogate-prototype-swapping.
+  var Ctor = function(){};
+
+  // Create a safe reference to the Underscore object for use below.
+  var _ = function(obj) {
+    if (obj instanceof _) return obj;
+    if (!(this instanceof _)) return new _(obj);
+    this._wrapped = obj;
+  };
+
+  // Export the Underscore object for **Node.js**, with
+  // backwards-compatibility for the old `require()` API. If we're in
+  // the browser, add `_` as a global object.
+  if (typeof exports !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
+      exports = module.exports = _;
+    }
+    exports._ = _;
+  } else {
+    root._ = _;
+  }
+
+  // Current version.
+  _.VERSION = '1.8.3';
+
+  // Internal function that returns an efficient (for current engines) version
+  // of the passed-in callback, to be repeatedly applied in other Underscore
+  // functions.
+  var optimizeCb = function(func, context, argCount) {
+    if (context === void 0) return func;
+    switch (argCount == null ? 3 : argCount) {
+      case 1: return function(value) {
+        return func.call(context, value);
+      };
+      case 2: return function(value, other) {
+        return func.call(context, value, other);
+      };
+      case 3: return function(value, index, collection) {
+        return func.call(context, value, index, collection);
+      };
+      case 4: return function(accumulator, value, index, collection) {
+        return func.call(context, accumulator, value, index, collection);
+      };
+    }
+    return function() {
+      return func.apply(context, arguments);
+    };
+  };
+
+  // A mostly-internal function to generate callbacks that can be applied
+  // to each element in a collection, returning the desired result — either
+  // identity, an arbitrary callback, a property matcher, or a property accessor.
+  var cb = function(value, context, argCount) {
+    if (value == null) return _.identity;
+    if (_.isFunction(value)) return optimizeCb(value, context, argCount);
+    if (_.isObject(value)) return _.matcher(value);
+    return _.property(value);
+  };
+  _.iteratee = function(value, context) {
+    return cb(value, context, Infinity);
+  };
+
+  // An internal function for creating assigner functions.
+  var createAssigner = function(keysFunc, undefinedOnly) {
+    return function(obj) {
+      var length = arguments.length;
+      if (length < 2 || obj == null) return obj;
+      for (var index = 1; index < length; index++) {
+        var source = arguments[index],
+          keys = keysFunc(source),
+          l = keys.length;
+        for (var i = 0; i < l; i++) {
+          var key = keys[i];
+          if (!undefinedOnly || obj[key] === void 0) obj[key] = source[key];
+        }
+      }
+      return obj;
+    };
+  };
+
+  // An internal function for creating a new object that inherits from another.
+  var baseCreate = function(prototype) {
+    if (!_.isObject(prototype)) return {};
+    if (nativeCreate) return nativeCreate(prototype);
+    Ctor.prototype = prototype;
+    var result = new Ctor;
+    Ctor.prototype = null;
+    return result;
+  };
+
+  var property = function(key) {
+    return function(obj) {
+      return obj == null ? void 0 : obj[key];
+    };
+  };
+
+  // Helper for collection methods to determine whether a collection
+  // should be iterated as an array or as an object
+  // Related: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength
+  // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094
+  var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1;
+  var getLength = property('length');
+  var isArrayLike = function(collection) {
+    var length = getLength(collection);
+    return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX;
+  };
+
+  // Collection Functions
+  // --------------------
+
+  // The cornerstone, an `each` implementation, aka `forEach`.
+  // Handles raw objects in addition to array-likes. Treats all
+  // sparse array-likes as if they were dense.
+  _.each = _.forEach = function(obj, iteratee, context) {
+    iteratee = optimizeCb(iteratee, context);
+    var i, length;
+    if (isArrayLike(obj)) {
+      for (i = 0, length = obj.length; i < length; i++) {
+        iteratee(obj[i], i, obj);
+      }
+    } else {
+      var keys = _.keys(obj);
+      for (i = 0, length = keys.length; i < length; i++) {
+        iteratee(obj[keys[i]], keys[i], obj);
+      }
+    }
+    return obj;
+  };
+
+  // Return the results of applying the iteratee to each element.
+  _.map = _.collect = function(obj, iteratee, context) {
+    iteratee = cb(iteratee, context);
+    var keys = !isArrayLike(obj) && _.keys(obj),
+      length = (keys || obj).length,
+      results = Array(length);
+    for (var index = 0; index < length; index++) {
+      var currentKey = keys ? keys[index] : index;
+      results[index] = iteratee(obj[currentKey], currentKey, obj);
+    }
+    return results;
+  };
+
+  // Create a reducing function iterating left or right.
+  function createReduce(dir) {
+    // Optimized iterator function as using arguments.length
+    // in the main function will deoptimize the, see #1991.
+    function iterator(obj, iteratee, memo, keys, index, length) {
+      for (; index >= 0 && index < length; index += dir) {
+        var currentKey = keys ? keys[index] : index;
+        memo = iteratee(memo, obj[currentKey], currentKey, obj);
+      }
+      return memo;
+    }
+
+    return function(obj, iteratee, memo, context) {
+      iteratee = optimizeCb(iteratee, context, 4);
+      var keys = !isArrayLike(obj) && _.keys(obj),
+        length = (keys || obj).length,
+        index = dir > 0 ? 0 : length - 1;
+      // Determine the initial value if none is provided.
+      if (arguments.length < 3) {
+        memo = obj[keys ? keys[index] : index];
+        index += dir;
+      }
+      return iterator(obj, iteratee, memo, keys, index, length);
+    };
+  }
+
+  // **Reduce** builds up a single result from a list of values, aka `inject`,
+  // or `foldl`.
+  _.reduce = _.foldl = _.inject = createReduce(1);
+
+  // The right-associative version of reduce, also known as `foldr`.
+  _.reduceRight = _.foldr = createReduce(-1);
+
+  // Return the first value which passes a truth test. Aliased as `detect`.
+  _.find = _.detect = function(obj, predicate, context) {
+    var key;
+    if (isArrayLike(obj)) {
+      key = _.findIndex(obj, predicate, context);
+    } else {
+      key = _.findKey(obj, predicate, context);
+    }
+    if (key !== void 0 && key !== -1) return obj[key];
+  };
+
+  // Return all the elements that pass a truth test.
+  // Aliased as `select`.
+  _.filter = _.select = function(obj, predicate, context) {
+    var results = [];
+    predicate = cb(predicate, context);
+    _.each(obj, function(value, index, list) {
+      if (predicate(value, index, list)) results.push(value);
+    });
+    return results;
+  };
+
+  // Return all the elements for which a truth test fails.
+  _.reject = function(obj, predicate, context) {
+    return _.filter(obj, _.negate(cb(predicate)), context);
+  };
+
+  // Determine whether all of the elements match a truth test.
+  // Aliased as `all`.
+  _.every = _.all = function(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var keys = !isArrayLike(obj) && _.keys(obj),
+      length = (keys || obj).length;
+    for (var index = 0; index < length; index++) {
+      var currentKey = keys ? keys[index] : index;
+      if (!predicate(obj[currentKey], currentKey, obj)) return false;
+    }
+    return true;
+  };
+
+  // Determine if at least one element in the object matches a truth test.
+  // Aliased as `any`.
+  _.some = _.any = function(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var keys = !isArrayLike(obj) && _.keys(obj),
+      length = (keys || obj).length;
+    for (var index = 0; index < length; index++) {
+      var currentKey = keys ? keys[index] : index;
+      if (predicate(obj[currentKey], currentKey, obj)) return true;
+    }
+    return false;
+  };
+
+  // Determine if the array or object contains a given item (using `===`).
+  // Aliased as `includes` and `include`.
+  _.contains = _.includes = _.include = function(obj, item, fromIndex, guard) {
+    if (!isArrayLike(obj)) obj = _.values(obj);
+    if (typeof fromIndex != 'number' || guard) fromIndex = 0;
+    return _.indexOf(obj, item, fromIndex) >= 0;
+  };
+
+  // Invoke a method (with arguments) on every item in a collection.
+  _.invoke = function(obj, method) {
+    var args = slice.call(arguments, 2);
+    var isFunc = _.isFunction(method);
+    return _.map(obj, function(value) {
+      var func = isFunc ? method : value[method];
+      return func == null ? func : func.apply(value, args);
+    });
+  };
+
+  // Convenience version of a common use case of `map`: fetching a property.
+  _.pluck = function(obj, key) {
+    return _.map(obj, _.property(key));
+  };
+
+  // Convenience version of a common use case of `filter`: selecting only objects
+  // containing specific `key:value` pairs.
+  _.where = function(obj, attrs) {
+    return _.filter(obj, _.matcher(attrs));
+  };
+
+  // Convenience version of a common use case of `find`: getting the first object
+  // containing specific `key:value` pairs.
+  _.findWhere = function(obj, attrs) {
+    return _.find(obj, _.matcher(attrs));
+  };
+
+  // Return the maximum element (or element-based computation).
+  _.max = function(obj, iteratee, context) {
+    var result = -Infinity, lastComputed = -Infinity,
+      value, computed;
+    if (iteratee == null && obj != null) {
+      obj = isArrayLike(obj) ? obj : _.values(obj);
+      for (var i = 0, length = obj.length; i < length; i++) {
+        value = obj[i];
+        if (value > result) {
+          result = value;
+        }
+      }
+    } else {
+      iteratee = cb(iteratee, context);
+      _.each(obj, function(value, index, list) {
+        computed = iteratee(value, index, list);
+        if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+          result = value;
+          lastComputed = computed;
+        }
+      });
+    }
+    return result;
+  };
+
+  // Return the minimum element (or element-based computation).
+  _.min = function(obj, iteratee, context) {
+    var result = Infinity, lastComputed = Infinity,
+      value, computed;
+    if (iteratee == null && obj != null) {
+      obj = isArrayLike(obj) ? obj : _.values(obj);
+      for (var i = 0, length = obj.length; i < length; i++) {
+        value = obj[i];
+        if (value < result) {
+          result = value;
+        }
+      }
+    } else {
+      iteratee = cb(iteratee, context);
+      _.each(obj, function(value, index, list) {
+        computed = iteratee(value, index, list);
+        if (computed < lastComputed || computed === Infinity && result === Infinity) {
+          result = value;
+          lastComputed = computed;
+        }
+      });
+    }
+    return result;
+  };
+
+  // Shuffle a collection, using the modern version of the
+  // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+  _.shuffle = function(obj) {
+    var set = isArrayLike(obj) ? obj : _.values(obj);
+    var length = set.length;
+    var shuffled = Array(length);
+    for (var index = 0, rand; index < length; index++) {
+      rand = _.random(0, index);
+      if (rand !== index) shuffled[index] = shuffled[rand];
+      shuffled[rand] = set[index];
+    }
+    return shuffled;
+  };
+
+  // Sample **n** random values from a collection.
+  // If **n** is not specified, returns a single random element.
+  // The internal `guard` argument allows it to work with `map`.
+  _.sample = function(obj, n, guard) {
+    if (n == null || guard) {
+      if (!isArrayLike(obj)) obj = _.values(obj);
+      return obj[_.random(obj.length - 1)];
+    }
+    return _.shuffle(obj).slice(0, Math.max(0, n));
+  };
+
+  // Sort the object's values by a criterion produced by an iteratee.
+  _.sortBy = function(obj, iteratee, context) {
+    iteratee = cb(iteratee, context);
+    return _.pluck(_.map(obj, function(value, index, list) {
+      return {
+        value: value,
+        index: index,
+        criteria: iteratee(value, index, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria;
+      var b = right.criteria;
+      if (a !== b) {
+        if (a > b || a === void 0) return 1;
+        if (a < b || b === void 0) return -1;
+      }
+      return left.index - right.index;
+    }), 'value');
+  };
+
+  // An internal function used for aggregate "group by" operations.
+  var group = function(behavior) {
+    return function(obj, iteratee, context) {
+      var result = {};
+      iteratee = cb(iteratee, context);
+      _.each(obj, function(value, index) {
+        var key = iteratee(value, index, obj);
+        behavior(result, value, key);
+      });
+      return result;
+    };
+  };
+
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = group(function(result, value, key) {
+    if (_.has(result, key)) result[key].push(value); else result[key] = [value];
+  });
+
+  // Indexes the object's values by a criterion, similar to `groupBy`, but for
+  // when you know that your index values will be unique.
+  _.indexBy = group(function(result, value, key) {
+    result[key] = value;
+  });
+
+  // Counts instances of an object that group by a certain criterion. Pass
+  // either a string attribute to count by, or a function that returns the
+  // criterion.
+  _.countBy = group(function(result, value, key) {
+    if (_.has(result, key)) result[key]++; else result[key] = 1;
+  });
+
+  // Safely create a real, live array from anything iterable.
+  _.toArray = function(obj) {
+    if (!obj) return [];
+    if (_.isArray(obj)) return slice.call(obj);
+    if (isArrayLike(obj)) return _.map(obj, _.identity);
+    return _.values(obj);
+  };
+
+  // Return the number of elements in an object.
+  _.size = function(obj) {
+    if (obj == null) return 0;
+    return isArrayLike(obj) ? obj.length : _.keys(obj).length;
+  };
+
+  // Split a collection into two arrays: one whose elements all satisfy the given
+  // predicate, and one whose elements all do not satisfy the predicate.
+  _.partition = function(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var pass = [], fail = [];
+    _.each(obj, function(value, key, obj) {
+      (predicate(value, key, obj) ? pass : fail).push(value);
+    });
+    return [pass, fail];
+  };
+
+  // Array Functions
+  // ---------------
+
+  // Get the first element of an array. Passing **n** will return the first N
+  // values in the array. Aliased as `head` and `take`. The **guard** check
+  // allows it to work with `_.map`.
+  _.first = _.head = _.take = function(array, n, guard) {
+    if (array == null) return void 0;
+    if (n == null || guard) return array[0];
+    return _.initial(array, array.length - n);
+  };
+
+  // Returns everything but the last entry of the array. Especially useful on
+  // the arguments object. Passing **n** will return all the values in
+  // the array, excluding the last N.
+  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
+  };
+
+  // Get the last element of an array. Passing **n** will return the last N
+  // values in the array.
+  _.last = function(array, n, guard) {
+    if (array == null) return void 0;
+    if (n == null || guard) return array[array.length - 1];
+    return _.rest(array, Math.max(0, array.length - n));
+  };
+
+  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+  // Especially useful on the arguments object. Passing an **n** will return
+  // the rest N values in the array.
+  _.rest = _.tail = _.drop = function(array, n, guard) {
+    return slice.call(array, n == null || guard ? 1 : n);
+  };
+
+  // Trim out all falsy values from an array.
+  _.compact = function(array) {
+    return _.filter(array, _.identity);
+  };
+
+  // Internal implementation of a recursive `flatten` function.
+  var flatten = function(input, shallow, strict, startIndex) {
+    var output = [], idx = 0;
+    for (var i = startIndex || 0, length = getLength(input); i < length; i++) {
+      var value = input[i];
+      if (isArrayLike(value) && (_.isArray(value) || _.isArguments(value))) {
+        //flatten current level of array or arguments object
+        if (!shallow) value = flatten(value, shallow, strict);
+        var j = 0, len = value.length;
+        output.length += len;
+        while (j < len) {
+          output[idx++] = value[j++];
+        }
+      } else if (!strict) {
+        output[idx++] = value;
+      }
+    }
+    return output;
+  };
+
+  // Flatten out an array, either recursively (by default), or just one level.
+  _.flatten = function(array, shallow) {
+    return flatten(array, shallow, false);
+  };
+
+  // Return a version of the array that does not contain the specified value(s).
+  _.without = function(array) {
+    return _.difference(array, slice.call(arguments, 1));
+  };
+
+  // Produce a duplicate-free version of the array. If the array has already
+  // been sorted, you have the option of using a faster algorithm.
+  // Aliased as `unique`.
+  _.uniq = _.unique = function(array, isSorted, iteratee, context) {
+    if (!_.isBoolean(isSorted)) {
+      context = iteratee;
+      iteratee = isSorted;
+      isSorted = false;
+    }
+    if (iteratee != null) iteratee = cb(iteratee, context);
+    var result = [];
+    var seen = [];
+    for (var i = 0, length = getLength(array); i < length; i++) {
+      var value = array[i],
+        computed = iteratee ? iteratee(value, i, array) : value;
+      if (isSorted) {
+        if (!i || seen !== computed) result.push(value);
+        seen = computed;
+      } else if (iteratee) {
+        if (!_.contains(seen, computed)) {
+          seen.push(computed);
+          result.push(value);
+        }
+      } else if (!_.contains(result, value)) {
+        result.push(value);
+      }
+    }
+    return result;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(flatten(arguments, true, true));
+  };
+
+  // Produce an array that contains every item shared between all the
+  // passed-in arrays.
+  _.intersection = function(array) {
+    var result = [];
+    var argsLength = arguments.length;
+    for (var i = 0, length = getLength(array); i < length; i++) {
+      var item = array[i];
+      if (_.contains(result, item)) continue;
+      for (var j = 1; j < argsLength; j++) {
+        if (!_.contains(arguments[j], item)) break;
+      }
+      if (j === argsLength) result.push(item);
+    }
+    return result;
+  };
+
+  // Take the difference between one array and a number of other arrays.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array) {
+    var rest = flatten(arguments, true, true, 1);
+    return _.filter(array, function(value){
+      return !_.contains(rest, value);
+    });
+  };
+
+  // Zip together multiple lists into a single array -- elements that share
+  // an index go together.
+  _.zip = function() {
+    return _.unzip(arguments);
+  };
+
+  // Complement of _.zip. Unzip accepts an array of arrays and groups
+  // each array's elements on shared indices
+  _.unzip = function(array) {
+    var length = array && _.max(array, getLength).length || 0;
+    var result = Array(length);
+
+    for (var index = 0; index < length; index++) {
+      result[index] = _.pluck(array, index);
+    }
+    return result;
+  };
+
+  // Converts lists into objects. Pass either a single array of `[key, value]`
+  // pairs, or two parallel arrays of the same length -- one of keys, and one of
+  // the corresponding values.
+  _.object = function(list, values) {
+    var result = {};
+    for (var i = 0, length = getLength(list); i < length; i++) {
+      if (values) {
+        result[list[i]] = values[i];
+      } else {
+        result[list[i][0]] = list[i][1];
+      }
+    }
+    return result;
+  };
+
+  // Generator function to create the findIndex and findLastIndex functions
+  function createPredicateIndexFinder(dir) {
+    return function(array, predicate, context) {
+      predicate = cb(predicate, context);
+      var length = getLength(array);
+      var index = dir > 0 ? 0 : length - 1;
+      for (; index >= 0 && index < length; index += dir) {
+        if (predicate(array[index], index, array)) return index;
+      }
+      return -1;
+    };
+  }
+
+  // Returns the first index on an array-like that passes a predicate test
+  _.findIndex = createPredicateIndexFinder(1);
+  _.findLastIndex = createPredicateIndexFinder(-1);
+
+  // Use a comparator function to figure out the smallest index at which
+  // an object should be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iteratee, context) {
+    iteratee = cb(iteratee, context, 1);
+    var value = iteratee(obj);
+    var low = 0, high = getLength(array);
+    while (low < high) {
+      var mid = Math.floor((low + high) / 2);
+      if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
+    }
+    return low;
+  };
+
+  // Generator function to create the indexOf and lastIndexOf functions
+  function createIndexFinder(dir, predicateFind, sortedIndex) {
+    return function(array, item, idx) {
+      var i = 0, length = getLength(array);
+      if (typeof idx == 'number') {
+        if (dir > 0) {
+          i = idx >= 0 ? idx : Math.max(idx + length, i);
+        } else {
+          length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
+        }
+      } else if (sortedIndex && idx && length) {
+        idx = sortedIndex(array, item);
+        return array[idx] === item ? idx : -1;
+      }
+      if (item !== item) {
+        idx = predicateFind(slice.call(array, i, length), _.isNaN);
+        return idx >= 0 ? idx + i : -1;
+      }
+      for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) {
+        if (array[idx] === item) return idx;
+      }
+      return -1;
+    };
+  }
+
+  // Return the position of the first occurrence of an item in an array,
+  // or -1 if the item is not included in the array.
+  // If the array is large and already in sort order, pass `true`
+  // for **isSorted** to use binary search.
+  _.indexOf = createIndexFinder(1, _.findIndex, _.sortedIndex);
+  _.lastIndexOf = createIndexFinder(-1, _.findLastIndex);
+
+  // Generate an integer Array containing an arithmetic progression. A port of
+  // the native Python `range()` function. See
+  // [the Python documentation](http://docs.python.org/library/functions.html#range).
+  _.range = function(start, stop, step) {
+    if (stop == null) {
+      stop = start || 0;
+      start = 0;
+    }
+    step = step || 1;
+
+    var length = Math.max(Math.ceil((stop - start) / step), 0);
+    var range = Array(length);
+
+    for (var idx = 0; idx < length; idx++, start += step) {
+      range[idx] = start;
+    }
+
+    return range;
+  };
+
+  // Function (ahem) Functions
+  // ------------------
+
+  // Determines whether to execute a function as a constructor
+  // or a normal function with the provided arguments
+  var executeBound = function(sourceFunc, boundFunc, context, callingContext, args) {
+    if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args);
+    var self = baseCreate(sourceFunc.prototype);
+    var result = sourceFunc.apply(self, args);
+    if (_.isObject(result)) return result;
+    return self;
+  };
+
+  // Create a function bound to a given object (assigning `this`, and arguments,
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
+  _.bind = function(func, context) {
+    if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
+    var args = slice.call(arguments, 2);
+    var bound = function() {
+      return executeBound(func, bound, context, this, args.concat(slice.call(arguments)));
+    };
+    return bound;
+  };
+
+  // Partially apply a function by creating a version that has had some of its
+  // arguments pre-filled, without changing its dynamic `this` context. _ acts
+  // as a placeholder, allowing any combination of arguments to be pre-filled.
+  _.partial = function(func) {
+    var boundArgs = slice.call(arguments, 1);
+    var bound = function() {
+      var position = 0, length = boundArgs.length;
+      var args = Array(length);
+      for (var i = 0; i < length; i++) {
+        args[i] = boundArgs[i] === _ ? arguments[position++] : boundArgs[i];
+      }
+      while (position < arguments.length) args.push(arguments[position++]);
+      return executeBound(func, bound, this, this, args);
+    };
+    return bound;
+  };
+
+  // Bind a number of an object's methods to that object. Remaining arguments
+  // are the method names to be bound. Useful for ensuring that all callbacks
+  // defined on an object belong to it.
+  _.bindAll = function(obj) {
+    var i, length = arguments.length, key;
+    if (length <= 1) throw new Error('bindAll must be passed function names');
+    for (i = 1; i < length; i++) {
+      key = arguments[i];
+      obj[key] = _.bind(obj[key], obj);
+    }
+    return obj;
+  };
+
+  // Memoize an expensive function by storing its results.
+  _.memoize = function(func, hasher) {
+    var memoize = function(key) {
+      var cache = memoize.cache;
+      var address = '' + (hasher ? hasher.apply(this, arguments) : key);
+      if (!_.has(cache, address)) cache[address] = func.apply(this, arguments);
+      return cache[address];
+    };
+    memoize.cache = {};
+    return memoize;
+  };
+
+  // Delays a function for the given number of milliseconds, and then calls
+  // it with the arguments supplied.
+  _.delay = function(func, wait) {
+    var args = slice.call(arguments, 2);
+    return setTimeout(function(){
+      return func.apply(null, args);
+    }, wait);
+  };
+
+  // Defers a function, scheduling it to run after the current call stack has
+  // cleared.
+  _.defer = _.partial(_.delay, _, 1);
+
+  // Returns a function, that, when invoked, will only be triggered at most once
+  // during a given window of time. Normally, the throttled function will run
+  // as much as it can, without ever going more than once per `wait` duration;
+  // but if you'd like to disable the execution on the leading edge, pass
+  // `{leading: false}`. To disable execution on the trailing edge, ditto.
+  _.throttle = function(func, wait, options) {
+    var context, args, result;
+    var timeout = null;
+    var previous = 0;
+    if (!options) options = {};
+    var later = function() {
+      previous = options.leading === false ? 0 : _.now();
+      timeout = null;
+      result = func.apply(context, args);
+      if (!timeout) context = args = null;
+    };
+    return function() {
+      var now = _.now();
+      if (!previous && options.leading === false) previous = now;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0 || remaining > wait) {
+        if (timeout) {
+          clearTimeout(timeout);
+          timeout = null;
+        }
+        previous = now;
+        result = func.apply(context, args);
+        if (!timeout) context = args = null;
+      } else if (!timeout && options.trailing !== false) {
+        timeout = setTimeout(later, remaining);
+      }
+      return result;
+    };
+  };
+
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds. If `immediate` is passed, trigger the function on the
+  // leading edge, instead of the trailing.
+  _.debounce = function(func, wait, immediate) {
+    var timeout, args, context, timestamp, result;
+
+    var later = function() {
+      var last = _.now() - timestamp;
+
+      if (last < wait && last >= 0) {
+        timeout = setTimeout(later, wait - last);
+      } else {
+        timeout = null;
+        if (!immediate) {
+          result = func.apply(context, args);
+          if (!timeout) context = args = null;
+        }
+      }
+    };
+
+    return function() {
+      context = this;
+      args = arguments;
+      timestamp = _.now();
+      var callNow = immediate && !timeout;
+      if (!timeout) timeout = setTimeout(later, wait);
+      if (callNow) {
+        result = func.apply(context, args);
+        context = args = null;
+      }
+
+      return result;
+    };
+  };
+
+  // Returns the first function passed as an argument to the second,
+  // allowing you to adjust arguments, run code before and after, and
+  // conditionally execute the original function.
+  _.wrap = function(func, wrapper) {
+    return _.partial(wrapper, func);
+  };
+
+  // Returns a negated version of the passed-in predicate.
+  _.negate = function(predicate) {
+    return function() {
+      return !predicate.apply(this, arguments);
+    };
+  };
+
+  // Returns a function that is the composition of a list of functions, each
+  // consuming the return value of the function that follows.
+  _.compose = function() {
+    var args = arguments;
+    var start = args.length - 1;
+    return function() {
+      var i = start;
+      var result = args[start].apply(this, arguments);
+      while (i--) result = args[i].call(this, result);
+      return result;
+    };
+  };
+
+  // Returns a function that will only be executed on and after the Nth call.
+  _.after = function(times, func) {
+    return function() {
+      if (--times < 1) {
+        return func.apply(this, arguments);
+      }
+    };
+  };
+
+  // Returns a function that will only be executed up to (but not including) the Nth call.
+  _.before = function(times, func) {
+    var memo;
+    return function() {
+      if (--times > 0) {
+        memo = func.apply(this, arguments);
+      }
+      if (times <= 1) func = null;
+      return memo;
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = _.partial(_.before, 2);
+
+  // Object Functions
+  // ----------------
+
+  // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed.
+  var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
+  var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString',
+    'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
+
+  function collectNonEnumProps(obj, keys) {
+    var nonEnumIdx = nonEnumerableProps.length;
+    var constructor = obj.constructor;
+    var proto = (_.isFunction(constructor) && constructor.prototype) || ObjProto;
+
+    // Constructor is a special case.
+    var prop = 'constructor';
+    if (_.has(obj, prop) && !_.contains(keys, prop)) keys.push(prop);
+
+    while (nonEnumIdx--) {
+      prop = nonEnumerableProps[nonEnumIdx];
+      if (prop in obj && obj[prop] !== proto[prop] && !_.contains(keys, prop)) {
+        keys.push(prop);
+      }
+    }
+  }
+
+  // Retrieve the names of an object's own properties.
+  // Delegates to **ECMAScript 5**'s native `Object.keys`
+  _.keys = function(obj) {
+    if (!_.isObject(obj)) return [];
+    if (nativeKeys) return nativeKeys(obj);
+    var keys = [];
+    for (var key in obj) if (_.has(obj, key)) keys.push(key);
+    // Ahem, IE < 9.
+    if (hasEnumBug) collectNonEnumProps(obj, keys);
+    return keys;
+  };
+
+  // Retrieve all the property names of an object.
+  _.allKeys = function(obj) {
+    if (!_.isObject(obj)) return [];
+    var keys = [];
+    for (var key in obj) keys.push(key);
+    // Ahem, IE < 9.
+    if (hasEnumBug) collectNonEnumProps(obj, keys);
+    return keys;
+  };
+
+  // Retrieve the values of an object's properties.
+  _.values = function(obj) {
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var values = Array(length);
+    for (var i = 0; i < length; i++) {
+      values[i] = obj[keys[i]];
+    }
+    return values;
+  };
+
+  // Returns the results of applying the iteratee to each element of the object
+  // In contrast to _.map it returns an object
+  _.mapObject = function(obj, iteratee, context) {
+    iteratee = cb(iteratee, context);
+    var keys =  _.keys(obj),
+      length = keys.length,
+      results = {},
+      currentKey;
+    for (var index = 0; index < length; index++) {
+      currentKey = keys[index];
+      results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
+    }
+    return results;
+  };
+
+  // Convert an object into a list of `[key, value]` pairs.
+  _.pairs = function(obj) {
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var pairs = Array(length);
+    for (var i = 0; i < length; i++) {
+      pairs[i] = [keys[i], obj[keys[i]]];
+    }
+    return pairs;
+  };
+
+  // Invert the keys and values of an object. The values must be serializable.
+  _.invert = function(obj) {
+    var result = {};
+    var keys = _.keys(obj);
+    for (var i = 0, length = keys.length; i < length; i++) {
+      result[obj[keys[i]]] = keys[i];
+    }
+    return result;
+  };
+
+  // Return a sorted list of the function names available on the object.
+  // Aliased as `methods`
+  _.functions = _.methods = function(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  };
+
+  // Extend a given object with all the properties in passed-in object(s).
+  _.extend = createAssigner(_.allKeys);
+
+  // Assigns a given object with all the own properties in the passed-in object(s)
+  // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
+  _.extendOwn = _.assign = createAssigner(_.keys);
+
+  // Returns the first key on an object that passes a predicate test
+  _.findKey = function(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var keys = _.keys(obj), key;
+    for (var i = 0, length = keys.length; i < length; i++) {
+      key = keys[i];
+      if (predicate(obj[key], key, obj)) return key;
+    }
+  };
+
+  // Return a copy of the object only containing the whitelisted properties.
+  _.pick = function(object, oiteratee, context) {
+    var result = {}, obj = object, iteratee, keys;
+    if (obj == null) return result;
+    if (_.isFunction(oiteratee)) {
+      keys = _.allKeys(obj);
+      iteratee = optimizeCb(oiteratee, context);
+    } else {
+      keys = flatten(arguments, false, false, 1);
+      iteratee = function(value, key, obj) { return key in obj; };
+      obj = Object(obj);
+    }
+    for (var i = 0, length = keys.length; i < length; i++) {
+      var key = keys[i];
+      var value = obj[key];
+      if (iteratee(value, key, obj)) result[key] = value;
+    }
+    return result;
+  };
+
+  // Return a copy of the object without the blacklisted properties.
+  _.omit = function(obj, iteratee, context) {
+    if (_.isFunction(iteratee)) {
+      iteratee = _.negate(iteratee);
+    } else {
+      var keys = _.map(flatten(arguments, false, false, 1), String);
+      iteratee = function(value, key) {
+        return !_.contains(keys, key);
+      };
+    }
+    return _.pick(obj, iteratee, context);
+  };
+
+  // Fill in a given object with default properties.
+  _.defaults = createAssigner(_.allKeys, true);
+
+  // Creates an object that inherits from the given prototype object.
+  // If additional properties are provided then they will be added to the
+  // created object.
+  _.create = function(prototype, props) {
+    var result = baseCreate(prototype);
+    if (props) _.extendOwn(result, props);
+    return result;
+  };
+
+  // Create a (shallow-cloned) duplicate of an object.
+  _.clone = function(obj) {
+    if (!_.isObject(obj)) return obj;
+    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+  };
+
+  // Invokes interceptor with the obj, and then returns obj.
+  // The primary purpose of this method is to "tap into" a method chain, in
+  // order to perform operations on intermediate results within the chain.
+  _.tap = function(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  };
+
+  // Returns whether an object has a given set of `key:value` pairs.
+  _.isMatch = function(object, attrs) {
+    var keys = _.keys(attrs), length = keys.length;
+    if (object == null) return !length;
+    var obj = Object(object);
+    for (var i = 0; i < length; i++) {
+      var key = keys[i];
+      if (attrs[key] !== obj[key] || !(key in obj)) return false;
+    }
+    return true;
+  };
+
+
+  // Internal recursive comparison function for `isEqual`.
+  var eq = function(a, b, aStack, bStack) {
+    // Identical objects are equal. `0 === -0`, but they aren't identical.
+    // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
+    if (a === b) return a !== 0 || 1 / a === 1 / b;
+    // A strict comparison is necessary because `null == undefined`.
+    if (a == null || b == null) return a === b;
+    // Unwrap any wrapped objects.
+    if (a instanceof _) a = a._wrapped;
+    if (b instanceof _) b = b._wrapped;
+    // Compare `[[Class]]` names.
+    var className = toString.call(a);
+    if (className !== toString.call(b)) return false;
+    switch (className) {
+      // Strings, numbers, regular expressions, dates, and booleans are compared by value.
+      case '[object RegExp]':
+      // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
+      case '[object String]':
+        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+        // equivalent to `new String("5")`.
+        return '' + a === '' + b;
+      case '[object Number]':
+        // `NaN`s are equivalent, but non-reflexive.
+        // Object(NaN) is equivalent to NaN
+        if (+a !== +a) return +b !== +b;
+        // An `egal` comparison is performed for other numeric values.
+        return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+      case '[object Date]':
+      case '[object Boolean]':
+        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+        // millisecond representations. Note that invalid dates with millisecond representations
+        // of `NaN` are not equivalent.
+        return +a === +b;
+    }
+
+    var areArrays = className === '[object Array]';
+    if (!areArrays) {
+      if (typeof a != 'object' || typeof b != 'object') return false;
+
+      // Objects with different constructors are not equivalent, but `Object`s or `Array`s
+      // from different frames are.
+      var aCtor = a.constructor, bCtor = b.constructor;
+      if (aCtor !== bCtor && !(_.isFunction(aCtor) && aCtor instanceof aCtor &&
+          _.isFunction(bCtor) && bCtor instanceof bCtor)
+        && ('constructor' in a && 'constructor' in b)) {
+        return false;
+      }
+    }
+    // Assume equality for cyclic structures. The algorithm for detecting cyclic
+    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+
+    // Initializing stack of traversed objects.
+    // It's done here since we only need them for objects and arrays comparison.
+    aStack = aStack || [];
+    bStack = bStack || [];
+    var length = aStack.length;
+    while (length--) {
+      // Linear search. Performance is inversely proportional to the number of
+      // unique nested structures.
+      if (aStack[length] === a) return bStack[length] === b;
+    }
+
+    // Add the first object to the stack of traversed objects.
+    aStack.push(a);
+    bStack.push(b);
+
+    // Recursively compare objects and arrays.
+    if (areArrays) {
+      // Compare array lengths to determine if a deep comparison is necessary.
+      length = a.length;
+      if (length !== b.length) return false;
+      // Deep compare the contents, ignoring non-numeric properties.
+      while (length--) {
+        if (!eq(a[length], b[length], aStack, bStack)) return false;
+      }
+    } else {
+      // Deep compare objects.
+      var keys = _.keys(a), key;
+      length = keys.length;
+      // Ensure that both objects contain the same number of properties before comparing deep equality.
+      if (_.keys(b).length !== length) return false;
+      while (length--) {
+        // Deep compare each member
+        key = keys[length];
+        if (!(_.has(b, key) && eq(a[key], b[key], aStack, bStack))) return false;
+      }
+    }
+    // Remove the first object from the stack of traversed objects.
+    aStack.pop();
+    bStack.pop();
+    return true;
+  };
+
+  // Perform a deep comparison to check if two objects are equal.
+  _.isEqual = function(a, b) {
+    return eq(a, b);
+  };
+
+  // Is a given array, string, or object empty?
+  // An "empty" object has no enumerable own-properties.
+  _.isEmpty = function(obj) {
+    if (obj == null) return true;
+    if (isArrayLike(obj) && (_.isArray(obj) || _.isString(obj) || _.isArguments(obj))) return obj.length === 0;
+    return _.keys(obj).length === 0;
+  };
+
+  // Is a given value a DOM element?
+  _.isElement = function(obj) {
+    return !!(obj && obj.nodeType === 1);
+  };
+
+  // Is a given value an array?
+  // Delegates to ECMA5's native Array.isArray
+  _.isArray = nativeIsArray || function(obj) {
+    return toString.call(obj) === '[object Array]';
+  };
+
+  // Is a given variable an object?
+  _.isObject = function(obj) {
+    var type = typeof obj;
+    return type === 'function' || type === 'object' && !!obj;
+  };
+
+  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError.
+  _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error'], function(name) {
+    _['is' + name] = function(obj) {
+      return toString.call(obj) === '[object ' + name + ']';
+    };
+  });
+
+  // Define a fallback version of the method in browsers (ahem, IE < 9), where
+  // there isn't any inspectable "Arguments" type.
+  if (!_.isArguments(arguments)) {
+    _.isArguments = function(obj) {
+      return _.has(obj, 'callee');
+    };
+  }
+
+  // Optimize `isFunction` if appropriate. Work around some typeof bugs in old v8,
+  // IE 11 (#1621), and in Safari 8 (#1929).
+  if (typeof /./ != 'function' && typeof Int8Array != 'object') {
+    _.isFunction = function(obj) {
+      return typeof obj == 'function' || false;
+    };
+  }
+
+  // Is a given object a finite number?
+  _.isFinite = function(obj) {
+    return isFinite(obj) && !isNaN(parseFloat(obj));
+  };
+
+  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+  _.isNaN = function(obj) {
+    return _.isNumber(obj) && obj !== +obj;
+  };
+
+  // Is a given value a boolean?
+  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
+  };
+
+  // Is a given value equal to null?
+  _.isNull = function(obj) {
+    return obj === null;
+  };
+
+  // Is a given variable undefined?
+  _.isUndefined = function(obj) {
+    return obj === void 0;
+  };
+
+  // Shortcut function for checking if an object has a given property directly
+  // on itself (in other words, not on a prototype).
+  _.has = function(obj, key) {
+    return obj != null && hasOwnProperty.call(obj, key);
+  };
+
+  // Utility Functions
+  // -----------------
+
+  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+  // previous owner. Returns a reference to the Underscore object.
+  _.noConflict = function() {
+    root._ = previousUnderscore;
+    return this;
+  };
+
+  // Keep the identity function around for default iteratees.
+  _.identity = function(value) {
+    return value;
+  };
+
+  // Predicate-generating functions. Often useful outside of Underscore.
+  _.constant = function(value) {
+    return function() {
+      return value;
+    };
+  };
+
+  _.noop = function(){};
+
+  _.property = property;
+
+  // Generates a function for a given object that returns a given property.
+  _.propertyOf = function(obj) {
+    return obj == null ? function(){} : function(key) {
+      return obj[key];
+    };
+  };
+
+  // Returns a predicate for checking whether an object has a given set of
+  // `key:value` pairs.
+  _.matcher = _.matches = function(attrs) {
+    attrs = _.extendOwn({}, attrs);
+    return function(obj) {
+      return _.isMatch(obj, attrs);
+    };
+  };
+
+  // Run a function **n** times.
+  _.times = function(n, iteratee, context) {
+    var accum = Array(Math.max(0, n));
+    iteratee = optimizeCb(iteratee, context, 1);
+    for (var i = 0; i < n; i++) accum[i] = iteratee(i);
+    return accum;
+  };
+
+  // Return a random integer between min and max (inclusive).
+  _.random = function(min, max) {
+    if (max == null) {
+      max = min;
+      min = 0;
+    }
+    return min + Math.floor(Math.random() * (max - min + 1));
+  };
+
+  // A (possibly faster) way to get the current timestamp as an integer.
+  _.now = Date.now || function() {
+    return new Date().getTime();
+  };
+
+  // List of HTML entities for escaping.
+  var escapeMap = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;',
+    '`': '&#x60;'
+  };
+  var unescapeMap = _.invert(escapeMap);
+
+  // Functions for escaping and unescaping strings to/from HTML interpolation.
+  var createEscaper = function(map) {
+    var escaper = function(match) {
+      return map[match];
+    };
+    // Regexes for identifying a key that needs to be escaped
+    var source = '(?:' + _.keys(map).join('|') + ')';
+    var testRegexp = RegExp(source);
+    var replaceRegexp = RegExp(source, 'g');
+    return function(string) {
+      string = string == null ? '' : '' + string;
+      return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
+    };
+  };
+  _.escape = createEscaper(escapeMap);
+  _.unescape = createEscaper(unescapeMap);
+
+  // If the value of the named `property` is a function then invoke it with the
+  // `object` as context; otherwise, return it.
+  _.result = function(object, property, fallback) {
+    var value = object == null ? void 0 : object[property];
+    if (value === void 0) {
+      value = fallback;
+    }
+    return _.isFunction(value) ? value.call(object) : value;
+  };
+
+  // Generate a unique integer id (unique within the entire client session).
+  // Useful for temporary DOM ids.
+  var idCounter = 0;
+  _.uniqueId = function(prefix) {
+    var id = ++idCounter + '';
+    return prefix ? prefix + id : id;
+  };
+
+  // By default, Underscore uses ERB-style template delimiters, change the
+  // following template settings to use alternative delimiters.
+  _.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
+
+  // When customizing `templateSettings`, if you don't want to define an
+  // interpolation, evaluation or escaping regex, we need one that is
+  // guaranteed not to match.
+  var noMatch = /(.)^/;
+
+  // Certain characters need to be escaped so that they can be put into a
+  // string literal.
+  var escapes = {
+    "'":      "'",
+    '\\':     '\\',
+    '\r':     'r',
+    '\n':     'n',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
+
+  var escaper = /\\|'|\r|\n|\u2028|\u2029/g;
+
+  var escapeChar = function(match) {
+    return '\\' + escapes[match];
+  };
+
+  // JavaScript micro-templating, similar to John Resig's implementation.
+  // Underscore templating handles arbitrary delimiters, preserves whitespace,
+  // and correctly escapes quotes within interpolated code.
+  // NB: `oldSettings` only exists for backwards compatibility.
+  _.template = function(text, settings, oldSettings) {
+    if (!settings && oldSettings) settings = oldSettings;
+    settings = _.defaults({}, settings, _.templateSettings);
+
+    // Combine delimiters into one regular expression via alternation.
+    var matcher = RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
+
+    // Compile the template source, escaping string literals appropriately.
+    var index = 0;
+    var source = "__p+='";
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset).replace(escaper, escapeChar);
+      index = offset + match.length;
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      } else if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      } else if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
+
+      // Adobe VMs need the match returned to produce the correct offest.
+      return match;
+    });
+    source += "';\n";
+
+    // If a variable is not specified, place data values in local scope.
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = "var __t,__p='',__j=Array.prototype.join," +
+      "print=function(){__p+=__j.call(arguments,'');};\n" +
+      source + 'return __p;\n';
+
+    try {
+      var render = new Function(settings.variable || 'obj', '_', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
+    }
+
+    var template = function(data) {
+      return render.call(this, data, _);
+    };
+
+    // Provide the compiled source as a convenience for precompilation.
+    var argument = settings.variable || 'obj';
+    template.source = 'function(' + argument + '){\n' + source + '}';
+
+    return template;
+  };
+
+  // Add a "chain" function. Start chaining a wrapped Underscore object.
+  _.chain = function(obj) {
+    var instance = _(obj);
+    instance._chain = true;
+    return instance;
+  };
+
+  // OOP
+  // ---------------
+  // If Underscore is called as a function, it returns a wrapped object that
+  // can be used OO-style. This wrapper holds altered versions of all the
+  // underscore functions. Wrapped objects may be chained.
+
+  // Helper function to continue chaining intermediate results.
+  var result = function(instance, obj) {
+    return instance._chain ? _(obj).chain() : obj;
+  };
+
+  // Add your own custom functions to the Underscore object.
+  _.mixin = function(obj) {
+    _.each(_.functions(obj), function(name) {
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return result(this, func.apply(_, args));
+      };
+    });
+  };
+
+  // Add all of the Underscore functions to the wrapper object.
+  _.mixin(_);
+
+  // Add all mutator Array functions to the wrapper.
+  _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      var obj = this._wrapped;
+      method.apply(obj, arguments);
+      if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
+      return result(this, obj);
+    };
+  });
+
+  // Add all accessor Array functions to the wrapper.
+  _.each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      return result(this, method.apply(this._wrapped, arguments));
+    };
+  });
+
+  // Extracts the result from a wrapped and chained object.
+  _.prototype.value = function() {
+    return this._wrapped;
+  };
+
+  // Provide unwrapping proxy for some methods used in engine operations
+  // such as arithmetic and JSON stringification.
+  _.prototype.valueOf = _.prototype.toJSON = _.prototype.value;
+
+  _.prototype.toString = function() {
+    return '' + this._wrapped;
+  };
+
+  // AMD registration happens at the end for compatibility with AMD loaders
+  // that may not enforce next-turn semantics on modules. Even though general
+  // practice for AMD registration is to be anonymous, underscore registers
+  // as a named module because, like jQuery, it is a base library that is
+  // popular enough to be bundled in a third party lib, but not be part of
+  // an AMD load request. Those cases could generate an error when an
+  // anonymous define() is called outside of a loader request.
+  if (typeof define === 'function' && define.amd) {
+    define('underscore', [], function() {
+      return _;
+    });
+  }
+}.call(this));
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/directive.acledit.html b/docs-web/src/main/webapp/src/partial/docs/directive.acledit.html
index 44e69bc7..d1ee62a3 100644
--- a/docs-web/src/main/webapp/src/partial/docs/directive.acledit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/directive.acledit.html
@@ -27,7 +27,7 @@
         <div class="col-sm-4">
           <input required ng-maxlength="50" class="form-control" type="text" id="inputTarget"
                  ng-attr-placeholder="{{ 'directive.acledit.search_user_group' | translate }}" name="target" ng-model="acl.target" autocomplete="off"
-                 typeahead="target as target.name for target in getTargetAclTypeahead($viewValue) | filter: $viewValue"
+                 uib-typeahead="target as target.name for target in getTargetAclTypeahead($viewValue)"
                  typeahead-template-url="partial/docs/directive.typeahead.acl.html"
                  typeahead-wait-ms="200" />
         </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/directive.selectrelation.html b/docs-web/src/main/webapp/src/partial/docs/directive.selectrelation.html
index 3ffa8bda..e17d0217 100644
--- a/docs-web/src/main/webapp/src/partial/docs/directive.selectrelation.html
+++ b/docs-web/src/main/webapp/src/partial/docs/directive.selectrelation.html
@@ -7,6 +7,6 @@
     </li>
   </ul>
   <input class="form-control" type="text" id="{{ ref }}" ng-attr-placeholder="{{ 'directive.selectrelation.typeahead' | translate }}" ng-model="input" ng-disabled="ngDisabled"
-    autocomplete="off" typeahead="document.title for document in getDocumentTypeahead($viewValue)"
+    autocomplete="off" uib-typeahead="document.title for document in getDocumentTypeahead($viewValue)"
     typeahead-wait-ms="200" typeahead-on-select="addRelation($item)" />
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/directive.selecttag.html b/docs-web/src/main/webapp/src/partial/docs/directive.selecttag.html
index 9cd24aef..92b936e0 100644
--- a/docs-web/src/main/webapp/src/partial/docs/directive.selecttag.html
+++ b/docs-web/src/main/webapp/src/partial/docs/directive.selecttag.html
@@ -7,5 +7,5 @@
     </li>
   </ul>
   <input class="form-control" type="text" id="{{ ref }}" ng-attr-placeholder="{{ 'directive.selecttag.typeahead' | translate }}" ng-model="input" ng-disabled="ngDisabled"
-    autocomplete="off" typeahead="tag.name for tag in allTags | filter: $viewValue" typeahead-on-select="addTag()" />
+    autocomplete="off" uib-typeahead="tag.name for tag in allTags | filter: $viewValue" typeahead-on-select="addTag()" />
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html
index afc7c067..24b22bb3 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.default.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html
@@ -3,8 +3,8 @@
 <div>
   <div class="well drop-zone">
     <h3><span class="glyphicon glyphicon-cloud-upload"></span> {{ 'document.default.quick_upload' | translate }}</h3>
-    <div class="row upload-zone" ng-model="dropFiles" ng-file-drop drag-over-class="bg-success"
-         ng-multiple="true" allow-dir="false" ng-file-change="fileDropped($files, $event, $rejectedFiles)">
+    <div class="row upload-zone" ng-model="dropFiles" ngf-drop="fileDropped($files)"
+         ngf-drag-over-class="'bg-success'" ngf-multiple="true" ngf-allow-dir="false">
       <div class="col-xs-6 col-sm-4 col-md-3 col-lg-2 text-center" ng-repeat="file in files">
         <div class="thumbnail" ng-class="{ 'thumbnail-checked': file.checked }" ng-if="file.id">
           <a ng-click="openFile(file)">
@@ -27,7 +27,7 @@
             {{ file.status }}
           </p>
           <div class="caption">
-            <progressbar value="file.progress" class="progress-info active"></progressbar>
+            <uib-progressbar value="file.progress" class="progress-info active"></uib-progressbar>
           </div>
         </div>
       </div>
@@ -39,10 +39,10 @@
 
       <div class="clearfix"></div>
       <div class="text-center">
-        <button class="btn btn-primary" ng-file-select
-                 ng-file-change="fileDropped($files, $event)"
+        <button class="btn btn-primary" ngf-select
+                 ngf-change="fileDropped($files, $event)"
                  input-file-multiple="multiple"
-                 ng-multiple="true">
+                 ngf-multiple="true">
           {{ 'document.default.add_files' | translate }}
         </button>
       </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.edit.html b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
index a450cdff..1d14be40 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.edit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
@@ -3,10 +3,10 @@
 <div ng-show="document || !isEdit()">
   <div class="row" ng-show="fileIsUploading">
     <h4>{{ 'document.edit.uploading_files' | translate }}</h4>
-    <div class="col-md-6"><progressbar value="fileProgress" class="progress-info active"></progressbar></div>
+    <div class="col-md-6"><uib-progressbar value="fileProgress" class="progress-info active"></uib-progressbar></div>
   </div>
 
-  <alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
+  <div uib-alert ng-class="'alert-' + alert.type" ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</div>
 
   <form name="documentForm" class="form-horizontal">
     <div class="pull-right btn-group" ng-init="form = documentForm">
@@ -26,7 +26,7 @@
         <div class="col-sm-10">
           <input required ng-maxlength="100" class="form-control" type="text" id="inputTitle"
             ng-attr-placeholder="{{ 'document.edit.title_placeholder' | translate }}" name="title" ng-model="document.title" autocomplete="off"
-            typeahead="document for document in getTitleTypeahead($viewValue)"
+            uib-typeahead="document for document in getTitleTypeahead($viewValue)"
             typeahead-wait-ms="200" ng-disabled="fileIsUploading" />
         </div>
       </div>
@@ -40,8 +40,8 @@
       <div class="form-group">
         <label class="col-sm-2 control-label" for="inputCreateDate">{{ 'document.creation_date' | translate }}</label>
         <div class="col-sm-10">
-          <input type="text" id="inputCreateDate" ng-readonly="true" datepicker-popup="yyyy-MM-dd" class="form-control"
-            ng-model="document.create_date" starting-day="1" show-weeks="false" ng-disabled="fileIsUploading" />
+          <input type="text" id="inputCreateDate" ng-readonly="true" uib-datepicker-popup="yyyy-MM-dd" class="form-control"
+            ng-model="document.create_date" datepicker-options="{ startingDay:1, showWeeks: false }" ng-click="datepickerOpened = true" is-open="datepickerOpened" ng-disabled="fileIsUploading" />
         </div>
       </div>
       <div class="form-group">
@@ -70,11 +70,11 @@
       <div class="form-group">
         <label class="col-sm-2 control-label" for="inputFiles">{{ 'document.edit.new_files' | translate }}</label>
         <div class="col-sm-6">
-          <input type="file" ng-file-select class="form-control" id="inputFiles" multiple="multiple" ng-model="newFiles" ng-disabled="fileIsUploading"></input>
+          <input type="file" ngf-select class="form-control" id="inputFiles" ngf-multiple="true" ng-model="newFiles" ng-disabled="fileIsUploading"></input>
         </div>
-        <div class="col-sm-4" ng-if="orphanFiles.length > 0">
-          + {{ orphanFiles.length }} file{{ orphanFiles.length > 1 ? 's' : '' }}
-          {{ 'document.edit.orphan_files' | translate: '{ count: orphanFiles.length }' }}
+        <div class="col-sm-4" ng-if="orphanFiles.length > 0"
+             translate="document.edit.orphan_files"
+             translate-values="{ count: orphanFiles.length }">
         </div>
       </div>
       <div class="form-group">
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.html b/docs-web/src/main/webapp/src/partial/docs/document.html
index 09de4487..7ad4afa7 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.html
@@ -6,8 +6,8 @@
       </p>
 
       <div class="row">
-        <div class="dropdown col-md-2 tag-tree-dropdown" dropdown>
-          <button class="btn btn-block btn-default" dropdown-toggle ng-disabled="disabled">
+        <div class="dropdown col-md-2 tag-tree-dropdown" uib-dropdown>
+          <button class="btn btn-block btn-default" uib-dropdown-toggle ng-disabled="disabled">
             {{ 'document.tags' | translate }} <span class="caret"></span>
           </button>
           <ul class="dropdown-menu tag-tree">
@@ -20,14 +20,14 @@
           <span class="input-group-addon">
             <span class="glyphicon glyphicon glyphicon-info-sign"
                   tooltip-placement="bottom"
-                  tooltip-html-unsafe="before:2012-05<br/>
+                  uib-tooltip-html="'before:2012-05<br/>
               after:2012-05<br/>
               at:2012-05<br/>
               tag:car<br/>
               full:led<br/>
               shared:yes<br/>
               lang:fra<br/>
-              by:user1"></span>
+              by:user1'"></span>
           </span>
           <input type="search" class="form-control" ng-attr-placeholder="{{ 'document.search' | translate }}" ng-model="search" />
           <span class="input-group-addon">
@@ -77,12 +77,13 @@
       </table>
 
       <div class="text-center pagination-box">
-        <pagination
+        <ul uib-pagination
+            ng-if="paginationShown"
             previous-text="{{ 'pagination.previous' | translate }}"
             next-text="{{ 'pagination.next' | translate }}"
             first-text="{{ 'pagination.first' | translate }}"
             last-text="{{ 'pagination.last' | translate }}"
-            total-items="totalDocuments" items-per-page="limit" max-size="5" page="currentPage"></pagination>
+            total-items="totalDocuments" items-per-page="limit" max-size="5" ng-model="currentPage"></ul>
         <label class="sr-only" for="pagesizeSelect">{{ 'document.page_size' | translate }}</label>
         <select ng-model="limit" id="pagesizeSelect" class="form-control">
           <option value="10">{{ 'document.page_size_10' | translate }}</option>
@@ -91,14 +92,13 @@
         </select>
       </div>
 
-      <div class="pull-left" title="{{ 'document.upgrade_quota' | translate }}">
-        {{ 'document.quota' | translate: '{ current: userInfo.storage_current / 1000000, percent: userInfo.storage_current / userInfo.storage_quota * 100, total: userInfo.storage_quota / 1000000 }' }}
+      <div class="pull-left" title="{{ 'document.upgrade_quota' | translate }}"
+           translate="document.quota"
+           translate-values="{ current: userInfo.storage_current / 1000000, percent: userInfo.storage_current / userInfo.storage_quota * 100, total: userInfo.storage_quota / 1000000 }">
       </div>
 
       <div class="text-right" >
-        <span ng-if="totalDocuments">
-          {{ 'document.count' | translate: '{ count: totalDocuments }' }}
-        </span>
+        <span ng-if="totalDocuments" translate="document.count" translate-values="{ count: totalDocuments }"></span>
         <span ng-if="!totalDocuments">&nbsp;</span>
       </div>
     </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
index 5821da00..e1bf86fb 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
@@ -38,8 +38,7 @@
   </dd>
 </dl>
 
-<div ng-file-drop drag-over-class="bg-success" ng-multiple="true" allow-dir="false" ng-model="dropFiles"
-     ng-file-change="fileDropped($files, $event, $rejectedFiles)">
+<div ngf-drop="fileDropped($files)" ngf-drag-over-class="'bg-success'" ngf-multiple="true" ngf-allow-dir="false" ng-model="dropFiles">
   <div class="row upload-zone" ui-sortable="fileSortableOptions" ng-model="files">
     <div class="col-xs-6 col-sm-4 col-md-4 col-lg-3 text-center" ng-repeat="file in files">
       <div class="thumbnail" ng-if="file.id">
@@ -63,7 +62,7 @@
           {{ file.status }}
         </p>
         <div class="caption">
-          <progressbar value="file.progress" class="progress-info active"></progressbar>
+          <uib-progressbar value="file.progress" class="progress-info active"></uib-progressbar>
         </div>
       </div>
     </div>
@@ -75,10 +74,10 @@
   </div>
 
   <div class="text-center">
-    <button class="btn btn-primary" ng-file-select
-      ng-file-change="fileDropped($files, $event)"
+    <button class="btn btn-primary" ngf-select
+      ngf-change="fileDropped($files, $event)"
       input-file-multiple="multiple"
-      ng-multiple="true">
+      ngf-multiple="true">
       {{ 'document.view.content.add_files' | translate }}
     </button>
   </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html
index 2d2205bf..e9ccab0b 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html
@@ -13,8 +13,8 @@
 
 <div ng-show="document">
 	<div class="pull-right">
-	  <div class="dropdown btn-export" dropdown ng-class="{ 'btn-group': document.writable }">
-      <button class="btn btn-default" dropdown-toggle>
+	  <div class="dropdown" uib-dropdown ng-class="{ 'btn-group': document.writable }">
+      <button class="btn btn-default" uib-dropdown-toggle>
         <span class="glyphicon glyphicon-export"></span>
         {{ 'export' | translate }}
         <span class="caret"></span>
diff --git a/docs-web/src/main/webapp/src/partial/docs/group.profile.html b/docs-web/src/main/webapp/src/partial/docs/group.profile.html
index 1568b08d..799ac65f 100644
--- a/docs-web/src/main/webapp/src/partial/docs/group.profile.html
+++ b/docs-web/src/main/webapp/src/partial/docs/group.profile.html
@@ -14,8 +14,9 @@
   <h4>{{ 'group.profile.related_links' | translate }}</h4>
   <ul>
     <li>
-      <a ng-href="#/settings/group/edit/{{ group.name }}">
-        {{ 'group.profile.edit_group' | translate: '{ name: group.name }' }}
+      <a ng-href="#/settings/group/edit/{{ group.name }}"
+         translate="group.profile.edit_group"
+         translate-values="{ name: group.name }">
       </a>
     </li>
   </ul>
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.account.html b/docs-web/src/main/webapp/src/partial/docs/settings.account.html
index 580283de..68e5f4a4 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.account.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.account.html
@@ -33,4 +33,4 @@
     </div>
   </div>
 </form>
-<alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
\ No newline at end of file
+<div uib-alert ng-repeat="alert in alerts" ng-class="'alert-' + alert.type" close="closeAlert($index)">{{ alert.msg }}</div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.config.html b/docs-web/src/main/webapp/src/partial/docs/settings.config.html
index fac842b1..9d1ad83a 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.config.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.config.html
@@ -40,7 +40,7 @@
   <div class="form-group">
     <label class="col-sm-2 control-label" for="inputLogo">{{ 'settings.config.logo' | translate }}</label>
     <div class="col-sm-2">
-      <input type="file" ng-file-select accept="image/gif,image/png,image/jpg,image/jpeg"
+      <input type="file" ngf-select ngf-accept="'image/gif,image/png,image/jpg,image/jpeg'"
         class="form-control" id="inputLogo" ng-model="logo" ng-disabled="sendingImage" />
     </div>
     <div class="col-sm-2">
@@ -54,7 +54,7 @@
   <div class="form-group">
     <label class="col-sm-2 control-label" for="inputBackground">{{ 'settings.config.background_image' | translate }}</label>
     <div class="col-sm-2">
-      <input type="file" ng-file-select accept="image/gif,image/png,image/jpg,image/jpeg"
+      <input type="file" ngf-select ngf-accept="'image/gif,image/png,image/jpg,image/jpeg'"
             class="form-control" id="inputBackground" ng-model="background" ng-disabled="sendingImage" />
     </div>
     <div class="col-sm-2">
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.group.edit.html b/docs-web/src/main/webapp/src/partial/docs/settings.group.edit.html
index 476f7a64..9deaec3b 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.group.edit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.group.edit.html
@@ -25,7 +25,7 @@
       <div class="col-sm-7">
         <input name="parent" type="text" id="inputParent" class="form-control" autocomplete="off"
                ng-attr-placeholder="{{ 'settings.group.edit.search_group' | translate }}" ng-model="group.parent"
-               typeahead="group for group in getGroupTypeahead($viewValue)"
+               uib-typeahead="group for group in getGroupTypeahead($viewValue)"
                typeahead-wait-ms="200" typeahead-editable="false" />
       </div>
     </div>
@@ -50,7 +50,7 @@
         <div class="col-sm-7">
           <input name="member" type="text" id="inputMember" class="form-control" ng-model="member"
                  ng-attr-placeholder="{{ 'settings.group.edit.search_user' | translate }}"
-                 typeahead="user for user in getUserTypeahead($viewValue)" typeahead-on-select="addMember($item)"
+                 uib-typeahead="user for user in getUserTypeahead($viewValue)" typeahead-on-select="addMember($item)"
                  typeahead-wait-ms="200" typeahead-editable="false" autocomplete="off" />
         </div>
       </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.html b/docs-web/src/main/webapp/src/partial/docs/settings.html
index a022d7b2..b0f8abe3 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.html
@@ -3,20 +3,20 @@
     <div class="panel panel-default">
       <div class="panel-heading"><strong>{{ 'settings.menu_personal_settings' | translate }}</strong></div>
       <ul class="list-group">
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/account" href="#/settings/account">{{ 'settings.menu_user_account' | translate }}</a>
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/security" href="#/settings/security">{{ 'settings.menu_two_factor_auth' | translate }}</a>
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/session" href="#/settings/session">{{ 'settings.menu_opened_sessions' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.account.**' }" href="#/settings/account">{{ 'settings.menu_user_account' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.security.**' }" href="#/settings/security">{{ 'settings.menu_two_factor_auth' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.session.**' }" href="#/settings/session">{{ 'settings.menu_opened_sessions' | translate }}</a>
       </ul>
     </div>
 
     <div class="panel panel-default" ng-show="isAdmin">
       <div class="panel-heading"><strong>{{ 'settings.menu_general_settings' | translate }}</strong></div>
       <ul class="list-group">
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/user.*" href="#/settings/user">{{ 'settings.menu_users' | translate }}</a>
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/group.*" href="#/settings/group">{{ 'settings.menu_groups' | translate }}</a>
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/vocabulary.*" href="#/settings/vocabulary">{{ 'settings.menu_vocabularies' | translate }}</a>
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/config" href="#/settings/config">{{ 'settings.menu_configuration' | translate }}</a>
-        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/log" href="#/settings/log">{{ 'settings.menu_server_logs' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.user.**' }" href="#/settings/user">{{ 'settings.menu_users' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.group.**' }" href="#/settings/group">{{ 'settings.menu_groups' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.vocabulary.**' }" href="#/settings/vocabulary">{{ 'settings.menu_vocabularies' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.config.**' }" href="#/settings/config">{{ 'settings.menu_configuration' | translate }}</a>
+        <a class="list-group-item" ui-sref-active="{ active: 'settings.log.**' }" href="#/settings/log">{{ 'settings.menu_server_logs' | translate }}</a>
       </ul>
     </div>
   </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/user.profile.html b/docs-web/src/main/webapp/src/partial/docs/user.profile.html
index 96a9ac1d..130b7e70 100644
--- a/docs-web/src/main/webapp/src/partial/docs/user.profile.html
+++ b/docs-web/src/main/webapp/src/partial/docs/user.profile.html
@@ -12,9 +12,9 @@
 <h4>{{ 'user.profile.quota_used' | translate }}</h4>
 <div class="row">
   <div class="col-md-6">
-    <div class="progress" title="{{ 'user.profile.percent_used' | translate: '{ percent: user.storage_current / user.storage_quota * 100 }' }}">
+    <div class="progress" translate-attr="{ title: 'user.profile.percent_used' }" translate-values="{ percent: user.storage_current / user.storage_quota * 100 }">
       <div class="progress-bar" ng-style="{ 'width': (user.storage_current / user.storage_quota * 100) + '%' }">
-        <span class="sr-only">{{ 'user.profile.percent_used' | translate: '{ percent: user.storage_current / user.storage_quota * 100 }' }}</span>
+        <span class="sr-only" translate="user.profile.percent_used" translate-values="{ percent: user.storage_current / user.storage_quota * 100 }"></span>
       </div>
     </div>
   </div>
@@ -23,13 +23,15 @@
 <h4>{{ 'user.profile.related_links' | translate }}</h4>
 <ul>
   <li>
-    <a ng-href="#/document/search/by:{{ user.username }}">
-      {{ 'user.profile.document_created' | translate: '{ username: user.username }' }}
+    <a ng-href="#/document/search/by:{{ user.username }}"
+       translate="user.profile.document_created"
+       translate-values="{ username: user.username }">
     </a>
   </li>
   <li ng-if="userInfo.base_functions.indexOf('ADMIN') != -1">
-    <a ng-href="#/settings/user/edit/{{ user.username }}">
-      {{ 'user.profile.edit_user' | translate: '{ username: user.username }' }}
+    <a ng-href="#/settings/user/edit/{{ user.username }}"
+       translate="user.profile.edit_user"
+       translate-values="{ username: user.username }">
     </a>
   </li>
 </ul>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/share/share.html b/docs-web/src/main/webapp/src/partial/share/share.html
index 9ea9ed90..053e3796 100644
--- a/docs-web/src/main/webapp/src/partial/share/share.html
+++ b/docs-web/src/main/webapp/src/partial/share/share.html
@@ -1,38 +1,40 @@
 <div class="row">
   <div class="col-md-10">
-    <div class="pull-right">
-      <div class="dropdown" dropdown>
-        <button class="btn btn-default" dropdown-toggle>
-          <span class="glyphicon glyphicon-export"></span>
-          Export
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li>
-            <a ng-href="../api/file/zip?id={{ document.id }}&share={{ $stateParams.shareId }}" title="Download all files">
-              <span class="glyphicon glyphicon glyphicon-compressed"></span>
-              Download files
-            </a>
-          </li>
-          <li>
-            <a ng-click="exportPdf()" title="Export document to PDF" class="pointer">
-              <span class="glyphicon glyphicon glyphicon-save-file"></span>
-              Export to PDF
-            </a>
-          </li>
+    <div>
+      <div class="pull-right">
+        <div class="dropdown" uib-dropdown>
+          <button class="btn btn-default" uib-dropdown-toggle>
+            <span class="glyphicon glyphicon-export"></span>
+            Export
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu">
+            <li>
+              <a ng-href="../api/file/zip?id={{ document.id }}&share={{ $stateParams.shareId }}" title="Download all files">
+                <span class="glyphicon glyphicon glyphicon-compressed"></span>
+                Download files
+              </a>
+            </li>
+            <li>
+              <a ng-click="exportPdf()" title="Export document to PDF" class="pointer">
+                <span class="glyphicon glyphicon glyphicon-save-file"></span>
+                Export to PDF
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="page-header">
+        <h1>
+          {{ document.title }} <small>{{ document.create_date | date: 'yyyy-MM-dd' }}</small>
+        </h1>
+        <ul class="list-inline">
+          <li ng-repeat="tag in document.tags"><span class="label label-info" ng-style="{ 'background': tag.color }">{{ tag.name }}</span></li>
         </ul>
       </div>
     </div>
 
-    <div class="page-header">
-      <h1>
-        {{ document.title }} <small>{{ document.create_date | date: 'yyyy-MM-dd' }}</small>
-      </h1>
-      <ul class="list-inline">
-        <li ng-repeat="tag in document.tags"><span class="label label-info" ng-style="{ 'background': tag.color }">{{ tag.name }}</span></li>
-      </ul>
-    </div>
-
     <p ng-bind-html="document.description | newline"></p>
     <dl class="dl-horizontal">
       <dt ng-if="document.subject">Subject</dt>
@@ -54,7 +56,7 @@
       <dt>Contributors</dt>
       <dd>
         <span ng-repeat="contributor in document.contributors">
-          <span class="btn btn-default btn-xs">
+          <span class="btn btn-link btn-xs">
             <a href="mailto:{{ contributor.email }}">
               {{ contributor.username }}
             </a>
diff --git a/docs-web/src/main/webapp/src/share.html b/docs-web/src/main/webapp/src/share.html
index ab67af4a..bff91761 100644
--- a/docs-web/src/main/webapp/src/share.html
+++ b/docs-web/src/main/webapp/src/share.html
@@ -30,7 +30,6 @@
     <script src="lib/angular.touch.js" type="text/javascript"></script>
     <script src="lib/angular.ui-router.js" type="text/javascript"></script>
     <script src="lib/angular.ui-bootstrap.js" type="text/javascript"></script>
-    <script src="lib/angular.ui-utils.js" type="text/javascript"></script>
     <script src="lib/angular.restangular.js" type="text/javascript"></script>
     <script src="app/share/app.js" type="text/javascript"></script>
     <script src="app/share/controller/Main.js" type="text/javascript"></script>
diff --git a/docs-web/src/main/webapp/src/style/bootstrap.css b/docs-web/src/main/webapp/src/style/bootstrap.css
index 9197e2c0..05c874c5 100644
--- a/docs-web/src/main/webapp/src/style/bootstrap.css
+++ b/docs-web/src/main/webapp/src/style/bootstrap.css
@@ -4549,6 +4549,11 @@ fieldset[disabled] .navbar-default .btn-link:focus {
 .navbar-inverse .navbar-nav > .active > a:focus {
   color: #fff;
 }
+.navbar-inverse .navbar-nav > .active2 > a,
+.navbar-inverse .navbar-nav > .active2 > a:hover,
+.navbar-inverse .navbar-nav > .active2 > a:focus {
+  color: #fff;
+}
 .navbar-inverse .navbar-nav > .disabled > a,
 .navbar-inverse .navbar-nav > .disabled > a:hover,
 .navbar-inverse .navbar-nav > .disabled > a:focus {
diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less
index 8aa526e7..689407cb 100644
--- a/docs-web/src/main/webapp/src/style/main.less
+++ b/docs-web/src/main/webapp/src/style/main.less
@@ -300,13 +300,6 @@ input[readonly].share-link {
   }
 }
 
-// Export dropdown
-.btn-export {
-  .dropdown-menu {
-    left: -62px;
-  }
-}
-
 /* Styling for the ngProgress itself */
 #ngProgress {
   margin: 0;
diff --git a/docs-web/src/main/webapp/test/conf.js b/docs-web/src/main/webapp/test/conf.js
deleted file mode 100644
index 32e83645..00000000
--- a/docs-web/src/main/webapp/test/conf.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-exports.config = {
-  seleniumServerJar: '../node_modules/selenium/lib/runner/selenium-server-standalone-2.20.0.jar',
-  framework: 'jasmine',
-  rootElement: 'html',
-  baseUrl: 'http://localhost:9999/docs-web/src/?protractor',
-  capabilities: {
-    'browserName': 'chrome'
-  },
- 
-  specs: [
-    'specs/**/*.js'
-  ],
-
-  jasmineNodeOpts: {
-    isVerbose: true,
-    showColors: true,
-    defaultTimeoutInterval: 30000
-  }
-};
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/test/specs/temp.js b/docs-web/src/main/webapp/test/specs/temp.js
deleted file mode 100644
index 402d9709..00000000
--- a/docs-web/src/main/webapp/test/specs/temp.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
- 
-describe('document', function () {
-  it('should create and delete a document', function () {
-    browser.get('');
-
-    // Login as admin
-    element(by.model('user.username')).sendKeys('admin');
-    element(by.model('user.password')).sendKeys('admin');
-    element(by.css('.login-box button[type="submit"]')).click();
-
-    // Create a document
-    element(by.partialLinkText('Add a document')).click();
-    element(by.model('document.title')).sendKeys('My test document');
-    element(by.buttonText('Add')).click();
-
-    // Open the last document
-    element(by.css('.table-documents tbody tr:nth-child(1)')).click();
-
-    // Delete the document
-    element(by.partialButtonText('Delete')).click();
-    element(by.partialButtonText('OK')).click();
-  });
-});
\ No newline at end of file