diff options
| author | Michał Gołębiowski | 2013-06-19 20:52:50 +0100 |
|---|---|---|
| committer | Pete Bacon Darwin | 2013-06-19 20:53:24 +0100 |
| commit | f1b94b4b599ab701bc75b55bbbbb73c5ef329a93 (patch) | |
| tree | 033c39426a25c8ac86dc7dc4efb1b4d05fe05272 /docs | |
| parent | 0bfa29377d7a77b360ecd3209d56eeb4f68a5043 (diff) | |
| download | angular.js-f1b94b4b599ab701bc75b55bbbbb73c5ef329a93.tar.bz2 | |
feat(jqLite): switch bind/unbind to more recent jQuery on/off
jQuery switched to a completely new event binding implementation as of
1.7.0, centering around on/off methods instead of previous bind/unbind.
This patch makes jqLite match this implementation while still supporting
previous bind/unbind methods.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components/angular-bootstrap/bootstrap-prettify.js | 2 | ||||
| -rw-r--r-- | docs/components/angular-bootstrap/bootstrap.js | 12 | ||||
| -rw-r--r-- | docs/content/guide/compiler.ngdoc | 6 | ||||
| -rw-r--r-- | docs/content/guide/concepts.ngdoc | 2 | ||||
| -rw-r--r-- | docs/content/guide/dev_guide.services.$location.ngdoc | 4 | ||||
| -rw-r--r-- | docs/content/guide/directive.ngdoc | 4 | ||||
| -rw-r--r-- | docs/content/guide/forms.ngdoc | 2 | ||||
| -rw-r--r-- | docs/src/templates/js/docs.js | 6 |
8 files changed, 19 insertions, 19 deletions
diff --git a/docs/components/angular-bootstrap/bootstrap-prettify.js b/docs/components/angular-bootstrap/bootstrap-prettify.js index dc2a34e2..ad5340e5 100644 --- a/docs/components/angular-bootstrap/bootstrap-prettify.js +++ b/docs/components/angular-bootstrap/bootstrap-prettify.js @@ -228,7 +228,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', }]); if (attrs.ngEmbedApp) modules.push(attrs.ngEmbedApp); - element.bind('click', function(event) { + element.on('click', function(event) { if (event.target.attributes.getNamedItem('ng-click')) { event.preventDefault(); } diff --git a/docs/components/angular-bootstrap/bootstrap.js b/docs/components/angular-bootstrap/bootstrap.js index 3bcc18fa..71972200 100644 --- a/docs/components/angular-bootstrap/bootstrap.js +++ b/docs/components/angular-bootstrap/bootstrap.js @@ -13,11 +13,11 @@ directive.dropdownToggle = close && close(); }); - element.parent().bind('click', function(event) { + element.parent().on('click', function(event) { close && close(); }); - element.bind('click', function(event) { + element.on('click', function(event) { event.preventDefault(); event.stopPropagation(); @@ -35,13 +35,13 @@ directive.dropdownToggle = close = function (event) { event && event.preventDefault(); event && event.stopPropagation(); - $document.unbind('click', close); + $document.off('click', close); element.parent().removeClass('open'); close = null; openElement = null; } - $document.bind('click', close); + $document.on('click', close); } }); } @@ -161,7 +161,7 @@ directive.tabbable = function() { } navTabs.append(li); - li.bind('click', function(event) { + li.on('click', function(event) { event.preventDefault(); event.stopPropagation(); if (ngModel.$setViewValue) { @@ -330,7 +330,7 @@ directive.tabPane = function() { require: '^tabbable', restrict: 'C', link: function(scope, element, attrs, tabsCtrl) { - element.bind('$remove', tabsCtrl.addPane(element, attrs)); + element.on('$remove', tabsCtrl.addPane(element, attrs)); } }; }; diff --git a/docs/content/guide/compiler.ngdoc b/docs/content/guide/compiler.ngdoc index fbba4a0e..a258055b 100644 --- a/docs/content/guide/compiler.ngdoc +++ b/docs/content/guide/compiler.ngdoc @@ -77,13 +77,13 @@ Here is a directive which makes any element draggable. Notice the `draggable` at backgroundColor: 'lightgrey', cursor: 'pointer' }); - element.bind('mousedown', function(event) { + element.on('mousedown', function(event) { // Prevent default dragging of selected content event.preventDefault(); startX = event.screenX - x; startY = event.screenY - y; - $document.bind('mousemove', mousemove); - $document.bind('mouseup', mouseup); + $document.on('mousemove', mousemove); + $document.on('mouseup', mouseup); }); function mousemove(event) { diff --git a/docs/content/guide/concepts.ngdoc b/docs/content/guide/concepts.ngdoc index fc5bce0a..06a06885 100644 --- a/docs/content/guide/concepts.ngdoc +++ b/docs/content/guide/concepts.ngdoc @@ -303,7 +303,7 @@ in HTML. require: 'ngModel', link: function(scope, elm, attrs, ctrl) { // view -> model - elm.bind('blur', function() { + elm.on('blur', function() { scope.$apply(function() { ctrl.$setViewValue(elm.html()); }); diff --git a/docs/content/guide/dev_guide.services.$location.ngdoc b/docs/content/guide/dev_guide.services.$location.ngdoc index 027a2332..99a75f87 100644 --- a/docs/content/guide/dev_guide.services.$location.ngdoc +++ b/docs/content/guide/dev_guide.services.$location.ngdoc @@ -450,7 +450,7 @@ In this examples we use `<base href="/base/index.html" />` input = angular.element('<input type="text">').val(browser.url()), delay; - input.bind('keypress keyup keydown', function() { + input.on('keypress keyup keydown', function() { if (!delay) { delay = setTimeout(fireUrlChange, 250); } @@ -469,7 +469,7 @@ In this examples we use `<base href="/base/index.html" />` }; }); }]); - root.bind('click', function(e) { + root.on('click', function(e) { e.stopPropagation(); }); } diff --git a/docs/content/guide/directive.ngdoc b/docs/content/guide/directive.ngdoc index 3f4924ce..7e0860e0 100644 --- a/docs/content/guide/directive.ngdoc +++ b/docs/content/guide/directive.ngdoc @@ -232,7 +232,7 @@ In this example we will build a directive that displays the current time. // listen on DOM destroy (removal) event, and cancel the next UI update // to prevent updating time after the DOM element was removed. - element.bind('$destroy', function() { + element.on('$destroy', function() { $timeout.cancel(timeoutId); }); @@ -687,7 +687,7 @@ Following is an example of building a reusable widget. opened = true; // Clicking on title should open/close the zippy - title.bind('click', toggle); + title.on('click', toggle); // Toggle the closed/opened state function toggle() { diff --git a/docs/content/guide/forms.ngdoc b/docs/content/guide/forms.ngdoc index 8c11d67e..c26eee79 100644 --- a/docs/content/guide/forms.ngdoc +++ b/docs/content/guide/forms.ngdoc @@ -293,7 +293,7 @@ The following example shows how to add two-way data-binding to contentEditable e require: 'ngModel', link: function(scope, elm, attrs, ctrl) { // view -> model - elm.bind('blur', function() { + elm.on('blur', function() { scope.$apply(function() { ctrl.$setViewValue(elm.html()); }); diff --git a/docs/src/templates/js/docs.js b/docs/src/templates/js/docs.js index e259058d..f1c0e5ec 100644 --- a/docs/src/templates/js/docs.js +++ b/docs/src/templates/js/docs.js @@ -162,10 +162,10 @@ docsApp.serviceFactory.docsSearch = ['$rootScope','lunrSearch', 'NG_PAGES', docsApp.directive.focused = function($timeout) { return function(scope, element, attrs) { element[0].focus(); - element.bind('focus', function() { + element.on('focus', function() { scope.$apply(attrs.focused + '=true'); }); - element.bind('blur', function() { + element.on('blur', function() { // have to use $timeout, so that we close the drop-down after the user clicks, // otherwise when the user clicks we process the closing before we process the click. $timeout(function() { @@ -610,7 +610,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $cookie $location.path('/api').replace(); } // bind escape to hash reset callback - angular.element(window).bind('keydown', function(e) { + angular.element(window).on('keydown', function(e) { if (e.keyCode === 27) { $scope.$apply(function() { $scope.subpage = false; |
