diff --git a/static/js/pandora.js b/static/js/pandora.js index ee56b31c4..e12285c87 100644 --- a/static/js/pandora.js +++ b/static/js/pandora.js @@ -210,7 +210,7 @@ appPanel body: $('body'), document: $(document), window: $(window) - .bind({ + .on({ beforeunload: pandora.beforeunloadWindow, resize: function() { pandora.resizeWindow(); diff --git a/static/js/pandora/allItems.js b/static/js/pandora/allItems.js index ae844d654..a3a03326e 100644 --- a/static/js/pandora/allItems.js +++ b/static/js/pandora/allItems.js @@ -9,7 +9,7 @@ pandora.ui.allItems = function() { cursor: 'default', overflow: 'hidden' }) - .bind({ + .on({ click: function() { that.gainFocus(); pandora.user.ui._list && pandora.UI.set('find', {conditions: [], operator: '&'}); diff --git a/static/js/pandora/embedDialog.js b/static/js/pandora/embedDialog.js index bf6c67ac5..e1d17b288 100644 --- a/static/js/pandora/embedDialog.js +++ b/static/js/pandora/embedDialog.js @@ -57,7 +57,7 @@ pandora.ui.embedDialog = function(data) { + '" height="' + height + '" src="' + constructUrl(data) + '" frameborder="0" allowfullscreen>' - ).bind({ + ).on({ click: function() { this.focus(); this.select(); diff --git a/static/js/pandora/home.0xdb.js b/static/js/pandora/home.0xdb.js index 1ff583228..1d6738908 100644 --- a/static/js/pandora/home.0xdb.js +++ b/static/js/pandora/home.0xdb.js @@ -39,7 +39,7 @@ pandora.ui.home = function() { bottom: 0, width: '320px', height: '160px', - margin: 'auto' + margin: 'auto', }) .appendTo(that), $logo = $('') @@ -57,7 +57,7 @@ pandora.ui.home = function() { margin: 'auto', cursor: 'pointer' }) - .bind({ + .on({ click: function() { $browseButton.triggerEvent('click'); } diff --git a/static/js/pandora/home.js b/static/js/pandora/home.js index 4a124f99f..be2219343 100644 --- a/static/js/pandora/home.js +++ b/static/js/pandora/home.js @@ -57,7 +57,7 @@ pandora.ui.home = function() { margin: 'auto', cursor: 'pointer' }) - .bind({ + .on({ click: function() { $browseButton.triggerEvent('click'); } diff --git a/static/js/pandora/home.padma.js b/static/js/pandora/home.padma.js index 006113f04..8f65a24a9 100644 --- a/static/js/pandora/home.padma.js +++ b/static/js/pandora/home.padma.js @@ -65,7 +65,7 @@ pandora.ui.home = function() { margin: '0 auto 0 auto', cursor: 'pointer' }) - .bind({ + .on({ click: function() { $browseButton.triggerEvent('click'); } @@ -414,7 +414,7 @@ pandora.ui.home = function() { } }) .appendTo($listsBox); - $listsBox.bind({ + $listsBox.on({ mouseenter: function() { mouse = true; $('.visible').show().stop().animate({ @@ -454,7 +454,7 @@ pandora.ui.home = function() { } } }; - Ox.$document.bind({keydown: self.keydown}); + Ox.$document.on({keydown: self.keydown}); lists.forEach(function(list, i) { $listBox[i] = $('
') .css({ @@ -584,7 +584,7 @@ pandora.ui.home = function() { that.remove(); }); pandora.$ui.tv && pandora.$ui.tv.unmute(); - self.keydown && Ox.$document.unbind({keydown: self.keydown}); + self.keydown && Ox.$document.off({keydown: self.keydown}); return that; }; diff --git a/static/js/pandora/importAnnotations.js b/static/js/pandora/importAnnotations.js index 2c2f6be8d..688b0c5a1 100644 --- a/static/js/pandora/importAnnotations.js +++ b/static/js/pandora/importAnnotations.js @@ -111,7 +111,7 @@ pandora.ui.importAnnotations = function(data) { .css({ padding: '8px' }) - .bind({ + .on({ change: function(event) { if(this.files.length) { file = this.files[0]; diff --git a/static/js/pandora/listDialog.js b/static/js/pandora/listDialog.js index 5ac21295e..72f1d5538 100644 --- a/static/js/pandora/listDialog.js +++ b/static/js/pandora/listDialog.js @@ -75,7 +75,7 @@ pandora.ui.listDialog = function(section) { ); } }) - ] + ], }) .css({ float: 'right', @@ -340,7 +340,7 @@ pandora.ui.listIconPanel = function(listData) { marginTop: '16px', cursor: 'pointer' }) - .bind({ + .on({ click: function(e) { clickIcon(e); }, diff --git a/static/js/pandora/uploadDialog.js b/static/js/pandora/uploadDialog.js index 8af31b80c..cfaed5c73 100644 --- a/static/js/pandora/uploadDialog.js +++ b/static/js/pandora/uploadDialog.js @@ -47,7 +47,7 @@ pandora.ui.uploadDialog = function(data) { height: 128, removeOnClose: true, width: 368, - title: 'Upload Video' + title: 'Upload Video', }) .bindEvent({ close: function(data) { @@ -79,7 +79,7 @@ pandora.ui.uploadDialog = function(data) { .css({ padding: '8px' }) - .bind({ + .on({ change: function(event) { if(this.files.length) { file = this.files[0]; diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index d05fa13fd..d2b7ca040 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -198,7 +198,7 @@ pandora.clickLink = function(e) { pandora.createLinks = function($element) { $element - .bind({ + .on({ click: function() { return false; } @@ -243,7 +243,7 @@ pandora.enableDragAndDrop = function($list, canMove) { }); }); $tooltip.options({title: getTitle()}).show(data.event); - canMove && Ox.UI.$window.bind({ + canMove && Ox.UI.$window.on({ keydown: keydown, keyup: keyup }); @@ -316,7 +316,7 @@ pandora.enableDragAndDrop = function($list, canMove) { }, draganddropend: function(data) { Ox.Log('', data, drag, '------------'); - canMove && Ox.UI.$window.unbind({ + canMove && Ox.UI.$window.off({ keydown: keydown, keyup: keyup });