From 19ea214ad986b784f671690b34e17a4e307dd312 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Thu, 23 Jan 2014 20:19:59 +0000 Subject: [PATCH] Fixed progress in upload --- dss/settings.py | 3 - static/js/app/appv2.js | 251 +- static/js/app/lib/audioController.js | 189 +- static/js/app/lib/controller.js | 395 +-- static/js/app/lib/dssView.js | 55 +- static/js/app/lib/utils.js | 223 +- static/js/app/views/mix/mixDetailView.js | 193 +- static/js/app/views/mix/mixEditView.coffee | 6 +- static/js/app/views/mix/mixEditView.js | 377 +-- static/js/app/views/mix/mixItemView.js | 283 +- static/js/app/views/mix/mixListView.js | 71 +- static/js/lib/jquery.js | 3099 +++++++++++++------- static/js/main.js | 14 +- templates/base.html | 8 +- 14 files changed, 3075 insertions(+), 2092 deletions(-) diff --git a/dss/settings.py b/dss/settings.py index a7c63b6..a16fe6a 100755 --- a/dss/settings.py +++ b/dss/settings.py @@ -183,7 +183,6 @@ LOGGING = logsettings.LOGGING FACEBOOK_APP_ID = '154504534677009' FACEBOOK_APP_SECRET = localsettings.FACEBOOK_APP_SECRET -from celery_settings import * djcelery.setup_loader() SOCIALACCOUNT_AVATAR_SUPPORT = True @@ -200,7 +199,6 @@ SOCIALACCOUNT_PROVIDERS = { } AVATAR_STORAGE_DIR = MEDIA_ROOT + '/avatars/' ACCOUNT_LOGOUT_REDIRECT_URL = '/' -LOGIN_REDIRECT_URL = '/' DSS_TEMP_PATH = localsettings.DSS_TEMP_PATH DSS_LAME_PATH = localsettings.DSS_LAME_PATH @@ -231,7 +229,6 @@ SENDFILE_ROOT = os.path.join(MEDIA_ROOT, 'mixes') SENDFILE_URL = '/media/mixes' import mimetypes - mimetypes.add_type("text/xml", ".plist", False) HTML_MINIFY = not localsettings.DEBUG diff --git a/static/js/app/appv2.js b/static/js/app/appv2.js index cc8165f..4e256ee 100755 --- a/static/js/app/appv2.js +++ b/static/js/app/appv2.js @@ -1,137 +1,140 @@ // Generated by CoffeeScript 1.4.0 +(function() { -define(['backbone', 'marionette', 'vent', 'utils', 'underscore', 'app.lib/social', 'app.lib/router', 'app.lib/panningRegion', 'app.lib/realtimeController', 'app.lib/audioController', 'models/user/userItem', 'models/mix/mixCollection', 'views/widgets/headerView', 'views/sidebar/sidebarView'], function(Backbone, Marionette, vent, utils, _, social, DssRouter, PanningRegion, RealtimeController, AudioController, UserItem, MixCollection, HeaderView, SidebarView) { - var App, sidebarView; - App = new Marionette.Application(); - App.audioController = new AudioController(); - App.realtimeController = new RealtimeController(); - App.realtimeController.startSocketIO(); - App.vent.on("routing:started", function() { - var enablePushState, pushState; - console.log("App(vent): routing:started"); - enablePushState = true; - pushState = !!(enablePushState && window.history && window.history.pushState); - Backbone.history.start({ - pushState: pushState, - hashChange: true + define(['backbone', 'marionette', 'vent', 'utils', 'underscore', 'app.lib/social', 'app.lib/router', 'app.lib/panningRegion', 'app.lib/realtimeController', 'app.lib/audioController', 'models/user/userItem', 'models/mix/mixCollection', 'views/widgets/headerView', 'views/sidebar/sidebarView'], function(Backbone, Marionette, vent, utils, _, social, DssRouter, PanningRegion, RealtimeController, AudioController, UserItem, MixCollection, HeaderView, SidebarView) { + var App, sidebarView; + App = new Marionette.Application(); + App.audioController = new AudioController(); + App.realtimeController = new RealtimeController(); + App.realtimeController.startSocketIO(); + App.vent.on("routing:started", function() { + var enablePushState, pushState; + console.log("App(vent): routing:started"); + enablePushState = true; + pushState = !!(enablePushState && window.history && window.history.pushState); + Backbone.history.start({ + pushState: pushState, + hashChange: true + }); + return true; }); - return true; - }); - App.addRegions({ - headerRegion: "#header", - contentRegion: { - selector: "#content" - }, - footerRegion: "#footer", - sidebarRegion: "#sidebar" - }); - App.addInitializer(function() { - console.log("App: routing starting"); - App.Router = new DssRouter(); - return App.vent.trigger("routing:started"); - }); - App.addInitializer(function() { - $(document).on("click", "a[href]:not([data-bypass])", function(evt) { - var href, root; - href = { - prop: $(this).prop("href"), - attr: $(this).attr("href") - }; - root = location.protocol + "//" + location.host + (App.root || '/'); - if (href.prop.slice(0, root.length) === root) { - evt.preventDefault(); - App.Router.navigate(href.attr, true); + App.addRegions({ + headerRegion: "#header", + contentRegion: { + selector: "#content" + }, + footerRegion: "#footer", + sidebarRegion: "#sidebar" + }); + App.addInitializer(function() { + console.log("App: routing starting"); + App.Router = new DssRouter(); + return App.vent.trigger("routing:started"); + }); + App.addInitializer(function() { + $(document).on("click", "a[href]:not([data-bypass])", function(evt) { + var href, root; + href = { + prop: $(this).prop("href"), + attr: $(this).attr("href") + }; + root = location.protocol + "//" + location.host + (App.root || '/'); + if (href.prop.slice(0, root.length) === root) { + evt.preventDefault(); + App.Router.navigate(href.attr, true); + return true; + } + }); + return true; + }); + App.addInitializer(function() { + this.listenTo(vent, "app:login", function() { + utils.modal("/dlg/LoginView"); return true; - } - }); - return true; - }); - App.addInitializer(function() { - this.listenTo(vent, "app:login", function() { - utils.modal("/dlg/LoginView"); - return true; - }); - this.listenTo(vent, "app:donate", function() { - console.log("App: donate"); - utils.modal("/dlg/Donate"); - return true; - }); - this.listenTo(vent, "mix:favourite", function(model) { - console.log("App(vent): mix:favourite"); - model.save('favourited', !model.get('favourited'), { - patch: true }); - return true; - }); - this.listenTo(vent, "mix:like", function(model, id, success, favourite) { - console.log("App(vent): mix:like"); - model.save('liked', !model.get('liked'), { - patch: true + this.listenTo(vent, "app:donate", function() { + console.log("App: donate"); + utils.modal("/dlg/Donate"); + return true; }); - return true; - }); - this.listenTo(vent, "mix:delete", function(model) { - console.log("App(vent): mix:like"); - return utils.messageBox("/dlg/DeleteMixConfirm", { - yes: function() { - console.log("Controller: mixDeleteYES!!"); - mix.destroy(); - return Backbone.history.navigate("/", { - trigger: true - }); - }, - no: function() { - return console.log("Controller: mixDeleteNO!!"); - } + this.listenTo(vent, "mix:favourite", function(model) { + console.log("App(vent): mix:favourite"); + model.save('favourited', !model.get('favourited'), { + patch: true + }); + return true; }); - }); - this.listenTo(vent, "user:follow", function(model) { - var target, user, - _this = this; - console.log("App(vent): user:follow"); - user = new UserItem({ - id: com.podnoms.settings.currentUser + this.listenTo(vent, "mix:like", function(model, id, success, favourite) { + console.log("App(vent): mix:like"); + model.save('liked', !model.get('liked'), { + patch: true + }); + return true; }); - target = com.podnoms.settings.urlRoot + "user/" + model.get("id") + "/"; - user.fetch({ - success: function() { - var f, newFollowers; - if (!model.get("is_following")) { - newFollowers = user.get("following").concat([target]); - user.save({ - "following": newFollowers, - "is_following": true, - patch: true + this.listenTo(vent, "mix:delete", function(model) { + console.log("App(vent): mix:like"); + return utils.messageBox("/dlg/DeleteMixConfirm", { + yes: function() { + console.log("Controller: mixDeleteYES!!"); + mix.destroy(); + return Backbone.history.navigate("/", { + trigger: true }); - model.set("is_following", true); - } else { - f = user.get("following"); - f.splice(f.indexOf(target), 1); - user.save({ - "following": f, - "is_following": false, - patch: true - }); - model.set("is_following", false); + }, + no: function() { + return console.log("Controller: mixDeleteNO!!"); } - } + }); + }); + this.listenTo(vent, "user:follow", function(model) { + var target, user, + _this = this; + console.log("App(vent): user:follow"); + user = new UserItem({ + id: com.podnoms.settings.currentUser + }); + target = com.podnoms.settings.urlRoot + "user/" + model.get("id") + "/"; + user.fetch({ + success: function() { + var f, newFollowers; + if (!model.get("is_following")) { + newFollowers = user.get("following").concat([target]); + user.save({ + "following": newFollowers, + "is_following": true, + patch: true + }); + model.set("is_following", true); + } else { + f = user.get("following"); + f.splice(f.indexOf(target), 1); + user.save({ + "following": f, + "is_following": false, + patch: true + }); + model.set("is_following", false); + } + } + }); + return true; + }); + return this.listenTo(vent, "mix:share", function(mode, model) { + console.log("App(vent): mix:share (" + mode + ")"); + if (mode === "facebook") { + social.sharePageToFacebook(model); + } else if (mode === "twitter") { + social.sharePageToTwitter(model); + } else if (mode === "embed") { + social.generateEmbedCode(model); + } + return true; }); - return true; - }); - return this.listenTo(vent, "mix:share", function(mode, model) { - console.log("App(vent): mix:share (" + mode + ")"); - if (mode === "facebook") { - social.sharePageToFacebook(model); - } else if (mode === "twitter") { - social.sharePageToTwitter(model); - } else if (mode === "embed") { - social.generateEmbedCode(model); - } - return true; }); + App.headerRegion.show(new HeaderView()); + sidebarView = new SidebarView(); + App.sidebarRegion.show(sidebarView); + return App; }); - App.headerRegion.show(new HeaderView()); - sidebarView = new SidebarView(); - App.sidebarRegion.show(sidebarView); - return App; -}); + +}).call(this); diff --git a/static/js/app/lib/audioController.js b/static/js/app/lib/audioController.js index a073db4..583fcc5 100755 --- a/static/js/app/lib/audioController.js +++ b/static/js/app/lib/audioController.js @@ -1,111 +1,114 @@ // Generated by CoffeeScript 1.4.0 -var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['app', 'marionette', 'vent', 'utils', 'soundmanager2', 'peneloplay'], function(App, Marionette, vent, utils, soundManager, peneloplay) { - var AudioController; - AudioController = (function(_super) { + define(['app', 'marionette', 'vent', 'utils', 'soundmanager2', 'peneloplay'], function(App, Marionette, vent, utils, soundManager, peneloplay) { + var AudioController; + AudioController = (function(_super) { - __extends(AudioController, _super); + __extends(AudioController, _super); - function AudioController() { - this.mixInit = __bind(this.mixInit, this); - return AudioController.__super__.constructor.apply(this, arguments); - } + function AudioController() { + this.mixInit = __bind(this.mixInit, this); + return AudioController.__super__.constructor.apply(this, arguments); + } - AudioController.prototype.initialize = function(options) { - console.log("AudioController: initialize"); - this.listenTo(vent, 'mix:init', this.mixInit); - this.listenTo(vent, 'mix:play', this.mixPlay); - this.listenTo(vent, 'mix:pause', this.mixPause); - this.listenTo(vent, 'mix:resume', this.mixResume); - this.listenTo(vent, 'live:play', this.livePlay); - this.listenTo(vent, 'live:pause', this.livePause); - return soundManager.setup({ - url: com.podnoms.settings.staticUrl + '/swf/sm/', - onready: function() { - return console.log("Sound manager ready sir!"); - }, - debugFlash: com.podnoms.smDebugMode, - preferFlash: true, - defaultOptions: { - volume: com.podnoms.settings.volume - } - }); - }; - - AudioController.prototype.setupPlayer = function(el, url) { - return peneloplay.setupPlayer(el, url); - }; - - AudioController.prototype.setupPlayerEl = function(el) { - peneloplay.setupPlayer(el); - return peneloplay.setupUIWidgets(); - }; - - AudioController.prototype.mixInit = function(model, el) { - var _this = this; - console.log("AudioController: mixInit"); - this.id = model.get('id'); - this.duration = model.get("duration"); - peneloplay.stopPlaying(); - return $.getJSON("/ajax/mix_stream_url/" + this.id + "/", function(data) { - console.log("Setting up player: ", data.stream_url); - _this.setupPlayer(el, data.stream_url); - peneloplay.startPlaying({ - success: function() { - vent.trigger("mix:play", model); - utils.checkPlayCount(); + AudioController.prototype.initialize = function(options) { + console.log("AudioController: initialize"); + this.listenTo(vent, 'mix:init', this.mixInit); + this.listenTo(vent, 'mix:play', this.mixPlay); + this.listenTo(vent, 'mix:pause', this.mixPause); + this.listenTo(vent, 'mix:resume', this.mixResume); + this.listenTo(vent, 'live:play', this.livePlay); + this.listenTo(vent, 'live:pause', this.livePause); + return soundManager.setup({ + url: com.podnoms.settings.staticUrl + '/swf/sm/', + onready: function() { + return console.log("Sound manager ready sir!"); }, - error: function() { - utils.showWarning("Ooops", "Error playing mix. If you have a flash blocker, please disable it for this site. Otherwise, do please try again."); + debugFlash: com.podnoms.smDebugMode, + preferFlash: true, + defaultOptions: { + volume: com.podnoms.settings.volume } }); - com.podnoms.storage.setItem("now_playing", _this.id); - }); - }; + }; - AudioController.prototype.isPlayingId = function(id) { - return id === this.id; - }; + AudioController.prototype.setupPlayer = function(el, url) { + return peneloplay.setupPlayer(el, url); + }; - AudioController.prototype.getMixState = function() { - return peneloplay.getMixState(); - }; + AudioController.prototype.setupPlayerEl = function(el) { + peneloplay.setupPlayer(el); + return peneloplay.setupUIWidgets(); + }; - AudioController.prototype.mixPlay = function() { - console.log("AudioController: mixPlay"); - return peneloplay.resume(); - }; + AudioController.prototype.mixInit = function(model, el) { + var _this = this; + console.log("AudioController: mixInit"); + this.id = model.get('id'); + this.duration = model.get("duration"); + peneloplay.stopPlaying(); + return $.getJSON("/ajax/mix_stream_url/" + this.id + "/", function(data) { + console.log("Setting up player: ", data.stream_url); + _this.setupPlayer(el, data.stream_url); + peneloplay.startPlaying({ + success: function() { + vent.trigger("mix:play", model); + utils.checkPlayCount(); + }, + error: function() { + utils.showWarning("Ooops", "Error playing mix. If you have a flash blocker, please disable it for this site. Otherwise, do please try again."); + } + }); + com.podnoms.storage.setItem("now_playing", _this.id); + }); + }; - AudioController.prototype.mixPause = function() { - console.log("AudioController: mixPause"); - return peneloplay.pause(); - }; + AudioController.prototype.isPlayingId = function(id) { + return id === this.id; + }; - AudioController.prototype.mixResume = function() { - console.log("AudioController: mixResume"); - return peneloplay.resume(); - }; + AudioController.prototype.getMixState = function() { + return peneloplay.getMixState(); + }; - AudioController.prototype.livePlay = function() { - console.log("AudioController: livePlay"); - return peneloplay.playLive({ - success: function() { - console.log("Live stream started"); - return vent.trigger('live:started'); - } - }); - }; + AudioController.prototype.mixPlay = function() { + console.log("AudioController: mixPlay"); + return peneloplay.resume(); + }; - AudioController.prototype.livePause = function() { - console.log("AudioController: livePause"); - return peneloplay.stopLive(); - }; + AudioController.prototype.mixPause = function() { + console.log("AudioController: mixPause"); + return peneloplay.pause(); + }; + AudioController.prototype.mixResume = function() { + console.log("AudioController: mixResume"); + return peneloplay.resume(); + }; + + AudioController.prototype.livePlay = function() { + console.log("AudioController: livePlay"); + return peneloplay.playLive({ + success: function() { + console.log("Live stream started"); + return vent.trigger('live:started'); + } + }); + }; + + AudioController.prototype.livePause = function() { + console.log("AudioController: livePause"); + return peneloplay.stopLive(); + }; + + return AudioController; + + })(Marionette.Controller); return AudioController; + }); - })(Marionette.Controller); - return AudioController; -}); +}).call(this); diff --git a/static/js/app/lib/controller.js b/static/js/app/lib/controller.js index eb2cb3d..6a796d0 100755 --- a/static/js/app/lib/controller.js +++ b/static/js/app/lib/controller.js @@ -1,223 +1,226 @@ // Generated by CoffeeScript 1.4.0 -var __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixCollection', 'models/mix/mixItem', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, MixEditView, UserProfileView, UserListView, UserEditView, MixCollection, MixItem, UserItem) { - var DssController; - DssController = (function(_super) { + define(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixCollection', 'models/mix/mixItem', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, MixEditView, UserProfileView, UserListView, UserEditView, MixCollection, MixItem, UserItem) { + var DssController; + DssController = (function(_super) { - __extends(DssController, _super); + __extends(DssController, _super); - function DssController() { - return DssController.__super__.constructor.apply(this, arguments); - } + function DssController() { + return DssController.__super__.constructor.apply(this, arguments); + } - DssController.prototype.initialize = function() { - return this.listenTo(vent, "mix:random", this.showRandomMix); - }; + DssController.prototype.initialize = function() { + return this.listenTo(vent, "mix:random", this.showRandomMix); + }; - DssController.prototype.home = function() { - console.log("Controller: home"); - return this.showMixList(); - }; + DssController.prototype.home = function() { + console.log("Controller: home"); + return this.showMixList(); + }; - DssController.prototype.doLogin = function() { - return vent.trigger('app:login'); - }; + DssController.prototype.doLogin = function() { + return vent.trigger('app:login'); + }; - DssController.prototype.showMixList = function(options) { - var app; - app = require('app'); - app.contentRegion.show(new MixListLayout(options || { - order_by: 'latest' - })); - return vent.trigger('mix:showlist', options || { - order_by: 'latest' - }); - }; + DssController.prototype.showMixList = function(options) { + var app; + app = require('app'); + app.contentRegion.show(new MixListLayout(options || { + order_by: 'latest' + })); + return vent.trigger('mix:showlist', options || { + order_by: 'latest' + }); + }; - DssController.prototype.showStreamList = function() { - return this.showMixList({ - stream: true - }); - }; + DssController.prototype.showStreamList = function() { + return this.showMixList({ + stream: true + }); + }; - DssController.prototype.showMixListType = function(type) { - return this.showMixList({ - order_by: type - }); - }; + DssController.prototype.showMixListType = function(type) { + return this.showMixList({ + order_by: type + }); + }; - DssController.prototype.showMixListGenre = function(type) { - return this.showMixList({ - genres__slug: type, - order_by: 'latest' - }); - }; + DssController.prototype.showMixListGenre = function(type) { + return this.showMixList({ + genres__slug: type, + order_by: 'latest' + }); + }; - DssController.prototype.showMix = function(slug) { - var app, mix; - console.log("Controller: showMix"); - app = require('app'); - mix = new MixItem({ - id: slug - }); - return mix.fetch({ - success: function() { - return app.contentRegion.show(new MixDetailView({ - model: mix - })); - } - }); - }; + DssController.prototype.showMix = function(slug) { + var app, mix; + console.log("Controller: showMix"); + app = require('app'); + mix = new MixItem({ + id: slug + }); + return mix.fetch({ + success: function() { + return app.contentRegion.show(new MixDetailView({ + model: mix + })); + } + }); + }; - DssController.prototype.showRandomMix = function() { - var app, mix; - console.log("Controller: showRandomMix"); - app = require('app'); - mix = new MixItem({ - id: 'random' - }); - mix.fetch({ - success: function() { - return app.contentRegion.show(new MixDetailView({ - model: mix - })); - } - }); - return Backbone.history.navigate("/random", { - trigger: false - }); - }; + DssController.prototype.showRandomMix = function() { + var app, mix; + console.log("Controller: showRandomMix"); + app = require('app'); + mix = new MixItem({ + id: 'random' + }); + mix.fetch({ + success: function() { + return app.contentRegion.show(new MixDetailView({ + model: mix + })); + } + }); + return Backbone.history.navigate("/random", { + trigger: false + }); + }; - DssController.prototype.uploadMix = function() { - var app, mix; - console.log("Controller: mixUpload"); - app = require('app'); - mix = new MixItem({ - title: '', - description: '', - mix_image: com.podnoms.settings.staticUrl + 'img/default-track.png', - download_allowed: true, - is_featured: false - }); - app.contentRegion.show(new MixEditView({ - model: mix - })); - return true; - }; + DssController.prototype.uploadMix = function() { + var app, mix; + console.log("Controller: mixUpload"); + app = require('app'); + mix = new MixItem({ + title: '', + description: '', + mix_image: com.podnoms.settings.staticUrl + 'img/default-track.png', + download_allowed: true, + is_featured: false + }); + app.contentRegion.show(new MixEditView({ + model: mix + })); + return true; + }; - DssController.prototype.editMix = function(slug) { - var app, mix; - console.log("Controller: mixEdit"); - app = require('app'); - mix = new MixItem({ - id: slug - }); - mix.fetch({ - success: function() { - return app.contentRegion.show(new MixEditView({ - model: mix - })); - } - }); - return true; - }; + DssController.prototype.editMix = function(slug) { + var app, mix; + console.log("Controller: mixEdit"); + app = require('app'); + mix = new MixItem({ + id: slug + }); + mix.fetch({ + success: function() { + return app.contentRegion.show(new MixEditView({ + model: mix + })); + } + }); + return true; + }; - DssController.prototype.showChat = function() { - var app; - console.log("Controller: showChat"); - app = require('app'); - return app.contentRegion.show(new ChatView()); - }; + DssController.prototype.showChat = function() { + var app; + console.log("Controller: showChat"); + app = require('app'); + return app.contentRegion.show(new ChatView()); + }; - DssController.prototype.showUserList = function() { - var app; - console.log("Controller: showUserList"); - app = require('app'); - return app.contentRegion.show(new UserListView()); - }; + DssController.prototype.showUserList = function() { + var app; + console.log("Controller: showUserList"); + app = require('app'); + return app.contentRegion.show(new UserListView()); + }; - DssController.prototype.showUserProfile = function(slug) { - var app, user; - console.log("Controller: showUserProfile"); - app = require('app'); - user = new UserItem({ - id: slug - }); - return user.fetch({ - success: function() { - return app.contentRegion.show(new UserProfileView({ - model: user - })); - }, - error: function(a, b, c) { - return console.log("Error fetching user"); - } - }); - }; + DssController.prototype.showUserProfile = function(slug) { + var app, user; + console.log("Controller: showUserProfile"); + app = require('app'); + user = new UserItem({ + id: slug + }); + return user.fetch({ + success: function() { + return app.contentRegion.show(new UserProfileView({ + model: user + })); + }, + error: function(a, b, c) { + return console.log("Error fetching user"); + } + }); + }; - DssController.prototype.showUserFavourites = function(slug) { - console.log("Controller: showUserFavourites"); - return this.showMixList({ - order_by: 'latest', - favourites__slug: slug - }); - }; + DssController.prototype.showUserFavourites = function(slug) { + console.log("Controller: showUserFavourites"); + return this.showMixList({ + order_by: 'latest', + favourites__slug: slug + }); + }; - DssController.prototype.showUserLikes = function(slug) { - console.log("Controller: showUserLikes"); - return this.showMixList({ - order_by: 'latest', - likes__slug: slug - }); - }; + DssController.prototype.showUserLikes = function(slug) { + console.log("Controller: showUserLikes"); + return this.showMixList({ + order_by: 'latest', + likes__slug: slug + }); + }; - DssController.prototype.showUserMixes = function(slug) { - console.log("Controller: showUserMixes"); - return this.showMixList({ - order_by: 'latest', - user: slug - }); - }; + DssController.prototype.showUserMixes = function(slug) { + console.log("Controller: showUserMixes"); + return this.showMixList({ + order_by: 'latest', + user: slug + }); + }; - DssController.prototype.showUserFollowing = function(slug) { - var app; - console.log("Controller: showUserFollowing"); - app = require('app'); - return app.contentRegion.show(new UserListView({ - followers__slug: slug - })); - }; + DssController.prototype.showUserFollowing = function(slug) { + var app; + console.log("Controller: showUserFollowing"); + app = require('app'); + return app.contentRegion.show(new UserListView({ + followers__slug: slug + })); + }; - DssController.prototype.showUserFollowers = function(slug) { - var app; - console.log("Controller: showUserFollowers"); - app = require('app'); - return app.contentRegion.show(new UserListView({ - following__slug: slug - })); - }; + DssController.prototype.showUserFollowers = function(slug) { + var app; + console.log("Controller: showUserFollowers"); + app = require('app'); + return app.contentRegion.show(new UserListView({ + following__slug: slug + })); + }; - DssController.prototype.editUser = function() { - var app, user; - console.log("Controller: editUser"); - app = require('app'); - user = new UserItem({ - id: com.podnoms.settings.currentUser - }); - user.fetch({ - success: function() { - return app.contentRegion.show(new UserEditView({ - model: user - })); - } - }); - return true; - }; + DssController.prototype.editUser = function() { + var app, user; + console.log("Controller: editUser"); + app = require('app'); + user = new UserItem({ + id: com.podnoms.settings.currentUser + }); + user.fetch({ + success: function() { + return app.contentRegion.show(new UserEditView({ + model: user + })); + } + }); + return true; + }; + return DssController; + + })(Marionette.Controller); return DssController; + }); - })(Marionette.Controller); - return DssController; -}); +}).call(this); diff --git a/static/js/app/lib/dssView.js b/static/js/app/lib/dssView.js index 826041d..84fd19e 100644 --- a/static/js/app/lib/dssView.js +++ b/static/js/app/lib/dssView.js @@ -1,34 +1,37 @@ // Generated by CoffeeScript 1.4.0 -var __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['marionette', 'utils'], function(Marionette, utils) { - var DssView; - DssView = (function(_super) { + define(['marionette', 'utils'], function(Marionette, utils) { + var DssView; + DssView = (function(_super) { - __extends(DssView, _super); + __extends(DssView, _super); - function DssView() { - return DssView.__super__.constructor.apply(this, arguments); - } - - DssView.prototype.templateHelpers = { - renderCheckbox: function(value) { - return (value ? "checked" : ""); - }, - isMe: function(id) { - return utils.isMe(id); - }, - humanise: function(date) { - return moment(date).fromNow(); - }, - secondsToHms: function(d) { - return utils.secondsToHms(d); + function DssView() { + return DssView.__super__.constructor.apply(this, arguments); } - }; + DssView.prototype.templateHelpers = { + renderCheckbox: function(value) { + return (value ? "checked" : ""); + }, + isMe: function(id) { + return utils.isMe(id); + }, + humanise: function(date) { + return moment(date).fromNow(); + }, + secondsToHms: function(d) { + return utils.secondsToHms(d); + } + }; + + return DssView; + + })(Marionette.ItemView); return DssView; + }); - })(Marionette.ItemView); - return DssView; -}); +}).call(this); diff --git a/static/js/app/lib/utils.js b/static/js/app/lib/utils.js index 3d01377..dcf4d08 100755 --- a/static/js/app/lib/utils.js +++ b/static/js/app/lib/utils.js @@ -1,122 +1,125 @@ // Generated by CoffeeScript 1.4.0 +(function() { -define(['jquery', 'bootstrap', 'toastr'], function($, bootstrap, toastr) { - return { - modal: function(url) { - if (url) { - if (url.indexOf("#") === 0) { - $(url).modal("open"); - } else { - $.get(url, function(data) { - $(data).modal().on("hidden", function() { - $(this).remove(); + define(['jquery', 'bootstrap', 'toastr'], function($, bootstrap, toastr) { + return { + modal: function(url) { + if (url) { + if (url.indexOf("#") === 0) { + $(url).modal("open"); + } else { + $.get(url, function(data) { + $(data).modal().on("hidden", function() { + $(this).remove(); + return true; + }); + return $(data).proceed().on("hidden", function() { + alert("Go on so"); + return true; + }); + }).success(function() { + $("input:text:visible:first").focus(); return true; }); - return $(data).proceed().on("hidden", function() { - alert("Go on so"); - return true; - }); - }).success(function() { - $("input:text:visible:first").focus(); - return true; - }); + } } - } - return true; - }, - secondsToHms: function(d) { - var h, m, s; - if (d) { - d = Number(d); - h = Math.floor(d / 3600); - m = Math.floor(d % 3600 / 60); - s = Math.floor(d % 3600 % 60); - return (h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "00:") + (s < 10 ? "0" : "") + s; - } else { - return "00:00:00"; - } - }, - messageBox: function(url, success) { - if (url) { - if (url.indexOf("#") === 0) { - $(url).modal("open"); + return true; + }, + secondsToHms: function(d) { + var h, m, s; + if (d) { + d = Number(d); + h = Math.floor(d / 3600); + m = Math.floor(d % 3600 / 60); + s = Math.floor(d % 3600 % 60); + return (h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "00:") + (s < 10 ? "0" : "") + s; } else { - $.get(url, function(data) { - return $(data).modal('show').on("shown.bs.modal", function(e) { - return $(this).find("#yes-no-positive").click(function() { - return success(); + return "00:00:00"; + } + }, + messageBox: function(url, success) { + if (url) { + if (url.indexOf("#") === 0) { + $(url).modal("open"); + } else { + $.get(url, function(data) { + return $(data).modal('show').on("shown.bs.modal", function(e) { + return $(this).find("#yes-no-positive").click(function() { + return success(); + }); }); }); + } + } + return true; + }, + checkPlayCount: function() { + var _this = this; + if (document.cookie.indexOf("sessionId")) { + $.getJSON("/ajax/session_play_count", function(data) { + console.log("utils: got playcount"); + if (data.play_count !== "0" && ((data.play_count % com.podnoms.settings.nag_count) === 0)) { + return _this.modal("/dlg/PlayCountLoginAlert"); + } }); } - } - return true; - }, - checkPlayCount: function() { - var _this = this; - if (document.cookie.indexOf("sessionId")) { - $.getJSON("/ajax/session_play_count", function(data) { - console.log("utils: got playcount"); - if (data.play_count !== "0" && ((data.play_count % com.podnoms.settings.nag_count) === 0)) { - return _this.modal("/dlg/PlayCountLoginAlert"); - } + return true; + }, + toastOptions: function() { + return toastr.options = { + closeButton: true, + debug: false, + positionClass: "toast-bottom-left", + onclick: null, + showDuration: "300", + hideDuration: "1000", + timeOut: "5000", + extendedTimeOut: "1000", + showEasing: "swing", + hideEasing: "linear", + showMethod: "fadeIn", + hideMethod: "fadeOut" + }; + }, + showError: function(title, message) { + this.toastOptions(); + return toastr.error(message, title); + }, + showWarning: function(title, message) { + this.toastOptions(); + return toastr.warning(message, title); + }, + showMessage: function(title, message) { + this.toastOptions(); + return toastr.success(message, title); + }, + showAlert: function(title, message) { + return this.showMessage(title, message); + }, + generateGuid: function() { + return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) { + var r, v; + r = Math.random() * 16 | 0; + v = (c === "x" ? r : r & 0x3 | 0x8); + return v.toString(16); }); + }, + downloadURL: function(url) { + var iframe; + iframe = document.getElementById("hiddenDownloader"); + if (iframe === null) { + iframe = document.createElement("iframe"); + iframe.id = "hiddenDownloader"; + iframe.style.visibility = "hidden"; + document.body.appendChild(iframe); + } + iframe.src = url; + return true; + }, + isMe: function(id) { + return id === com.podnoms.settings.currentUser; } - return true; - }, - toastOptions: function() { - return toastr.options = { - closeButton: true, - debug: false, - positionClass: "toast-bottom-left", - onclick: null, - showDuration: "300", - hideDuration: "1000", - timeOut: "5000", - extendedTimeOut: "1000", - showEasing: "swing", - hideEasing: "linear", - showMethod: "fadeIn", - hideMethod: "fadeOut" - }; - }, - showError: function(title, message) { - this.toastOptions(); - return toastr.error(message, title); - }, - showWarning: function(title, message) { - this.toastOptions(); - return toastr.warning(message, title); - }, - showMessage: function(title, message) { - this.toastOptions(); - return toastr.success(message, title); - }, - showAlert: function(title, message) { - return this.showMessage(title, message); - }, - generateGuid: function() { - return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) { - var r, v; - r = Math.random() * 16 | 0; - v = (c === "x" ? r : r & 0x3 | 0x8); - return v.toString(16); - }); - }, - downloadURL: function(url) { - var iframe; - iframe = document.getElementById("hiddenDownloader"); - if (iframe === null) { - iframe = document.createElement("iframe"); - iframe.id = "hiddenDownloader"; - iframe.style.visibility = "hidden"; - document.body.appendChild(iframe); - } - iframe.src = url; - return true; - }, - isMe: function(id) { - return id === com.podnoms.settings.currentUser; - } - }; -}); + }; + }); + +}).call(this); diff --git a/static/js/app/views/mix/mixDetailView.js b/static/js/app/views/mix/mixDetailView.js index b39c74d..9ddf26a 100644 --- a/static/js/app/views/mix/mixDetailView.js +++ b/static/js/app/views/mix/mixDetailView.js @@ -1,104 +1,107 @@ // Generated by CoffeeScript 1.4.0 -var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['marionette', 'utils', 'models/mix/mixItem', 'models/comment/commentItem', 'models/comment/commentCollection', 'views/comment/commentListView', 'views/mix/mixItemView', 'text!/tpl/MixDetailView', 'vent'], function(Marionette, utils, MixItem, CommentItem, CommentsCollection, CommentsListView, MixItemView, Template, vent) { - var MixDetailView; - return MixDetailView = (function(_super) { + define(['marionette', 'utils', 'models/mix/mixItem', 'models/comment/commentItem', 'models/comment/commentCollection', 'views/comment/commentListView', 'views/mix/mixItemView', 'text!/tpl/MixDetailView', 'vent'], function(Marionette, utils, MixItem, CommentItem, CommentsCollection, CommentsListView, MixItemView, Template, vent) { + var MixDetailView; + return MixDetailView = (function(_super) { - __extends(MixDetailView, _super); + __extends(MixDetailView, _super); - function MixDetailView() { - this.modelChanged = __bind(this.modelChanged, this); - return MixDetailView.__super__.constructor.apply(this, arguments); - } - - MixDetailView.prototype.template = _.template(Template); - - MixDetailView.prototype.regions = { - mix: "#mix", - comments: "#comments" - }; - - MixDetailView.prototype.ui = { - commentText: '#comment-text' - }; - - MixDetailView.prototype.events = { - "click #btn-add-comment": "addComment", - "keypress #comment-text": "checkCommentKeypress" - }; - - MixDetailView.prototype.initialize = function() { - return this.model.on('nested-change', this.modelChanged); - }; - - MixDetailView.prototype.onRender = function() { - this.view = new MixItemView({ - tagName: "div", - className: "mix-listing audio-listing-single", - model: this.model - }); - this.mix.show(this.view); - this.renderComments(); - return window.scrollTo(0, 0); - }; - - MixDetailView.prototype.onDomRefresh = function() { - return this.view.onDomRefresh(); - }; - - MixDetailView.prototype.renderComments = function() { - var comments; - console.log("MixDetailView: Rendering comments"); - comments = new CommentsCollection(); - comments.url = this.model.get("resource_uri") + "/comments/"; - comments.mix_id = this.model.id; - comments.mix = this.model; - comments.fetch({ - success: function(data) { - var content; - content = new CommentsListView({ - collection: comments - }).render(); - $("#comments", this.el).html(content.el); - return true; - } - }); - return true; - }; - - MixDetailView.prototype.modelChanged = function() { - console.log("MixDetailView: modelChanged"); - this.render(); - return true; - }; - - MixDetailView.prototype.checkCommentKeypress = function(e) { - if (e.which === 13) { - return this.addComment(); + function MixDetailView() { + this.modelChanged = __bind(this.modelChanged, this); + return MixDetailView.__super__.constructor.apply(this, arguments); } - }; - MixDetailView.prototype.addComment = function() { - var activeTab, comment, - _this = this; - activeTab = $("ul#mix-tab li.active", this.el); - comment = this.ui.commentText.val(); - this.model.addComment(comment, (function() { - _this.ui.commentText.val(""); - utils.showMessage("Comment saved.."); - return activeTab.tab().show(); - }), function(error) { - utils.showError("Woops \n" + error); - $('#comment-input').addClass('has-error'); - return $('#comment-text').focus(); - }); + MixDetailView.prototype.template = _.template(Template); + + MixDetailView.prototype.regions = { + mix: "#mix", + comments: "#comments" + }; + + MixDetailView.prototype.ui = { + commentText: '#comment-text' + }; + + MixDetailView.prototype.events = { + "click #btn-add-comment": "addComment", + "keypress #comment-text": "checkCommentKeypress" + }; + + MixDetailView.prototype.initialize = function() { + return this.model.on('nested-change', this.modelChanged); + }; + + MixDetailView.prototype.onRender = function() { + this.view = new MixItemView({ + tagName: "div", + className: "mix-listing audio-listing-single", + model: this.model + }); + this.mix.show(this.view); + this.renderComments(); + return window.scrollTo(0, 0); + }; + + MixDetailView.prototype.onDomRefresh = function() { + return this.view.onDomRefresh(); + }; + + MixDetailView.prototype.renderComments = function() { + var comments; + console.log("MixDetailView: Rendering comments"); + comments = new CommentsCollection(); + comments.url = this.model.get("resource_uri") + "/comments/"; + comments.mix_id = this.model.id; + comments.mix = this.model; + comments.fetch({ + success: function(data) { + var content; + content = new CommentsListView({ + collection: comments + }).render(); + $("#comments", this.el).html(content.el); + return true; + } + }); + return true; + }; + + MixDetailView.prototype.modelChanged = function() { + console.log("MixDetailView: modelChanged"); + this.render(); + return true; + }; + + MixDetailView.prototype.checkCommentKeypress = function(e) { + if (e.which === 13) { + return this.addComment(); + } + }; + + MixDetailView.prototype.addComment = function() { + var activeTab, comment, + _this = this; + activeTab = $("ul#mix-tab li.active", this.el); + comment = this.ui.commentText.val(); + this.model.addComment(comment, (function() { + _this.ui.commentText.val(""); + utils.showMessage("Comment saved.."); + return activeTab.tab().show(); + }), function(error) { + utils.showError("Woops \n" + error); + $('#comment-input').addClass('has-error'); + return $('#comment-text').focus(); + }); + return MixDetailView; + }; + return MixDetailView; - }; - return MixDetailView; + })(Marionette.Layout); + }); - })(Marionette.Layout); -}); +}).call(this); diff --git a/static/js/app/views/mix/mixEditView.coffee b/static/js/app/views/mix/mixEditView.coffee index 3d82be0..cd3c9f0 100755 --- a/static/js/app/views/mix/mixEditView.coffee +++ b/static/js/app/views/mix/mixEditView.coffee @@ -70,11 +70,13 @@ define ['app.lib/editableView', (or click)
' + drop: -> + $('.progress', @el).show() + uploadprogress: (e, progress, bytesSent) => - $('.progress', @el).hide() + $('.progress', @el).show() @uploadState = 1 percentage = Math.round(progress) - console.log("Progressing") @ui.progress.css("width", percentage + "%").parent().attr "data-percent", percentage + "%" complete: => diff --git a/static/js/app/views/mix/mixEditView.js b/static/js/app/views/mix/mixEditView.js index 9e55663..7434d17 100644 --- a/static/js/app/views/mix/mixEditView.js +++ b/static/js/app/views/mix/mixEditView.js @@ -1,71 +1,72 @@ // Generated by CoffeeScript 1.4.0 -var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['app.lib/editableView', 'vent', 'moment', 'utils', 'backbone.syphon', 'text!/tpl/MixEditView', 'models/genre/genreCollection', 'lib/jdataview', 'ace', 'dropzone', 'wizard', 'ajaxfileupload', 'jquery.fileupload', 'lib/ace/uncompressed/select2'], function(EditableView, vent, moment, utils, Syphon, Template, GenreCollection, jDataView) { - var MixEditView; - return MixEditView = (function(_super) { + define(['app.lib/editableView', 'vent', 'moment', 'utils', 'backbone.syphon', 'text!/tpl/MixEditView', 'models/genre/genreCollection', 'lib/jdataview', 'ace', 'dropzone', 'wizard', 'ajaxfileupload', 'jquery.fileupload', 'lib/ace/uncompressed/select2'], function(EditableView, vent, moment, utils, Syphon, Template, GenreCollection, jDataView) { + var MixEditView; + return MixEditView = (function(_super) { - __extends(MixEditView, _super); + __extends(MixEditView, _super); - function MixEditView() { - this.saveChanges = __bind(this.saveChanges, this); - return MixEditView.__super__.constructor.apply(this, arguments); - } - - MixEditView.prototype.template = _.template(Template); - - MixEditView.prototype.events = { - "click #login": "login", - "change input[name='...']": "imageChanged" - }; - - MixEditView.prototype.ui = { - image: "#mix-image", - progress: "#mix-upload-progress", - uploadError: '#mix-upload-error' - }; - - MixEditView.prototype.initialize = function() { - this.guid = utils.generateGuid(); - this.uploadState = 0; - this.detailsEntered = false; - return this.patch = false; - }; - - MixEditView.prototype.onRender = function() { - var wizard, - _this = this; - console.log("MixEditView: onRender js"); - $('.progress', this.el).hide(); - this.sendImage = false; - if (!this.model.id) { - $('input[name="upload-hash"]', this.el).val(this.guid); - } else { - $('#header-step1', this.el).remove(); - $('#step1', this.el).remove(); - $('#header-step2', this.el).addClass("active"); - $('#step2', this.el).addClass("active"); - $('.progress', this.el).hide(); - this.patch = true; - this.uploadState = 2; + function MixEditView() { + this.saveChanges = __bind(this.saveChanges, this); + return MixEditView.__super__.constructor.apply(this, arguments); } - wizard = $("#fuelux-wizard", this.el).ace_wizard().on("change", function(e, info) { - if (info.step === 1 && _this.uploadState === 0) { - console.log("MixEditView: No mix uploaded"); - _this.ui.uploadError.fadeIn(); - $('#step1').addClass("alert-danger"); - return false; + + MixEditView.prototype.template = _.template(Template); + + MixEditView.prototype.events = { + "click #login": "login", + "change input[name='...']": "imageChanged" + }; + + MixEditView.prototype.ui = { + image: "#mix-image", + progress: "#mix-upload-progress", + uploadError: '#mix-upload-error' + }; + + MixEditView.prototype.initialize = function() { + this.guid = utils.generateGuid(); + this.uploadState = 0; + this.detailsEntered = false; + return this.patch = false; + }; + + MixEditView.prototype.onRender = function() { + var wizard, + _this = this; + console.log("MixEditView: onRender js"); + $('.progress', this.el).hide(); + this.sendImage = false; + if (!this.model.id) { + $('input[name="upload-hash"]', this.el).val(this.guid); } else { - return true; + $('#header-step1', this.el).remove(); + $('#step1', this.el).remove(); + $('#header-step2', this.el).addClass("active"); + $('#step2', this.el).addClass("active"); + $('.progress', this.el).hide(); + this.patch = true; + this.uploadState = 2; } - }).on("finished", function(e) { - console.log("Finished"); - return _this.saveChanges(); - }); - $("#mix-upload-form", this.el).dropzone({ - previewTemplate: '
\n\ + wizard = $("#fuelux-wizard", this.el).ace_wizard().on("change", function(e, info) { + if (info.step === 1 && _this.uploadState === 0) { + console.log("MixEditView: No mix uploaded"); + _this.ui.uploadError.fadeIn(); + $('#step1').addClass("alert-danger"); + return false; + } else { + return true; + } + }).on("finished", function(e) { + console.log("Finished"); + return _this.saveChanges(); + }); + $("#mix-upload-form", this.el).dropzone({ + previewTemplate: '
\n\
\n\
\n\
\n\ @@ -78,147 +79,151 @@ define(['app.lib/editableView', 'vent', 'moment', 'utils', 'backbone.syphon', 't
\n\
\n\
', - dictDefaultMessage: ' Drop files to upload\ + dictDefaultMessage: ' Drop files to upload\ (or click)
\ ', - uploadprogress: function(e, progress, bytesSent) { - var percentage; - $('.progress', _this.el).hide(); - _this.uploadState = 1; - percentage = Math.round(progress); - console.log("Progressing"); - return _this.ui.progress.css("width", percentage + "%").parent().attr("data-percent", percentage + "%"); - }, - complete: function() { - _this.uploadState = 2; - return _this.checkRedirect(); - } - }); - $("#genres", this.el).select2({ - placeholder: "Start typing and choose from list or create your own.", - minimumInputLength: 1, - multiple: true, - ajax: { - url: "/ajax/lookup/genre/", - dataType: "json", - data: function(term, page) { - return { - q: term - }; + drop: function() { + return $('.progress', this.el).show(); }, - results: function(data, page) { - return { - results: data - }; + uploadprogress: function(e, progress, bytesSent) { + var percentage; + $('.progress', _this.el).show(); + _this.uploadState = 1; + percentage = Math.round(progress); + return _this.ui.progress.css("width", percentage + "%").parent().attr("data-percent", percentage + "%"); + }, + complete: function() { + _this.uploadState = 2; + return _this.checkRedirect(); } - }, - formatResult: function(genre) { - return genre.description; - }, - formatSelection: function(genre) { - return "
" + genre.description + "
"; - }, - initSelection: function(element, callback) { - var genres, result; - console.log("MixEditView: genres:initSelection"); - result = []; - genres = _this.model.get("genres"); - if (genres !== undefined) { - genres.each(function(data) { - return result.push({ - id: data.get("id"), - description: data.get("description") + }); + $("#genres", this.el).select2({ + placeholder: "Start typing and choose from list or create your own.", + minimumInputLength: 1, + multiple: true, + ajax: { + url: "/ajax/lookup/genre/", + dataType: "json", + data: function(term, page) { + return { + q: term + }; + }, + results: function(data, page) { + return { + results: data + }; + } + }, + formatResult: function(genre) { + return genre.description; + }, + formatSelection: function(genre) { + return "
" + genre.description + "
"; + }, + initSelection: function(element, callback) { + var genres, result; + console.log("MixEditView: genres:initSelection"); + result = []; + genres = _this.model.get("genres"); + if (genres !== undefined) { + genres.each(function(data) { + return result.push({ + id: data.get("id"), + description: data.get("description") + }); }); - }); + } + return callback(result); } - return callback(result); - } - }, "createSearchChoice: (term, data) ->\n if $(data).filter(->\n @description.localeCompare(term) is 0\n ).length is 0\n id: term\n text: term"); - return true; - }; + }, "createSearchChoice: (term, data) ->\n if $(data).filter(->\n @description.localeCompare(term) is 0\n ).length is 0\n id: term\n text: term"); + return true; + }; - MixEditView.prototype.saveChanges = function() { - var flair, - _this = this; - console.log("MixEditView: saveChanges"); - this.model.set(Syphon.serialize($("#mix-details-form", this.el)[0])); - flair = Syphon.serialize($("#mix-flair-form", this.el)[0], { - exclude: ["...", ""] - }); - this.model.set(flair); - this.model.set("upload-hash", this.guid); - this.model.set("upload-extension", $("#upload-extension", this.el).val()); - this.model.set("genres", new GenreCollection()); - $.each($("#genres", this.el).select2("data"), function(i, item) { - "if @model.get(\"genres\") is undefined\n @model.set(\"genres\", new GenreCollection())"; - return _this.model.get("genres").add({ - id: item.id, - description: item.text + MixEditView.prototype.saveChanges = function() { + var flair, + _this = this; + console.log("MixEditView: saveChanges"); + this.model.set(Syphon.serialize($("#mix-details-form", this.el)[0])); + flair = Syphon.serialize($("#mix-flair-form", this.el)[0], { + exclude: ["...", ""] }); - }); - if (!this.sendImage) { - this.model.unset("mix_image"); - } - this.model.unset("comments"); - this._saveChanges({ - patch: this.patch, - success: function() { - if (_this.sendImage) { - $.ajaxFileUpload({ - url: "/ajax/upload_mix_image/" + _this.model.get("id") + "/", - secureuri: false, - fileElementId: "input[name='...']", - success: function(data, status) { - if (typeof data.error !== "undefined") { - if (data.error !== "") { - return alert(data.error); + this.model.set(flair); + this.model.set("upload-hash", this.guid); + this.model.set("upload-extension", $("#upload-extension", this.el).val()); + this.model.set("genres", new GenreCollection()); + $.each($("#genres", this.el).select2("data"), function(i, item) { + "if @model.get(\"genres\") is undefined\n @model.set(\"genres\", new GenreCollection())"; + return _this.model.get("genres").add({ + id: item.id, + description: item.text + }); + }); + if (!this.sendImage) { + this.model.unset("mix_image"); + } + this.model.unset("comments"); + this._saveChanges({ + patch: this.patch, + success: function() { + if (_this.sendImage) { + $.ajaxFileUpload({ + url: "/ajax/upload_mix_image/" + _this.model.get("id") + "/", + secureuri: false, + fileElementId: "input[name='...']", + success: function(data, status) { + if (typeof data.error !== "undefined") { + if (data.error !== "") { + return alert(data.error); + } else { + return alert(data.msg); + } } else { - return alert(data.msg); + $("#mix-upload-wizard", _this.el).hide(); + _this.detailsEntered = true; + return _this.checkRedirect(); } - } else { - $("#mix-upload-wizard", _this.el).hide(); - _this.detailsEntered = true; - return _this.checkRedirect(); + }, + error: function(data, status, e) { + return utils.showError(e); } - }, - error: function(data, status, e) { - return utils.showError(e); - } - }); - } else { - $("#mix-upload-wizard", _this.el).hide(); - _this.detailsEntered = true; - _this.checkRedirect(); + }); + } else { + $("#mix-upload-wizard", _this.el).hide(); + _this.detailsEntered = true; + _this.checkRedirect(); + } + return true; + }, + error: function(model, response) { + return utils.showError("Error", "Something went wrong
Nerd stuff is: " + response); } - return true; - }, - error: function(model, response) { - return utils.showError("Error", "Something went wrong
Nerd stuff is: " + response); - } - }); - return false; - }; - - MixEditView.prototype.checkRedirect = function() { - if (this.detailsEntered && this.uploadState === 2) { - return Backbone.history.navigate("/mix/" + this.model.get("slug"), { - trigger: true }); - } - }; + return false; + }; - MixEditView.prototype.login = function() { - return vent.trigger('app:login'); - }; + MixEditView.prototype.checkRedirect = function() { + if (this.detailsEntered && this.uploadState === 2) { + return Backbone.history.navigate("/mix/" + this.model.get("slug"), { + trigger: true + }); + } + }; - MixEditView.prototype.imageChanged = function(evt) { - return this.sendImage = true; - }; + MixEditView.prototype.login = function() { + return vent.trigger('app:login'); + }; - MixEditView; + MixEditView.prototype.imageChanged = function(evt) { + return this.sendImage = true; + }; + + MixEditView; - return MixEditView; + return MixEditView; - })(EditableView); -}); + })(EditableView); + }); + +}).call(this); diff --git a/static/js/app/views/mix/mixItemView.js b/static/js/app/views/mix/mixItemView.js index debe2e8..f76bc44 100755 --- a/static/js/app/views/mix/mixItemView.js +++ b/static/js/app/views/mix/mixItemView.js @@ -1,163 +1,166 @@ // Generated by CoffeeScript 1.4.0 -var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['underscore', 'moment', 'app', 'vent', 'app.lib/dssView', 'utils', 'text!/tpl/MixItemView'], function(_, moment, App, vent, DssView, utils, Template) { - var MixItemView; - MixItemView = (function(_super) { + define(['underscore', 'moment', 'app', 'vent', 'app.lib/dssView', 'utils', 'text!/tpl/MixItemView'], function(_, moment, App, vent, DssView, utils, Template) { + var MixItemView; + MixItemView = (function(_super) { - __extends(MixItemView, _super); + __extends(MixItemView, _super); - function MixItemView() { - this.onRender = __bind(this.onRender, this); + function MixItemView() { + this.onRender = __bind(this.onRender, this); - this.initialize = __bind(this.initialize, this); - return MixItemView.__super__.constructor.apply(this, arguments); - } - - MixItemView.prototype.template = _.template(Template); - - MixItemView.prototype.tagName = MixItemView.tagName || "li"; - - MixItemView.prototype.className = MixItemView.className || ""; - - MixItemView.prototype.events = { - "click .play": "mixPlay", - "click .pause": "mixPause", - "click .resume": "mixResume", - "click .mix-link": "mixLink", - "click .delete-button a": "mixDelete", - "click .like-button a": "mixLike", - "click .favourite-button a": "mixFavourite", - "click .share-button": "mixShare", - "click .download-button a": "mixDownload", - "click .login-download-button a": "login" - }; - - MixItemView.prototype.ui = { - playButton: ".mix-state-toggle", - playButtonIcon: ".mix-state-toggle i", - playerEl: ".pnp-instance" - }; - - MixItemView.prototype.initialize = function() { - this.mixState = 0; - this.listenTo(this.model, 'change:favourited', this.render); - this.listenTo(this.model, 'change:liked', this.render); - this.listenTo(this.model, 'nested-change', this.render); - this.listenTo(vent, 'mix:init', this.onMixInit); - this.listenTo(vent, 'mix:resume', this.onMixStateChanged); - this.listenTo(vent, 'mix:pause', this.onMixStateChanged); - this.app = require('app'); - return true; - }; - - MixItemView.prototype.onRender = function() { - var data, id; - id = this.model.get('id'); - data = this.model.toJSON(); - return window.scrollTo(0, 0); - }; - - MixItemView.prototype.onDomRefresh = function() { - if (this.app.audioController.isPlayingId(this.model.id)) { - console.log("Re-wrapping player"); - this.app.audioController.setupPlayerEl($(this.el)); - this.ui.playButton.toggleClass("play", false).toggleClass("pause", false).toggleClass("resume", false); - this.mixState = this.app.audioController.getMixState(); - this._setupStateUI(); + this.initialize = __bind(this.initialize, this); + return MixItemView.__super__.constructor.apply(this, arguments); } - }; - MixItemView.prototype.onMixInit = function() { - this.mixState = 1; - return this._setupStateUI(); - }; + MixItemView.prototype.template = _.template(Template); - MixItemView.prototype.onMixStateChanged = function() { - console.log("***** state is " + this.state); - if (this.app.audioController.isPlayingId(this.model.id)) { - if (this.mixState === 0) { - this.mixState = 1; - } else if (this.mixState === 1) { - this.mixState = 2; - } else if (this.mixState === 2) { - this.mixState = 1; + MixItemView.prototype.tagName = MixItemView.tagName || "li"; + + MixItemView.prototype.className = MixItemView.className || ""; + + MixItemView.prototype.events = { + "click .play": "mixPlay", + "click .pause": "mixPause", + "click .resume": "mixResume", + "click .mix-link": "mixLink", + "click .delete-button a": "mixDelete", + "click .like-button a": "mixLike", + "click .favourite-button a": "mixFavourite", + "click .share-button": "mixShare", + "click .download-button a": "mixDownload", + "click .login-download-button a": "login" + }; + + MixItemView.prototype.ui = { + playButton: ".mix-state-toggle", + playButtonIcon: ".mix-state-toggle i", + playerEl: ".pnp-instance" + }; + + MixItemView.prototype.initialize = function() { + this.mixState = 0; + this.listenTo(this.model, 'change:favourited', this.render); + this.listenTo(this.model, 'change:liked', this.render); + this.listenTo(this.model, 'nested-change', this.render); + this.listenTo(vent, 'mix:init', this.onMixInit); + this.listenTo(vent, 'mix:resume', this.onMixStateChanged); + this.listenTo(vent, 'mix:pause', this.onMixStateChanged); + this.app = require('app'); + return true; + }; + + MixItemView.prototype.onRender = function() { + var data, id; + id = this.model.get('id'); + data = this.model.toJSON(); + return window.scrollTo(0, 0); + }; + + MixItemView.prototype.onDomRefresh = function() { + if (this.app.audioController.isPlayingId(this.model.id)) { + console.log("Re-wrapping player"); + this.app.audioController.setupPlayerEl($(this.el)); + this.ui.playButton.toggleClass("play", false).toggleClass("pause", false).toggleClass("resume", false); + this.mixState = this.app.audioController.getMixState(); + this._setupStateUI(); } + }; + + MixItemView.prototype.onMixInit = function() { + this.mixState = 1; return this._setupStateUI(); - } - }; + }; - MixItemView.prototype._setupStateUI = function() { - this.ui.playButton.removeClass("play").removeClass("resume").removeClass("pause"); - this.ui.playButtonIcon.removeClass("icon-play").removeClass("icon-pause"); - if (this.mixState === 1) { - this.ui.playButton.addClass("pause"); - return this.ui.playButtonIcon.removeClass("icon-play").addClass("icon-pause"); - } else if (this.mixState === 2) { - this.ui.playButton.addClass("resume"); - return this.ui.playButtonIcon.removeClass("icon-pause").addClass("icon-play"); - } - }; + MixItemView.prototype.onMixStateChanged = function() { + console.log("***** state is " + this.state); + if (this.app.audioController.isPlayingId(this.model.id)) { + if (this.mixState === 0) { + this.mixState = 1; + } else if (this.mixState === 1) { + this.mixState = 2; + } else if (this.mixState === 2) { + this.mixState = 1; + } + return this._setupStateUI(); + } + }; - MixItemView.prototype.mixPlay = function(button) { - return vent.trigger('mix:init', this.model, $(this.el)); - }; + MixItemView.prototype._setupStateUI = function() { + this.ui.playButton.removeClass("play").removeClass("resume").removeClass("pause"); + this.ui.playButtonIcon.removeClass("icon-play").removeClass("icon-pause"); + if (this.mixState === 1) { + this.ui.playButton.addClass("pause"); + return this.ui.playButtonIcon.removeClass("icon-play").addClass("icon-pause"); + } else if (this.mixState === 2) { + this.ui.playButton.addClass("resume"); + return this.ui.playButtonIcon.removeClass("icon-pause").addClass("icon-play"); + } + }; - MixItemView.prototype.mixPause = function() { - return vent.trigger('mix:pause', this.model, $(this.el)); - }; + MixItemView.prototype.mixPlay = function(button) { + return vent.trigger('mix:init', this.model, $(this.el)); + }; - MixItemView.prototype.mixResume = function() { - return vent.trigger('mix:resume', this.model, $(this.el)); - }; + MixItemView.prototype.mixPause = function() { + return vent.trigger('mix:pause', this.model, $(this.el)); + }; - MixItemView.prototype.mixFavourite = function() { - var app; - console.log("MixItemView: favouriteMix"); - app = require('app'); - vent.trigger("mix:favourite", this.model); - return true; - }; + MixItemView.prototype.mixResume = function() { + return vent.trigger('mix:resume', this.model, $(this.el)); + }; - MixItemView.prototype.mixDelete = function() { - var _this = this; - console.log("MixItemView: mixDelete"); - return utils.messageBox("/dlg/DeleteMixConfirm", function() { - return _this.model.destroy(); - }); - }; + MixItemView.prototype.mixFavourite = function() { + var app; + console.log("MixItemView: favouriteMix"); + app = require('app'); + vent.trigger("mix:favourite", this.model); + return true; + }; - MixItemView.prototype.mixLike = function() { - console.log("MixItemView: likeMix"); - vent.trigger("mix:like", this.model); - return true; - }; + MixItemView.prototype.mixDelete = function() { + var _this = this; + console.log("MixItemView: mixDelete"); + return utils.messageBox("/dlg/DeleteMixConfirm", function() { + return _this.model.destroy(); + }); + }; - MixItemView.prototype.mixShare = function(e) { - var mode; - console.log("MixItemView: shareMix"); - mode = $(e.currentTarget).data("mode"); - console.log("MixItemView: " + mode); - vent.trigger("mix:share", mode, this.model); - return true; - }; + MixItemView.prototype.mixLike = function() { + console.log("MixItemView: likeMix"); + vent.trigger("mix:like", this.model); + return true; + }; - MixItemView.prototype.mixDownload = function() { - console.log("MixItemView: mixDownload"); - utils.downloadURL("/audio/download/" + this.model.get('id')); - return true; - }; + MixItemView.prototype.mixShare = function(e) { + var mode; + console.log("MixItemView: shareMix"); + mode = $(e.currentTarget).data("mode"); + console.log("MixItemView: " + mode); + vent.trigger("mix:share", mode, this.model); + return true; + }; - MixItemView.prototype.login = function() { - console.log("MixItemView: login"); - vent.trigger('app:login'); - return true; - }; + MixItemView.prototype.mixDownload = function() { + console.log("MixItemView: mixDownload"); + utils.downloadURL("/audio/download/" + this.model.get('id')); + return true; + }; + MixItemView.prototype.login = function() { + console.log("MixItemView: login"); + vent.trigger('app:login'); + return true; + }; + + return MixItemView; + + })(DssView); return MixItemView; + }); - })(DssView); - return MixItemView; -}); +}).call(this); diff --git a/static/js/app/views/mix/mixListView.js b/static/js/app/views/mix/mixListView.js index dd8f159..4aa9e04 100755 --- a/static/js/app/views/mix/mixListView.js +++ b/static/js/app/views/mix/mixListView.js @@ -1,43 +1,46 @@ // Generated by CoffeeScript 1.4.0 -var __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +(function() { + var __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; -define(['marionette', 'vent', 'models/mix/mixCollection', 'views/mix/mixItemView', 'text!/tpl/MixListView'], function(Marionette, vent, MixCollection, MixItemView, Template) { - var MixListView; - MixListView = (function(_super) { - var currentMix; + define(['marionette', 'vent', 'models/mix/mixCollection', 'views/mix/mixItemView', 'text!/tpl/MixListView'], function(Marionette, vent, MixCollection, MixItemView, Template) { + var MixListView; + MixListView = (function(_super) { + var currentMix; - __extends(MixListView, _super); + __extends(MixListView, _super); - function MixListView() { - return MixListView.__super__.constructor.apply(this, arguments); - } - - MixListView.prototype.template = _.template(Template); - - MixListView.prototype.className = "mix-listing audio-listing"; - - MixListView.prototype.itemView = MixItemView; - - MixListView.prototype.itemViewContainer = "#mix-list-container-ul"; - - currentMix = -1; - - MixListView.prototype.mixPlay = function(model) { - var v; - if (currentMix !== -1) { - v = this.children.findByModelCid(currentMix); - v.mixStop(v.model); + function MixListView() { + return MixListView.__super__.constructor.apply(this, arguments); } - currentMix = model.cid; - }; - MixListView.prototype.onRender = function() { - return window.scrollTo(0, 0); - }; + MixListView.prototype.template = _.template(Template); + MixListView.prototype.className = "mix-listing audio-listing"; + + MixListView.prototype.itemView = MixItemView; + + MixListView.prototype.itemViewContainer = "#mix-list-container-ul"; + + currentMix = -1; + + MixListView.prototype.mixPlay = function(model) { + var v; + if (currentMix !== -1) { + v = this.children.findByModelCid(currentMix); + v.mixStop(v.model); + } + currentMix = model.cid; + }; + + MixListView.prototype.onRender = function() { + return window.scrollTo(0, 0); + }; + + return MixListView; + + })(Marionette.CompositeView); return MixListView; + }); - })(Marionette.CompositeView); - return MixListView; -}); +}).call(this); diff --git a/static/js/lib/jquery.js b/static/js/lib/jquery.js index 5c54dff..bfb2376 100644 --- a/static/js/lib/jquery.js +++ b/static/js/lib/jquery.js @@ -1,5 +1,5 @@ /*! - * jQuery JavaScript Library v2.0.2 + * jQuery JavaScript Library v1.10.2 * http://jquery.com/ * * Includes Sizzle.js @@ -9,7 +9,7 @@ * Released under the MIT license * http://jquery.org/license * - * Date: 2013-05-30T21:25Z + * Date: 2013-07-03T13:48Z */ (function( window, undefined ) { @@ -19,13 +19,13 @@ // Support: Firefox 18+ //"use strict"; var - // A central reference to the root jQuery(document) - rootjQuery, - // The deferred used on DOM ready readyList, - // Support: IE9 + // A central reference to the root jQuery(document) + rootjQuery, + + // Support: IE<10 // For `typeof xmlNode.method` instead of `xmlNode.method !== undefined` core_strundefined = typeof undefined, @@ -46,7 +46,7 @@ var // List of deleted data cache ids, so we can reuse them core_deletedIds = [], - core_version = "2.0.2", + core_version = "1.10.2", // Save a reference to some core methods core_concat = core_deletedIds.concat, @@ -69,6 +69,9 @@ var // Used for splitting on whitespace core_rnotwhite = /\S+/g, + // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE) + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + // A simple way to check for HTML strings // Prioritize #id over to avoid XSS via location.hash (#9521) // Strict HTML recognition (#11290: must start with <) @@ -77,6 +80,12 @@ var // Match a standalone tag rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, + rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g, + // Matches dashed string for camelizing rmsPrefix = /^-ms-/, rdashAlpha = /-([\da-z])/gi, @@ -86,11 +95,25 @@ var return letter.toUpperCase(); }, - // The ready event handler and self cleanup method - completed = function() { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); - jQuery.ready(); + // The ready event handler + completed = function( event ) { + + // readyState === "complete" is good enough for us to call the dom ready in oldIE + if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) { + detach(); + jQuery.ready(); + } + }, + // Clean-up method for dom ready events + detach = function() { + if ( document.addEventListener ) { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); + + } else { + document.detachEvent( "onreadystatechange", completed ); + window.detachEvent( "onload", completed ); + } }; jQuery.fn = jQuery.prototype = { @@ -153,7 +176,13 @@ jQuery.fn = jQuery.prototype = { // Check parentNode to catch when Blackberry 4.6 returns // nodes that are no longer in the document #6963 if ( elem && elem.parentNode ) { - // Inject the element directly into the jQuery object + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } + + // Otherwise, we inject the element directly into the jQuery object this.length = 1; this[0] = elem; } @@ -283,7 +312,7 @@ jQuery.fn = jQuery.prototype = { jQuery.fn.init.prototype = jQuery.fn; jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, + var src, copyIsArray, copy, name, options, clone, target = arguments[0] || {}, i = 1, length = arguments.length, @@ -348,6 +377,7 @@ jQuery.extend = jQuery.fn.extend = function() { jQuery.extend({ // Unique for each copy of jQuery on the page + // Non-digits removed to match rinlinejQuery expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ), noConflict: function( deep ) { @@ -386,6 +416,11 @@ jQuery.extend({ return; } + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready ); + } + // Remember that the DOM is ready jQuery.isReady = true; @@ -410,10 +445,13 @@ jQuery.extend({ return jQuery.type(obj) === "function"; }, - isArray: Array.isArray, + isArray: Array.isArray || function( obj ) { + return jQuery.type(obj) === "array"; + }, isWindow: function( obj ) { - return obj != null && obj === obj.window; + /* jshint eqeqeq: false */ + return obj != null && obj == obj.window; }, isNumeric: function( obj ) { @@ -424,37 +462,46 @@ jQuery.extend({ if ( obj == null ) { return String( obj ); } - // Support: Safari <= 5.1 (functionish RegExp) return typeof obj === "object" || typeof obj === "function" ? class2type[ core_toString.call(obj) ] || "object" : typeof obj; }, isPlainObject: function( obj ) { - // Not plain objects: - // - Any object or value whose internal [[Class]] property is not "[object Object]" - // - DOM nodes - // - window - if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + var key; + + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { return false; } - // Support: Firefox <20 - // The try/catch suppresses exceptions thrown when attempting to access - // the "constructor" property of certain host objects, ie. |window.location| - // https://bugzilla.mozilla.org/show_bug.cgi?id=814622 try { + // Not own constructor property must be Object if ( obj.constructor && - !core_hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { + !core_hasOwn.call(obj, "constructor") && + !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { return false; } } catch ( e ) { + // IE8,9 Will throw exceptions on certain host objects #9897 return false; } - // If the function hasn't returned already, we're confident that - // |obj| is a plain object, created by {} or constructed with new Object - return true; + // Support: IE<9 + // Handle iteration over inherited properties before own properties. + if ( jQuery.support.ownLast ) { + for ( key in obj ) { + return core_hasOwn.call( obj, key ); + } + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + for ( key in obj ) {} + + return key === undefined || core_hasOwn.call( obj, key ); }, isEmptyObject: function( obj ) { @@ -491,15 +538,41 @@ jQuery.extend({ } parsed = jQuery.buildFragment( [ data ], context, scripts ); - if ( scripts ) { jQuery( scripts ).remove(); } - return jQuery.merge( [], parsed.childNodes ); }, - parseJSON: JSON.parse, + parseJSON: function( data ) { + // Attempt to parse using the native JSON parser first + if ( window.JSON && window.JSON.parse ) { + return window.JSON.parse( data ); + } + + if ( data === null ) { + return data; + } + + if ( typeof data === "string" ) { + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); + + if ( data ) { + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( rvalidchars.test( data.replace( rvalidescape, "@" ) + .replace( rvalidtokens, "]" ) + .replace( rvalidbraces, "")) ) { + + return ( new Function( "return " + data ) )(); + } + } + } + + jQuery.error( "Invalid JSON: " + data ); + }, // Cross-browser xml parsing parseXML: function( data ) { @@ -507,16 +580,19 @@ jQuery.extend({ if ( !data || typeof data !== "string" ) { return null; } - - // Support: IE9 try { - tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); - } catch ( e ) { + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + } catch( e ) { xml = undefined; } - - if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) { + if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { jQuery.error( "Invalid XML: " + data ); } return xml; @@ -525,25 +601,16 @@ jQuery.extend({ noop: function() {}, // Evaluates a script in a global context - globalEval: function( code ) { - var script, - indirect = eval; - - code = jQuery.trim( code ); - - if ( code ) { - // If the code includes a valid, prologue position - // strict mode pragma, execute code by injecting a - // script tag into the document. - if ( code.indexOf("use strict") === 1 ) { - script = document.createElement("script"); - script.text = code; - document.head.appendChild( script ).parentNode.removeChild( script ); - } else { - // Otherwise, avoid the DOM node creation, insertion - // and removal by using an indirect global eval - indirect( code ); - } + // Workarounds based on findings by Jim Driscoll + // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + globalEval: function( data ) { + if ( data && jQuery.trim( data ) ) { + // We use execScript on Internet Explorer + // We use an anonymous function so that context is window + // rather than jQuery in Firefox + ( window.execScript || function( data ) { + window[ "eval" ].call( window, data ); + } )( data ); } }, @@ -607,9 +674,20 @@ jQuery.extend({ return obj; }, - trim: function( text ) { - return text == null ? "" : core_trim.call( text ); - }, + // Use native String.trim function wherever possible + trim: core_trim && !core_trim.call("\uFEFF\xA0") ? + function( text ) { + return text == null ? + "" : + core_trim.call( text ); + } : + + // Otherwise use our own trimming functionality + function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, // results is for internal usage only makeArray: function( arr, results ) { @@ -630,7 +708,25 @@ jQuery.extend({ }, inArray: function( elem, arr, i ) { - return arr == null ? -1 : core_indexOf.call( arr, elem, i ); + var len; + + if ( arr ) { + if ( core_indexOf ) { + return core_indexOf.call( arr, elem, i ); + } + + len = arr.length; + i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; + + for ( ; i < len; i++ ) { + // Skip accessing in sparse arrays + if ( i in arr && arr[ i ] === elem ) { + return i; + } + } + } + + return -1; }, merge: function( first, second ) { @@ -711,7 +807,7 @@ jQuery.extend({ // Bind a function to a context, optionally partially applying any // arguments. proxy: function( fn, context ) { - var tmp, args, proxy; + var args, proxy, tmp; if ( typeof context === "string" ) { tmp = fn[ context ]; @@ -790,7 +886,9 @@ jQuery.extend({ length ? fn( elems[0], key ) : emptyGet; }, - now: Date.now, + now: function() { + return ( new Date() ).getTime(); + }, // A method for quickly swapping in/out CSS properties to get correct calculations. // Note: this method belongs to the css module but it's needed here for the support module. @@ -828,13 +926,50 @@ jQuery.ready.promise = function( obj ) { // Handle it asynchronously to allow scripts the opportunity to delay ready setTimeout( jQuery.ready ); - } else { - + // Standards-based browsers support DOMContentLoaded + } else if ( document.addEventListener ) { // Use the handy event callback document.addEventListener( "DOMContentLoaded", completed, false ); // A fallback to window.onload, that will always work window.addEventListener( "load", completed, false ); + + // If IE event model is used + } else { + // Ensure firing before onload, maybe late but safe also for iframes + document.attachEvent( "onreadystatechange", completed ); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", completed ); + + // If IE and not a frame + // continually check to see if the document is ready + var top = false; + + try { + top = window.frameElement == null && document.documentElement; + } catch(e) {} + + if ( top && top.doScroll ) { + (function doScrollCheck() { + if ( !jQuery.isReady ) { + + try { + // Use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + top.doScroll("left"); + } catch(e) { + return setTimeout( doScrollCheck, 50 ); + } + + // detach all dom ready events + detach(); + + // and execute any waiting functions + jQuery.ready(); + } + })(); + } } } return readyList.promise( obj ); @@ -865,14 +1000,14 @@ function isArraylike( obj ) { // All jQuery objects should point back to these rootjQuery = jQuery(document); /*! - * Sizzle CSS Selector Engine v1.9.4-pre + * Sizzle CSS Selector Engine v1.10.2 * http://sizzlejs.com/ * * Copyright 2013 jQuery Foundation, Inc. and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2013-05-27 + * Date: 2013-07-03 */ (function( window, undefined ) { @@ -905,7 +1040,13 @@ var i, tokenCache = createCache(), compilerCache = createCache(), hasDuplicate = false, - sortOrder = function() { return 0; }, + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + return 0; + }, // General-purpose constants strundefined = typeof undefined, @@ -1148,19 +1289,11 @@ function Sizzle( selector, context, results, seed ) { return select( selector.replace( rtrim, "$1" ), context, results, seed ); } -/** - * For feature detection - * @param {Function} fn The function to test for native support - */ -function isNative( fn ) { - return rnative.test( fn + "" ); -} - /** * 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 + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry */ function createCache() { var keys = []; @@ -1209,58 +1342,14 @@ function assert( fn ) { /** * 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 if the test fails - * @param {Boolean} test The result of a test. If true, null will be set as the handler in leiu of the specified handler + * @param {Function} handler The method that will be applied */ -function addHandle( attrs, handler, test ) { - attrs = attrs.split("|"); - var current, - i = attrs.length, - setHandle = test ? null : handler; +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; while ( i-- ) { - // Don't override a user's handler - if ( !(current = Expr.attrHandle[ attrs[i] ]) || current === handler ) { - Expr.attrHandle[ attrs[i] ] = setHandle; - } - } -} - -/** - * Fetches boolean attributes by node - * @param {Element} elem - * @param {String} name - */ -function boolHandler( elem, name ) { - // XML does not need to be checked as this will not be assigned for XML documents - var val = elem.getAttributeNode( name ); - return val && val.specified ? - val.value : - elem[ name ] === true ? name.toLowerCase() : null; -} - -/** - * Fetches attributes without interpolation - * http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx - * @param {Element} elem - * @param {String} name - */ -function interpolationHandler( elem, name ) { - // XML does not need to be checked as this will not be assigned for XML documents - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); -} - -/** - * Uses defaultValue to retrieve value in IE6/7 - * @param {Element} elem - * @param {String} name - */ -function valueHandler( elem ) { - // Ignore the value *property* on inputs by using defaultValue - // Fallback to Sizzle.attr by returning undefined where appropriate - // XML does not need to be checked as this will not be assigned for XML documents - if ( elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; + Expr.attrHandle[ arr[i] ] = handler; } } @@ -1268,7 +1357,7 @@ function valueHandler( elem ) { * Checks document order of two siblings * @param {Element} a * @param {Element} b - * @returns Returns -1 if a precedes b, 1 if a follows 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, @@ -1358,7 +1447,7 @@ support = Sizzle.support = {}; */ setDocument = Sizzle.setDocument = function( node ) { var doc = node ? node.ownerDocument || node : preferredDoc, - parent = doc.parentWindow; + parent = doc.defaultView; // If no document and documentElement is available, return if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { @@ -1375,7 +1464,8 @@ setDocument = Sizzle.setDocument = function( node ) { // Support: IE>8 // If iframe document is assigned to "document" variable and if iframe has been reloaded, // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 - if ( parent && parent.frameElement ) { + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent.attachEvent && parent !== parent.top ) { parent.attachEvent( "onbeforeunload", function() { setDocument(); }); @@ -1387,32 +1477,10 @@ setDocument = Sizzle.setDocument = function( node ) { // Support: IE<8 // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) support.attributes = assert(function( div ) { - - // Support: IE<8 - // Prevent attribute/property "interpolation" - div.innerHTML = ""; - addHandle( "type|href|height|width", interpolationHandler, div.firstChild.getAttribute("href") === "#" ); - - // Support: IE<9 - // Use getAttributeNode to fetch booleans when getAttribute lies - addHandle( booleans, boolHandler, div.getAttribute("disabled") == null ); - div.className = "i"; return !div.getAttribute("className"); }); - // Support: IE<9 - // Retrieving value should defer to defaultValue - support.input = assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; - }); - - // IE6/7 still return empty string for value, - // but are actually retrieving the property - addHandle( "value", valueHandler, support.attributes && support.input ); - /* getElement(s)By* ---------------------------------------------------------------------- */ @@ -1521,7 +1589,7 @@ setDocument = Sizzle.setDocument = function( node ) { // See http://bugs.jquery.com/ticket/13378 rbuggyQSA = []; - if ( (support.qsa = isNative(doc.querySelectorAll)) ) { + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { // Build QSA regex // Regex strategy adopted from Diego Perini assert(function( div ) { @@ -1573,7 +1641,7 @@ setDocument = Sizzle.setDocument = function( node ) { }); } - if ( (support.matchesSelector = isNative( (matches = docElem.webkitMatchesSelector || + if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector || docElem.mozMatchesSelector || docElem.oMatchesSelector || docElem.msMatchesSelector) )) ) { @@ -1599,7 +1667,7 @@ setDocument = Sizzle.setDocument = function( node ) { // Element contains another // Purposefully does not implement inclusive descendent // As in, an element does not contain itself - contains = isNative(docElem.contains) || docElem.compareDocumentPosition ? + contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ? function( a, b ) { var adown = a.nodeType === 9 ? a.documentElement : a, bup = b && b.parentNode; @@ -1623,13 +1691,6 @@ setDocument = Sizzle.setDocument = function( node ) { /* Sorting ---------------------------------------------------------------------- */ - // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) - // Detached nodes confoundingly follow *each other* - support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( doc.createElement("div") ) & 1; - }); - // Document order sorting sortOrder = docElem.compareDocumentPosition ? function( a, b ) { @@ -1772,9 +1833,9 @@ Sizzle.attr = function( elem, name ) { var fn = Expr.attrHandle[ name.toLowerCase() ], // Don't get fooled by Object.prototype properties (jQuery #13807) - val = ( fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? fn( elem, name, !documentIsHTML ) : - undefined ); + undefined; return val === undefined ? support.attributes || !documentIsHTML ? @@ -2319,6 +2380,8 @@ Expr = Sizzle.selectors = { } }; +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 ); @@ -2327,6 +2390,11 @@ 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(); + function tokenize( selector, parseOnly ) { var matched, match, tokens, type, soFar, groups, preFilters, @@ -2838,26 +2906,67 @@ function select( selector, context, results, seed ) { return results; } -// Deprecated -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - // One-time assignments // Sort stability support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; +// Support: Chrome<14 +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = hasDuplicate; + // Initialize against the default document setDocument(); -// Support: Chrome<<14 -// Always assume duplicates if they aren't passed to the comparison function -[0, 0].sort( sortOrder ); -support.detectDuplicates = hasDuplicate; +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.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( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.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( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + elem[ name ] === true ? name.toLowerCase() : null; + } + }); +} jQuery.find = Sizzle; jQuery.expr = Sizzle.selectors; @@ -2884,23 +2993,23 @@ function createOptions( options ) { /* * 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 + * 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) + * 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) + * 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) + * unique: will ensure a callback can only be added once (no duplicate in the list) * - * stopOnFalse: interrupt callings when a callback returns false + * stopOnFalse: interrupt callings when a callback returns false * */ jQuery.Callbacks = function( options ) { @@ -2911,18 +3020,18 @@ jQuery.Callbacks = function( options ) { ( optionsCache[ options ] || createOptions( options ) ) : jQuery.extend( {}, options ); - var // Last fire value (for non-forgettable lists) + 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 know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, // End of the loop when firing firingLength, // Index of currently firing callback (modified by remove if needed) firingIndex, + // First callback to fire (used internally by add and fireWith) + firingStart, // Actual callback list list = [], // Stack of fire calls for repeatable lists @@ -3042,9 +3151,9 @@ jQuery.Callbacks = function( options ) { }, // Call all callbacks with the given context and arguments fireWith: function( context, args ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; if ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; if ( firing ) { stack.push( args ); } else { @@ -3208,34 +3317,83 @@ jQuery.extend({ } }); jQuery.support = (function( support ) { - var input = document.createElement("input"), - fragment = document.createDocumentFragment(), - div = document.createElement("div"), - select = document.createElement("select"), - opt = select.appendChild( document.createElement("option") ); - // Finish early in limited environments - if ( !input.type ) { + var all, a, input, select, fragment, opt, eventName, isSupported, i, + div = document.createElement("div"); + + // Setup + div.setAttribute( "className", "t" ); + div.innerHTML = "
a"; + + // Finish early in limited (non-browser) environments + all = div.getElementsByTagName("*") || []; + a = div.getElementsByTagName("a")[ 0 ]; + if ( !a || !a.style || !all.length ) { return support; } - input.type = "checkbox"; + // First batch of tests + select = document.createElement("select"); + opt = select.appendChild( document.createElement("option") ); + input = div.getElementsByTagName("input")[ 0 ]; - // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3 - // Check the default checkbox/radio value ("" on old WebKit; "on" elsewhere) - support.checkOn = input.value !== ""; + a.style.cssText = "top:1px;float:left;opacity:.5"; - // Must access the parent to make an option select properly - // Support: IE9, IE10 + // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + support.getSetAttribute = div.className !== "t"; + + // IE strips leading whitespace when .innerHTML is used + support.leadingWhitespace = div.firstChild.nodeType === 3; + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + support.tbody = !div.getElementsByTagName("tbody").length; + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + support.htmlSerialize = !!div.getElementsByTagName("link").length; + + // Get the style information from getAttribute + // (IE uses .cssText instead) + support.style = /top/.test( a.getAttribute("style") ); + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + support.hrefNormalized = a.getAttribute("href") === "/a"; + + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + support.opacity = /^0.5/.test( a.style.opacity ); + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + support.cssFloat = !!a.style.cssFloat; + + // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere) + support.checkOn = !!input.value; + + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) support.optSelected = opt.selected; + // Tests for enctype support on a form (#6743) + support.enctype = !!document.createElement("form").enctype; + + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>"; + // Will be defined later + support.inlineBlockNeedsLayout = false; + support.shrinkWrapBlocks = false; + support.pixelPosition = false; + support.deleteExpando = true; + support.noCloneEvent = true; support.reliableMarginRight = true; support.boxSizingReliable = true; - support.pixelPosition = false; // Make sure checked status is properly cloned - // Support: IE9, IE10 input.checked = true; support.noCloneChecked = input.cloneNode( true ).checked; @@ -3244,37 +3402,72 @@ jQuery.support = (function( support ) { select.disabled = true; support.optDisabled = !opt.disabled; - // Check if an input maintains its value after becoming a radio - // Support: IE9, IE10 + // Support: IE<9 + try { + delete div.test; + } catch( e ) { + support.deleteExpando = false; + } + + // Check if we can trust getAttribute("value") input = document.createElement("input"); + input.setAttribute( "value", "" ); + support.input = input.getAttribute( "value" ) === ""; + + // Check if an input maintains its value after becoming a radio input.value = "t"; - input.type = "radio"; + input.setAttribute( "type", "radio" ); support.radioValue = input.value === "t"; // #11217 - WebKit loses check when the name is after the checked attribute input.setAttribute( "checked", "t" ); input.setAttribute( "name", "t" ); + fragment = document.createDocumentFragment(); fragment.appendChild( input ); - // Support: Safari 5.1, Android 4.x, Android 2.3 - // old WebKit doesn't clone checked state correctly in fragments + // Check if a disconnected checkbox will retain its checked + // value of true after appended to the DOM (IE6/7) + support.appendChecked = input.checked; + + // WebKit doesn't clone checked state correctly in fragments support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; - // Support: Firefox, Chrome, Safari + // Support: IE<9 + // Opera does not clone events (and typeof div.attachEvent === undefined). + // IE9-10 clones events bound via attachEvent, but they don't trigger with .click() + if ( div.attachEvent ) { + div.attachEvent( "onclick", function() { + support.noCloneEvent = false; + }); + + div.cloneNode( true ).click(); + } + + // Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event) // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) - support.focusinBubbles = "onfocusin" in window; + for ( i in { submit: true, change: true, focusin: true }) { + div.setAttribute( eventName = "on" + i, "t" ); + + support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false; + } div.style.backgroundClip = "content-box"; div.cloneNode( true ).style.backgroundClip = ""; support.clearCloneStyle = div.style.backgroundClip === "content-box"; + // Support: IE<9 + // Iteration over object's inherited properties before its own. + for ( i in jQuery( support ) ) { + break; + } + support.ownLast = i !== "0"; + // Run tests that need a body at doc ready jQuery(function() { - var container, marginDiv, - // Support: Firefox, Android 2.3 (Prefixed box-sizing versions). - divReset = "padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box", - body = document.getElementsByTagName("body")[ 0 ]; + var container, marginDiv, tds, + divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;", + body = document.getElementsByTagName("body")[0]; if ( !body ) { // Return for frameset docs that don't have a body @@ -3284,11 +3477,30 @@ jQuery.support = (function( support ) { container = document.createElement("div"); container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px"; - // Check box-sizing and margin behavior. body.appendChild( container ).appendChild( div ); + + // Support: IE8 + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + div.innerHTML = "
t
"; + tds = div.getElementsByTagName("td"); + tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none"; + isSupported = ( tds[ 0 ].offsetHeight === 0 ); + + tds[ 0 ].style.display = ""; + tds[ 1 ].style.display = "none"; + + // Support: IE8 + // Check if empty table cells still have offsetWidth/Height + support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + + // Check box-sizing and margin behavior. div.innerHTML = ""; - // Support: Firefox, Android 2.3 (Prefixed box-sizing versions). - div.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%"; + div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;"; // Workaround failing boxSizing test due to offsetWidth returning wrong value // with some non-1 values of body zoom, ticket #13543 @@ -3301,9 +3513,9 @@ jQuery.support = (function( support ) { support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%"; support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px"; - // Support: Android 2.3 // Check if div with explicit width and no margin-right incorrectly // gets computed margin-right based on width of container. (#3333) + // Fails in WebKit before Feb 2011 nightlies // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right marginDiv = div.appendChild( document.createElement("div") ); marginDiv.style.cssText = div.style.cssText = divReset; @@ -3314,259 +3526,299 @@ jQuery.support = (function( support ) { !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight ); } + if ( typeof div.style.zoom !== core_strundefined ) { + // Support: IE<8 + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + div.innerHTML = ""; + div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1"; + support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); + + // Support: IE6 + // Check if elements with layout shrink-wrap their children + div.style.display = "block"; + div.innerHTML = "
"; + div.firstChild.style.width = "5px"; + support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); + + if ( support.inlineBlockNeedsLayout ) { + // Prevent IE 6 from affecting layout for positioned elements #11048 + // Prevent IE from shrinking the body in IE 7 mode #12869 + // Support: IE<8 + body.style.zoom = 1; + } + } + body.removeChild( container ); + + // Null elements to avoid leaks in IE + container = div = tds = marginDiv = null; }); + // Null elements to avoid leaks in IE + all = select = fragment = opt = a = input = null; + return support; -})( {} ); +})({}); -/* - 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 data_user, data_priv, - rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, +var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, rmultiDash = /([A-Z])/g; -function Data() { - // Support: Android < 4, - // Old WebKit does not have Object.preventExtensions/freeze method, - // return new empty object instead with no [[set]] accessor - Object.defineProperty( this.cache = {}, 0, { - get: function() { - return {}; - } - }); +function internalData( elem, name, data, pvt /* Internal Use Only */ ){ + if ( !jQuery.acceptData( elem ) ) { + return; + } - this.expando = jQuery.expando + Math.random(); + var ret, thisCache, + internalKey = jQuery.expando, + + // We have to handle DOM nodes and JS objects differently because IE6-7 + // can't GC object references properly across the DOM-JS boundary + isNode = elem.nodeType, + + // Only DOM nodes need the global jQuery cache; JS object data is + // attached directly to the object so GC can occur automatically + cache = isNode ? jQuery.cache : elem, + + // Only defining an ID for JS objects if its cache already exists allows + // the code to shortcut on the same path as a DOM node with no cache + id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey; + + // Avoid doing any more work than we need to when trying to get data on an + // object that has no data at all + if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) { + return; + } + + if ( !id ) { + // Only DOM nodes need a new unique ID for each element since their data + // ends up in the global cache + if ( isNode ) { + id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++; + } else { + id = internalKey; + } + } + + if ( !cache[ id ] ) { + // Avoid exposing jQuery metadata on plain JS objects when the object + // is serialized using JSON.stringify + cache[ id ] = isNode ? {} : { toJSON: jQuery.noop }; + } + + // An object can be passed to jQuery.data instead of a key/value pair; this gets + // shallow copied over onto the existing cache + if ( typeof name === "object" || typeof name === "function" ) { + if ( pvt ) { + cache[ id ] = jQuery.extend( cache[ id ], name ); + } else { + cache[ id ].data = jQuery.extend( cache[ id ].data, name ); + } + } + + thisCache = cache[ id ]; + + // jQuery data() is stored in a separate object inside the object's internal data + // cache in order to avoid key collisions between internal data and user-defined + // data. + if ( !pvt ) { + if ( !thisCache.data ) { + thisCache.data = {}; + } + + thisCache = thisCache.data; + } + + if ( data !== undefined ) { + thisCache[ jQuery.camelCase( name ) ] = data; + } + + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( typeof name === "string" ) { + + // First Try to find as-is property data + ret = thisCache[ name ]; + + // Test for null|undefined property data + if ( ret == null ) { + + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } + + return ret; } -Data.uid = 1; +function internalRemoveData( elem, name, pvt ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } -Data.accepts = function( owner ) { - // Accepts only: - // - Node - // - Node.ELEMENT_NODE - // - Node.DOCUMENT_NODE - // - Object - // - Any - return owner.nodeType ? - owner.nodeType === 1 || owner.nodeType === 9 : true; -}; + var thisCache, i, + isNode = elem.nodeType, -Data.prototype = { - key: function( owner ) { - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return the key for a frozen object. - if ( !Data.accepts( owner ) ) { - return 0; - } + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + id = isNode ? elem[ jQuery.expando ] : jQuery.expando; - var descriptor = {}, - // Check if the owner object already has a cache key - unlock = owner[ this.expando ]; + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } - // If not, create one - if ( !unlock ) { - unlock = Data.uid++; + if ( name ) { - // Secure it in a non-enumerable, non-writable property - try { - descriptor[ this.expando ] = { value: unlock }; - Object.defineProperties( owner, descriptor ); + thisCache = pvt ? cache[ id ] : cache[ id ].data; - // Support: Android < 4 - // Fallback to a less secure definition - } catch ( e ) { - descriptor[ this.expando ] = unlock; - jQuery.extend( owner, descriptor ); - } - } + if ( thisCache ) { - // Ensure the cache object - if ( !this.cache[ unlock ] ) { - this.cache[ unlock ] = {}; - } + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { - return unlock; - }, - set: function( owner, data, value ) { - var prop, - // There may be an unlock assigned to this node, - // if there is no entry for this "owner", create one inline - // and set the unlock as though an owner entry had always existed - unlock = this.key( owner ), - cache = this.cache[ unlock ]; + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { - // Handle: [ owner, key, value ] args - if ( typeof data === "string" ) { - cache[ data ] = value; - - // Handle: [ owner, { properties } ] args - } else { - // Fresh assignments by object are shallow copied - if ( jQuery.isEmptyObject( cache ) ) { - jQuery.extend( this.cache[ unlock ], data ); - // Otherwise, copy the properties one-by-one to the cache object - } else { - for ( prop in data ) { - cache[ prop ] = data[ prop ]; + // split the camel cased version by spaces unless a key with the spaces exists + name = jQuery.camelCase( name ); + if ( name in thisCache ) { + name = [ name ]; + } else { + name = name.split(" "); + } } - } - } - return cache; - }, - get: function( owner, key ) { - // Either a valid cache is found, or will be created. - // New caches will be created and the unlock returned, - // allowing direct access to the newly created - // empty data object. A valid owner object must be provided. - var cache = this.cache[ this.key( owner ) ]; - - return key === undefined ? - cache : cache[ 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, name, camel, - unlock = this.key( owner ), - cache = this.cache[ unlock ]; - - if ( key === undefined ) { - this.cache[ unlock ] = {}; - - } else { - // Support array or space separated string of keys - if ( jQuery.isArray( key ) ) { + } else { // If "name" is an array of keys... // When data is initially created, via ("key", "val") signature, // keys will be converted to camelCase. // Since there is no way to tell _how_ a key was added, remove // both plain key and camelCase key. #12786 // This will only penalize the array argument path. - name = key.concat( key.map( jQuery.camelCase ) ); - } else { - camel = jQuery.camelCase( key ); - // Try the string as a key before any manipulation - if ( key in cache ) { - name = [ key, camel ]; - } else { - // If a key with the spaces exists, use it. - // Otherwise, create an array by matching non-whitespace - name = camel; - name = name in cache ? - [ name ] : ( name.match( core_rnotwhite ) || [] ); - } + name = name.concat( jQuery.map( name, jQuery.camelCase ) ); } i = name.length; while ( i-- ) { - delete cache[ name[ i ] ]; + delete thisCache[ name[i] ]; + } + + // If there is no data left in the cache, we want to continue + // and let the cache object itself get destroyed + if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) { + return; } } - }, - hasData: function( owner ) { - return !jQuery.isEmptyObject( - this.cache[ owner[ this.expando ] ] || {} - ); - }, - discard: function( owner ) { - if ( owner[ this.expando ] ) { - delete this.cache[ owner[ this.expando ] ]; + } + + // See jQuery.data for more information + if ( !pvt ) { + delete cache[ id ].data; + + // Don't destroy the parent cache unless the internal data object + // had been the only thing left in it + if ( !isEmptyDataObject( cache[ id ] ) ) { + return; } } -}; -// These may be used throughout the jQuery core codebase -data_user = new Data(); -data_priv = new Data(); + // Destroy the cache + if ( isNode ) { + jQuery.cleanData( [ elem ], true ); + // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) + /* jshint eqeqeq: false */ + } else if ( jQuery.support.deleteExpando || cache != cache.window ) { + /* jshint eqeqeq: true */ + delete cache[ id ]; + + // When all else fails, null + } else { + cache[ id ] = null; + } +} jQuery.extend({ - acceptData: Data.accepts, + cache: {}, + + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "applet": true, + "embed": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" + }, hasData: function( elem ) { - return data_user.hasData( elem ) || data_priv.hasData( elem ); + elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + return !!elem && !isEmptyDataObject( elem ); }, data: function( elem, name, data ) { - return data_user.access( elem, name, data ); + return internalData( elem, name, data ); }, removeData: function( elem, name ) { - data_user.remove( elem, name ); + return internalRemoveData( elem, name ); }, - // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to data_priv methods, these can be deprecated. + // For internal use only. _data: function( elem, name, data ) { - return data_priv.access( elem, name, data ); + return internalData( elem, name, data, true ); }, _removeData: function( elem, name ) { - data_priv.remove( elem, name ); + return internalRemoveData( elem, name, true ); + }, + + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + // Do not set data on non-element because it will not be cleared (#8335). + if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) { + return false; + } + + var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ]; + + // nodes accept data unless otherwise specified; rejection can be conditional + return !noData || noData !== true && elem.getAttribute("classid") === noData; } }); jQuery.fn.extend({ data: function( key, value ) { var attrs, name, - elem = this[ 0 ], + data = null, i = 0, - data = null; + elem = this[0]; + + // Special expections of .data basically thwart jQuery.access, + // so implement the relevant behavior ourselves // Gets all values if ( key === undefined ) { if ( this.length ) { - data = data_user.get( elem ); + data = jQuery.data( elem ); - if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { + if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { attrs = elem.attributes; for ( ; i < attrs.length; i++ ) { - name = attrs[ i ].name; + name = attrs[i].name; - if ( name.indexOf( "data-" ) === 0 ) { + if ( name.indexOf("data-") === 0 ) { name = jQuery.camelCase( name.slice(5) ); + dataAttr( elem, name, data[ name ] ); } } - data_priv.set( elem, "hasDataAttrs", true ); + jQuery._data( elem, "parsedAttrs", true ); } } @@ -3576,80 +3828,36 @@ jQuery.fn.extend({ // Sets multiple values if ( typeof key === "object" ) { return this.each(function() { - data_user.set( this, key ); + jQuery.data( this, key ); }); } - return jQuery.access( this, function( value ) { - var data, - camelKey = jQuery.camelCase( key ); + return arguments.length > 1 ? - // 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 - // with the key as-is - data = data_user.get( elem, key ); - if ( data !== undefined ) { - return data; - } - - // Attempt to get data from the cache - // with the key camelized - data = data_user.get( elem, camelKey ); - if ( data !== undefined ) { - return data; - } - - // Attempt to "discover" the data in - // HTML5 custom data-* attrs - data = dataAttr( elem, camelKey, undefined ); - if ( data !== undefined ) { - return data; - } - - // We tried really hard, but the data doesn't exist. - return; - } - - // Set the data... + // Sets one value this.each(function() { - // First, attempt to store a copy or reference of any - // data that might've been store with a camelCased key. - var data = data_user.get( this, camelKey ); + jQuery.data( this, key, value ); + }) : - // For HTML5 data-* attribute interop, we have to - // store property names with dashes in a camelCase form. - // This might not apply to all properties...* - data_user.set( this, camelKey, value ); - - // *... In the case of properties that might _actually_ - // have dashes, we need to also store a copy of that - // unchanged property. - if ( key.indexOf("-") !== -1 && data !== undefined ) { - data_user.set( this, key, value ); - } - }); - }, null, value, arguments.length > 1, null, true ); + // Gets one value + // Try to fetch any internally stored data first + elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null; }, removeData: function( key ) { return this.each(function() { - data_user.remove( this, key ); + jQuery.removeData( this, key ); }); } }); 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, "-$1" ).toLowerCase(); + + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + data = elem.getAttribute( name ); if ( typeof data === "string" ) { @@ -3659,30 +3867,49 @@ function dataAttr( elem, key, data ) { data === "null" ? null : // Only convert to a number if it doesn't change the string +data + "" === data ? +data : - rbrace.test( data ) ? JSON.parse( data ) : - data; + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; } catch( e ) {} // Make sure we set the data so it isn't changed later - data_user.set( elem, key, data ); + jQuery.data( elem, key, data ); + } else { data = undefined; } } + return data; } + +// checks a cache object for emptiness +function isEmptyDataObject( obj ) { + var name; + for ( name in obj ) { + + // if the public data object is empty, the private is still empty + if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { + continue; + } + if ( name !== "toJSON" ) { + return false; + } + } + + return true; +} jQuery.extend({ queue: function( elem, type, data ) { var queue; if ( elem ) { type = ( type || "fx" ) + "queue"; - queue = data_priv.get( elem, type ); + queue = jQuery._data( elem, type ); // Speed up dequeue by getting out quickly if this is just a lookup if ( data ) { - if ( !queue || jQuery.isArray( data ) ) { - queue = data_priv.access( elem, type, jQuery.makeArray(data) ); + if ( !queue || jQuery.isArray(data) ) { + queue = jQuery._data( elem, type, jQuery.makeArray(data) ); } else { queue.push( data ); } @@ -3729,9 +3956,10 @@ jQuery.extend({ // not intended for public consumption - generates a queueHooks object, or returns the current one _queueHooks: function( elem, type ) { var key = type + "queueHooks"; - return data_priv.get( elem, key ) || data_priv.access( elem, key, { + return jQuery._data( elem, key ) || jQuery._data( elem, key, { empty: jQuery.Callbacks("once memory").add(function() { - data_priv.remove( elem, [ type + "queue", key ] ); + jQuery._removeData( elem, type + "queue" ); + jQuery._removeData( elem, key ); }) }); } @@ -3806,7 +4034,7 @@ jQuery.fn.extend({ type = type || "fx"; while( i-- ) { - tmp = data_priv.get( elements[ i ], type + "queueHooks" ); + tmp = jQuery._data( elements[ i ], type + "queueHooks" ); if ( tmp && tmp.empty ) { count++; tmp.empty.add( resolve ); @@ -3819,7 +4047,11 @@ jQuery.fn.extend({ var nodeHook, boolHook, rclass = /[\t\r\n\f]/g, rreturn = /\r/g, - rfocusable = /^(?:input|select|textarea|button)$/i; + rfocusable = /^(?:input|select|textarea|button|object)$/i, + rclickable = /^(?:a|area)$/i, + ruseDefault = /^(?:checked|selected)$/i, + getSetAttribute = jQuery.support.getSetAttribute, + getSetInput = jQuery.support.input; jQuery.fn.extend({ attr: function( name, value ) { @@ -3837,8 +4069,13 @@ jQuery.fn.extend({ }, removeProp: function( name ) { + name = jQuery.propFix[ name ] || name; return this.each(function() { - delete this[ jQuery.propFix[ name ] || name ]; + // try/catch handles cases where IE balks (such as removing a property on window) + try { + this[ name ] = undefined; + delete this[ name ]; + } catch( e ) {} }); }, @@ -3920,8 +4157,11 @@ jQuery.fn.extend({ }, toggleClass: function( value, stateVal ) { - var type = typeof value, - isBool = typeof stateVal === "boolean"; + 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 ) { @@ -3935,27 +4175,29 @@ jQuery.fn.extend({ var className, i = 0, self = jQuery( this ), - state = stateVal, classNames = value.match( core_rnotwhite ) || []; while ( (className = classNames[ i++ ]) ) { // check each className given, space separated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); + if ( self.hasClass( className ) ) { + self.removeClass( className ); + } else { + self.addClass( className ); + } } // Toggle whole class name } else if ( type === core_strundefined || type === "boolean" ) { if ( this.className ) { // store className if set - data_priv.set( this, "__className__", this.className ); + jQuery._data( this, "__className__", this.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. - this.className = this.className || value === false ? "" : data_priv.get( this, "__className__" ) || ""; + this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; } }); }, @@ -3974,7 +4216,7 @@ jQuery.fn.extend({ }, val: function( value ) { - var hooks, ret, isFunction, + var ret, hooks, isFunction, elem = this[0]; if ( !arguments.length ) { @@ -4037,10 +4279,11 @@ jQuery.extend({ valHooks: { option: { get: function( elem ) { - // attributes.value is undefined in Blackberry 4.7 but - // uses .value. See #6932 - var val = elem.attributes.value; - return !val || val.specified ? elem.value : elem.text; + // Use proper attribute retrieval(#6932, #12072) + var val = jQuery.find.attr( elem, "value" ); + return val != null ? + val : + elem.text; } }, select: { @@ -4059,7 +4302,7 @@ jQuery.extend({ for ( ; i < max; i++ ) { option = options[ i ]; - // IE6-9 doesn't update selected after form reset (#2551) + // oldIE 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 ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && @@ -4163,10 +4406,21 @@ jQuery.extend({ // Boolean attributes get special treatment (#10870) if ( jQuery.expr.match.bool.test( name ) ) { // Set corresponding property to false - elem[ propName ] = false; + if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + elem[ propName ] = false; + // Support: IE<9 + // Also clear defaultChecked/defaultSelected (if appropriate) + } else { + elem[ jQuery.camelCase( "default-" + name ) ] = + elem[ propName ] = false; + } + + // See #9699 for explanation of this approach (setting first, then removal) + } else { + jQuery.attr( elem, name, "" ); } - elem.removeAttribute( name ); + elem.removeAttribute( getSetAttribute ? name : propName ); } } }, @@ -4225,9 +4479,16 @@ jQuery.extend({ propHooks: { tabIndex: { get: function( elem ) { - return elem.hasAttribute( "tabindex" ) || rfocusable.test( elem.nodeName ) || elem.href ? - elem.tabIndex : - -1; + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // 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" ); + + return tabindex ? + parseInt( tabindex, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + -1; } } } @@ -4239,42 +4500,166 @@ boolHook = { if ( value === false ) { // Remove boolean attributes when set to false jQuery.removeAttr( elem, name ); + } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + // IE<8 needs the *property* name + elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name ); + + // Use defaultChecked and defaultSelected for oldIE } else { - elem.setAttribute( name, name ); + elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true; } + return name; } }; jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) { var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr; - jQuery.expr.attrHandle[ name ] = function( elem, name, isXML ) { - var fn = jQuery.expr.attrHandle[ name ], - ret = isXML ? - undefined : - /* jshint eqeqeq: false */ - // Temporarily disable this handler to check existence - (jQuery.expr.attrHandle[ name ] = undefined) != - getter( elem, name, isXML ) ? + jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ? + function( elem, name, isXML ) { + var fn = jQuery.expr.attrHandle[ name ], + ret = isXML ? + undefined : + /* jshint eqeqeq: false */ + (jQuery.expr.attrHandle[ name ] = undefined) != + getter( elem, name, isXML ) ? + name.toLowerCase() : + null; + jQuery.expr.attrHandle[ name ] = fn; + return ret; + } : + function( elem, name, isXML ) { + return isXML ? + undefined : + elem[ jQuery.camelCase( "default-" + name ) ] ? name.toLowerCase() : null; - - // Restore handler - jQuery.expr.attrHandle[ name ] = fn; - - return ret; - }; + }; }); -// Support: IE9+ -// Selectedness for an option in an optgroup can be inaccurate +// fix oldIE attroperties +if ( !getSetInput || !getSetAttribute ) { + jQuery.attrHooks.value = { + set: function( elem, value, name ) { + if ( jQuery.nodeName( elem, "input" ) ) { + // Does not return so that setAttribute is also used + elem.defaultValue = value; + } else { + // Use nodeHook if defined (#1954); otherwise setAttribute is fine + return nodeHook && nodeHook.set( elem, value, name ); + } + } + }; +} + +// IE6/7 do not support getting/setting some attributes with get/setAttribute +if ( !getSetAttribute ) { + + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = { + set: function( elem, value, name ) { + // Set the existing or create a new attribute node + var ret = elem.getAttributeNode( name ); + if ( !ret ) { + elem.setAttributeNode( + (ret = elem.ownerDocument.createAttribute( name )) + ); + } + + ret.value = value += ""; + + // Break association with cloned elements by also using setAttribute (#9646) + return name === "value" || value === elem.getAttribute( name ) ? + value : + undefined; + } + }; + jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords = + // Some attributes are constructed with empty-string values when not defined + function( elem, name, isXML ) { + var ret; + return isXML ? + undefined : + (ret = elem.getAttributeNode( name )) && ret.value !== "" ? + ret.value : + null; + }; + jQuery.valHooks.button = { + get: function( elem, name ) { + var ret = elem.getAttributeNode( name ); + return ret && ret.specified ? + ret.value : + undefined; + }, + set: nodeHook.set + }; + + // Set contenteditable to false on removals(#10429) + // Setting to empty string throws an error as an invalid value + jQuery.attrHooks.contenteditable = { + set: function( elem, value, name ) { + nodeHook.set( elem, value === "" ? false : value, name ); + } + }; + + // Set width and height to auto instead of 0 on empty string( Bug #8150 ) + // This is for removals + jQuery.each([ "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = { + set: function( elem, value ) { + if ( value === "" ) { + elem.setAttribute( name, "auto" ); + return value; + } + } + }; + }); +} + + +// Some attributes require a special call on IE +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !jQuery.support.hrefNormalized ) { + // href/src property should get the full normalized URL (#10299/#12915) + jQuery.each([ "href", "src" ], function( i, name ) { + jQuery.propHooks[ name ] = { + get: function( elem ) { + return elem.getAttribute( name, 4 ); + } + }; + }); +} + +if ( !jQuery.support.style ) { + jQuery.attrHooks.style = { + get: function( elem ) { + // Return undefined in the case of empty string + // Note: IE uppercases css property names, but if we were to .toLowerCase() + // .cssText, that would destroy case senstitivity in URL's, like in "background" + return elem.style.cssText || undefined; + }, + set: function( elem, value ) { + return ( elem.style.cssText = value + "" ); + } + }; +} + +// Safari mis-reports the default selected property of an option +// Accessing the parent's selectedIndex property fixes it if ( !jQuery.support.optSelected ) { jQuery.propHooks.selected = { get: function( elem ) { var parent = elem.parentNode; - if ( parent && parent.parentNode ) { - parent.parentNode.selectedIndex; + + if ( parent ) { + parent.selectedIndex; + + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } } return null; } @@ -4296,6 +4681,11 @@ jQuery.each([ jQuery.propFix[ this.toLowerCase() ] = this; }); +// IE6/7 call enctype encoding +if ( !jQuery.support.enctype ) { + jQuery.propFix.enctype = "encoding"; +} + // Radios and checkboxes getter/setter jQuery.each([ "radio", "checkbox" ], function() { jQuery.valHooks[ this ] = { @@ -4313,7 +4703,8 @@ jQuery.each([ "radio", "checkbox" ], function() { }; } }); -var rkeyEvent = /^key/, +var rformElems = /^(?:input|select|textarea)$/i, + rkeyEvent = /^key/, rmouseEvent = /^(?:mouse|contextmenu)|click/, rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; @@ -4341,11 +4732,10 @@ jQuery.event = { global: {}, add: function( elem, types, handler, data, selector ) { - - var handleObjIn, eventHandle, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = data_priv.get( elem ); + var tmp, events, t, handleObjIn, + special, eventHandle, handleObj, + handlers, type, namespaces, origType, + elemData = jQuery._data( elem ); // Don't attach events to noData or text/comment nodes (but allow plain objects) if ( !elemData ) { @@ -4419,10 +4809,14 @@ jQuery.event = { handlers = events[ type ] = []; handlers.delegateCount = 0; - // Only use addEventListener if the special events handler returns false + // Only use addEventListener/attachEvent if the special events handler returns false if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element if ( elem.addEventListener ) { elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); } } } @@ -4452,11 +4846,11 @@ jQuery.event = { // 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 = data_priv.hasData( elem ) && data_priv.get( elem ); + var j, handleObj, tmp, + origCount, t, events, + special, handlers, type, + namespaces, origType, + elemData = jQuery.hasData( elem ) && jQuery._data( elem ); if ( !elemData || !(events = elemData.events) ) { return; @@ -4517,13 +4911,16 @@ jQuery.event = { // Remove the expando if it's no longer used if ( jQuery.isEmptyObject( events ) ) { delete elemData.handle; - data_priv.remove( elem, "events" ); + + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery._removeData( elem, "events" ); } }, trigger: function( event, data, elem, onlyHandlers ) { - - var i, cur, tmp, bubbleType, ontype, handle, special, + var handle, ontype, cur, + bubbleType, special, tmp, i, eventPath = [ elem || document ], type = core_hasOwn.call( event, "type" ) ? event.type : event, namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; @@ -4605,7 +5002,7 @@ jQuery.event = { special.bindType || type; // jQuery handler - handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); if ( handle ) { handle.apply( cur, data ); } @@ -4625,8 +5022,9 @@ jQuery.event = { jQuery.acceptData( elem ) ) { // Call a native DOM method on the target with the same name name as the event. + // Can't use an .isFunction() check here because IE6/7 fails that test. // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { + if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { // Don't re-trigger an onFOO event when we call its FOO() method tmp = elem[ ontype ]; @@ -4637,7 +5035,12 @@ jQuery.event = { // Prevent re-triggering of the same event, since we already bubbled it above jQuery.event.triggered = type; - elem[ type ](); + try { + elem[ type ](); + } catch ( e ) { + // IE<9 dies on focus/blur to hidden element (#1486,#12518) + // only reproducible on winXP IE8 native, not IE9 in IE8 mode + } jQuery.event.triggered = undefined; if ( tmp ) { @@ -4655,10 +5058,10 @@ jQuery.event = { // Make a writable jQuery.Event from the native event object event = jQuery.event.fix( event ); - var i, j, ret, matched, handleObj, + var i, ret, handleObj, matched, j, handlerQueue = [], args = core_slice.call( arguments ), - handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], + handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], special = jQuery.event.special[ event.type ] || {}; // Use the fix-ed jQuery.Event rather than the (read-only) native event @@ -4710,7 +5113,7 @@ jQuery.event = { }, handlers: function( event, handlers ) { - var i, matches, sel, handleObj, + var sel, handleObj, matches, i, handlerQueue = [], delegateCount = handlers.delegateCount, cur = event.target; @@ -4720,10 +5123,13 @@ jQuery.event = { // Avoid non-left-click bubbling in Firefox (#3861) if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { - for ( ; cur !== this; cur = cur.parentNode || this ) { + /* jshint eqeqeq: false */ + for ( ; cur != this; cur = cur.parentNode || this ) { + /* jshint eqeqeq: true */ + // Don't check non-elements (#13208) // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.disabled !== true || event.type !== "click" ) { + if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) { matches = []; for ( i = 0; i < delegateCount; i++ ) { handleObj = handlers[ i ]; @@ -4755,50 +5161,6 @@ jQuery.event = { return handlerQueue; }, - // Includes some event props shared by KeyEvent and MouseEvent - 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( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - fix: function( event ) { if ( event[ jQuery.expando ] ) { return event; @@ -4826,19 +5188,73 @@ jQuery.event = { event[ prop ] = originalEvent[ prop ]; } - // Support: Cordova 2.5 (WebKit) (#13255) - // All events should have a target; Cordova deviceready doesn't + // Support: IE<9 + // Fix target property (#1925) if ( !event.target ) { - event.target = document; + event.target = originalEvent.srcElement || document; } - // Support: Safari 6.0+, Chrome < 28 + // Support: Chrome 23+, Safari? // Target should not be a text node (#504, #13143) if ( event.target.nodeType === 3 ) { event.target = event.target.parentNode; } - return fixHook.filter? fixHook.filter( event, originalEvent ) : event; + // Support: IE<9 + // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) + event.metaKey = !!event.metaKey; + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + 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( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var body, eventDoc, doc, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } }, special: { @@ -4850,8 +5266,14 @@ jQuery.event = { // Fire native event if possible so blur/focus sequence is correct trigger: function() { if ( this !== safeActiveElement() && this.focus ) { - this.focus(); - return false; + try { + this.focus(); + return false; + } catch ( e ) { + // Support: IE<9 + // If we error on focus to hidden element (#1486, #12518), + // let .trigger() run the handlers + } } }, delegateType: "focusin" @@ -4868,7 +5290,7 @@ jQuery.event = { click: { // For checkbox, fire native event so checked state will be right trigger: function() { - if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { + if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { this.click(); return false; } @@ -4883,8 +5305,7 @@ jQuery.event = { beforeunload: { postDispatch: function( event ) { - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. + // Even when returnValue equals to undefined Firefox will still show alert if ( event.result !== undefined ) { event.originalEvent.returnValue = event.result; } @@ -4916,11 +5337,26 @@ jQuery.event = { } }; -jQuery.removeEvent = function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } -}; +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } + } : + function( elem, type, handle ) { + var name = "on" + type; + + if ( elem.detachEvent ) { + + // #8545, #7054, preventing memory leaks for custom events in IE6-8 + // detachEvent needed property on element, by name of that event, to properly expose it to GC + if ( typeof elem[ name ] === core_strundefined ) { + elem[ name ] = null; + } + + elem.detachEvent( name, handle ); + } + }; jQuery.Event = function( src, props ) { // Allow instantiation without the 'new' keyword @@ -4935,7 +5371,7 @@ jQuery.Event = function( src, props ) { // 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 || + this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; // Event type @@ -4966,19 +5402,35 @@ jQuery.Event.prototype = { var e = this.originalEvent; this.isDefaultPrevented = returnTrue; + if ( !e ) { + return; + } - if ( e && e.preventDefault ) { + // If preventDefault exists, run it on the original event + if ( e.preventDefault ) { e.preventDefault(); + + // Support: IE + // Otherwise set the returnValue property of the original event to false + } else { + e.returnValue = false; } }, stopPropagation: function() { var e = this.originalEvent; this.isPropagationStopped = returnTrue; - - if ( e && e.stopPropagation ) { + if ( !e ) { + return; + } + // If stopPropagation exists, run it on the original event + if ( e.stopPropagation ) { e.stopPropagation(); } + + // Support: IE + // Set the cancelBubble property of the original event to true + e.cancelBubble = true; }, stopImmediatePropagation: function() { this.isImmediatePropagationStopped = returnTrue; @@ -4987,7 +5439,6 @@ jQuery.Event.prototype = { }; // Create mouseenter/leave events using mouseover/out and event-time checks -// Support: Chrome 15+ jQuery.each({ mouseenter: "mouseover", mouseleave: "mouseout" @@ -5014,8 +5465,113 @@ jQuery.each({ }; }); +// IE submit delegation +if ( !jQuery.support.submitBubbles ) { + + jQuery.event.special.submit = { + setup: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + if ( form && !jQuery._data( form, "submitBubbles" ) ) { + jQuery.event.add( form, "submit._submit", function( event ) { + event._submit_bubble = true; + }); + jQuery._data( form, "submitBubbles", true ); + } + }); + // return undefined since we don't need an event listener + }, + + postDispatch: function( event ) { + // If form was submitted by the user, bubble the event up the tree + if ( event._submit_bubble ) { + delete event._submit_bubble; + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event, true ); + } + } + }, + + teardown: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); + } + }; +} + +// IE change delegation and checkbox/radio fix +if ( !jQuery.support.changeBubbles ) { + + jQuery.event.special.change = { + + setup: function() { + + if ( rformElems.test( this.nodeName ) ) { + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._just_changed = true; + } + }); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._just_changed && !event.isTrigger ) { + this._just_changed = false; + } + // Allow triggered, simulated change events (#11500) + jQuery.event.simulate( "change", this, event, true ); + }); + } + return false; + } + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; + + if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event, true ); + } + }); + jQuery._data( elem, "changeBubbles", true ); + } + }); + }, + + handle: function( event ) { + var elem = event.target; + + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); + } + }, + + teardown: function() { + jQuery.event.remove( this, "._change" ); + + return !rformElems.test( this.nodeName ); + } + }; +} + // Create "bubbling" focus and blur events -// Support: Firefox, Chrome, Safari if ( !jQuery.support.focusinBubbles ) { jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { @@ -5043,7 +5599,7 @@ if ( !jQuery.support.focusinBubbles ) { jQuery.fn.extend({ on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; + var type, origFn; // Types can be a map of types/handlers if ( typeof types === "object" ) { @@ -5181,12 +5737,12 @@ jQuery.fn.extend({ }, has: function( target ) { - var targets = jQuery( target, this ), - l = targets.length; + var i, + targets = jQuery( target, this ), + len = targets.length; return this.filter(function() { - var i = 0; - for ( ; i < l; i++ ) { + for ( i = 0; i < len; i++ ) { if ( jQuery.contains( this, targets[i] ) ) { return true; } @@ -5219,8 +5775,8 @@ jQuery.fn.extend({ var cur, i = 0, l = this.length, - matched = [], - pos = ( rneedsContext.test( selectors ) || typeof selectors !== "string" ) ? + ret = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? jQuery( selectors, context || this.context ) : 0; @@ -5234,13 +5790,13 @@ jQuery.fn.extend({ cur.nodeType === 1 && jQuery.find.matchesSelector(cur, selectors)) ) { - cur = matched.push( cur ); + cur = ret.push( cur ); break; } } } - return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); + return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret ); }, // Determine the position of an element within @@ -5249,20 +5805,18 @@ jQuery.fn.extend({ // No argument, return index in parent if ( !elem ) { - return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1; } // index in selector if ( typeof elem === "string" ) { - return core_indexOf.call( jQuery( elem ), this[ 0 ] ); + return jQuery.inArray( this[0], jQuery( elem ) ); } // Locate the position of the desired element - return core_indexOf.call( this, - + return jQuery.inArray( // If it receives a jQuery object, the first element is used - elem.jquery ? elem[ 0 ] : elem - ); + elem.jquery ? elem[0] : elem, this ); }, add: function( selector, context ) { @@ -5282,7 +5836,9 @@ jQuery.fn.extend({ }); function sibling( cur, dir ) { - while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} + do { + cur = cur[ dir ]; + } while ( cur && cur.nodeType !== 1 ); return cur; } @@ -5323,33 +5879,35 @@ jQuery.each({ return jQuery.sibling( elem.firstChild ); }, contents: function( elem ) { - return elem.contentDocument || jQuery.merge( [], elem.childNodes ); + return jQuery.nodeName( elem, "iframe" ) ? + elem.contentDocument || elem.contentWindow.document : + jQuery.merge( [], elem.childNodes ); } }, function( name, fn ) { jQuery.fn[ name ] = function( until, selector ) { - var matched = jQuery.map( this, fn, until ); + var ret = jQuery.map( this, fn, until ); if ( name.slice( -5 ) !== "Until" ) { selector = until; } if ( selector && typeof selector === "string" ) { - matched = jQuery.filter( selector, matched ); + ret = jQuery.filter( selector, ret ); } if ( this.length > 1 ) { // Remove duplicates if ( !guaranteedUnique[ name ] ) { - jQuery.unique( matched ); + ret = jQuery.unique( ret ); } // Reverse order for parents* and prev-derivatives if ( rparentsprev.test( name ) ) { - matched.reverse(); + ret = ret.reverse(); } } - return this.pushStack( matched ); + return this.pushStack( ret ); }; }); @@ -5370,29 +5928,27 @@ jQuery.extend({ dir: function( elem, dir, until ) { var matched = [], - truncate = until !== undefined; + cur = elem[ dir ]; - while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { + matched.push( cur ); } + cur = cur[dir]; } return matched; }, sibling: function( n, elem ) { - var matched = []; + var r = []; for ( ; n; n = n.nextSibling ) { if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); + r.push( n ); } } - return matched; + return r; } }); @@ -5422,11 +5978,31 @@ function winnow( elements, qualifier, not ) { } return jQuery.grep( elements, function( elem ) { - return ( core_indexOf.call( qualifier, elem ) >= 0 ) !== not; + return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; }); } -var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, +function createSafeFragment( document ) { + var list = nodeNames.split( "|" ), + safeFrag = document.createDocumentFragment(); + + if ( safeFrag.createElement ) { + while ( list.length ) { + safeFrag.createElement( + list.pop() + ); + } + } + return safeFrag; +} + +var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", + rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, + rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"), + rleadingWhitespace = /^\s+/, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, rtagName = /<([\w:]+)/, + rtbody = / // We have to close these tags to support XHTML (#13200) wrapMap = { - - // Support: IE 9 option: [ 1, "" ], - + legend: [ 1, "
", "
" ], + area: [ 1, "", "" ], + param: [ 1, "", "" ], thead: [ 1, "", "
" ], - col: [ 2, "", "
" ], tr: [ 2, "", "
" ], + col: [ 2, "", "
" ], td: [ 3, "", "
" ], - _default: [ 0, "", "" ] - }; + // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, + // unless wrapped in a div with non-breaking characters in front of it. + _default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
", "
" ] + }, + safeFragment = createSafeFragment( document ), + fragmentDiv = safeFragment.appendChild( document.createElement("div") ); -// Support: IE 9 wrapMap.optgroup = wrapMap.option; - wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; wrapMap.th = wrapMap.td; @@ -5461,7 +6039,7 @@ jQuery.fn.extend({ return jQuery.access( this, function( value ) { return value === undefined ? jQuery.text( this ) : - this.empty().append( ( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value ) ); + this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) ); }, null, value, arguments.length ); }, @@ -5506,6 +6084,7 @@ jQuery.fn.extend({ i = 0; for ( ; (elem = elems[i]) != null; i++ ) { + if ( !keepData && elem.nodeType === 1 ) { jQuery.cleanData( getAll( elem ) ); } @@ -5526,13 +6105,20 @@ jQuery.fn.extend({ i = 0; for ( ; (elem = this[i]) != null; i++ ) { + // Remove element nodes and prevent memory leaks if ( elem.nodeType === 1 ) { - - // Prevent memory leaks jQuery.cleanData( getAll( elem, false ) ); + } - // Remove any remaining nodes - elem.textContent = ""; + // Remove any remaining nodes + while ( elem.firstChild ) { + elem.removeChild( elem.firstChild ); + } + + // If this is a select, ensure that it displays empty (#12336) + // Support: IE<9 + if ( elem.options && jQuery.nodeName( elem, "select" ) ) { + elem.options.length = 0; } } @@ -5550,25 +6136,28 @@ jQuery.fn.extend({ html: function( value ) { return jQuery.access( this, function( value ) { - var elem = this[ 0 ] || {}, + var elem = this[0] || {}, i = 0, l = this.length; - if ( value === undefined && elem.nodeType === 1 ) { - return elem.innerHTML; + if ( value === undefined ) { + return elem.nodeType === 1 ? + elem.innerHTML.replace( rinlinejQuery, "" ) : + undefined; } // See if we can take a shortcut and just use innerHTML if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + ( jQuery.support.htmlSerialize || !rnoshimcache.test( value ) ) && + ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && + !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) { value = value.replace( rxhtmlTag, "<$1>" ); try { - for ( ; i < l; i++ ) { - elem = this[ i ] || {}; - + for (; i < l; i++ ) { // Remove element nodes and prevent memory leaks + elem = this[i] || {}; if ( elem.nodeType === 1 ) { jQuery.cleanData( getAll( elem, false ) ); elem.innerHTML = value; @@ -5578,7 +6167,7 @@ jQuery.fn.extend({ elem = 0; // If using innerHTML throws an exception, use the fallback method - } catch( e ) {} + } catch(e) {} } if ( elem ) { @@ -5624,12 +6213,13 @@ jQuery.fn.extend({ // Flatten any nested arrays args = core_concat.apply( [], args ); - var fragment, first, scripts, hasScripts, node, doc, + var first, node, hasScripts, + scripts, doc, fragment, i = 0, l = this.length, set = this, iNoClone = l - 1, - value = args[ 0 ], + value = args[0], isFunction = jQuery.isFunction( value ); // We can't cloneNode fragments that contain checked, in WebKit @@ -5637,7 +6227,7 @@ jQuery.fn.extend({ return this.each(function( index ) { var self = set.eq( index ); if ( isFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); + args[0] = value.call( this, index, self.html() ); } self.domManip( args, callback, allowIntersection ); }); @@ -5665,13 +6255,11 @@ jQuery.fn.extend({ // Keep references to cloned scripts for later restoration if ( hasScripts ) { - // Support: QtWebKit - // jQuery.merge because core_push.apply(_, arraylike) throws jQuery.merge( scripts, getAll( node, "script" ) ); } } - callback.call( this[ i ], node, i ); + callback.call( this[i], node, i ); } if ( hasScripts ) { @@ -5684,17 +6272,20 @@ jQuery.fn.extend({ for ( i = 0; i < hasScripts; i++ ) { node = scripts[ i ]; if ( rscriptType.test( node.type || "" ) && - !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) { if ( node.src ) { // Hope ajax is available... jQuery._evalUrl( node.src ); } else { - jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) ); } } } } + + // Fix #11809: Avoid leaking memory + fragment = first = null; } } @@ -5702,6 +6293,136 @@ jQuery.fn.extend({ } }); +// Support: IE<8 +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName("tbody")[0] || + elem.appendChild( elem.ownerDocument.createElement("tbody") ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = (jQuery.find.attr( elem, "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; +} + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var elem, + i = 0; + for ( ; (elem = elems[i]) != null; i++ ) { + jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) ); + } +} + +function cloneCopyEvent( src, dest ) { + + if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) { + return; + } + + var type, i, l, + oldData = jQuery._data( src ), + curData = jQuery._data( dest, oldData ), + events = oldData.events; + + if ( events ) { + delete curData.handle; + curData.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + + // make the cloned public data object a copy from the original + if ( curData.data ) { + curData.data = jQuery.extend( {}, curData.data ); + } +} + +function fixCloneNodeIssues( src, dest ) { + var nodeName, e, data; + + // We do not need to do anything for non-Elements + if ( dest.nodeType !== 1 ) { + return; + } + + nodeName = dest.nodeName.toLowerCase(); + + // IE6-8 copies events bound via attachEvent when using cloneNode. + if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) { + data = jQuery._data( dest ); + + for ( e in data.events ) { + jQuery.removeEvent( dest, e, data.handle ); + } + + // Event data gets referenced instead of copied if the expando gets copied too + dest.removeAttribute( jQuery.expando ); + } + + // IE blanks contents when cloning scripts, and tries to evaluate newly-set text + if ( nodeName === "script" && dest.text !== src.text ) { + disableScript( dest ).text = src.text; + restoreScript( dest ); + + // IE6-10 improperly clones children of object elements using classid. + // IE10 throws NoModificationAllowedError if parent is null, #12132. + } else if ( nodeName === "object" ) { + if ( dest.parentNode ) { + dest.outerHTML = src.outerHTML; + } + + // This path appears unavoidable for IE9. When cloning an object + // element in IE9, the outerHTML strategy above is not sufficient. + // If the src has innerHTML and the destination does not, + // copy the src.innerHTML into the dest.innerHTML. #10324 + if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) { + dest.innerHTML = src.innerHTML; + } + + } else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) { + // IE6-8 fails to persist the checked state of a cloned checkbox + // or radio button. Worse, IE6-7 fail to give the cloned element + // a checked appearance if the defaultChecked value isn't also set + + dest.defaultChecked = dest.checked = src.checked; + + // IE6-7 get confused and end up setting the value of a cloned + // checkbox/radio button to an empty string instead of "on" + if ( dest.value !== src.value ) { + dest.value = src.value; + } + + // IE6-8 fails to return the selected option to the default selected + // state when cloning options + } else if ( nodeName === "option" ) { + dest.defaultSelected = dest.selected = src.defaultSelected; + + // IE6-8 fails to set the defaultValue to the correct value when + // cloning other types of input fields + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + jQuery.each({ appendTo: "append", prependTo: "prepend", @@ -5711,17 +6432,16 @@ jQuery.each({ }, function( name, original ) { jQuery.fn[ name ] = function( selector ) { var elems, + i = 0, ret = [], insert = jQuery( selector ), - last = insert.length - 1, - i = 0; + last = insert.length - 1; for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone( true ); - jQuery( insert[ i ] )[ original ]( elems ); + elems = i === last ? this : this.clone(true); + jQuery( insert[i] )[ original ]( elems ); - // Support: QtWebKit - // .get() because core_push.apply(_, arraylike) throws + // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() core_push.apply( ret, elems.get() ); } @@ -5729,22 +6449,62 @@ jQuery.each({ }; }); +function getAll( context, tag ) { + var elems, elem, + i = 0, + found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) : + typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) : + undefined; + + if ( !found ) { + for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) { + if ( !tag || jQuery.nodeName( elem, tag ) ) { + found.push( elem ); + } else { + jQuery.merge( found, getAll( elem, tag ) ); + } + } + } + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], found ) : + found; +} + +// Used in buildFragment, fixes the defaultChecked property +function fixDefaultChecked( elem ) { + if ( manipulation_rcheckableType.test( elem.type ) ) { + elem.defaultChecked = elem.checked; + } +} + jQuery.extend({ clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var i, l, srcElements, destElements, - clone = elem.cloneNode( true ), + var destElements, node, clone, i, srcElements, inPage = jQuery.contains( elem.ownerDocument, elem ); - // Support: IE >= 9 - // Fix Cloning issues - if ( !jQuery.support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) { + if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { + clone = elem.cloneNode( true ); + + // IE<=8 does not properly clone detached, unknown element nodes + } else { + fragmentDiv.innerHTML = elem.outerHTML; + fragmentDiv.removeChild( clone = fragmentDiv.firstChild ); + } + + if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) && + (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) { // We eschew Sizzle here for performance reasons: http://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 ] ); + // Fix all IE cloning issues + for ( i = 0; (node = srcElements[i]) != null; ++i ) { + // Ensure that the destination node is not null; Fixes #9587 + if ( destElements[i] ) { + fixCloneNodeIssues( node, destElements[i] ); + } } } @@ -5754,8 +6514,8 @@ jQuery.extend({ srcElements = srcElements || getAll( elem ); destElements = destElements || getAll( clone ); - for ( i = 0, l = srcElements.length; i < l; i++ ) { - cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + for ( i = 0; (node = srcElements[i]) != null; i++ ) { + cloneCopyEvent( node, destElements[i] ); } } else { cloneCopyEvent( elem, clone ); @@ -5768,16 +6528,22 @@ jQuery.extend({ setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); } + destElements = srcElements = node = null; + // Return the cloned set return clone; }, buildFragment: function( elems, context, scripts, selection ) { - var elem, tmp, tag, wrap, contains, j, - i = 0, + var j, elem, contains, + tmp, tag, tbody, wrap, l = elems.length, - fragment = context.createDocumentFragment(), - nodes = []; + + // Ensure a safe fragment + safe = createSafeFragment( context ), + + nodes = [], + i = 0; for ( ; i < l; i++ ) { elem = elems[ i ]; @@ -5786,8 +6552,6 @@ jQuery.extend({ // Add nodes directly if ( jQuery.type( elem ) === "object" ) { - // Support: QtWebKit - // jQuery.merge because core_push.apply(_, arraylike) throws jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); // Convert non-html into a text node @@ -5796,35 +6560,71 @@ jQuery.extend({ // Convert html into DOM nodes } else { - tmp = tmp || fragment.appendChild( context.createElement("div") ); + tmp = tmp || safe.appendChild( context.createElement("div") ); // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || ["", ""] )[ 1 ].toLowerCase(); + tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(); wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; + + tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2]; // Descend through wrappers to the right content - j = wrap[ 0 ]; + j = wrap[0]; while ( j-- ) { - tmp = tmp.firstChild; + tmp = tmp.lastChild; + } + + // Manually add leading whitespace removed by IE + if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) { + nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) ); + } + + // Remove IE's autoinserted from table fragments + if ( !jQuery.support.tbody ) { + + // String was a , *may* have spurious + elem = tag === "table" && !rtbody.test( elem ) ? + tmp.firstChild : + + // String was a bare or + wrap[1] === "
" && !rtbody.test( elem ) ? + tmp : + 0; + + j = elem && elem.childNodes.length; + while ( j-- ) { + if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) { + elem.removeChild( tbody ); + } + } } - // Support: QtWebKit - // jQuery.merge because core_push.apply(_, arraylike) throws jQuery.merge( nodes, tmp.childNodes ); - // Remember the top-level container - tmp = fragment.firstChild; - - // Fixes #12346 - // Support: Webkit, IE + // Fix #12392 for WebKit and IE > 9 tmp.textContent = ""; + + // Fix #12392 for oldIE + while ( tmp.firstChild ) { + tmp.removeChild( tmp.firstChild ); + } + + // Remember the top-level container for proper cleanup + tmp = safe.lastChild; } } } - // Remove wrapper from fragment - fragment.textContent = ""; + // Fix #11356: Clear elements from fragment + if ( tmp ) { + safe.removeChild( tmp ); + } + + // Reset defaultChecked for any radios and checkboxes + // about to be appended to the DOM in IE 6/7 (#8060) + if ( !jQuery.support.appendChecked ) { + jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked ); + } i = 0; while ( (elem = nodes[ i++ ]) ) { @@ -5838,7 +6638,7 @@ jQuery.extend({ contains = jQuery.contains( elem.ownerDocument, elem ); // Append to fragment - tmp = getAll( fragment.appendChild( elem ), "script" ); + tmp = getAll( safe.appendChild( elem ), "script" ); // Preserve script evaluation history if ( contains ) { @@ -5856,22 +6656,29 @@ jQuery.extend({ } } - return fragment; + tmp = null; + + return safe; }, - cleanData: function( elems ) { - var data, elem, events, type, key, j, - special = jQuery.event.special, - i = 0; + cleanData: function( elems, /* internal */ acceptData ) { + var elem, type, id, data, + i = 0, + internalKey = jQuery.expando, + cache = jQuery.cache, + deleteExpando = jQuery.support.deleteExpando, + special = jQuery.event.special; - for ( ; (elem = elems[ i ]) !== undefined; i++ ) { - if ( Data.accepts( elem ) ) { - key = elem[ data_priv.expando ]; + for ( ; (elem = elems[i]) != null; i++ ) { - if ( key && (data = data_priv.cache[ key ]) ) { - events = Object.keys( data.events || {} ); - if ( events.length ) { - for ( j = 0; (type = events[j]) !== undefined; j++ ) { + if ( acceptData || jQuery.acceptData( elem ) ) { + + id = elem[ internalKey ]; + data = id && cache[ id ]; + + if ( data ) { + if ( data.events ) { + for ( type in data.events ) { if ( special[ type ] ) { jQuery.event.remove( elem, type ); @@ -5881,14 +6688,29 @@ jQuery.extend({ } } } - if ( data_priv.cache[ key ] ) { - // Discard any remaining `private` data - delete data_priv.cache[ key ]; + + // Remove cache only if it was not already removed by jQuery.event.remove + if ( cache[ id ] ) { + + delete cache[ id ]; + + // IE does not allow us to delete expando properties from nodes, + // nor does it have a removeAttribute function on Document nodes; + // we must handle all of these cases + if ( deleteExpando ) { + delete elem[ internalKey ]; + + } else if ( typeof elem.removeAttribute !== core_strundefined ) { + elem.removeAttribute( internalKey ); + + } else { + elem[ internalKey ] = null; + } + + core_deletedIds.push( id ); } } } - // Discard any remaining `user` data - delete data_user.cache[ elem[ data_user.expando ] ]; } }, @@ -5903,129 +6725,27 @@ jQuery.extend({ }); } }); - -// Support: 1.x compatibility -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName("tbody")[0] || - elem.appendChild( elem.ownerDocument.createElement("tbody") ) : - 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; -} - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var l = elems.length, - i = 0; - - for ( ; i < l; i++ ) { - data_priv.set( - elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) - ); - } -} - -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 ( data_priv.hasData( src ) ) { - pdataOld = data_priv.access( src ); - pdataCur = data_priv.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 ( data_user.hasData( src ) ) { - udataOld = data_user.access( src ); - udataCur = jQuery.extend( {}, udataOld ); - - data_user.set( dest, udataCur ); - } -} - - -function getAll( context, tag ) { - var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : - context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : - []; - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], ret ) : - ret; -} - -// Support: IE >= 9 -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" && manipulation_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; - } -} jQuery.fn.extend({ wrapAll: function( html ) { - var wrap; - if ( jQuery.isFunction( html ) ) { - return this.each(function( i ) { - jQuery( this ).wrapAll( html.call(this, i) ); + return this.each(function(i) { + jQuery(this).wrapAll( html.call(this, i) ); }); } - if ( this[ 0 ] ) { - + if ( this[0] ) { // The elements to wrap the target around - wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true ); + var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true); - if ( this[ 0 ].parentNode ) { - wrap.insertBefore( this[ 0 ] ); + if ( this[0].parentNode ) { + wrap.insertBefore( this[0] ); } wrap.map(function() { var elem = this; - while ( elem.firstElementChild ) { - elem = elem.firstElementChild; + while ( elem.firstChild && elem.firstChild.nodeType === 1 ) { + elem = elem.firstChild; } return elem; @@ -6037,8 +6757,8 @@ jQuery.fn.extend({ wrapInner: function( html ) { if ( jQuery.isFunction( html ) ) { - return this.each(function( i ) { - jQuery( this ).wrapInner( html.call(this, i) ); + return this.each(function(i) { + jQuery(this).wrapInner( html.call(this, i) ); }); } @@ -6058,7 +6778,7 @@ jQuery.fn.extend({ wrap: function( html ) { var isFunction = jQuery.isFunction( html ); - return this.each(function( i ) { + return this.each(function(i) { jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html ); }); }, @@ -6071,7 +6791,10 @@ jQuery.fn.extend({ }).end(); } }); -var curCSS, iframe, +var iframe, getStyles, curCSS, + ralpha = /alpha\([^)]*\)/i, + ropacity = /opacity\s*=\s*([^)]*)/, + rposition = /^(top|right|bottom|left)$/, // 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]).+)/, @@ -6120,12 +6843,6 @@ function isHidden( elem, el ) { return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); } -// NOTE: we've included the "window" in window.getComputedStyle -// because jsdom on node.js will break without it. -function getStyles( elem ) { - return window.getComputedStyle( elem, null ); -} - function showHide( elements, show ) { var display, elem, hidden, values = [], @@ -6138,7 +6855,7 @@ function showHide( elements, show ) { continue; } - values[ index ] = data_priv.get( elem, "olddisplay" ); + values[ index ] = jQuery._data( elem, "olddisplay" ); display = elem.style.display; if ( show ) { // Reset the inline display of this element to learn if it is @@ -6151,7 +6868,7 @@ function showHide( elements, show ) { // in a stylesheet to whatever the default browser style is // for such an element if ( elem.style.display === "" && isHidden( elem ) ) { - values[ index ] = data_priv.access( elem, "olddisplay", css_defaultDisplay(elem.nodeName) ); + values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) ); } } else { @@ -6159,7 +6876,7 @@ function showHide( elements, show ) { hidden = isHidden( elem ); if ( display && display !== "none" || !hidden ) { - data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css(elem, "display") ); + jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) ); } } } @@ -6183,7 +6900,7 @@ function showHide( elements, show ) { jQuery.fn.extend({ css: function( name, value ) { return jQuery.access( this, function( elem, name, value ) { - var styles, len, + var len, styles, map = {}, i = 0; @@ -6210,10 +6927,12 @@ jQuery.fn.extend({ return showHide( this ); }, toggle: function( state ) { - var bool = typeof state === "boolean"; + if ( typeof state === "boolean" ) { + return state ? this.show() : this.hide(); + } return this.each(function() { - if ( bool ? state : isHidden( this ) ) { + if ( isHidden( this ) ) { jQuery( this ).show(); } else { jQuery( this ).hide(); @@ -6244,6 +6963,7 @@ jQuery.extend({ "fontWeight": true, "lineHeight": true, "opacity": true, + "order": true, "orphans": true, "widows": true, "zIndex": true, @@ -6254,7 +6974,7 @@ jQuery.extend({ // setting or getting the value cssProps: { // normalize float css property - "float": "cssFloat" + "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat" }, // Get and set the style property on a DOM Node @@ -6296,7 +7016,7 @@ jQuery.extend({ value += "px"; } - // Fixes #8908, it can be done more correctly by specifying setters in cssHooks, + // Fixes #8908, it can be done more correctly by specifing setters in cssHooks, // but it would mean to define eight (for every problematic property) identical functions if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) { style[ name ] = "inherit"; @@ -6304,7 +7024,12 @@ jQuery.extend({ // 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 ) { - style[ name ] = value; + + // Wrapped to prevent IE from throwing errors when 'invalid' values are provided + // Fixes bug #5509 + try { + style[ name ] = value; + } catch(e) {} } } else { @@ -6319,7 +7044,7 @@ jQuery.extend({ }, css: function( elem, name, extra, styles ) { - var val, num, hooks, + var num, val, hooks, origName = jQuery.camelCase( name ); // Make sure that we're working with the right name @@ -6353,46 +7078,99 @@ jQuery.extend({ } }); -curCSS = function( elem, name, _computed ) { - var width, minWidth, maxWidth, - computed = _computed || getStyles( elem ), +// NOTE: we've included the "window" in window.getComputedStyle +// because jsdom on node.js will break without it. +if ( window.getComputedStyle ) { + getStyles = function( elem ) { + return window.getComputedStyle( elem, null ); + }; - // Support: IE9 - // getPropertyValue is only needed for .css('filter') in IE9, see #12537 - ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined, - style = elem.style; + curCSS = function( elem, name, _computed ) { + var width, minWidth, maxWidth, + computed = _computed || getStyles( elem ), - if ( computed ) { + // getPropertyValue is only needed for .css('filter') in IE9, see #12537 + ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined, + style = elem.style; - if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { - ret = jQuery.style( elem, name ); + if ( computed ) { + + if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { + ret = jQuery.style( elem, name ); + } + + // A tribute to the "awesome hack by Dean Edwards" + // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right + // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels + // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + if ( 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; + } } - // Support: Safari 5.1 - // A tribute to the "awesome hack by Dean Edwards" - // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels - // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values - if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) { + return ret; + }; +} else if ( document.documentElement.currentStyle ) { + getStyles = function( elem ) { + return elem.currentStyle; + }; + + curCSS = function( elem, name, _computed ) { + var left, rs, rsLeft, + computed = _computed || getStyles( elem ), + ret = computed ? computed[ name ] : undefined, + style = elem.style; + + // Avoid setting ret to empty string here + // so we don't default to auto + if ( ret == null && style && style[ name ] ) { + ret = style[ name ]; + } + + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + + // If we're not dealing with a regular pixel number + // but a number that has a weird ending, we need to convert it to pixels + // but not position css attributes, as those are proportional to the parent element instead + // and we can't measure the parent instead because it might trigger a "stacking dolls" problem + if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) { // Remember the original values - width = style.width; - minWidth = style.minWidth; - maxWidth = style.maxWidth; + left = style.left; + rs = elem.runtimeStyle; + rsLeft = rs && rs.left; // Put in the new values to get a computed value out - style.minWidth = style.maxWidth = style.width = ret; - ret = computed.width; + if ( rsLeft ) { + rs.left = elem.currentStyle.left; + } + style.left = name === "fontSize" ? "1em" : ret; + ret = style.pixelLeft + "px"; // Revert the changed values - style.width = width; - style.minWidth = minWidth; - style.maxWidth = maxWidth; + style.left = left; + if ( rsLeft ) { + rs.left = rsLeft; + } } - } - - return ret; -}; + return ret === "" ? "auto" : ret; + }; +} function setPositiveNumber( elem, value, subtract ) { var matches = rnumsplit.exec( value ); @@ -6553,15 +7331,57 @@ jQuery.each([ "height", "width" ], function( i, name ) { }; }); +if ( !jQuery.support.opacity ) { + jQuery.cssHooks.opacity = { + get: function( elem, computed ) { + // IE uses filters for opacity + return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ? + ( 0.01 * parseFloat( RegExp.$1 ) ) + "" : + computed ? "1" : ""; + }, + + set: function( elem, value ) { + var style = elem.style, + currentStyle = elem.currentStyle, + opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "", + filter = currentStyle && currentStyle.filter || style.filter || ""; + + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + style.zoom = 1; + + // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652 + // if value === "", then remove inline opacity #12685 + if ( ( value >= 1 || value === "" ) && + jQuery.trim( filter.replace( ralpha, "" ) ) === "" && + style.removeAttribute ) { + + // Setting style.filter to null, "" & " " still leave "filter:" in the cssText + // if "filter:" is present at all, clearType is disabled, we want to avoid this + // style.removeAttribute is IE Only, but so apparently is this code path... + style.removeAttribute( "filter" ); + + // if there is no filter style applied in a css rule or unset inline opacity, we are done + if ( value === "" || currentStyle && !currentStyle.filter ) { + return; + } + } + + // otherwise, set new filter values + style.filter = ralpha.test( filter ) ? + filter.replace( ralpha, opacity ) : + filter + " " + opacity; + } + }; +} + // These hooks cannot be added until DOM ready because the support test // for it is not run until after DOM ready jQuery(function() { - // Support: Android 2.3 if ( !jQuery.support.reliableMarginRight ) { jQuery.cssHooks.marginRight = { get: function( elem, computed ) { if ( computed ) { - // Support: Android 2.3 // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right // Work around by temporarily setting element display to inline-block return jQuery.swap( elem, { "display": "inline-block" }, @@ -6596,7 +7416,8 @@ if ( jQuery.expr && jQuery.expr.filters ) { jQuery.expr.filters.hidden = function( elem ) { // Support: Opera <= 12.12 // Opera reports offsetWidths and offsetHeights less than zero on some elements - return elem.offsetWidth <= 0 && elem.offsetHeight <= 0; + return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 || + (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none"); }; jQuery.expr.filters.visible = function( elem ) { @@ -6766,13 +7587,12 @@ var // Document location ajaxLocParts, ajaxLocation, - ajax_nonce = jQuery.now(), ajax_rquery = /\?/, rhash = /#.*$/, rts = /([?&])_=[^&]*/, - rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg, + rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL // #7653, #8125, #8152: local protocol detection rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/, rnoContent = /^(?:GET|HEAD)$/, @@ -6879,7 +7699,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX // that takes "flat" options (not to be deep extended) // Fixes #9887 function ajaxExtend( target, src ) { - var key, deep, + var deep, key, flatOptions = jQuery.ajaxSettings.flatOptions || {}; for ( key in src ) { @@ -6899,12 +7719,12 @@ jQuery.fn.load = function( url, params, callback ) { return _load.apply( this, arguments ); } - var selector, type, response, + var selector, response, type, self = this, off = url.indexOf(" "); if ( off >= 0 ) { - selector = url.slice( off ); + selector = url.slice( off, url.length ); url = url.slice( 0, off ); } @@ -7062,20 +7882,23 @@ jQuery.extend({ // Force options to be an object options = options || {}; - var transport, - // URL without anti-cache param - cacheURL, - // Response headers - responseHeadersString, - responseHeaders, - // timeout handle - timeoutTimer, - // Cross-domain detection vars + var // Cross-domain detection vars parts, - // To know if global events are to be dispatched - fireGlobals, // Loop variable i, + // URL without anti-cache param + cacheURL, + // Response headers as string + responseHeadersString, + // timeout handle + timeoutTimer, + + // To know if global events are to be dispatched + fireGlobals, + + transport, + // Response headers + responseHeaders, // Create the final options object s = jQuery.ajaxSetup( {}, options ), // Callbacks context @@ -7172,11 +7995,10 @@ jQuery.extend({ jqXHR.error = jqXHR.fail; // Remove hash character (#7531: and string promotion) - // Add protocol if not provided (prefilters might expect it) + // Add protocol if not provided (#5866: IE7 issue with protocol-less urls) // 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 || ajaxLocation ) + "" ).replace( rhash, "" ) - .replace( rprotocol, ajaxLocParts[ 1 ] + "//" ); + s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" ); // Alias method option to type as per ticket #12004 s.type = options.method || options.type || s.method || s.type; @@ -7472,8 +8294,7 @@ jQuery.each( [ "get", "post" ], function( i, method ) { * - returns the corresponding response */ function ajaxHandleResponses( s, jqXHR, responses ) { - - var ct, type, finalDataType, firstDataType, + var firstDataType, ct, finalDataType, type, contents = s.contents, dataTypes = s.dataTypes; @@ -7559,7 +8380,7 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) { if ( current ) { - // There's only work to do if current dataType is non-auto + // There's only work to do if current dataType is non-auto if ( current === "*" ) { current = prev; @@ -7633,42 +8454,71 @@ jQuery.ajaxSetup({ } }); -// Handle cache's special case and crossDomain +// Handle cache's special case and global jQuery.ajaxPrefilter( "script", function( s ) { if ( s.cache === undefined ) { s.cache = false; } if ( s.crossDomain ) { s.type = "GET"; + s.global = false; } }); // Bind script tag hack transport -jQuery.ajaxTransport( "script", function( s ) { +jQuery.ajaxTransport( "script", function(s) { + // This transport only deals with cross domain requests if ( s.crossDomain ) { - var script, callback; + + var script, + head = document.head || jQuery("head")[0] || document.documentElement; + return { - send: function( _, complete ) { - script = jQuery(" - - {% compress js %} + {% endcompress %} + + {% block footerscripts %} {% endblock %}