diff --git a/core/modules/views/views_ui/js/views-admin.js b/core/modules/views/views_ui/js/views-admin.js
index 97c8e6c..c34819d 100644
--- a/core/modules/views/views_ui/js/views-admin.js
+++ b/core/modules/views/views_ui/js/views-admin.js
@@ -29,14 +29,17 @@ Drupal.behaviors.viewsUiEditView = {
 Drupal.behaviors.viewsUiAddView = {
   attach: function (context) {
 
-    var exclude, replace, suffix;
+    var exclude,
+      replace,
+      suffix,
+      $context = $(context);
     // Set up regular expressions to allow only numbers, letters, and dashes.
     exclude = new RegExp('[^a-z0-9\\-]+', 'g');
     replace = '-';
 
     // The page title, block title, and menu link fields can all be prepopulated
     // with the view name - no regular expression needed.
-    var $fields = $(context).find('[id^="edit-page-title"], [id^="edit-block-title"], [id^="edit-page-link-properties-title"]');
+    var $fields = $context.find('[id^="edit-page-title"], [id^="edit-block-title"], [id^="edit-page-link-properties-title"]');
     if ($fields.length) {
       if (!this.fieldsFiller) {
         this.fieldsFiller = new Drupal.viewsUi.FormFieldFiller($fields);
@@ -52,7 +55,7 @@ Drupal.behaviors.viewsUiAddView = {
     }
 
     // Prepopulate the path field with a URLified version of the view name.
-    var $pathField = $(context).find('[id^="edit-page-path"]');
+    var $pathField = $context.find('[id^="edit-page-path"]');
     if ($pathField.length) {
       if (!this.pathFiller) {
         this.pathFiller = new Drupal.viewsUi.FormFieldFiller($pathField, exclude, replace);
@@ -64,7 +67,7 @@ Drupal.behaviors.viewsUiAddView = {
 
     // Populate the RSS feed field with a URLified version of the view name, and
     // an .xml suffix (to make it unique).
-    var $feedField = $(context).find('[id^="edit-page-feed-properties-path"]');
+    var $feedField = $context.find('[id^="edit-page-feed-properties-path"]');
     if ($feedField.length) {
       if (!this.feedFiller) {
         suffix = '.xml';
@@ -152,8 +155,8 @@ Drupal.viewsUi.FormFieldFiller.prototype._populate = function () {
  */
 Drupal.viewsUi.FormFieldFiller.prototype._unbind = function () {
 
-  this.source.unbind('keyup.viewsUi change.viewsUi', this.populate);
-  this.target.unbind('focus.viewsUi', this.unbind);
+  this.source.off('keyup.viewsUi change.viewsUi', this.populate);
+  this.target.off('focus.viewsUi', this.unbind);
 };
 
 /**
@@ -234,7 +237,7 @@ Drupal.behaviors.viewsUiRenderAddViewButton = {
   attach: function (context) {
 
     // Build the add display menu and pull the display input buttons into it.
-    var $menu = $('#views-display-menu-tabs', context).once('views-ui-render-add-view-button-processed');
+    var $menu = context.find('#views-display-menu-tabs').once('views-ui-render-add-view-button-processed');
 
     if (!$menu.length) {
       return;
@@ -248,15 +251,16 @@ Drupal.behaviors.viewsUiRenderAddViewButton = {
     // @todo This assumes English, but so does $addDisplayDropdown above. Add
     //   support for translation.
     $displayButtons.each(function () {
-      var label = $(this).val();
+      var $this = $(this),
+        label = $this.val();
       if (label.substr(0, 4) === 'Add ') {
-        $(this).val(label.substr(4));
+        $this.val(label.substr(4));
       }
     });
     $addDisplayDropdown.appendTo($menu);
 
     // Add the click handler for the add display button
-    $('li.add > a', $menu).on('click', function (event) {
+    $menu.find('li.add > a').on('click', function (event) {
       event.preventDefault();
       var $trigger = $(this);
       Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu($trigger);
@@ -268,9 +272,9 @@ Drupal.behaviors.viewsUiRenderAddViewButton = {
     // We use the live binder because the open class on this item will be
     // toggled on and off and we want the handler to take effect in the cases
     // that the class is present, but not when it isn't.
-    $('li.add', $menu).on('mouseleave', function () {
-      var $this = $(this);
-      var $trigger = $this.children('a[href="#"]');
+    $menu.find('li.add').on('mouseleave', function () {
+      var $this = $(this),
+      $trigger = $this.children('a[href="#"]');
       if ($this.children('.action-list').is(':visible')) {
         Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu($trigger);
       }
@@ -403,7 +407,7 @@ Drupal.behaviors.viewsUiPreview = {
   attach: function (context) {
 
     // Only act on the edit view form.
-    var contextualFiltersBucket = $('.views-display-column .views-ui-display-tab-bucket.contextual-filters', context);
+    var contextualFiltersBucket = context.find('.views-display-column .views-ui-display-tab-bucket.contextual-filters');
     if (contextualFiltersBucket.length === 0) {
       return;
     }
@@ -411,7 +415,7 @@ Drupal.behaviors.viewsUiPreview = {
     // If the display has no contextual filters, hide the form where you enter
     // the contextual filters for the live preview. If it has contextual filters,
     // show the form.
-    var contextualFilters = $('.views-display-setting a', contextualFiltersBucket);
+    var contextualFilters = contextualFiltersBucket.find('.views-display-setting a');
     if (contextualFilters.length) {
       $('#preview-args').parent().show();
     }
@@ -434,8 +438,8 @@ Drupal.behaviors.viewsUiRearrangeFilter = {
       return;
     }
 
-    var table = $('#views-rearrange-filters', context).once('views-rearrange-filters');
-    var operator = $('.form-item-filter-groups-operator', context).once('views-rearrange-filters');
+    var table = context.find('#views-rearrange-filters').once('views-rearrange-filters');
+    var operator = context.find('.form-item-filter-groups-operator').once('views-rearrange-filters');
     if (table.length) {
       new Drupal.viewsUi.rearrangeFilterHandler(table, operator);
     }
@@ -454,11 +458,11 @@ Drupal.viewsUi.rearrangeFilterHandler = function (table, operator) {
   this.hasGroupOperator = this.operator.length > 0;
 
   // Keep a reference to all draggable rows within the table.
-  this.draggableRows = $('.draggable', table);
+  this.draggableRows = table.find('.draggable');
 
   // Keep a reference to the buttons for adding and removing filter groups.
   this.addGroupButton = $('input#views-add-group');
-  this.removeGroupButtons = $('input.views-remove-group', table);
+  this.removeGroupButtons = table.find('input.views-remove-group');
 
   // Add links that duplicate the functionality of the (hidden) add and remove
   // buttons.
@@ -481,9 +485,9 @@ Drupal.viewsUi.rearrangeFilterHandler = function (table, operator) {
   // next to the filters in each group, and bind a handler so that they change
   // based on the values of the operator dropdown within that group.
   this.redrawOperatorLabels();
-  $('.views-group-title select', table)
+  table.find('.views-group-title select')
     .once('views-rearrange-filter-handler')
-    .bind('change.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
+    .on('change.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
 
   // Bind handlers so that when a "Remove" link is clicked, we:
   // - Update the rowspans of cells containing an operator dropdown (since they
@@ -491,10 +495,10 @@ Drupal.viewsUi.rearrangeFilterHandler = function (table, operator) {
   // - Redraw the operator labels next to the filters in the group (since the
   //   filter that is currently displayed last in each group is not supposed to
   //   have a label display next to it).
-  $('a.views-groups-remove-link', this.table)
+  this.table.find('a.views-groups-remove-link')
     .once('views-rearrange-filter-handler')
-    .bind('click.views-rearrange-filter-handler', $.proxy(this, 'updateRowspans'))
-    .bind('click.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
+    .on('click.views-rearrange-filter-handler', $.proxy(this, 'updateRowspans'))
+    .on('click.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
 };
 
 /**
@@ -511,7 +515,7 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.insertAddRemoveFilterGroupLinks
     // When the link is clicked, dynamically click the hidden form button for
     // adding a new filter group.
     .once('views-rearrange-filter-handler')
-    .bind('click.views-rearrange-filter-handler', $.proxy(this, 'clickAddGroupButton'));
+    .on('click.views-rearrange-filter-handler', $.proxy(this, 'clickAddGroupButton'));
 
   // Find each (visually hidden) button for removing a filter group and insert
   // a link next to it.
@@ -524,7 +528,7 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.insertAddRemoveFilterGroupLinks
       // When the link is clicked, dynamically click the corresponding form
       // button.
       .once('views-rearrange-filter-handler')
-      .bind('click.views-rearrange-filter-handler', {buttonId: buttonId}, $.proxy(this, 'clickRemoveGroupButton'));
+      .on('click.views-rearrange-filter-handler', {buttonId: buttonId}, $.proxy(this, 'clickRemoveGroupButton'));
   }
 };
 
@@ -553,7 +557,7 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.clickRemoveGroupButton = functio
   // For some reason, here we only need to trigger .submit(), unlike for
   // Drupal.viewsUi.rearrangeFilterHandler.prototype.clickAddGroupButton()
   // where we had to trigger .mousedown() also.
-  $('input#' + event.data.buttonId, this.table).submit();
+  this.table.find('input#' + event.data.buttonId).submit();
   event.preventDefault();
 };
 
@@ -565,7 +569,8 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.duplicateGroupsOperator = functi
 
   var dropdowns, newRow;
 
-  var titleRows = $('tr.views-group-title'), titleRow;
+  var $titleRows = $('tr.views-group-title'),
+    $titleRow;
 
   // Get rid of the explanatory text around the operator; its placement is
   // explanatory enough.
@@ -576,21 +581,21 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.duplicateGroupsOperator = functi
   dropdowns = this.operator;
 
   // Move the operator to a new row just above the second group.
-  titleRow = $('tr#views-group-title-2');
+  $titleRow = $('tr#views-group-title-2');
   newRow = $('<tr class="filter-group-operator-row"><td colspan="5"></td></tr>');
   newRow.find('td').append(this.operator);
-  newRow.insertBefore(titleRow);
-  var i, length = titleRows.length;
+  newRow.insertBefore($titleRow);
+  var i, length = $titleRows.length;
   // Starting with the third group, copy the operator to a new row above the
   // group title.
   for (i = 2; i < length; i++) {
-    titleRow = $(titleRows[i]);
+    $titleRow = $($titleRows[i]);
     // Make a copy of the operator dropdown and put it in a new table row.
     var fakeOperator = this.operator.clone();
     fakeOperator.attr('id', '');
     newRow = $('<tr class="filter-group-operator-row"><td colspan="5"></td></tr>');
     newRow.find('td').append(fakeOperator);
-    newRow.insertBefore(titleRow);
+    newRow.insertBefore($titleRow);
     dropdowns = dropdowns.add(fakeOperator);
   }
 
@@ -645,11 +650,11 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.modifyTableDrag = function () {
       // Make sure the row that just got moved (this.group) is inside one of
       // the filter groups (i.e. below an empty marker row or a draggable). If
       // it isn't, move it down one.
-      var thisRow = $(this.group);
-      var previousRow = thisRow.prev('tr');
-      if (previousRow.length && !previousRow.hasClass('group-message') && !previousRow.hasClass('draggable')) {
+      var $thisRow = $(this.group);
+      var $previousRow = $thisRow.prev('tr');
+      if ($previousRow.length && !$previousRow.hasClass('group-message') && !$previousRow.hasClass('draggable')) {
         // Move the dragged row down one.
-        var next = thisRow.next();
+        var next = $thisRow.next();
         if (next.is('tr')) {
           this.swap('after', next);
         }
@@ -668,13 +673,13 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.modifyTableDrag = function () {
     // If the tabledrag change marker (i.e., the "*") has been inserted inside
     // a row after the operator label (i.e., "And" or "Or") rearrange the items
     // so the operator label continues to appear last.
-    var changeMarker = $(this.oldRowElement).find('.tabledrag-changed');
-    if (changeMarker.length) {
+    var $changeMarker = $(this.oldRowElement).find('.tabledrag-changed');
+    if ($changeMarker.length) {
       // Search for occurrences of the operator label before the change marker,
       // and reverse them.
-      var operatorLabel = changeMarker.prevAll('.views-operator-label');
+      var operatorLabel = $changeMarker.prevAll('.views-operator-label');
       if (operatorLabel.length) {
-        operatorLabel.insertAfter(changeMarker);
+        operatorLabel.insertAfter($changeMarker);
       }
     }
 
@@ -683,7 +688,7 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.modifyTableDrag = function () {
     // implementation of tableDrag.onDrop().
     var groupRow = $(this.rowObject.element).prevAll('tr.group-message').get(0);
     var groupName = groupRow.className.replace(/([^ ]+[ ]+)*group-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
-    var groupField = $('select.views-group-select', this.rowObject.element);
+    var groupField = this.rowObject.element.find('select.views-group-select', this.rowObject.element);
     if ($(this.rowObject.element).prev('tr').is('.group-message') && !groupField.is('.views-group-select-' + groupName)) {
       var oldGroupName = groupField.attr('class').replace(/([^ ]+[ ]+)*views-group-select-([^ ]+)([ ]+[^ ]+)*/, '$2');
       groupField.removeClass('views-group-select-' + oldGroupName).addClass('views-group-select-' + groupName);
@@ -701,7 +706,7 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.redrawOperatorLabels = function
     // Within the row, the operator labels are displayed inside the first table
     // cell (next to the filter name).
     var $draggableRow = $(this.draggableRows[i]);
-    var $firstCell = $('td:first', $draggableRow);
+    var $firstCell = $draggableRow.find('td:first');
     if ($firstCell.length) {
       // The value of the operator label ("And" or "Or") is taken from the
       // first operator dropdown we encounter, going backwards from the current
@@ -776,7 +781,7 @@ Drupal.behaviors.viewsFilterConfigSelectAll = {
   attach: function(context) {
 
     // Show the select all checkbox.
-    $('#views-ui-config-item-form div.form-item-options-value-all', context).once(function() {
+    $(context).find('#views-ui-config-item-form div.form-item-options-value-all').once(function() {
       $(this).show();
     })
     .find('input[type=checkbox]')
@@ -886,18 +891,18 @@ Drupal.viewsUi.Checkboxifier.prototype.clickHandler = function () {
  */
 Drupal.behaviors.viewsUiOverrideSelect = {
   attach: function (context) {
-    $('#edit-override-dropdown', context).once('views-ui-override-button-text', function() {
+    context.find('#edit-override-dropdown').once('views-ui-override-button-text', function() {
       // Closures! :(
-      var $submit = $('#edit-submit', context);
+      var $submit = context.find('#edit-submit');
       var old_value = $submit.val();
 
       $submit.once('views-ui-override-button-text')
-        .bind('mouseup', function() {
+        .on('mouseup', function() {
           $(this).val(old_value);
           return true;
         });
 
-      $(this).bind('change', function() {
+      $(this).on('change', function() {
         var value = $(this).val();
         if (value === 'default') {
           $submit.val(Drupal.t('Apply (all displays)'));
@@ -917,15 +922,18 @@ Drupal.behaviors.viewsUiOverrideSelect = {
 Drupal.viewsUi.resizeModal = function (e, no_shrink) {
 
   var $modal = $('.views-ui-dialog'),
-    $scroll = $('.scroll', $modal);
+    $scroll = $modal.find('.scroll');
   if ($modal.size() === 0 || $modal.css('display') === 'none') {
     return;
   }
 
   var windowWidth = $(window).width(),
-    windowHeight = $(window).height(),
-    maxWidth = parseInt(windowWidth * 0.85, 10), // 70% of window
-    minWidth = parseInt(windowWidth * 0.6, 10); // 70% of window
+    windowHeight = $(window).height();
+
+  // 70% of window
+  var maxWidth = parseInt(windowWidth * 0.85, 10);
+  // 70% of window
+  var minWidth = parseInt(windowWidth * 0.6, 10);
 
   // Set the modal to the minwidth so that our width calculation of
   // children works.
@@ -969,7 +977,7 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
   difference += $('.views-messages').outerHeight(true);
   difference += $('#views-ajax-title').outerHeight(true);
   difference += $('.views-add-form-selected').outerHeight(true);
-  difference += $('.form-buttons', $modal).outerHeight(true);
+  difference += $modal.find('.form-buttons').outerHeight(true);
 
   height = scrollHeight + difference;
 
@@ -1014,4 +1022,4 @@ $(function() {
   });
 });
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);