diff --git a/app.js b/app.js index 0c76edd15..b9b4ae1b9 100644 --- a/app.js +++ b/app.js @@ -98,8 +98,9 @@ function bootApplication(next) { // Load placeholder, replaced later app.use(app.mwHelpers.staticMiddleware('')); - // Media paths + // Core static paths app.use(express["static"](path + '/media', {maxAge: 86400000})); + app.use(express["static"](path + '/lib/client/js', {maxAge: 86400000})); // connect-form app.use(form({ diff --git a/bin/calipso b/bin/calipso index ca4510e97..5c5b81655 100755 --- a/bin/calipso +++ b/bin/calipso @@ -65,12 +65,11 @@ function runLauncher(appLauncher) { // Check if this is a calipso src folder if(isLibrary() && !appLauncher.src) { - console.log('\x1b[1mTo run this from the src folder, you need to add an "-s true" parameter, or please run from an empty directory or an installed calipso site\x1b[0m\r\n'); - return; + console.log('\r\nWARNING:'.yellow.bold + ' You are running this from a Calipso source folder.'.white.bold); } // Check if this is a calipso site - if(!isCalipso() && appLauncher.command != 'site' && !appLauncher.src) { + if(!isCalipso() && appLauncher.command != 'site' && !isLibrary()) { console.log('\x1b[1mThis is not a Calipso site - you must run:\x1b[0m calipso site SiteName\r\n'); return; } @@ -95,7 +94,7 @@ function runLauncher(appLauncher) { var modules = require('lib/cli/Modules') modules.moduleRouter(path,appLauncher.script.params,true,function(err) { if(err) { - console.log("\r\n" + err.message.red + "\r\n"); + console.log("\r\n" + err.message.red.bold + "\r\n"); } process.exit(); }); @@ -108,7 +107,7 @@ function runLauncher(appLauncher) { var themes = require('lib/cli/Themes') themes.themeRouter(path,appLauncher.script.params,true,function(err) { if(err) { - console.log("\r\n" + err.message.red + "\r\n"); + console.log("\r\n" + err.message.red.bold + "\r\n"); } process.exit(); }); @@ -230,7 +229,7 @@ function createApplicationAt(path) { mkdir(path + '/tmp',self.parallel()); copy(calipsoPath + '/app-cluster.js',path + '/',self.parallel()); copy(calipsoPath + '/app.js',path + '/',self.parallel()); - copy(calipsoPath + '/package.json',path + '/',self.parallel()); + copy(calipsoPath + '/package.json',path + '/',self.parallel()); copy(calipsoPath + '/logo.js',path + '/',self.parallel()); }, function done() { diff --git a/lib/Helpers.js b/lib/Helpers.js index 9fb8d7059..916f7226f 100644 --- a/lib/Helpers.js +++ b/lib/Helpers.js @@ -36,7 +36,7 @@ exports = module.exports = { request: function(req, res, calipso){ return req; }, - + /** * Config shortcut */ @@ -156,16 +156,14 @@ exports = module.exports = { }; }, - + /** * Retrieves the params parsed during module routing */ - getParams: function(req, res, calipso) { - + getParams: function(req, res, calipso) { return function() { return res.params; } - }, /** @@ -191,32 +189,30 @@ exports = module.exports = { return urlFrags.join('-'); }, - /** - * TODO Include a script in the response. - * Thoughts ... What this will actually do is add the file to a internal list. - * It will check if any of the files are different to the last request, if so, - * it will minify the contents of all the files, write to a temp js file, and reference - * that in the response (e.g. in the header of the template via another helper function). - * If nothing has changed it will just include the link to the previously generated file? - */ - includeScript: function(req, res, calipso){ - - return function(block) { - // TODO - not yet implemented - }; + addScript: function(req, res, calipso) { + return function(options) { + res.client.addScript(options); + } }, - /** - * TODO Retrieve the concatenated / minified js scripts to add to template. - */ - getScripts: function(req, res, calipso){ + getScripts: function(req, res, calipso) { + return function(next) { + res.client.listScripts(next); + } + }, - return function() { - // TODO - not yet implemented + addStyle: function(req, res, calipso) { + return function(options) { + res.client.addStyle(options); + } + }, - }; + getStyles: function(req, res, calipso) { + return function(next) { + res.client.listStyles(next); + } }, /** diff --git a/lib/Theme.js b/lib/Theme.js index 2e5032e15..df709c370 100644 --- a/lib/Theme.js +++ b/lib/Theme.js @@ -109,9 +109,9 @@ module.exports.Theme = function(theme, next) { // Scan through each layout var layout = res.layout ? res.layout : "default"; - + calipso.silly("Using layout " + layout); - + if(!theme.config.layouts[layout]) { layout = "default"; if(!theme.config.layouts[layout]) { @@ -120,8 +120,8 @@ module.exports.Theme = function(theme, next) { return; } } - - + + processTheme(req,res,layout,theme,function(err) { // If something went wrong ... @@ -129,7 +129,7 @@ module.exports.Theme = function(theme, next) { next(err,null); return; } - + // Now, process the layout template itself var themeOptions = createOptions(req,res,res.bufferedOutput); @@ -225,7 +225,7 @@ function processSection(req, res, section, sectionPath, layoutConfig, theme, nex if(typeof sectionCacheFn === "function") { sectionCacheFn(req,themeOptions,function(err,fnOptions) { - + if(err) { err.xMessage = "Issue executing the theme function for section " + section + ", check " + sectionPath.replace(".","/") + ".js"; localNext(err); @@ -287,25 +287,25 @@ function processTheme(req, res, layout, theme, next) { var copyConfig = theme.config.layouts[layoutConfig.copyFrom].layout; layoutConfig.sections = layoutConfig.sections || {}; - + // Copy over any missing sections from default for(var copySection in copyConfig.sections) { - + var sectionExists = layoutConfig.sections && layoutConfig.sections[copySection]; - var disable = layoutConfig.sections && layoutConfig.sections[copySection] && layoutConfig.sections[copySection].disable; + var disable = layoutConfig.sections && layoutConfig.sections[copySection] && layoutConfig.sections[copySection].disable; if(!sectionExists && !disable) { layoutConfig.sections[copySection] = copyConfig.sections[copySection]; layoutConfig.sections[copySection].layout = "default"; // Flag override as below } - + } } - + // Create a section array var sections = []; for(section in layoutConfig.sections) { - disable = layoutConfig.sections[section].disable; + disable = layoutConfig.sections[section].disable; if(!disable) { sections.push(section); } @@ -318,11 +318,11 @@ function processTheme(req, res, layout, theme, next) { // and better ability to debug function localNext(err) { totalDone += 1; - + if(totalDone == totalCount) { next(); } - + } for(section in layoutConfig.sections) { @@ -333,13 +333,13 @@ function processTheme(req, res, layout, theme, next) { var sectionPath = layoutOverride ? layoutOverride + "." + section : layout + "." + section; var cache = layoutConfig.sections[section].cache; var params = layoutConfig.sections[section].varyParams; - var cacheEnabled = calipso.config.get('performance:cache:enabled'); + var cacheEnabled = calipso.config.get('performance:cache:enabled'); var isAdmin = req.session.user && req.session.user.isAdmin; - - disable = layoutConfig.sections[section].disable; + + disable = layoutConfig.sections[section].disable; calipso.silly("Processing " + section + " ..."); - + // Sections are cacheable if(!disable) { if(cache && cacheEnabled && !isAdmin) { @@ -436,7 +436,7 @@ function cacheTheme(themeConfig, themePath, next) { // Add the templates - for(var section in layoutConfig.sections) { + for(var section in layoutConfig.sections) { var template = layoutConfig.sections[section].template; if(template) { templates.push({ @@ -532,7 +532,7 @@ function loadTemplate(templateCache, template, themePath, next) { path.exists(templatePath,function(exists) { if(exists) { - + fs.readFile(templatePath, 'utf8', function(err,data) { if(!err) { @@ -556,14 +556,14 @@ function loadTemplate(templateCache, template, themePath, next) { if(exists) { try { templateCache[template.name].fn = require(templateFnPath); - } catch(ex) { + } catch(ex) { next(ex); return; } } next(null,templateCache); }); - } else { + } else { next(err); } }); diff --git a/lib/Utils.js b/lib/Utils.js index 2fb0a0e34..bde9a61a0 100644 --- a/lib/Utils.js +++ b/lib/Utils.js @@ -1,7 +1,7 @@ /** * General utility methods */ - + exports = module.exports = { /** * Basically like getProperty, different return @@ -55,4 +55,4 @@ exports = module.exports = { } return obj; } -} \ No newline at end of file +} diff --git a/lib/calipso.js b/lib/calipso.js index 74011e586..c038446b0 100644 --- a/lib/calipso.js +++ b/lib/calipso.js @@ -52,7 +52,8 @@ var app, prettyDate: require(path.join(rootpath, 'utils/prettyDate.js')), crypto: require(path.join(rootpath, 'utils/crypto.js')), connect: require('connect'), - _:require('underscore') + _:require('underscore'), + async: require('async') }, sessionCache: {}, dynamicHelpers: require('./Helpers'), @@ -61,7 +62,7 @@ var app, for(var helper in this.dynamicHelpers) { req.helpers[helper] = this.dynamicHelpers[helper](req, res, this); } - }, + }, mongoConnect: mongoConnect, reloadConfig: reloadConfig, // Track running MR (Map Reduce) operations @@ -70,9 +71,9 @@ var app, theme: {}, // Holds global config data data: {}, - modules: {}, + modules: {}, // Core libraries - date: require('./Date').CalipsoDate, + date: require('./Date').CalipsoDate, table: require('./Table').CalipsoTable, link: require('./Link').CalipsoLink, menu: require('./Menu'), @@ -94,13 +95,13 @@ var app, // Set app and config references var app = require(path.join(rootpath, 'app')).app; - + app.calipso = app; calipso.app = app; - + // Load the calipso package.json into about loadAbout(app, rootpath, 'package.json'); - + calipso.config = app.config; // Configure the cache @@ -111,12 +112,12 @@ var app, initCallback(); }; - // Create our calipso event emitter + // Create our calipso event emitter calipso.e = new calipso.event.CalipsoEventEmitter({ hook:{ name:calipso.config.get('server:hookio:name'), 'hook-host':calipso.config.get('server:hookio:host'), - 'hook-port': calipso.config.get('server:hookio:port'), + 'hook-port': calipso.config.get('server:hookio:port'), debug: calipso.config.get('server:hookio:debug') } }); @@ -138,6 +139,10 @@ var app, secondary:new calipso.menu.CalipsoMenu('secondary','name','root',{cls:'secondary'})}; + // Initialise our clientJS library linked to this request + var Client = require('./client/Client'); + res.client = new Client(); + // Initialise helpers - first pass calipso.getDynamicHelpers(req, res); @@ -147,7 +152,7 @@ var app, // Best to parse the form very early in the chain if(req.form) { - calipso.form.process(req, function() { + calipso.form.process(req, function() { // Route the modules eventRouteModules(req, res, next); @@ -187,16 +192,16 @@ function initialiseCalipso(reloadConfig) { calipso.e.init(); // Configure the logging - calipso.logging.configureLogging(); + calipso.logging.configureLogging(); // Check / Connect Mongo mongoConnect(calipso.config.get('database:uri'),false,function(err,connected) { - + if(err) { console.log("There was an error connecting to the database: " + err.message); process.exit(); } - + // Load all the themes loadThemes(function() { @@ -212,7 +217,7 @@ function initialiseCalipso(reloadConfig) { }); }); - + }); } @@ -227,7 +232,7 @@ function eventRouteModules(req, res, next) { // Ignore static content // TODO : Make this more connect friendly or at least configurable if(req.url.match(/^\/images|^\/js|^\/css|^\/favicon.ico/)) { - return next(); + return next(); } req.timeStart = new Date(); @@ -348,7 +353,7 @@ function doLastModules(req, res, next) { } } - + // Execute their routing functions calipso.lib.step( @@ -368,7 +373,7 @@ function doLastModules(req, res, next) { } next(); - + } ); @@ -378,7 +383,7 @@ function doLastModules(req, res, next) { * Standard response to all modules completing their routing */ function doResponse(req, res, next) { - + // If we are in install mode, and are not in the installation process, then redirect if(!calipso.config.get('installed') && !req.url.match(/^\/admin\/install/)) { calipso.silly("Redirecting to admin/install ..."); @@ -398,7 +403,7 @@ function doResponse(req, res, next) { if(res.statusCode === 404 || res.statusCode === 500 || res.statusCode === 200) { calipso.theme.render(req, res, function(err, content) { - + if(err) { // Something went wrong at the layout, cannot use layout to render. @@ -429,19 +434,19 @@ function doResponse(req, res, next) { } /** -* Called both via a hook.io event as +* Called both via a hook.io event as * well as via the server that initiated it. */ -function reloadConfig(event, data, next) { - +function reloadConfig(event, data, next) { + // Create a callback - calipso.initCallback = function (err) { + calipso.initCallback = function (err) { // If called via event emitter rather than hook if(typeof next === "function") next(err); } - initialiseCalipso(true); + initialiseCalipso(true); return; - + } /** @@ -453,7 +458,7 @@ function initModules() { // Reset calipso.initComplete = false; - + // Create a list of all our enabled modules var enabledModules = []; for(var module in calipso.modules) { @@ -936,7 +941,7 @@ function configureTheme(next, overrideTheme) { var defaultTheme = calipso.config.get("theme:default"); if(theme) { - + require('./Theme').Theme(theme,function(loadedTheme) { calipso.theme = loadedTheme; @@ -998,30 +1003,30 @@ function configureTheme(next, overrideTheme) { */ function mongoConnect(dbUri,checkInstalling,next) { - // Test the mongodb configuration + // Test the mongodb configuration var isInstalled = calipso.config.get('installed'); - + // If first option is callback, ste dbUri to config value if(typeof dbUri === "function") { next = dbUri; dbUri = calipso.config.get('database:uri'); checkInstalling = false; } - + // Check we are installing ... - if(checkInstalling) { - var db = mongoose.createConnection(dbUri,function(err) { - next(err,false); + if(checkInstalling) { + var db = mongoose.createConnection(dbUri,function(err) { + next(err,false); }); - return; + return; } - + if(isInstalled) { - + // Always disconnect first just in case any left overs from installation mongoose.disconnect(function() { - - mongoose.connect(dbUri,function(err) { + + mongoose.connect(dbUri,function(err) { if (err) { // Add additional detail to know errors switch (err.code) { @@ -1032,11 +1037,11 @@ function mongoConnect(dbUri,checkInstalling,next) { calipso.error("Fatal unknown error: ".magenta + err); } mongoose.disconnect(function() { - next(err); - }); - } else { - calipso.silly("Database connection to " + dbUri + " was successful."); - + next(err); + }); + } else { + calipso.silly("Database connection to " + dbUri + " was successful."); + // Replace the inmemory session with mongodb backed one var foundMiddleware = false, mw; calipso.app.stack.forEach(function(middleware,key) { @@ -1044,21 +1049,21 @@ function mongoConnect(dbUri,checkInstalling,next) { foundMiddleware = true; mw = calipso.lib.express.session({ secret: calipso.config.get('session:secret') , store: mongoStore({ url: calipso.config.get('database:uri') }) }); mw.tag = 'session' - calipso.app.stack[key].handle = mw; + calipso.app.stack[key].handle = mw; } }); - + if(!foundMiddleware) { return next(new Error("Unable to load the MongoDB backed session, please check your session and db configuration"),false); } - - return next(null,true); - + + return next(null,true); + } }); }); - + } else { calipso.silly("Database connection not attempted to " + dbUri + " as in installation mode.") next(null,false); diff --git a/lib/cli/Download.js b/lib/cli/Download.js index a98e25670..9616854a5 100644 --- a/lib/cli/Download.js +++ b/lib/cli/Download.js @@ -15,12 +15,16 @@ var rootpath = process.cwd() + '/', path = require('path') calipso = require(path.join(rootpath, 'lib/calipso')), - Api = require(path.join(rootpath, 'lib/cli/RepoApi')), + api = require(path.join(rootpath, 'lib/cli/RepoApi')), + moduleCli = require(path.join(rootpath, 'lib/cli/Modules')), exec = require('child_process').exec, sys = require('sys'), colors = require('colors'), sys = require('sys'), util = require('util'), + zip = require('zipfile'), + fs = require('fs'), + rimraf = require('rimraf') semver = require('semver'); /** @@ -45,24 +49,21 @@ function download(type,fromUrl,toPath,cli,next) { if(err) { next(err); } else { - processDownload(type,path,next); + processDownload(type, path, next); } } if(fromUrl.match(/^http.*/)) { - downloadUrl(fromUrl,toPath,cli,localNext); - return; + return downloadUrl(fromUrl, toPath, cli, localNext); } if(fromUrl.match(/^(.*)\/(.*)$/)) { - downloadGithub(fromUrl,toPath,cli,localNext); - return; + return downloadGithub(fromUrl, toPath, cli, localNext); } // Otherwise assume repo - append type fromUrl = "module/" + fromUrl; - downloadRepo(type,fromUrl,toPath,cli,localNext); - return; + return downloadRepo(type, fromUrl, toPath, cli, localNext); } @@ -84,14 +85,14 @@ function downloadRepo(type,fromUrl,toPath,cli,next) { constructRepoUrl(repoName,version,function(err,url) { if(!err && url) { - download(type,url,toPath,cli,next); + return downloadGithub(url, toPath, cli, next); } else { next(err); } }); } else { - next(new Error('B You need to provide a calipso repository project name - e.g. ElasticSearch')); + next(new Error('You need to provide a calipso repository project name - e.g. ElasticSearch')); } } @@ -159,7 +160,7 @@ function downloadUrl(fromUrl,toPath,cli,next) { } -function downloadFile(url,fileName,toPath,next) { +function downloadFile(url, fileName, toPath, next) { var u = require('url'), fs = require('fs'), path = require('path'); var parts = u.parse(url); @@ -180,7 +181,8 @@ function downloadFile(url,fileName,toPath,next) { } } - console.log("Downloading file:".cyan); + console.log("\r\nResolving file location, and downloading ...".cyan); + client.get({ host: parts.hostname, port: parts.port, path: parts.pathname }, function(res) { if(res.statusCode === 302) { @@ -272,17 +274,17 @@ function constructGithubUrl(userProject,tag) { /** * Create a url based on the repository details */ -function constructRepoUrl(repoName,version,next) { +function constructRepoUrl(repoName, version, next) { // Create our API wrapper - var repo = new Api("http://localhost:3001/repo/api/"); + var repo = new api(); // Variables for lookup var type = repoName.split("/")[0]; var name = repoName.split("/")[1]; var version = version || "master"; - repo.list({type:type,name:name,version:version},function(err,r) { + repo.get({type:type,name:name,version:version},function(err,r) { if(err || !r) { next(err); } else { @@ -294,7 +296,7 @@ function constructRepoUrl(repoName,version,next) { if(v.version === version) { next(null,v.url); versionMatched = true; - console.log("Resolved ".cyan.bold + repoName.white + "@".white + v.version.white + " to ".cyan.bold + v.url + (v.version === "master" ? "" : "@" + v.version)); + console.log("Resolved ".cyan.bold + name.green.bold + "@".white + v.version.green.bold + " to github repo ".cyan.bold + v.url + (v.version === "master" ? "" : "@" + v.version)); return; } }); @@ -302,7 +304,15 @@ function constructRepoUrl(repoName,version,next) { next(new Error("Unable to locate the version specified.")); } } else { - next(new Error("There was an error locating that module, multiple entries returned")); + if(r.length === 0) { + console.log("\r\nNo entries found, searching the repository for something along the same lines ...".white.bold); + moduleCli.findModule(["",name], true, function(err,data) { + // Throw a blank error + next(new Error("Please try again using one of the module names listed above, or perhaps this is the inspiration for you to build one? :)")); + }); + } else { + next(new Error("There was an error locating that module, " + r.length.toString().red.bold + " entries returned".red)); + } } } }); @@ -313,7 +323,7 @@ function constructRepoUrl(repoName,version,next) { * Process a downloaded module, place into modules folder */ -function processDownload(type,file,next) { +function processDownload(type, file, next) { // Checks var isValid; @@ -323,7 +333,14 @@ function processDownload(type,file,next) { // #2 - unzip it, check contents if(isValid) { - unzipDownload(type,file,next); + unzipDownload(type, file, function(err, tmpName, tmpFolder) { + // Intercept to enable a cleanup + if(err) { + fs.unlinkSync(file); + err.message = err.message + "The downloaded file has been deleted."; + } + next(err, tmpName, tmpFolder); + }); } else { next(new Error("The file downloaded must be a valid zip archive.")); } @@ -336,16 +353,17 @@ function processDownload(type,file,next) { function unzipDownload(type, file, callback) { - var zip = require('zipfile'), - fs = require('fs'), - rimraf = require('rimraf'), - path = require('path'); - - var zf = new zip.ZipFile(file), + var zf, baseFolder, tmpFolder, tmpName; + try { + zf = new zip.ZipFile(file) + } catch(ex) { + return callback(ex); + } + zf.names.forEach(function(name) { // First result is the basefolder @@ -378,57 +396,57 @@ function unzipDownload(type, file, callback) { if(path.existsSync(tmpFolder)) { rimraf.sync(tmpFolder); } - + // First run through and create every directory synchronously - var folders = []; - zf.names.forEach(function(name) { - folders.push(name.replace(baseFolder,"").split("/")); + var folders = []; + zf.names.forEach(function(name) { + folders.push(name.replace(baseFolder,"").split("/")); }); - - folders.forEach(function(folderList) { - var folder = tmpFolder; + + folders.forEach(function(folderList) { + var folder = tmpFolder; folderList.forEach(function (currFolder) { - var isDir = (!path.extname(currFolder) || currFolder[0] === '.'); + var isDir = (!path.extname(currFolder) || currFolder[0] === '.'); folder = path.join(folder, currFolder); if(isDir) { dirExists(folder); - } - }); - }); - + } + }); + }); + // Now, lets extract all the files - var remaining = zf.names.length; - - zf.names.forEach(function(name) { - + var remaining = zf.names.length; + + zf.names.forEach(function(name) { + var dest = path.join( tmpFolder, name.replace(baseFolder,"") ); // Skip directories, hiddens. - var isDir = (!path.extname(name) || name[0] === '.' || name[name.length] === "/"); + var isDir = (!path.extname(name) || name[0] === '.' || name[name.length] === "/"); if (isDir) { remaining--; - if (!remaining) return callback(null); - } else { - zf.readFile(name, function(err, buff) { + if (!remaining) return callback(null); + } else { + zf.readFile(name, function(err, buff) { if (err) return callback(err); - fs.open(dest, 'w', 0644, function(err, fd) { + fs.open(dest, 'w', 0644, function(err, fd) { if(err) { if(err.code !== "EISDIR") { // fs.unlinkSync(file); - return callback(err); + return callback(err); } else { remaining--; - } - + } + } else { fs.write(fd, buff, 0, buff.length, null, function(err) { if (err) { fs.unlinkSync(file); - return callback(err); - } + return callback(err); + } fs.close(fd, function(err) { if (err) return callback(err); remaining--; @@ -437,13 +455,13 @@ function unzipDownload(type, file, callback) { callback(null,tmpName,tmpFolder); } }); - }); + }); } }); - }); + }); } }); - + } else { if(type === 'module') { @@ -457,12 +475,12 @@ function unzipDownload(type, file, callback) { } /** - * + * */ function dirExists(dest) { - + var fs = require('fs'); - + // Try to create the folder try { fs.mkdirSync(dest, 0755) @@ -474,7 +492,7 @@ function dirExists(dest) { return false; } } - + return true; } diff --git a/lib/cli/Modules.js b/lib/cli/Modules.js index 10e1af4d7..b96634ae4 100644 --- a/lib/cli/Modules.js +++ b/lib/cli/Modules.js @@ -23,7 +23,8 @@ var rootpath = process.cwd() + '/', sys = require('sys'), colors = require('colors'), semver = require('semver'), - download = require('lib/cli/Download'); + api = require(path.join(rootpath, 'lib/cli/RepoApi')), + download = require(path.join(rootpath, 'lib/cli/Download')); /** @@ -51,24 +52,70 @@ exports.moduleRouter = function(path,options,cli,next) { case 'disable': toggleModule(false,options,cli,next); break; + case 'install': // Default is github + downloadModule(options, cli, next); + break; case 'download': // Default is github - var toPath = calipso.app.path + "/modules/downloaded/"; - var fromUrl = options[1]; - download('module',fromUrl,toPath,cli,function(err,moduleName,path) { - if(err) { - next(err); - } else { - installViaNpm(moduleName,path,next); - } - }); + downloadModule(options, cli, next); + break; + case 'find': + findModule(options, cli, next) break; - default: next(new Error("You need to specify a valid command, please refer to the help available for valid options.")); } } +/** + *Find module + */ + +function findModule(options, cli, next) { + + var search = options[1]; // Second parameter is our query + var searchRegex = new RegExp(search,"ig"); + search = search.replace(/\*/g,""); + + var repo = new api(); + repo.find('module', options, function(err, data) { + console.log(""); + data.forEach(function(module) { + var versionString = ""; + module.versions.forEach(function(version) { + versionString += " - [" + version.version + "] : " + version.url + "\r\n" + }); + var description = module.description.replace(searchRegex,search.yellow.bold); + var author = " - [Author] ".cyan + module.author.cyan.bold + "\r\n"; + console.log(module.name.white.bold + "\r\n" + description.white + "\r\n" + author + versionString.cyan); + }); + console.log(""); + console.log("To install a module, use: ".white + "\r\n"); + console.log(" calipso modules download".cyan.bold + " ModuleName".green.bold + " [for latest version]".grey); + console.log(" calipso modules download".cyan.bold + " repo/project@version".green.bold + " [for specific version]".grey); + console.log(""); + next(); + }); + +} +exports.findModule = findModule; + + +/** + * Try to download a module + */ +function downloadModule(options, cli, next) { + var toPath = calipso.app.path + "/modules/downloaded/"; + var fromUrl = options[1]; + download('module', fromUrl, toPath, cli, function(err,moduleName,path) { + if(err) { + next(err); + } else { + installViaNpm(moduleName,path,next); + } + }); +} + /** * Show the list of currently installed modules - highlight those with issues / updates? */ @@ -95,7 +142,7 @@ function listModules(options,cli,next) { /** * Enable or disable a module */ -function toggleModule(enabled,options,cli,next) { +function toggleModule(enabled, options, cli, next) { // Get the module name var moduleName = options[1]; @@ -106,6 +153,7 @@ function toggleModule(enabled,options,cli,next) { // Split module / version var moduleVersion = moduleName.split('@')[1] || ""; var moduleName = moduleName.split('@')[0]; + var configKey = 'modules:' + moduleName; // Locate the module var installedModule = calipso.modules[moduleName]; @@ -114,30 +162,14 @@ function toggleModule(enabled,options,cli,next) { // Assume that we want to re-install the dependencies via NPM if(installed) { - // Re-retrieve our object - var AppConfig = calipso.lib.mongoose.model('AppConfig'); - AppConfig.findOne({}, function(err, c) { - - // Updates to mongo - var modules = []; - c.modules.forEach(function(value,key) { - if(value.name === moduleName) { - value.enabled = enabled; - } - modules.push(value); - }); - c.modules = modules; - - c.save(function(err) { - if (err) { - next(new Error("You must specify a module name.")); - } else { - console.log("Module " + moduleName.green.bold + " is now " + (enabled ? "enabled".green.bold : "disabled".red.bold) + "."); - next(); - } - }); - - }); + if (!calipso.config.get(configKey)) { + next(new Error("You must specify a valid module name, try 'modules list' first.")); + } else { + calipso.config.setSave(configKey + ':enabled', enabled, function(err) { + console.log("Module " + moduleName.green.bold + " is now " + (enabled ? "enabled".green.bold : "disabled".red.bold) + "."); + next(); + }); + } } else { diff --git a/lib/cli/RepoApi.js b/lib/cli/RepoApi.js index e2a96181d..e75e59e5d 100644 --- a/lib/cli/RepoApi.js +++ b/lib/cli/RepoApi.js @@ -20,34 +20,59 @@ var rootpath = process.cwd() + '/', function Api(url) { - this.url = url || "http://calip.so/repo/api/"; + + this.url = url || calipso.config.get('calipso:repo:url'); + this.url = this.url + (calipso.lib._.last(this.url) !== "/" ? "/" : ""); + +} + +/** + * Retrieve a specific item from the repo + * @options + * type : module, theme, profile + * name : name of module + */ +Api.prototype.get = function(options, next) { + + // Construct the url based on the options + var url = this.url + path.join('get', + (options.type ? options.type : "all"), + (options.name ? options.name : "*"), + (options.version ? options.version : "master")); + + console.log(""); + console.log("Asking repository for " + options.name.green.bold + "@".white + options.version.green.bold + " ..."); + + // Simple get request + get(url, next); + } + /** * Wrapper for Repo List * @options * type : module, theme, profile * name : name of module */ -Api.prototype.list = function(options,next) { +Api.prototype.find = function(type, options, next) { // Construct the url based on the options - var url = this.url - + (options.type ? options.type : "all") - + "/" + (options.name ? options.name : "*") - + "/" + (options.version ? options.version : "master"); + var searchString = options[1]; + var url = this.url + path.join('find', type, searchString); - console.dir(url); + console.log(""); + console.log("Searching repository for " + searchString.green.bold + " ..."); // Simple get request - get(url,next); + get(url, next); } /** * Simple wrapper for get requests */ -function get(url,cb) { +function get(url, cb) { // Parse the url to determine request type var parts = require('url').parse(url); @@ -72,7 +97,6 @@ function get(url,cb) { res.on('end', function() { try { - console.dir(data); var json = JSON.parse(data); cb(null,json); } catch(ex) { diff --git a/lib/client/Client.js b/lib/client/Client.js new file mode 100644 index 000000000..4fba3c701 --- /dev/null +++ b/lib/client/Client.js @@ -0,0 +1,206 @@ +/** + * This library provides a wrapper to enable modules to load javascript and styles into an + * array, that can then be rendered into a theme in the appropriate location. + * + * Styles and JS are all indexed by key, so you could write functions that over-wrote them in the theme as the + * last update will always stick. + * + */ + + var rootpath = process.cwd() + '/', + path = require('path'), + calipso = require(path.join(rootpath, 'lib/calipso')), + fs = require('fs'); + +/** + * Client Object - handle CSS and JS loading for modules out to themes + */ +var Client = module.exports = function Client(options) { + + this.options = options || { + 'minified-script': 'media/calipso-main' + }; + + this.scripts = []; + this.styles = []; + + // Shortcuts to core, must be included somewhere (module or theme) to be rendered + this.coreScripts = { + 'jquery': {key:'jquery', url:'jquery-1.6.4.min.js', weight: -100}, + 'calipso': {key:'calipso', url:'calipso.js', weight: -50} + } + +} + +Client.prototype.addScript = function(options) { + + var self = this; + + // Convert our options over with flexible defaults + if(typeof options === "string") { + if(this.coreScripts[options]) { + options = this.coreScripts[options]; + } else { + options = {name:options, url:options, weight: 0}; + } + } + if(!options.name) options.name = options.url; + + // Add the script + self._add('scripts',options.name,options); + +} + +/** + * Create simple list of all client JS + */ +Client.prototype.listScripts = function(next) { + + // TODO - this should be updated to use LABjs by default (?) + var self = this; + var output = "" + self.scripts.forEach(function(value) { + output += '\r\n'; + }); + output += "" + next(null,output); + +} + +Client.prototype.addStyle = function(options) { + + var self = this; + + // Convert our options over with flexible defaults + if(typeof options === "string") { + options = {name:options, url:options, weight: 0}; + } + if(!options.name) options.name = options.url; + + // Add the script + self._add('styles',options.name,options); + +} + +/** + * Compile together all of the client side scripts + */ +Client.prototype.listStyles = function(next) { + + // TODO - this should be updated to use LABjs by default (?) + var self = this; + var output = "" + + self.styles.forEach(function(value) { + output += '\r\n'; + }); + output += "" + next(null,output); + +} + + + +/** + * Helper to add unique elements to an array + */ +Client.prototype._add = function(arrName, name, options) { + + var self = this; + self[arrName] = self[arrName] || []; + + // Find first match + var found = calipso.lib._.find(self[arrName],function(context, value, index, list) { + return (value.name && value.name === name) ? true : false; + }); + + if(found) { + // Replace - this means we never get duplicates (e.g. of JQuery, JQueryUI) + self[arrName].splice(found, 1, options); + } else { + // Push + self[arrName].push(options); + } + + // Sort - TODO, this can probably be more efficient by placing the new item smarter + self[arrName].sort(function(a,b) { + return a.weight > b.weight; + }); + +} + + +/** + * Compile together all of the client side scripts + * TODO - this is currently not used, needs to be worked on and thought through. + * +Client.prototype.compile = function(next) { + + var self = this; + + try { + + var scriptFile = path.join(rootpath,self.options.script), + scriptStream = fs.createWriteStream(scriptFile, {'flags': 'a'}); + + } catch(ex) { + + console.dir(ex); + + } + + var grabFile = function(item, callback) { + + // TODO - allow referential + var filePath = path.join(rootpath, item.url); + + // Check to see if the file has changed + var stat = fs.lstatSync(filePath); + + fs.readFile(filePath, 'utf8', function(err, contents) { + + if(err) { + + return callback(new Error("Unable to locate file for ClientJS creation: " + filePath)); + + } else { + + var drain; + drain = scriptStream.write(contents); + callback(null, stat.mtime); + + } + }); + + } + + // Callback wrapper to close the streams + var done = function(err, data) { + scriptStream.end(); + next(err, data); + } + + // var contents = fs.readFileSync(config.out, 'utf8'); + calipso.lib.async.mapSeries(self.scripts, grabFile, function(err, scripts) { + + if(err) return done(err); + + var reduce = function(context, memo, value, index, list) { + return (value > memo) ? value : memo; + }; + + var maxmtime = calipso.lib._.reduce(scripts, reduce); + + console.dir(maxmtime); + + var script = '' + + done(null, script); + + }) + +} +**/ + + + diff --git a/lib/client/js/README b/lib/client/js/README new file mode 100644 index 000000000..e69de29bb diff --git a/lib/client/js/calipso.js b/lib/client/js/calipso.js new file mode 100644 index 000000000..b1071d424 --- /dev/null +++ b/lib/client/js/calipso.js @@ -0,0 +1,15 @@ +/** + * Calipso client side JS library + * + * This library is included in every page request, and should be used to manage all client side + * Javascript libraries. + * + */ +var Calipso = function () {}; + +/** + * Require a library + */ +Calipso.prototype.require(jsFile) { + +} diff --git a/lib/client/js/jquery-1.6.4.min.js b/lib/client/js/jquery-1.6.4.min.js new file mode 100644 index 000000000..628ed9b31 --- /dev/null +++ b/lib/client/js/jquery-1.6.4.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */ +(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file diff --git a/lib/conf/default.json b/lib/conf/default.json index cba8274e3..5b4e05c97 100644 --- a/lib/conf/default.json +++ b/lib/conf/default.json @@ -1,5 +1,5 @@ { - "version":1, + "version":"0.3.0", "installed":false, "database": { "uri":"mongodb://localhost/calipso" @@ -21,6 +21,12 @@ "maxListeners":500 } }, + "calipso": { + "repo": { + "url":"http://calip.so/repo/api", + "defaultVersion":"master" + } + }, "performance": { "cache":{ "enabled":false, diff --git a/package.json b/package.json index 98d72fad7..8020d432f 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "hook.io":"0.7.x", "zipfile":"0.2.x", "rimraf":"1.0.x", - "nconf":"0.2.x" + "nconf":"0.2.x", + "async": "0.1.x" }, "devDependencies": { "expresso": "0.8.x",