From 4d3b4b85df5cd5e3471b523c2b13ba2985e6082a Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 16 Oct 2012 17:04:04 +0200 Subject: [PATCH 001/130] Updates version to 0.23-dev. --- README.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1660cc29..eb85785f 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,12 @@ It profits from these great projects: ## Changelog (**h5ai** uses [semantic versioning](http://semver.org/)) + +### v0.23 + +* + + ### v0.22.1 - *2012-10-16* * bug fix concerning API requests in PHP mode diff --git a/package.json b/package.json index 85301372..0b17b040 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "h5ai", - "version": "0.22.1", + "version": "0.23-dev", "description": "a modern HTTP web server index", "url": "http://larsjung.de/h5ai/", "author": "Lars Jung", From e6bbb7c2cdf5c5648af3c0304513673d970af2a0 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 16 Oct 2012 20:44:59 +0200 Subject: [PATCH 002/130] Changes versioning. --- README.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb85785f..d4b79e19 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ It profits from these great projects: (**h5ai** uses [semantic versioning](http://semver.org/)) -### v0.23 +### develop branch * diff --git a/package.json b/package.json index 0b17b040..5f0ba87a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "h5ai", - "version": "0.23-dev", + "version": "0.22.1-dev", "description": "a modern HTTP web server index", "url": "http://larsjung.de/h5ai/", "author": "Lars Jung", From e43d43933a346cce08ff4f072d149c976ec4b181 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 16 Oct 2012 22:50:41 +0200 Subject: [PATCH 003/130] Updates storage. --- src/_h5ai/client/js/inc/core/store.js | 38 ++++++++++++++-------- src/_h5ai/client/js/inc/ext/l10n.js | 2 +- src/_h5ai/client/js/inc/ext/preview-img.js | 2 +- src/_h5ai/client/js/inc/ext/sort.js | 2 +- src/_h5ai/client/js/inc/view/viewmode.js | 2 +- src/_h5ai/client/js/lib/modernizr-2.6.2.js | 18 ++++++++-- 6 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/store.js b/src/_h5ai/client/js/inc/core/store.js index c7c2a7c3..1278470e 100644 --- a/src/_h5ai/client/js/inc/core/store.js +++ b/src/_h5ai/client/js/inc/core/store.js @@ -1,25 +1,37 @@ -modulejs.define('core/store', ['_'], function (_) { +modulejs.define('core/store', ['_', 'modernizr'], function (_, modernizr) { - var store = window.localStorage, + var store = modernizr.localstorage ? window.localStorage : null, + + key = '_h5ai', + + load = function () { + + if (store) { + try { + return JSON.parse(store[key]); + } catch (e) {} + } + return {}; + }, + + save = function (obj) { + + if (store) { + store[key] = JSON.stringify(obj); + } + }, put = function (key, value) { - if (store && _.isString(key)) { - store[key] = JSON.stringify({data: value}); - } + var obj = load(); + obj[key] = value; + return save(obj); }, get = function (key) { - if (store && _.isString(key)) { - var json = store[key], - obj = {}; - - try { obj = JSON.parse(json); } catch (e) {} - - return obj.data; - } + return load()[key]; }; return { diff --git a/src/_h5ai/client/js/inc/ext/l10n.js b/src/_h5ai/client/js/inc/ext/l10n.js index 66a8a3de..8095f872 100644 --- a/src/_h5ai/client/js/inc/ext/l10n.js +++ b/src/_h5ai/client/js/inc/ext/l10n.js @@ -34,7 +34,7 @@ modulejs.define('ext/l10n', ['_', '$', 'core/settings', 'core/langs', 'core/form '', langOptionTemplate = '
  • ', - storekey = 'h5ai.language', + storekey = 'l10n.lang', loaded = { en: _.extend({}, defaultTranslations) diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index ba015f3c..78ea5fd9 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -28,7 +28,7 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', '' + '', - storekey = 'h5ai.preview-img.isFullscreen', + storekey = 'preview-img.isFullscreen', currentEntries = [], currentIdx = 0, diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js index 389498e5..89031b21 100644 --- a/src/_h5ai/client/js/inc/ext/sort.js +++ b/src/_h5ai/client/js/inc/ext/sort.js @@ -6,7 +6,7 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e order: 'na' }, allsettings.sort), - storekey = 'h5ai.sortorder', + storekey = 'sort.order', type = function (entry) { diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js index 1943f342..b8360c04 100644 --- a/src/_h5ai/client/js/inc/view/viewmode.js +++ b/src/_h5ai/client/js/inc/view/viewmode.js @@ -7,7 +7,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c modes: modes }, allsettings.view), - storekey = 'h5ai.viewmode', + storekey = 'viewmode', template = '
  • ' + '' + diff --git a/src/_h5ai/client/js/lib/modernizr-2.6.2.js b/src/_h5ai/client/js/lib/modernizr-2.6.2.js index e4382d16..17158e12 100644 --- a/src/_h5ai/client/js/lib/modernizr-2.6.2.js +++ b/src/_h5ai/client/js/lib/modernizr-2.6.2.js @@ -1,5 +1,5 @@ /* Modernizr 2.6.2 (Custom Build) | MIT & BSD - * Build: http://modernizr.com/download/#-opacity-rgba-canvas-history-audio-video-shiv-cssclasses-prefixes + * Build: http://modernizr.com/download/#-opacity-rgba-canvas-history-audio-video-localstorage-shiv-cssclasses-prefixes */ ; @@ -182,7 +182,21 @@ window.Modernizr = (function( window, document, undefined ) { } catch(e) { } return bool; - }; for ( var feature in tests ) { + }; + + + tests['localstorage'] = function() { + try { + localStorage.setItem(mod, mod); + localStorage.removeItem(mod); + return true; + } catch(e) { + return false; + } + }; + + + for ( var feature in tests ) { if ( hasOwnProp(tests, feature) ) { featureName = feature.toLowerCase(); Modernizr[featureName] = tests[feature](); From 70f4500232528f07f14307801306be3c98a6ebe4 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 16 Oct 2012 23:10:05 +0200 Subject: [PATCH 004/130] Removes aai. --- src/_h5ai/client/js/inc/core/server.js | 120 ------------------------- src/_h5ai/client/js/scripts.js | 41 +-------- src/_h5ai/server/aai/aai.htaccess | 23 ----- src/_h5ai/server/aai/footer.html.jade | 3 - src/_h5ai/server/aai/header.html.jade | 45 ---------- 5 files changed, 1 insertion(+), 231 deletions(-) delete mode 100644 src/_h5ai/server/aai/aai.htaccess delete mode 100644 src/_h5ai/server/aai/footer.html.jade delete mode 100644 src/_h5ai/server/aai/header.html.jade diff --git a/src/_h5ai/client/js/inc/core/server.js b/src/_h5ai/client/js/inc/core/server.js index 7870d219..759b81bb 100644 --- a/src/_h5ai/client/js/inc/core/server.js +++ b/src/_h5ai/client/js/inc/core/server.js @@ -20,8 +20,6 @@ modulejs.define('core/server', ['$', '_', 'config'], function ($, _, config) { callback(); } }); - } else if (server.backend === 'aai') { - return modulejs.require('core/server-request-mock-aai')(data, callback); } else { callback(); } @@ -30,121 +28,3 @@ modulejs.define('core/server', ['$', '_', 'config'], function ($, _, config) { return server; }); - - - -modulejs.define('core/server-request-mock-aai', ['$', '_', 'core/settings', 'core/format'], function ($, _, allsettings, format) { - - var loadText = function (href) { - - var deferred = $.Deferred(); - - $.ajax(href, {dataType: 'text'}).always(function (content) { - - content = content.replace ? content : null; - deferred.resolve(content); - }); - - return deferred; - }, - - loadJson = function (href) { - - var deferred = $.Deferred(); - - loadText(href).always(function (content) { - - var json = content.replace ? JSON.parse(content.replace(/\/\*[\s\S]*?\*\/|\/\/.*?(\n|$)/g, '')) : {}; - deferred.resolve(json); - }); - - return deferred; - }, - - parse = function (absHref, html) { - - html = '
    ' + html.replace(/^[\s\S]*|<\/body>[\s\S]*$/g, '') + '
    '; - var $table = $(html).find('#data-apache-autoindex table'); - - return _.compact(_.map($table.find('td').closest('tr'), function (tr) { - - var $tds = $(tr).find('td'), - $a = $tds.eq(1).find('a'); - - return $a.text() === 'Parent Directory' ? null : { - absHref: absHref + $a.attr('href'), - time: format.parseDate($tds.eq(2).text(), ['YYYY-MM-DD HH:mm', 'DD-MMM-YYYY HH:mm']), - size: format.parseSize($tds.eq(3).text()) - }; - })); - }; - - return function (data, callback) { - - if (data.action === 'get' && data.l10n === true) { - - var isoCodes = data.l10nCodes.split(':'); - var isoCode = data.l10nCodes.split(':')[0]; - loadJson(allsettings.h5aiAbsHref + 'conf/l10n/' + isoCode + '.json').done(function (json) { - - var result = {code: 0, l10n: {}}; - - if (json) { - result.l10n[isoCode] = json; - } - callback(result); - }); - - } else if (data.action === 'get' && data.custom === true) { - - $.when( - loadText('_h5ai.header.html'), - loadText('_h5ai.footer.html') - ).done(function (header, footer) { - - callback({ - code: 0, - custom: { - header: header, - footer: footer - } - }); - }); - - } else if (data.action === 'get' && data.entries === true) { - - var absHref = data.entriesHref, - what = data.entriesWhat, - magicSequence = '=h5ai=', - reContentType = /^text\/html;h5ai=/; - - $.ajax({ - url: absHref, - type: what === 0 ? 'HEAD' : 'GET', - complete: function (xhr) { - - var entries = [], - status = xhr.status; - - if (status === 200 && reContentType.test(xhr.getResponseHeader('Content-Type'))) { - status = magicSequence; - } - - if (status === magicSequence && what > 0) { - entries = parse(absHref, xhr.responseText); - } - entries.push({absHref: absHref, status: status, content: what > 0}); - - callback({ - code: 0, - entries: entries - }); - } - }); - - } else { - - callback(); - } - }; -}); diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js index 0b714814..7036d680 100644 --- a/src/_h5ai/client/js/scripts.js +++ b/src/_h5ai/client/js/scripts.js @@ -39,52 +39,13 @@ $(function () { modulejs.require('info'); }); - } else if (mode === 'php') { + } else { $.getJSON('.', {action: 'get', options: true, types: true, langs: true, server: true}, function (config) { modulejs.define('config', config); $(function () { modulejs.require('main'); }); }); - - } else if (mode === 'aai') { - - var src = $script.attr('src'), - appHref = src.substr(0, src.length - filename.length), - loadJson = function (href) { - - var deferred = $.Deferred(); - - $.ajax(href, {dataType: 'text'}).always(function (content) { - - var json = content.replace ? JSON.parse(content.replace(/\/\*[\s\S]*?\*\/|\/\/.*?(\n|$)/g, '')) : {}; - deferred.resolve(json); - }); - - return deferred; - }; - - $.when( - loadJson(appHref + 'conf/options.json'), - loadJson(appHref + 'conf/types.json'), - loadJson(appHref + 'conf/langs.json') - ).done(function (options, types, langs) { - - var config = { - options: options, - types: types, - langs: langs, - server: { - backend: mode, - api: false, - name: 'apache', - version: null - } - }; - - modulejs.define('config', config); - $(function () { modulejs.require('main'); }); - }); } }()); diff --git a/src/_h5ai/server/aai/aai.htaccess b/src/_h5ai/server/aai/aai.htaccess deleted file mode 100644 index 497f7381..00000000 --- a/src/_h5ai/server/aai/aai.htaccess +++ /dev/null @@ -1,23 +0,0 @@ -################################ -# {{pkg.name}} {{pkg.version}} -# customized .htaccess -################################ - -Options +Indexes -Options +FollowSymLinks - -HeaderName /_{{pkg.name}}/server/aai/header.html -ReadmeName /_{{pkg.name}}/server/aai/footer.html - -IndexIgnore _{{pkg.name}}* - -IndexOptions Charset=UTF-8 -IndexOptions FancyIndexing -IndexOptions FoldersFirst -IndexOptions HTMLTable -IndexOptions NameWidth=* -IndexOptions SuppressDescription -IndexOptions SuppressHTMLPreamble -IndexOptions SuppressRules -IndexOptions Type=text/html;{{pkg.name}}={{pkg.version}} -IndexOptions XHTML diff --git a/src/_h5ai/server/aai/footer.html.jade b/src/_h5ai/server/aai/footer.html.jade deleted file mode 100644 index 4b4a411d..00000000 --- a/src/_h5ai/server/aai/footer.html.jade +++ /dev/null @@ -1,3 +0,0 @@ - -// generated code ends here -| diff --git a/src/_h5ai/server/aai/header.html.jade b/src/_h5ai/server/aai/header.html.jade deleted file mode 100644 index 29106464..00000000 --- a/src/_h5ai/server/aai/header.html.jade +++ /dev/null @@ -1,45 +0,0 @@ - -- var href = "/_{{pkg.name}}/" - -doctype 5 -//if lt IE 9 - -//[if gt IE 8]> -// - -div#topbar.clearfix - ul#navbar - -div#content - div#extended.clearfix - -div#bottombar.clearfix - span.left - a#h5ai-reference( href="{{pkg.url}}", title="{{pkg.name}} · {{pkg.description}}" ) - | {{pkg.name}} {{pkg.version}} - span.hideOnJs.noJsMsg - | ⚡ JavaScript is disabled! ⚡ - span.oldBrowser - | ⚡ Some features disabled! Works best in - a( href="http://browsehappy.com" ) modern browsers - | . ⚡ - span.right - span.center - -|
    -// The following code was generated by Apache's autoindex module. From 396bc6662ffd45130da15e90b7779418dd8b4ade Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 17 Oct 2012 00:17:22 +0200 Subject: [PATCH 005/130] Cleans code. --- ...allback-table.less => no-js-fallback.less} | 2 +- src/_h5ai/client/css/styles.less | 2 +- src/_h5ai/client/js/inc/core/entry.js | 45 +++---------------- src/_h5ai/client/js/scripts.js | 6 +-- src/_h5ai/conf/langs.json | 34 -------------- src/_h5ai/server/php/inc/init.php | 1 - src/_h5ai/server/php/index.php.jade | 9 ++-- 7 files changed, 12 insertions(+), 87 deletions(-) rename src/_h5ai/client/css/inc/{fallback-table.less => no-js-fallback.less} (96%) delete mode 100644 src/_h5ai/conf/langs.json diff --git a/src/_h5ai/client/css/inc/fallback-table.less b/src/_h5ai/client/css/inc/no-js-fallback.less similarity index 96% rename from src/_h5ai/client/css/inc/fallback-table.less rename to src/_h5ai/client/css/inc/no-js-fallback.less index c2180336..c1e2bb97 100644 --- a/src/_h5ai/client/css/inc/fallback-table.less +++ b/src/_h5ai/client/css/inc/no-js-fallback.less @@ -1,5 +1,5 @@ -#data-apache-autoindex, #data-php-no-js-fallback { +#no-js-fallback { max-width: 960px; margin: 0 auto 80px auto; diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index 631aba7d..bf62e7c2 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -26,7 +26,7 @@ @import "inc/extended-grid"; // @import "inc/context-menu"; @import "inc/dropbox"; -@import "inc/fallback-table"; +@import "inc/no-js-fallback"; @import "inc/responsive"; diff --git a/src/_h5ai/client/js/inc/core/entry.js b/src/_h5ai/client/js/inc/core/entry.js index 53431840..ace3e99f 100644 --- a/src/_h5ai/client/js/inc/core/entry.js +++ b/src/_h5ai/client/js/inc/core/entry.js @@ -1,47 +1,12 @@ -modulejs.define('core/entry', ['_', '$', 'core/format', 'model/entry'], function (_, $, format, Entry) { +modulejs.define('core/entry', ['_', 'config', 'model/entry'], function (_, config, Entry) { - var parseGenericJson = function (absHref, $container) { + _.each(config.entries || [], function (entry) { - return JSON.parse($.trim($container.text()) || '{}').entries; - }, + Entry.get(entry.absHref, entry.time, entry.size, entry.status, entry.content); + }); - parseApacheTable = function (absHref, $table) { - - return _.compact(_.map($table.find('td').closest('tr'), function (tr) { - - var $tds = $(tr).find('td'), - $a = $tds.eq(1).find('a'); - - return $a.text() === 'Parent Directory' ? null : { - absHref: absHref + $a.attr('href'), - time: format.parseDate($tds.eq(2).text(), ['YYYY-MM-DD HH:mm', 'DD-MMM-YYYY HH:mm']), - size: format.parseSize($tds.eq(3).text()) - }; - })); - }, - - parse = function (absHref, $html) { - - var $generic = $html.find('#data-generic-json'), - $apache = $html.find('#data-apache-autoindex table'), - json = []; - - if ($generic.length) { - json = parseGenericJson(absHref, $generic); - } else if ($apache.length) { - json = parseApacheTable(absHref, $apache); - } - - return _.map(json, function (entry) { - - return Entry.get(entry.absHref, entry.time, entry.size, entry.status, entry.content); - }); - }, - - entry = Entry.get(); - - parse(entry.absHref, $('body')); + var entry = Entry.get(); entry.status = '=h5ai='; return entry; diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js index 7036d680..ea476ec2 100644 --- a/src/_h5ai/client/js/scripts.js +++ b/src/_h5ai/client/js/scripts.js @@ -31,9 +31,7 @@ // @include "inc/**/*.js" var $ = jQuery, - filename = 'client/js/scripts.js', - $script = $('script[src$="' + filename + '"]'), - mode = $script.data('mode'); + mode = $('script[src$="scripts.js"]').data('mode'); if (mode === 'info') { @@ -41,7 +39,7 @@ } else { - $.getJSON('.', {action: 'get', options: true, types: true, langs: true, server: true}, function (config) { + $.getJSON('.', {action: 'get', options: true, types: true, langs: true, server: true, entries: true}, function (config) { modulejs.define('config', config); $(function () { modulejs.require('main'); }); diff --git a/src/_h5ai/conf/langs.json b/src/_h5ai/conf/langs.json deleted file mode 100644 index 8a5081c9..00000000 --- a/src/_h5ai/conf/langs.json +++ /dev/null @@ -1,34 +0,0 @@ -/* -{{pkg.name}} {{pkg.version}} -{{pkg.url}} - -Available translations -*/ - -{ - "en": "english", - - "bg": "български", - "cs": "čeština", - "de": "deutsch", - "el": "ελληνικά", - "es": "español", - "fr": "français", - "he": "עברית", - "hu": "magyar", - "it": "italiano", - "ja": "日本語", - "lv": "latviešu", - "nb": "norwegian", - "nl": "nederlands", - "pl": "polski", - "pt": "português", - "ro": "română", - "ru": "русский", - "sk": "slovenčina", - "sr": "srpski", - "sv": "svenska", - "tr": "türkçe", - "zh-cn": "简体中文", - "zh-tw": "正體中文" -} diff --git a/src/_h5ai/server/php/inc/init.php b/src/_h5ai/server/php/inc/init.php index 38890720..9761dde1 100644 --- a/src/_h5ai/server/php/inc/init.php +++ b/src/_h5ai/server/php/inc/init.php @@ -35,7 +35,6 @@ if (array_key_exists("action", $_REQUEST)) { } else { $HREF = $app->get_app_abs_href(); - $JSON = $app->get_generic_json(); $FALLBACK = $app->get_no_js_fallback(); } diff --git a/src/_h5ai/server/php/index.php.jade b/src/_h5ai/server/php/index.php.jade index ac4ef7d2..c9f0bd2d 100644 --- a/src/_h5ai/server/php/index.php.jade +++ b/src/_h5ai/server/php/index.php.jade @@ -1,7 +1,6 @@ | - var href = "" -- var json = "" - var fallback = "" doctype 5 @@ -21,9 +20,9 @@ html.no-js( lang="en" ) link( rel="apple-touch-icon", type="image/png", href!="#{href}client/images/app-48x48.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) link( rel="stylesheet", href!="#{href}client/css/styles.css" ) - script( src!="#{href}client/js/scripts.js", data-mode="php" ) + script( src!="#{href}client/js/scripts.js" ) - body#h5ai-main + body div#topbar.clearfix ul#navbar @@ -44,6 +43,4 @@ html.no-js( lang="en" ) span.right span.center - div#data-generic-json.hidden !{json} - - div#data-php-no-js-fallback.hideOnJs !{fallback} + div#no-js-fallback.hideOnJs !{fallback} From cecc5c57a2484e8bdc40c87b31ec404c51c20abf Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 17 Oct 2012 00:53:28 +0200 Subject: [PATCH 006/130] Cleans code. --- src/_h5ai/client/js/inc/core/location.js | 2 +- src/_h5ai/client/js/inc/core/store.js | 2 +- src/_h5ai/server/php/inc/init.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 0ebcb24e..bea9577b 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -1,5 +1,5 @@ -modulejs.define('core/location', ['$', 'core/event'], function ($, event) { +modulejs.define('core/location', [], function () { var doc = document, diff --git a/src/_h5ai/client/js/inc/core/store.js b/src/_h5ai/client/js/inc/core/store.js index 1278470e..e4a66222 100644 --- a/src/_h5ai/client/js/inc/core/store.js +++ b/src/_h5ai/client/js/inc/core/store.js @@ -1,5 +1,5 @@ -modulejs.define('core/store', ['_', 'modernizr'], function (_, modernizr) { +modulejs.define('core/store', ['modernizr'], function (modernizr) { var store = modernizr.localstorage ? window.localStorage : null, diff --git a/src/_h5ai/server/php/inc/init.php b/src/_h5ai/server/php/inc/init.php index 9761dde1..333478e7 100644 --- a/src/_h5ai/server/php/inc/init.php +++ b/src/_h5ai/server/php/inc/init.php @@ -21,7 +21,6 @@ normalized_require_once("/server/php/inc/Entry.php"); $app = new App(APP_ABS_PATH, APP_ABS_HREF, ABS_HREF); -// if (count($_REQUEST)) { if (array_key_exists("action", $_REQUEST)) { header("Content-type: application/json"); From 885ce9e9e928db08e85e7bd2e249f8142062ccd2 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 17 Oct 2012 01:33:26 +0200 Subject: [PATCH 007/130] Cleans code. --- src/_h5ai/client/js/inc/core/format.js | 38 +------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/format.js b/src/_h5ai/client/js/inc/core/format.js index edebc71d..d2267d5c 100644 --- a/src/_h5ai/client/js/inc/core/format.js +++ b/src/_h5ai/client/js/inc/core/format.js @@ -1,8 +1,7 @@ modulejs.define('core/format', ['_', 'moment'], function (_, moment) { - var reParseSize = /^\s*([\.\d]+)\s*([kmgt]?)b?\s*$/i, - decimalMetric = { + var decimalMetric = { t: 1000.0, k: 1000.0, u: ['B', 'KB', 'MB', 'GB', 'TB'] @@ -15,30 +14,6 @@ modulejs.define('core/format', ['_', 'moment'], function (_, moment) { defaultMetric = decimalMetric, defaultDateFormat = 'YYYY-MM-DD HH:mm', - parseSize = function (str) { - - var match = reParseSize.exec(str), - kilo = decimalMetric.k, - val, unit; - - if (!match) { - return null; - } - - val = parseFloat(match[1]); - unit = match[2].toLowerCase(); - if (unit === 'k') { - val *= kilo; - } else if (unit === 'm') { - val *= kilo * kilo; - } else if (unit === 'g') { - val *= kilo * kilo * kilo; - } else if (unit === 't') { - val *= kilo * kilo * kilo * kilo; - } - return val; - }, - setDefaultMetric = function (metric) { if (!metric) { @@ -73,15 +48,6 @@ modulejs.define('core/format', ['_', 'moment'], function (_, moment) { defaultDateFormat = dateFormat; }, - parseDate = function (str, dateFormat) { - - try { // problems with ie < 9 :( - return moment(str, dateFormat || defaultDateFormat).valueOf() || null; - } catch (err) {} - - return Date.parse(str).valueOf() || null; - }, - formatDate = function (millis, dateFormat) { if (!_.isNumber(millis) || !millis) { @@ -92,11 +58,9 @@ modulejs.define('core/format', ['_', 'moment'], function (_, moment) { }; return { - parseSize: parseSize, setDefaultMetric: setDefaultMetric, formatSize: formatSize, setDefaultDateFormat: setDefaultDateFormat, - parseDate: parseDate, formatDate: formatDate }; }); From 910312f7ce8914dce97a0417d80fea9a9790254b Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 17 Oct 2012 01:54:05 +0200 Subject: [PATCH 008/130] Cleans code. --- src/_h5ai/client/js/inc/core/resource.js | 1 + src/_h5ai/client/js/inc/core/settings.js | 17 +++--- src/_h5ai/client/js/inc/ext/folderstatus.js | 30 ---------- src/_h5ai/client/js/inc/model/entry.js | 29 ---------- src/_h5ai/conf/options.json | 62 +++++++++------------ 5 files changed, 35 insertions(+), 104 deletions(-) delete mode 100644 src/_h5ai/client/js/inc/ext/folderstatus.js diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js index 1be1a4cc..f89007b7 100644 --- a/src/_h5ai/client/js/inc/core/resource.js +++ b/src/_h5ai/client/js/inc/core/resource.js @@ -5,6 +5,7 @@ modulejs.define('core/resource', ['core/settings'], function (settings) { return settings.h5aiAbsHref + 'client/images/' + id + (noPngExt ? '' : '.png'); }, + icon = function (id, big) { return settings.h5aiAbsHref + 'client/icons/' + (big ? '48x48' : '16x16') + '/' + id + '.png'; diff --git a/src/_h5ai/client/js/inc/core/settings.js b/src/_h5ai/client/js/inc/core/settings.js index 6afde834..03112e74 100644 --- a/src/_h5ai/client/js/inc/core/settings.js +++ b/src/_h5ai/client/js/inc/core/settings.js @@ -1,16 +1,17 @@ modulejs.define('core/settings', ['config', '_', '$'], function (config, _, $) { - var settings = _.extend({ - h5aiAbsHref: '/_h5ai/' - }, config.options), - - filename = 'client/js/scripts.js', + var filename = 'client/js/scripts.js', src = $('script[src$="' + filename + '"]').attr('src'), - appHref = src.substr(0, src.length - filename.length); + appHref = src.substr(0, src.length - filename.length), - settings.h5aiAbsHref = src.substr(0, src.length - filename.length).replace(/\/*$/, '/'); - settings.rootAbsHref = /^(.*\/)[^\/]+\/?$/.exec(settings.h5aiAbsHref)[1]; + h5aiAbsHref = src.substr(0, src.length - filename.length).replace(/\/*$/, '/'), + rootAbsHref = /^(.*\/)[^\/]+\/?$/.exec(h5aiAbsHref)[1], + + settings = _.extend({}, config.options, { + h5aiAbsHref: h5aiAbsHref, + rootAbsHref: rootAbsHref + }); return settings; }); diff --git a/src/_h5ai/client/js/inc/ext/folderstatus.js b/src/_h5ai/client/js/inc/ext/folderstatus.js deleted file mode 100644 index 929f7e79..00000000 --- a/src/_h5ai/client/js/inc/ext/folderstatus.js +++ /dev/null @@ -1,30 +0,0 @@ - -modulejs.define('ext/folderstatus', ['_', '$', 'core/settings', 'core/event', 'core/entry'], function (_, $, allsettings, event, entry) { - - var settings = _.extend({ - enabled: false, - maxChecks: 16, - delay: 2000 - }, allsettings.folderstatus), - - init = function () { - - if (!settings.enabled) { - return; - } - - event.sub('ready', function () { - - var count = 0; - _.each(entry.content, function (e) { - - if (e.isFolder() && e.status === null && count <= settings.maxChecks) { - count += 1; - setTimeout(function () { e.fetchStatus(); }, settings.delay); - } - }); - }); - }; - - init(); -}); diff --git a/src/_h5ai/client/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/entry.js index 162c59fe..21ebf124 100644 --- a/src/_h5ai/client/js/inc/model/entry.js +++ b/src/_h5ai/client/js/inc/model/entry.js @@ -106,30 +106,6 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett } }, - fetchStatus = function (absHref, callback) { - - var self = getEntry(absHref); - - if (!_.isFunction(callback)) { - callback = function () {}; - } - - if (self.status !== null) { - callback(self); - } else { - server.request({action: 'get', entries: true, entriesHref: self.absHref, entriesWhat: 0}, function (response) { - - if (response.entries) { - _.each(response.entries, function (entry) { - getEntry(entry.absHref, entry.time, entry.size, entry.status, entry.content); - }); - } - - callback(self); - }); - } - }, - fetchContent = function (absHref, callback) { var self = getEntry(absHref); @@ -224,11 +200,6 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett return _.keys(this.content).length === 0; }, - fetchStatus: function (callback) { - - return fetchStatus(this.absHref, callback); - }, - fetchContent: function (callback) { return fetchContent(this.absHref, callback); diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index a5f4ec61..ec68c0b6 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -6,7 +6,7 @@ Options */ { - /* [all] + /* Spacing of the main content. Left and right will be added to a minimum of 30px. Top and bottom @@ -20,7 +20,7 @@ Options "left": "auto" }, - /* [all] + /* General view options. - modes: array of "details", "icons", "grid" and/or "list" @@ -45,7 +45,7 @@ Options /*** Extensions (in alphabetical order) ***/ - /* [php] + /* Watch and update current folder content. - interval: number, update interval in milliseconds, at least 1000 @@ -55,14 +55,14 @@ Options "interval": 5000 }, - /* [all] + /* Show a clickable breadcrumb. */ "crumb": { "enabled": true }, - /* [all] + /* Filenames of customized header and footer files to look for in each folder. */ @@ -72,14 +72,14 @@ Options "footer": "_{{pkg.name}}.footer.html" }, - /* [php, EXPERIMENTAL] + /* [EXPERIMENTAL] Allow file deletion. */ "delete": { "enabled": false }, - /* [php, EXPERIMENTAL] + /* [EXPERIMENTAL] File upload via drag'n'drop. Folders are not supported. The working file size seems to be very browser dependent. @@ -92,7 +92,7 @@ Options "maxfilesize": 1000 }, - /* [php] + /* Enable packaged download of selected entries. - execution: "php" or "shell" @@ -106,7 +106,7 @@ Options "packageName": null }, - /* [all] + /* Allow filtering the displayed files and folders. Will check entries for right order of characters, i.e. "ab" matches "ab", "axb", "xaxbx" but not "ba". @@ -119,26 +119,14 @@ Options "enabled": true }, - /* [php] + /* Calc the size of folders. */ "foldersize": { "enabled": true }, - /* [aai] - Fetch status for subfolders of the current folder. - - - maxChecks: number, max number of status requests in the current folder - - delay: number, delay in milliseconds after "dom-ready" before starting the requests - */ - "folderstatus": { - "enabled": false, - "maxChecks": 16, - "delay": 2000 - }, - - /* [all] + /* Adds Google Analytics asynchronous tracking code. for example: @@ -156,7 +144,7 @@ Options "gaq": [] }, - /* [all] + /* Localization, for example "en", "de" etc. - see "langs" below for possible values. Adjust it to your needs. If lang is not found in "langs" it defaults to "en". @@ -170,14 +158,14 @@ Options "useBrowserLang": true }, - /* [all] + /* Link the hover effects between crumb, main view and tree. */ "link-hover-states": { "enabled": true }, - /* [all] + /* Shows the server mode in the bottom left corner. - display: @@ -190,7 +178,7 @@ Options "display": 2 }, - /* [all] + /* Adds Piwik tracker javascript code. - baseURL: do not include the protocol, e.g. "mydomain.tld/piwik" @@ -202,7 +190,7 @@ Options "idSite": 1 }, - /* [all] + /* Show an image preview on click. - types: array of types @@ -212,7 +200,7 @@ Options "types": ["bmp", "gif", "ico", "image", "jpg", "png", "tiff"] }, - /* [all] + /* Show text file preview on click. "types" maps file types to SyntaxHighligher brushes. Special case: "markdown" will be rendered as HTML. @@ -250,7 +238,7 @@ Options } }, - /* [all] + /* Show QRCodes on hovering files. - size: width and height in pixel @@ -260,7 +248,7 @@ Options "size": 150 }, - /* [php, EXPERIMENTAL] + /* [EXPERIMENTAL] Allow to rename files. No GUI yet. */ @@ -268,14 +256,14 @@ Options "enabled": false }, - /* [all] + /* Make entries selectable. At the moment only needed for packaged download and delete. */ "select": { "enabled": true }, - /* [all] + /* Default sort order is a two letter code. The first letter specifies the column: "n" for "Name", "d" for "Date" or "s" for "Size". The second letter specifies the sort order: "a" for "ascending" or "d" @@ -288,14 +276,14 @@ Options "order": "na" }, - /* [all] + /* Show additional info in a statusbar. */ "statusbar": { "enabled": true }, - /* [php] + /* Show thumbnails for image files. Needs the "/_{{pkg.name}}/cache" folder to be writable for the web Server. @@ -312,14 +300,14 @@ Options "delay": 1 }, - /* [all] + /* Replace window title with current breadcrumb. */ "title": { "enabled": true }, - /* [all] + /* Show a folder tree. Note that this might affect performance significantly. From c7a9d444afe63bce25ab9c3f1be2d665bf1e7033 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 18 Oct 2012 20:52:47 +0200 Subject: [PATCH 009/130] Adds notifications. --- src/_h5ai/client/css/inc/notify.less | 17 +++++++++++++++ src/_h5ai/client/js/inc/core/notify.js | 29 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/_h5ai/client/css/inc/notify.less create mode 100644 src/_h5ai/client/js/inc/core/notify.js diff --git a/src/_h5ai/client/css/inc/notify.less b/src/_h5ai/client/css/inc/notify.less new file mode 100644 index 00000000..19e38cef --- /dev/null +++ b/src/_h5ai/client/css/inc/notify.less @@ -0,0 +1,17 @@ + +#notify { + position: fixed; + left: 50%; + top: 3px; + width: 200px; + margin-left: -100px; + z-index: 100; + padding: 2px 6px 2px 6px; + color: #fff; + // background-color: rgba(240, 100, 0, 0.5); + // border: 2px solid rgba(255, 255, 255, 0.5); + // border: 2px solid rgba(240, 100, 0, 0.9); + background-color: rgba(0, 0, 0, 0.2); + .border-radius(4px); + text-align: center; +} diff --git a/src/_h5ai/client/js/inc/core/notify.js b/src/_h5ai/client/js/inc/core/notify.js new file mode 100644 index 00000000..b4e7c9c7 --- /dev/null +++ b/src/_h5ai/client/js/inc/core/notify.js @@ -0,0 +1,29 @@ + +modulejs.define('core/notify', ['$'], function ($) { + + var test = null, + + template = '
    ', + + id = 0, + + set = function (content) { + + if (content) { + $('#notify').stop(true, true).html(content).fadeIn(400); + } else { + $('#notify').stop(true, true).fadeOut(400); + } + }, + + init = function () { + + $(template).hide().appendTo('body'); + }; + + init(); + + return { + set: set + }; +}); From ecc05d3a8b347aab84a7e82c0773c09f981d3ebc Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 18 Oct 2012 20:53:38 +0200 Subject: [PATCH 010/130] Adds notifications. --- src/_h5ai/client/css/styles.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index bf62e7c2..27c23fa9 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -17,6 +17,7 @@ @import "inc/qrcode"; @import "inc/preview-img"; @import "inc/preview-txt"; +@import "inc/notify"; @import "inc/content"; @import "inc/extended"; From 499013f4fb4537a2472826e8c6f299603766f58a Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 18 Oct 2012 21:27:09 +0200 Subject: [PATCH 011/130] Initial switch to smart browsing. --- src/_h5ai/client/js/inc/core/entry.js | 12 +- src/_h5ai/client/js/inc/core/location.js | 117 +++++++++++++++--- src/_h5ai/client/js/inc/core/refresh.js | 4 +- src/_h5ai/client/js/inc/core/server.js | 4 +- src/_h5ai/client/js/inc/ext/crumb.js | 54 +++++--- src/_h5ai/client/js/inc/ext/custom.js | 34 +++-- .../client/js/inc/ext/link-hover-states.js | 19 ++- src/_h5ai/client/js/inc/main.js | 4 +- src/_h5ai/client/js/inc/model/entry.js | 24 +++- .../js/inc/view/{extended.js => items.js} | 61 +++++---- src/_h5ai/conf/options.json | 5 +- src/_h5ai/server/php/index.php.jade | 3 - 12 files changed, 244 insertions(+), 97 deletions(-) rename src/_h5ai/client/js/inc/view/{extended.js => items.js} (75%) diff --git a/src/_h5ai/client/js/inc/core/entry.js b/src/_h5ai/client/js/inc/core/entry.js index ace3e99f..03e374a4 100644 --- a/src/_h5ai/client/js/inc/core/entry.js +++ b/src/_h5ai/client/js/inc/core/entry.js @@ -1,13 +1,5 @@ -modulejs.define('core/entry', ['_', 'config', 'model/entry'], function (_, config, Entry) { +modulejs.define('core/entry', ['core/location'], function (location) { - _.each(config.entries || [], function (entry) { - - Entry.get(entry.absHref, entry.time, entry.size, entry.status, entry.content); - }); - - var entry = Entry.get(); - entry.status = '=h5ai='; - - return entry; + return location.getItem(); }); diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index bea9577b..8a870525 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -1,7 +1,13 @@ -modulejs.define('core/location', [], function () { +modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event', 'core/notify'], function (_, modernizr, allsettings, event, notify) { - var doc = document, + var settings = _.extend({ + smartBrowsing: false + }, allsettings.view), + + doc = document, + + history = settings.smartBrowsing && modernizr.history ? window.history : null, forceEncoding = function (href) { @@ -17,36 +23,109 @@ modulejs.define('core/location', [], function () { .replace(/\=/g, '%3D'); }, - absHref = (function () { + reUriToPathname = /^.*:\/\/[^\/]*|[^\/]*$/g, + uriToPathname = function (uri) { - var rePrePathname = /.*:\/\/[^\/]*/, - rePostPathname = /[^\/]*$/, + return uri.replace(reUriToPathname, ''); + }, - uriToPathname = function (uri) { + hrefsAreDecoded = (function () { - return uri.replace(rePrePathname, '').replace(rePostPathname, ''); - }, - - testpathname = '/a b', - a = doc.createElement('a'), - isDecoded, location; + var testpathname = '/a b', + a = doc.createElement('a'); a.href = testpathname; - isDecoded = uriToPathname(a.href) === testpathname; + return uriToPathname(a.href) === testpathname; + }()), - a.href = doc.location.href; + encodedHref = function (href) { + + var a = doc.createElement('a'), + location; + + a.href = href; location = uriToPathname(a.href); - if (isDecoded) { + if (hrefsAreDecoded) { location = encodeURIComponent(location).replace(/%2F/ig, '/'); } return forceEncoding(location); - }()); + }; + + + var absHref = null, + + getDomain = function () { + + return doc.domain; + }, + + getAbsHref = function () { + + return absHref; + }, + + getItem = function () { + + return modulejs.require('model/entry').get(absHref); + }, + + setLocation = function (newAbsHref, keepBrowserUrl) { + + newAbsHref = encodedHref(newAbsHref); + if (absHref !== newAbsHref) { + absHref = newAbsHref; + event.pub('location.changed', absHref); + + notify.set('loading...'); + modulejs.require('core/refresh')(function () { notify.set(); }); + + if (history) { + if (keepBrowserUrl) { + history.replaceState({absHref: absHref}, '', absHref); + } else { + history.pushState({absHref: absHref}, '', absHref); + } + } + } + }, + + setLink = function ($el, item) { + + $el.attr('href', item.absHref); + + if (history && item.isFolder() && item.status === '=h5ai=') { + $el.on('click', function () { + + setLocation(item.absHref); + return false; + }); + } + + if (item.status !== '=h5ai=') { + $el.attr('target', '_blank'); + } + }; + + + if (history) { + window.onpopstate = function (e) { + + if (e.state && e.state.absHref) { + setLocation(e.state.absHref, true); + } + }; + } + return { - domain: doc.domain, - absHref: absHref, - forceEncoding: forceEncoding + forceEncoding: forceEncoding, + encodedHref: encodedHref, + getDomain: getDomain, + getAbsHref: getAbsHref, + getItem: getItem, + setLocation: setLocation, + setLink: setLink }; }); diff --git a/src/_h5ai/client/js/inc/core/refresh.js b/src/_h5ai/client/js/inc/core/refresh.js index 23d60b84..0ac66bcf 100644 --- a/src/_h5ai/client/js/inc/core/refresh.js +++ b/src/_h5ai/client/js/inc/core/refresh.js @@ -1,5 +1,5 @@ -modulejs.define('core/refresh', ['_', 'core/server', 'model/entry'], function (_, server, Entry) { +modulejs.define('core/refresh', ['_', 'config', 'core/server', 'model/entry', 'core/location'], function (_, config, server, Entry, location) { var parseJson = function (entry, json) { @@ -20,7 +20,7 @@ modulejs.define('core/refresh', ['_', 'core/server', 'model/entry'], function (_ refresh = function (callback) { - var entry = Entry.get(); + var entry = Entry.get(location.getAbsHref()); server.request({action: 'get', entries: true, entriesHref: entry.absHref, entriesWhat: 1}, function (json) { diff --git a/src/_h5ai/client/js/inc/core/server.js b/src/_h5ai/client/js/inc/core/server.js index 759b81bb..3ca818f6 100644 --- a/src/_h5ai/client/js/inc/core/server.js +++ b/src/_h5ai/client/js/inc/core/server.js @@ -1,5 +1,5 @@ -modulejs.define('core/server', ['$', '_', 'config'], function ($, _, config) { +modulejs.define('core/server', ['$', '_', 'config', 'core/location'], function ($, _, config, location) { var server = _.extend({}, config.server, { @@ -7,7 +7,7 @@ modulejs.define('core/server', ['$', '_', 'config'], function ($, _, config) { if (server.api) { $.ajax({ - url: '.', + url: location.getAbsHref(), data: data, type: 'POST', dataType: 'json', diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index da128980..72ebfbd3 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -1,5 +1,5 @@ -modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/entry'], function (_, $, allsettings, resource, event, entry) { +modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/location'], function (_, $, allsettings, resource, event, location) { var settings = _.extend({ enabled: false @@ -26,11 +26,11 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ $html .addClass(entry.isFolder() ? 'folder' : 'file') + .data('item', entry) .data('status', entry.status); - $a - .attr('href', entry.absHref) - .find('span').text(entry.label).end(); + location.setLink($a, entry); + $a.find('span').text(entry.label).end(); if (entry.isDomain()) { $html.addClass('domain'); @@ -69,25 +69,49 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ } }, - // creates the complete crumb from entry down to the root - init = function (entry) { + onLocationChanged = function (item) { + + var crumb = item.getCrumb(), + $ul = $('#navbar'), + found = false; + + $ul.find('.crumb').each(function () { + + var $html = $(this); + if ($html.data('item') === item) { + found = true; + $html.addClass('current'); + } else { + $html.removeClass('current'); + } + }); + + if (!found) { + $ul.find('.crumb').remove(); + _.each(crumb, function (e) { + + $ul.append(update(e)); + }); + } + }, + + init = function () { if (!settings.enabled) { return; } - var crumb = entry.getCrumb(), - $ul = $('#navbar'); - - _.each(crumb, function (e) { - - $ul.append(update(e)); - }); - // event.sub('entry.created', onContentChanged); // event.sub('entry.removed', onContentChanged); event.sub('entry.changed', onContentChanged); + + event.sub('location.changed', function () { + + onLocationChanged(location.getItem()); + }); + + onLocationChanged(location.getItem()); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/ext/custom.js b/src/_h5ai/client/js/inc/ext/custom.js index 5da2495b..649fcc70 100644 --- a/src/_h5ai/client/js/inc/ext/custom.js +++ b/src/_h5ai/client/js/inc/ext/custom.js @@ -1,5 +1,5 @@ -modulejs.define('ext/custom', ['_', '$', 'core/settings', 'core/server'], function (_, $, allsettings, server) { +modulejs.define('ext/custom', ['_', '$', 'core/settings', 'core/server', 'core/event'], function (_, $, allsettings, server, event) { var settings = _.extend({ enabled: false, @@ -7,23 +7,35 @@ modulejs.define('ext/custom', ['_', '$', 'core/settings', 'core/server'], functi footer: '_h5ai.footer.html' }, allsettings.custom), + onLocationChanged = function () { + + $('#content-header, #content-footer').stop(true, true).slideUp(200); + + server.request({action: 'get', custom: true}, function (response) { + + if (response) { + if (response.custom.header) { + $('#content-header').html(response.custom.header).stop(true, true).slideDown(400); + } + if (response.custom.footer) { + $('#content-footer').html(response.custom.footer).stop(true, true).slideDown(400); + } + } + }); + }, + init = function () { if (!settings.enabled) { return; } - server.request({action: 'get', custom: true}, function (response) { + $('
    ').hide().prependTo('#content'); + $('
    ').hide().appendTo('#content'); - if (response) { - if (response.custom.header) { - $('
    ' + response.custom.header + '
    ').prependTo('#content'); - } - if (response.custom.footer) { - $('
    ' + response.custom.footer + '
    ').appendTo('#content'); - } - } - }); + event.sub('location.changed', onLocationChanged); + + onLocationChanged(); }; init(); diff --git a/src/_h5ai/client/js/inc/ext/link-hover-states.js b/src/_h5ai/client/js/inc/ext/link-hover-states.js index f3a84e0c..ee4eb910 100644 --- a/src/_h5ai/client/js/inc/ext/link-hover-states.js +++ b/src/_h5ai/client/js/inc/ext/link-hover-states.js @@ -1,5 +1,5 @@ -modulejs.define('ext/link-hover-states', ['_', '$', 'core/settings'], function (_, $, allsettings) { +modulejs.define('ext/link-hover-states', ['_', '$', 'core/settings', 'core/event'], function (_, $, allsettings, event) { var settings = _.extend({ enabled: false @@ -29,13 +29,22 @@ modulejs.define('ext/link-hover-states', ['_', '$', 'core/settings'], function ( selectLinks(href).removeClass('hover'); }, + onLocationChanged = function () { + + $('.hover').removeClass('hover'); + }, + init = function () { - if (settings.enabled) { - $('body') - .on('mouseenter', selector, onMouseEnter) - .on('mouseleave', selector, onMouseLeave); + if (!settings.enabled) { + return; } + + $('body') + .on('mouseenter', selector, onMouseEnter) + .on('mouseleave', selector, onMouseLeave); + + event.sub('location.changed', onLocationChanged); }; init(); diff --git a/src/_h5ai/client/js/inc/main.js b/src/_h5ai/client/js/inc/main.js index ed29852e..04e7a1cd 100644 --- a/src/_h5ai/client/js/inc/main.js +++ b/src/_h5ai/client/js/inc/main.js @@ -3,10 +3,12 @@ modulejs.define('main', ['_', 'core/event'], function (_, event) { event.pub('beforeView'); - modulejs.require('view/extended'); + modulejs.require('view/items'); modulejs.require('view/spacing'); modulejs.require('view/viewmode'); + modulejs.require('core/location').setLocation(document.location.href, true); + event.pub('beforeExt'); _.each(modulejs.state(), function (state, id) { diff --git a/src/_h5ai/client/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/entry.js index 21ebf124..d1e3cb6e 100644 --- a/src/_h5ai/client/js/inc/model/entry.js +++ b/src/_h5ai/client/js/inc/model/entry.js @@ -1,5 +1,6 @@ -modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/settings', 'core/location', 'core/server'], function ($, _, types, event, settings, location, server) { +modulejs.define('model/entry', ['$', '_', 'config', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function ($, _, config, types, event, settings, server, location) { + var reEndsWithSlash = /\/$/, @@ -44,7 +45,7 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett getEntry = function (absHref, time, size, status, isContentFetched) { - absHref = location.forceEncoding(absHref || location.absHref); + absHref = location.forceEncoding(absHref); if (!startsWith(absHref, settings.rootAbsHref)) { return null; @@ -88,7 +89,7 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett removeEntry = function (absHref) { - absHref = location.forceEncoding(absHref || location.absHref); + absHref = location.forceEncoding(absHref); var self = cache[absHref]; @@ -128,6 +129,14 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett callback(self); }); } + }, + + init = function () { + + _.each(config.entries || [], function (entry) { + + getEntry(entry.absHref, entry.time, entry.size, entry.status, entry.content); + }); }; @@ -142,7 +151,7 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett this.absHref = absHref; this.type = types.getType(absHref); - this.label = createLabel(absHref === '/' ? location.domain : split.name); + this.label = createLabel(absHref === '/' ? location.getDomain() : split.name); this.time = null; this.size = null; this.parent = null; @@ -167,7 +176,7 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett isCurrentFolder: function () { - return this.absHref === location.absHref; + return this.absHref === location.getAbsHref(); }, isInCurrentFolder: function () { @@ -177,7 +186,7 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett isCurrentParentFolder: function () { - return this === getEntry().parent; + return this === getEntry(location.getAbsHref()).parent; }, isDomain: function () { @@ -259,6 +268,9 @@ modulejs.define('model/entry', ['$', '_', 'core/types', 'core/event', 'core/sett } }); + + init(); + return { get: getEntry, remove: removeEntry diff --git a/src/_h5ai/client/js/inc/view/extended.js b/src/_h5ai/client/js/inc/view/items.js similarity index 75% rename from src/_h5ai/client/js/inc/view/extended.js rename to src/_h5ai/client/js/inc/view/items.js index aecbe811..506bd301 100644 --- a/src/_h5ai/client/js/inc/view/extended.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -1,5 +1,5 @@ -modulejs.define('view/extended', ['_', '$', 'core/settings', 'core/resource', 'core/format', 'core/event', 'core/entry'], function (_, $, allsettings, resource, format, event, entry) { +modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core/format', 'core/event', 'core/location'], function (_, $, allsettings, resource, format, event, location) { var settings = _.extend({ setParentFolderLabels: false, @@ -25,6 +25,7 @@ modulejs.define('view/extended', ['_', '$', 'core/settings', 'core/resource', 'c '
    • ' + '', emptyTemplate = '
    ', + contentTemplate = '
    ', // updates this single entry update = function (entry, force) { @@ -40,14 +41,14 @@ modulejs.define('view/extended', ['_', '$', 'core/settings', 'core/resource', 'c $label = $html.find('.label'), $date = $html.find('.date'), $size = $html.find('.size'); - // escapedHref = entry.absHref.replace(/'/g, "%27").replace(/"/g, "%22"); $html .addClass(entry.isFolder() ? 'folder' : 'file') .data('entry', entry) .data('status', entry.status); - $a.attr('href', entry.absHref); + location.setLink($a, entry); + $imgSmall.attr('src', resource.icon(entry.type)).attr('alt', entry.type); $imgBig.attr('src', resource.icon(entry.type, true)).attr('alt', entry.type); $label.text(entry.label); @@ -94,32 +95,42 @@ modulejs.define('view/extended', ['_', '$', 'core/settings', 'core/resource', 'c event.pub('entry.mouseleave', entry); }, - // creates the view for entry content - init = function (entry) { + onLocationChanged = function (item) { var $extended = $('#extended'), - $ul = $(listTemplate), - $emtpy = $(emptyTemplate); + $ul = $extended.find('ul'), + $empty = $extended.find('.empty'); - format.setDefaultMetric(settings.binaryPrefix); + $ul.find('.entry').remove(); - if (entry.parent) { - $ul.append(update(entry.parent)); + if (item.parent) { + $ul.append(update(item.parent)); } - _.each(entry.content, function (e) { + _.each(item.content, function (e) { $ul.append(update(e)); }); - $extended.append($ul); - $extended.append($emtpy); - - if (!entry.isEmpty()) { - $emtpy.hide(); + if (item.isEmpty()) { + $empty.show(); + } else { + $empty.hide(); } + }, + + init = function () { + + var $content = $(contentTemplate), + $extended = $content.find('#extended'), + $ul = $(listTemplate), + $emtpy = $(emptyTemplate).hide(); + + format.setDefaultMetric(settings.binaryPrefix); $extended + .append($ul) + .append($emtpy) .on('mouseenter', '.entry a', onMouseenter) .on('mouseleave', '.entry a', onMouseleave); @@ -133,24 +144,32 @@ modulejs.define('view/extended', ['_', '$', 'core/settings', 'core/resource', 'c event.sub('entry.created', function (entry) { if (entry.isInCurrentFolder() && !entry.$extended) { - update(entry, true).hide().appendTo($ul).slideDown(400); - $emtpy.slideUp(400); + $emtpy.fadeOut(100, function () { + update(entry, true).hide().appendTo($ul).fadeIn(400); + }); } }); event.sub('entry.removed', function (entry) { if (entry.isInCurrentFolder() && entry.$extended) { - entry.$extended.slideUp(400, function () { + entry.$extended.fadeOut(400, function () { entry.$extended.remove(); if (entry.parent.isEmpty()) { - $emtpy.slideDown(400); + $emtpy.fadeIn(100); } }); } }); + + event.sub('location.changed', function () { + + onLocationChanged(location.getItem()); + }); + + $content.appendTo('body'); }; - init(entry); + init(); }); diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index ec68c0b6..dfbef51b 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -38,7 +38,8 @@ Options "setParentFolderLabels": true, "binaryPrefix": false, "indexFiles": ["index.html", "index.htm", "index.php"], - "ignore": ["^\\.", "^_{{pkg.name}}"] + "ignore": ["^\\.", "^_{{pkg.name}}"], + "smartBrowsing": true }, @@ -67,7 +68,7 @@ Options in each folder. */ "custom": { - "enabled": false, + "enabled": true, "header": "_{{pkg.name}}.header.html", "footer": "_{{pkg.name}}.footer.html" }, diff --git a/src/_h5ai/server/php/index.php.jade b/src/_h5ai/server/php/index.php.jade index c9f0bd2d..8ea6cbe1 100644 --- a/src/_h5ai/server/php/index.php.jade +++ b/src/_h5ai/server/php/index.php.jade @@ -27,9 +27,6 @@ html.no-js( lang="en" ) div#topbar.clearfix ul#navbar - div#content - div#extended.clearfix - div#bottombar.clearfix span.left a#h5ai-reference( href="{{pkg.url}}", title="{{pkg.name}} · {{pkg.description}}" ) From e956a496806a9703985a1220effa39dc76140f64 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 18 Oct 2012 23:08:48 +0200 Subject: [PATCH 012/130] More changes to enable smart browsing. --- src/_h5ai/client/js/inc/core/entry.js | 5 --- src/_h5ai/client/js/inc/core/location.js | 2 +- src/_h5ai/client/js/inc/ext/crumb.js | 7 +---- src/_h5ai/client/js/inc/ext/custom.js | 2 -- src/_h5ai/client/js/inc/ext/download.js | 4 +-- src/_h5ai/client/js/inc/ext/dropbox.js | 4 +-- src/_h5ai/client/js/inc/ext/preview-img.js | 14 ++++++--- src/_h5ai/client/js/inc/ext/preview-txt.js | 14 ++++++--- src/_h5ai/client/js/inc/ext/statusbar.js | 21 +++++++------ src/_h5ai/client/js/inc/ext/thumbnails.js | 20 +++++++----- src/_h5ai/client/js/inc/ext/title.js | 21 ++++++++----- src/_h5ai/client/js/inc/ext/tree.js | 36 +++++++++++++--------- src/_h5ai/client/js/inc/main.js | 4 +-- src/_h5ai/client/js/inc/view/items.js | 5 +-- 14 files changed, 85 insertions(+), 74 deletions(-) delete mode 100644 src/_h5ai/client/js/inc/core/entry.js diff --git a/src/_h5ai/client/js/inc/core/entry.js b/src/_h5ai/client/js/inc/core/entry.js deleted file mode 100644 index 03e374a4..00000000 --- a/src/_h5ai/client/js/inc/core/entry.js +++ /dev/null @@ -1,5 +0,0 @@ - -modulejs.define('core/entry', ['core/location'], function (location) { - - return location.getItem(); -}); diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 8a870525..4e12a2a2 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -76,7 +76,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event newAbsHref = encodedHref(newAbsHref); if (absHref !== newAbsHref) { absHref = newAbsHref; - event.pub('location.changed', absHref); + event.pub('location.changed', getItem()); notify.set('loading...'); modulejs.require('core/refresh')(function () { notify.set(); }); diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index 72ebfbd3..b4656b50 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -105,12 +105,7 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ // event.sub('entry.removed', onContentChanged); event.sub('entry.changed', onContentChanged); - event.sub('location.changed', function () { - - onLocationChanged(location.getItem()); - }); - - onLocationChanged(location.getItem()); + event.sub('location.changed', onLocationChanged); }; init(); diff --git a/src/_h5ai/client/js/inc/ext/custom.js b/src/_h5ai/client/js/inc/ext/custom.js index 649fcc70..33df86e8 100644 --- a/src/_h5ai/client/js/inc/ext/custom.js +++ b/src/_h5ai/client/js/inc/ext/custom.js @@ -34,8 +34,6 @@ modulejs.define('ext/custom', ['_', '$', 'core/settings', 'core/server', 'core/e $('
    ').hide().appendTo('#content'); event.sub('location.changed', onLocationChanged); - - onLocationChanged(); }; init(); diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js index fbab9e5a..bd9c43cd 100644 --- a/src/_h5ai/client/js/inc/ext/download.js +++ b/src/_h5ai/client/js/inc/ext/download.js @@ -1,5 +1,5 @@ -modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/server', 'core/entry'], function (_, $, allsettings, resource, event, server, entry) { +modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/server', 'core/location'], function (_, $, allsettings, resource, event, server, location) { var settings = _.extend({ enabled: false, @@ -36,7 +36,7 @@ modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'co if (json && json.code === 0) { setTimeout(function () { // wait here so the img above can be updated in time - window.location = '?action=getArchive&id=' + json.id + '&as=' + (settings.packageName || entry.label) + '.' + settings.format; + window.location = '?action=getArchive&id=' + json.id + '&as=' + (settings.packageName || location.getItem().label) + '.' + settings.format; }, 200); } else { failed(); diff --git a/src/_h5ai/client/js/inc/ext/dropbox.js b/src/_h5ai/client/js/inc/ext/dropbox.js index e0d8caad..2d45a5b2 100644 --- a/src/_h5ai/client/js/inc/ext/dropbox.js +++ b/src/_h5ai/client/js/inc/ext/dropbox.js @@ -1,5 +1,5 @@ -modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/entry', 'core/refresh', 'core/server'], function (_, $, allsettings, entry, refresh, server) { +modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'core/refresh', 'core/server'], function (_, $, allsettings, location, refresh, server) { var settings = _.extend({ enabled: false, @@ -50,7 +50,7 @@ modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/entry', 'core/r url: server.api, data: { action: 'upload', - href: entry.absHref + href: location.getAbsHref() }, docEnter: function () { diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index 78ea5fd9..c4a140e1 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -1,5 +1,5 @@ -modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', 'core/store', 'core/event', 'core/entry'], function (_, $, allsettings, resource, store, event, entry) { +modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', 'core/store', 'core/event', 'core/location'], function (_, $, allsettings, resource, store, event, location) { var settings = _.extend({ enabled: false, @@ -219,14 +219,17 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', } }, - init = function (entry) { + onLocationChanged = function (item) { + + _.each(item.content, initEntry); + }, + + init = function () { if (!settings.enabled) { return; } - _.each(entry.content, initEntry); - $(template).appendTo('body'); $('#pv-img-bar-prev, #pv-img-prev').on('click', onPrevious); $('#pv-img-bar-next, #pv-img-next').on('click', onNext); @@ -276,10 +279,11 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', event.stopImmediatePropagation(); }); + event.sub('location.changed', onLocationChanged); event.sub('entry.created', initEntry); $(window).on('resize load', adjustSize); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index e80afde7..eed57ba3 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -1,5 +1,5 @@ -modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', 'core/store', 'core/event', 'core/entry'], function (_, $, allsettings, resource, store, event, entry) { +modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', 'core/store', 'core/event', 'core/location'], function (_, $, allsettings, resource, store, event, location) { var settings = _.extend({ enabled: false, @@ -224,14 +224,17 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', } }, - init = function (entry) { + onLocationChanged = function (item) { + + _.each(item.content, initEntry); + }, + + init = function () { if (!settings.enabled) { return; } - _.each(entry.content, initEntry); - $(template).appendTo('body'); $('#pv-txt-bar-prev').on('click', onPrevious); $('#pv-txt-bar-next').on('click', onNext); @@ -253,10 +256,11 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', event.stopImmediatePropagation(); }); + event.sub('location.changed', onLocationChanged); event.sub('entry.created', initEntry); $(window).on('resize load', adjustSize); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/ext/statusbar.js b/src/_h5ai/client/js/inc/ext/statusbar.js index c292525b..09edfd47 100644 --- a/src/_h5ai/client/js/inc/ext/statusbar.js +++ b/src/_h5ai/client/js/inc/ext/statusbar.js @@ -1,5 +1,5 @@ -modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'core/event', 'core/entry'], function (_, $, allsettings, format, event, entry) { +modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'core/event', 'core/location'], function (_, $, allsettings, format, event, location) { var settings = _.extend({ enabled: false @@ -29,7 +29,7 @@ modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'cor } }, - init = function (entry) { + init = function () { if (!settings.enabled) { return; @@ -42,25 +42,28 @@ modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'cor $statusDefault = $statusbar.find('.status.default'); $statusDynamic = $statusbar.find('.status.dynamic'); - var stats = entry.getStats(); - $folderTotal.text(stats.folders); - $fileTotal.text(stats.files); + event.sub('location.changed', function (item) { - update(); + var stats = item.getStats(); + $folderTotal.text(stats.folders); + $fileTotal.text(stats.files); + + update(); + }); event.sub('statusbar', update); $('#bottombar > .center').append($statusbar); event.sub('entry.created', function () { - var stats = entry.getStats(); + var stats = location.getItem().getStats(); $folderTotal.text(stats.folders); $fileTotal.text(stats.files); }); event.sub('entry.removed', function () { - var stats = entry.getStats(); + var stats = location.getItem().getStats(); $folderTotal.text(stats.folders); $fileTotal.text(stats.files); }); @@ -89,5 +92,5 @@ modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'cor }); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js index f399f5db..61e80086 100644 --- a/src/_h5ai/client/js/inc/ext/thumbnails.js +++ b/src/_h5ai/client/js/inc/ext/thumbnails.js @@ -1,5 +1,5 @@ -modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/entry', 'core/event', 'core/server'], function (_, allsettings, entry, event, server) { +modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/server'], function (_, allsettings, event, server) { var settings = _.extend({ enabled: false, @@ -56,22 +56,26 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/entry', 'core/eve } }, - init = function (entry) { + onLocationChanged = function (item) { + + setTimeout(function () { + + _.each(item.content, checkEntry); + }, settings.delay); + }, + + init = function () { if (!settings.enabled || !server.api) { return; } - setTimeout(function () { - - _.each(entry.content, checkEntry); - }, settings.delay); - + event.sub('location.changed', onLocationChanged); event.sub('entry.created', function (entry) { checkEntry(entry); }); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/ext/title.js b/src/_h5ai/client/js/inc/ext/title.js index f9da90a9..f2946080 100644 --- a/src/_h5ai/client/js/inc/ext/title.js +++ b/src/_h5ai/client/js/inc/ext/title.js @@ -1,17 +1,13 @@ -modulejs.define('ext/title', ['_', 'core/settings', 'core/entry'], function (_, allsettings, entry) { +modulejs.define('ext/title', ['_', 'core/settings', 'core/event'], function (_, allsettings, event) { var settings = _.extend({ enabled: false }, allsettings.title), - init = function (entry) { + onLocationChanged = function (item) { - if (!settings.enabled) { - return; - } - - var labels = _.pluck(entry.getCrumb(), 'label'), + var labels = _.pluck(item.getCrumb(), 'label'), title = labels.join(' > '); if (labels.length > 1) { @@ -19,7 +15,16 @@ modulejs.define('ext/title', ['_', 'core/settings', 'core/entry'], function (_, } document.title = title; + }, + + init = function () { + + if (!settings.enabled) { + return; + } + + event.sub('location.changed', onLocationChanged); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index 7271b752..00afc7f2 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -1,5 +1,5 @@ -modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/entry'], function (_, $, allsettings, resource, event, entry) { +modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/location'], function (_, $, allsettings, resource, event, location) { var settings = _.extend({ enabled: false, @@ -34,7 +34,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e .data('entry', entry) .data('status', entry.status); - $a.attr('href', entry.absHref); + location.setLink($a, entry); $img.attr('src', resource.icon(entry.type)); $label.text(entry.label); @@ -207,10 +207,24 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e } update(entry); + adjustSpacing(); + shiftTree(false, true); + }, + + onLocationChanged = function (item) { + + fetchTree(item, function (root) { + + $('#tree') + .find('.sp-container').append(update(root)).end() + .show(); + adjustSpacing(); + shiftTree(false, true); + }); }, // creates the complete tree from entry down to the root - init = function (entry) { + init = function () { if (!settings.enabled) { return; @@ -229,23 +243,15 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e shiftTree(); }); - fetchTree(entry, function (root) { - - $tree - .find('.sp-container').append(update(root)).end() - .show(); - - adjustSpacing(); - shiftTree(false, true); - }); - - event.sub('ready', adjustSpacing); + event.sub('location.changed', onLocationChanged); // strong negative performance impact in aai mode // event.sub('entry.changed', onContentChanged); // event.sub('entry.created', onContentChanged); // event.sub('entry.removed', onContentChanged); + event.sub('ready', adjustSpacing); + $(window).on('resize', function () { adjustSpacing(); @@ -253,5 +259,5 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e }); }; - init(entry); + init(); }); diff --git a/src/_h5ai/client/js/inc/main.js b/src/_h5ai/client/js/inc/main.js index 04e7a1cd..8e92d494 100644 --- a/src/_h5ai/client/js/inc/main.js +++ b/src/_h5ai/client/js/inc/main.js @@ -7,8 +7,6 @@ modulejs.define('main', ['_', 'core/event'], function (_, event) { modulejs.require('view/spacing'); modulejs.require('view/viewmode'); - modulejs.require('core/location').setLocation(document.location.href, true); - event.pub('beforeExt'); _.each(modulejs.state(), function (state, id) { @@ -18,5 +16,7 @@ modulejs.define('main', ['_', 'core/event'], function (_, event) { } }); + modulejs.require('core/location').setLocation(document.location.href, true); + event.pub('ready'); }); diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 506bd301..702ae024 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -163,10 +163,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core } }); - event.sub('location.changed', function () { - - onLocationChanged(location.getItem()); - }); + event.sub('location.changed', onLocationChanged); $content.appendTo('body'); }; From 3814558ca1c210ea8b9374ed24e1997865c9dc62 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 19 Oct 2012 18:40:07 +0200 Subject: [PATCH 013/130] Fixes event stack. --- src/_h5ai/client/js/inc/core/location.js | 6 ++-- src/_h5ai/client/js/inc/core/refresh.js | 2 +- src/_h5ai/client/js/inc/ext/thumbnails.js | 41 +++++++++++------------ 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 4e12a2a2..dde5527a 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -76,10 +76,12 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event newAbsHref = encodedHref(newAbsHref); if (absHref !== newAbsHref) { absHref = newAbsHref; - event.pub('location.changed', getItem()); notify.set('loading...'); - modulejs.require('core/refresh')(function () { notify.set(); }); + modulejs.require('core/refresh')(function () { + notify.set(); + event.pub('location.changed', getItem()); + }); if (history) { if (keepBrowserUrl) { diff --git a/src/_h5ai/client/js/inc/core/refresh.js b/src/_h5ai/client/js/inc/core/refresh.js index 0ac66bcf..912b06c4 100644 --- a/src/_h5ai/client/js/inc/core/refresh.js +++ b/src/_h5ai/client/js/inc/core/refresh.js @@ -1,5 +1,5 @@ -modulejs.define('core/refresh', ['_', 'config', 'core/server', 'model/entry', 'core/location'], function (_, config, server, Entry, location) { +modulejs.define('core/refresh', ['_', 'core/server', 'model/entry', 'core/location'], function (_, server, Entry, location) { var parseJson = function (entry, json) { diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js index 61e80086..d5e65f5d 100644 --- a/src/_h5ai/client/js/inc/ext/thumbnails.js +++ b/src/_h5ai/client/js/inc/ext/thumbnails.js @@ -27,32 +27,29 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser checkEntry = function (entry) { - if (entry.$extended) { + var type = null; - var type = null; + if (_.indexOf(settings.img, entry.type) >= 0) { + type = 'img'; + } else if (_.indexOf(settings.mov, entry.type) >= 0) { + type = 'mov'; + } else if (_.indexOf(settings.doc, entry.type) >= 0) { + type = 'doc'; + } - if (_.indexOf(settings.img, entry.type) >= 0) { - type = 'img'; - } else if (_.indexOf(settings.mov, entry.type) >= 0) { - type = 'mov'; - } else if (_.indexOf(settings.doc, entry.type) >= 0) { - type = 'doc'; - } + if (type) { + requestThumbSmall(type, entry.absHref, function (src) { - if (type) { - requestThumbSmall(type, entry.absHref, function (src) { + if (src && entry.$extended) { + entry.$extended.find('.icon.small img').addClass('thumb').attr('src', src); + } + }); + requestThumbBig(type, entry.absHref, function (src) { - if (src) { - entry.$extended.find('.icon.small img').addClass('thumb').attr('src', src); - } - }); - requestThumbBig(type, entry.absHref, function (src) { - - if (src) { - entry.$extended.find('.icon.big img').addClass('thumb').attr('src', src); - } - }); - } + if (src && entry.$extended) { + entry.$extended.find('.icon.big img').addClass('thumb').attr('src', src); + } + }); } }, From 796e5086352c6b1f0db76dd92e0b674cbc4aa01b Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 19 Oct 2012 19:12:45 +0200 Subject: [PATCH 014/130] Minor style changes. --- src/_h5ai/client/css/inc/extended-grid.less | 3 +-- src/_h5ai/client/css/inc/extended-icons.less | 3 +-- src/_h5ai/client/css/inc/extended.less | 1 + src/_h5ai/conf/options.json | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/_h5ai/client/css/inc/extended-grid.less b/src/_h5ai/client/css/inc/extended-grid.less index 1d69c83c..b652c7ca 100644 --- a/src/_h5ai/client/css/inc/extended-grid.less +++ b/src/_h5ai/client/css/inc/extended-grid.less @@ -12,8 +12,7 @@ padding: 8px; width: 164px; height: 24px; - border: 2px solid rgba(0,0,0,0); - .border-radius(5px); + border: 1px solid rgba(0,0,0,0); &:hover, &.hover { border-color: #e8e8e8; diff --git a/src/_h5ai/client/css/inc/extended-icons.less b/src/_h5ai/client/css/inc/extended-icons.less index 006bef97..740e358f 100644 --- a/src/_h5ai/client/css/inc/extended-icons.less +++ b/src/_h5ai/client/css/inc/extended-icons.less @@ -13,8 +13,7 @@ padding: 8px; width: 100px; height: 120px; - border: 2px solid rgba(0,0,0,0); - .border-radius(5px); + border: 1px solid rgba(0,0,0,0); &:hover, &.hover { border-color: #e8e8e8; diff --git a/src/_h5ai/client/css/inc/extended.less b/src/_h5ai/client/css/inc/extended.less index 8ec706e2..419f5f17 100644 --- a/src/_h5ai/client/css/inc/extended.less +++ b/src/_h5ai/client/css/inc/extended.less @@ -74,6 +74,7 @@ &.selected:not(.selecting), &.selecting:not(.selected) { a, a:active, a:visited { + color: #000; border-color: rgba(240,100,0,0.2); background-color: rgba(240,100,0,0.2); diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index dfbef51b..f4b7049c 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -34,7 +34,7 @@ Options - ignore [php only]: don't list items matching these regular expressions */ "view": { - "modes": ["details", "icons"], + "modes": ["details", "icons", "grid", "list"], "setParentFolderLabels": true, "binaryPrefix": false, "indexFiles": ["index.html", "index.htm", "index.php"], From f97a4e490bc40dd3386aa8508efeb2e08ec89b2d Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 19 Oct 2012 23:52:18 +0200 Subject: [PATCH 015/130] Some style improvments. --- src/_h5ai/client/css/inc/extended.less | 1 + src/_h5ai/client/css/inc/responsive.less | 2 +- src/_h5ai/client/js/inc/core/location.js | 13 +++++++------ src/_h5ai/client/js/inc/view/viewmode.js | 13 +++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/_h5ai/client/css/inc/extended.less b/src/_h5ai/client/css/inc/extended.less index 419f5f17..e767d296 100644 --- a/src/_h5ai/client/css/inc/extended.less +++ b/src/_h5ai/client/css/inc/extended.less @@ -11,6 +11,7 @@ #extended { display: none; + margin: 0 auto; a, a:active, a:visited { color: #333; diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index ec1f8837..0cd32318 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -25,7 +25,7 @@ body { #extended.view-icons { padding: 0; border: none; - margin: 0 -14px; + // margin: 0 -14px; } #bottombar { .center { diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index dde5527a..e5a63a69 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -74,15 +74,10 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event setLocation = function (newAbsHref, keepBrowserUrl) { newAbsHref = encodedHref(newAbsHref); + if (absHref !== newAbsHref) { absHref = newAbsHref; - notify.set('loading...'); - modulejs.require('core/refresh')(function () { - notify.set(); - event.pub('location.changed', getItem()); - }); - if (history) { if (keepBrowserUrl) { history.replaceState({absHref: absHref}, '', absHref); @@ -91,6 +86,12 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event } } } + + notify.set('loading...'); + modulejs.require('core/refresh')(function () { + notify.set(); + event.pub('location.changed', getItem()); + }); }, setLink = function ($el, item) { diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js index b8360c04..559b773c 100644 --- a/src/_h5ai/client/js/inc/view/viewmode.js +++ b/src/_h5ai/client/js/inc/view/viewmode.js @@ -16,6 +16,15 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c '' + '', + adjustSpacing = function () { + + var contentWidth = $('#content').width(), + $extended = $('#extended'), + itemWidth = ($extended.hasClass('view-icons') || $extended.hasClass('view-grid')) ? ($extended.find('.entry').eq(0).width() || 1) : 1; + + $extended.width(Math.floor(contentWidth / itemWidth) * itemWidth); + }, + update = function (viewmode) { var $extended = $('#extended'); @@ -32,6 +41,8 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c $extended.removeClass('view-' + mode); } }); + + adjustSpacing(); }, init = function () { @@ -54,6 +65,8 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c } update(store.get(storekey)); + + $(window).on('resize', adjustSpacing); }; init(); From 1dd6e5c7b0d4ffe678bd10bb4a995cd2cc6c7b3d Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 20 Oct 2012 21:03:40 +0200 Subject: [PATCH 016/130] Minor changes. --- src/_h5ai/client/js/inc/model/entry.js | 13 +------------ src/_h5ai/client/js/scripts.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/_h5ai/client/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/entry.js index d1e3cb6e..8e2defb4 100644 --- a/src/_h5ai/client/js/inc/model/entry.js +++ b/src/_h5ai/client/js/inc/model/entry.js @@ -1,5 +1,5 @@ -modulejs.define('model/entry', ['$', '_', 'config', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function ($, _, config, types, event, settings, server, location) { +modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function (_, types, event, settings, server, location) { var reEndsWithSlash = /\/$/, @@ -129,14 +129,6 @@ modulejs.define('model/entry', ['$', '_', 'config', 'core/types', 'core/event', callback(self); }); } - }, - - init = function () { - - _.each(config.entries || [], function (entry) { - - getEntry(entry.absHref, entry.time, entry.size, entry.status, entry.content); - }); }; @@ -268,9 +260,6 @@ modulejs.define('model/entry', ['$', '_', 'config', 'core/types', 'core/event', } }); - - init(); - return { get: getEntry, remove: removeEntry diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js index ea476ec2..164f5fbc 100644 --- a/src/_h5ai/client/js/scripts.js +++ b/src/_h5ai/client/js/scripts.js @@ -39,10 +39,16 @@ } else { - $.getJSON('.', {action: 'get', options: true, types: true, langs: true, server: true, entries: true}, function (config) { + $.ajax({ + url: '.', + data: {action: 'get', options: true, types: true, langs: true, server: true}, + type: 'POST', + dataType: 'json', + success: function (config) { - modulejs.define('config', config); - $(function () { modulejs.require('main'); }); + modulejs.define('config', config); + $(function () { modulejs.require('main'); }); + } }); } From 7d0a691bc340100969b29f2196c1aefdcb1445e3 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 21 Oct 2012 18:37:19 +0200 Subject: [PATCH 017/130] Add option related to non-h5ai links. --- src/_h5ai/client/js/inc/core/location.js | 5 +++-- src/_h5ai/conf/options.json | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index e5a63a69..5529447e 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -2,7 +2,8 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event', 'core/notify'], function (_, modernizr, allsettings, event, notify) { var settings = _.extend({ - smartBrowsing: false + smartBrowsing: true, + extInNewWindow: true }, allsettings.view), doc = document, @@ -106,7 +107,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event }); } - if (item.status !== '=h5ai=') { + if (settings.extInNewWindow && item.status !== '=h5ai=') { $el.attr('target', '_blank'); } }; diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index f4b7049c..759607ce 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -30,8 +30,10 @@ Options so that it will be persistent. - setParentFolderLabels: set parent folder labels to real folder names - binaryPrefix: set to true uses 1024B=1KiB when formatting file sizes (see http://en.wikipedia.org/wiki/Binary_prefix) - - indexFiles [php only]: consider folder with those files as non {{pkg.name}} folders - - ignore [php only]: don't list items matching these regular expressions + - indexFiles: consider folder with those files as non {{pkg.name}} folders + - ignore: don't list items matching these regular expressions + - smartBrowsing: use browser history if available (no need to reload the whole page) + - extInNewWindow: open non-h5ai links in new window/tab */ "view": { "modes": ["details", "icons", "grid", "list"], @@ -39,7 +41,8 @@ Options "binaryPrefix": false, "indexFiles": ["index.html", "index.htm", "index.php"], "ignore": ["^\\.", "^_{{pkg.name}}"], - "smartBrowsing": true + "smartBrowsing": true, + "extInNewWindow": true }, From cc30a12beeb85080a046a20dcd7730e191d7981f Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 21 Oct 2012 18:43:11 +0200 Subject: [PATCH 018/130] Updates readme. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d4b79e19..68736220 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,8 @@ It profits from these great projects: ### develop branch -* +* removes `aai` mode! +* adds smart browsing ### v0.22.1 - *2012-10-16* From e6e5f3309b718f0e7853422ef0c4929c0ae53887 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 21 Oct 2012 21:28:56 +0200 Subject: [PATCH 019/130] Minor style updates. --- src/_h5ai/client/css/inc/preview-img.less | 13 +------------ src/_h5ai/client/css/inc/preview-txt.less | 14 +------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/_h5ai/client/css/inc/preview-img.less b/src/_h5ai/client/css/inc/preview-img.less index f11e9708..c3864013 100644 --- a/src/_h5ai/client/css/inc/preview-img.less +++ b/src/_h5ai/client/css/inc/preview-img.less @@ -19,8 +19,6 @@ } -// @check-white: rgba(255,255,255,0.5); -// @check-black: rgba(0,0,0,0.2); @check-white: #f8f8f8; @check-black: #e8e8e8; #pv-img-image { @@ -120,20 +118,11 @@ } } -// #pv-img-topbar { -// position: fixed; -// z-index: 5; -// width: 100%; -// left: 0; -// top: 0; -// .vert-gradient(rgb(37,37,37), rgb(24,24,24)); -// border-bottom: 1px solid rgb(27,27,27); -// } - #pv-img-bottombar { position: fixed; z-index: 5; width: 100%; + height: 32px; left: 0; bottom: 0; .vert-gradient(rgb(27,27,27), rgb(14,14,14)); diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index 413327a3..fc95063f 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -34,9 +34,6 @@ .gutter .line { border-right: none !important; } - // .code .line, table td.code .container textarea { - // white-space: normal !important; - // } } &.markdown { @@ -138,20 +135,11 @@ } } -// #pv-txt-topbar { -// position: fixed; -// z-index: 5; -// width: 100%; -// left: 0; -// top: 0; -// .vert-gradient(rgb(37,37,37), rgb(24,24,24)); -// border-bottom: 1px solid rgb(27,27,27); -// } - #pv-txt-bottombar { position: fixed; z-index: 5; width: 100%; + height: 32px; left: 0; bottom: 0; .vert-gradient(rgb(27,27,27), rgb(14,14,14)); From 74b0ec827b7c536e67076d734948be7720783569 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 21 Oct 2012 23:15:59 +0200 Subject: [PATCH 020/130] Improves text preview. A little bit slower, but with line-wrap. --- src/_h5ai/client/css/inc/preview-txt.less | 76 +++++- src/_h5ai/client/css/lib/sh/shCore.less | 228 ------------------ .../client/css/lib/sh/shThemeDefault.less | 117 --------- src/_h5ai/client/css/styles.less | 2 - src/_h5ai/client/js/inc/ext/preview-txt.js | 15 ++ 5 files changed, 89 insertions(+), 349 deletions(-) delete mode 100644 src/_h5ai/client/css/lib/sh/shCore.less delete mode 100644 src/_h5ai/client/css/lib/sh/shThemeDefault.less diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index fc95063f..baf4f950 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -31,11 +31,83 @@ .syntaxhighlighter { overflow: visible !important; - .gutter .line { - border-right: none !important; + tr:hover { + background-color: rgba(0,0,0,0.05); + + .nr { + color: #333; + } + } + + td { + vertical-align: top; + font-family: "Ubuntu Mono"; + font-size: 16px; + line-height: 1.2em; + color: #999; + word-break: normal; + + &.nr { + text-align: right; + padding: 0 8px 0 4px; + } + + &.line { + width: 100%; + padding: 0 4px 0 8px; + } + + code { + font-family: "Ubuntu Mono"; + font-size: 16px; + line-height: 1.2em; + } + } + + .plain { + color: #000; + } + .comments, .comments a { + color: #008200; + } + .string, .string a { + color: #1111ff; + } + .keyword { + color: #006699; + font-weight: bold; + } + .preprocessor { + color: #999; + } + .variable { + color: #aa7700; + } + .value { + color: #009900; + } + .functions { + color: #ff1493; + } + .constants { + color: #0066cc; + } + .script { + color: #006699; + font-weight: bold; + } + .color1, .color1 a { + color: #999; + } + .color2, .color2 a { + color: #ff1493; + } + .color3, .color3 a { + color: #ff1111; } } + &.markdown { font-size: 16px; padding: 8px 24px; diff --git a/src/_h5ai/client/css/lib/sh/shCore.less b/src/_h5ai/client/css/lib/sh/shCore.less deleted file mode 100644 index 41aa11aa..00000000 --- a/src/_h5ai/client/css/lib/sh/shCore.less +++ /dev/null @@ -1,228 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter a, -.syntaxhighlighter div, -.syntaxhighlighter code, -.syntaxhighlighter table, -.syntaxhighlighter table td, -.syntaxhighlighter table tr, -.syntaxhighlighter table tbody, -.syntaxhighlighter table thead, -.syntaxhighlighter table caption, -.syntaxhighlighter textarea { - -moz-border-radius: 0 0 0 0 !important; - -webkit-border-radius: 0 0 0 0 !important; - background: none !important; - border: 0 !important; - bottom: auto !important; - float: none !important; - height: auto !important; - left: auto !important; - line-height: 1.1em !important; - margin: 0 !important; - outline: 0 !important; - overflow: visible !important; - padding: 0 !important; - position: static !important; - right: auto !important; - text-align: left !important; - top: auto !important; - vertical-align: baseline !important; - width: auto !important; - box-sizing: content-box !important; - // font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important; - font-family: "Ubuntu Mono", "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important; - font-weight: normal !important; - font-style: normal !important; - // font-size: 1em !important; - font-size: 16px !important; - min-height: inherit !important; - min-height: auto !important; -} - -.syntaxhighlighter { - width: 100% !important; - margin: 1em 0 1em 0 !important; - position: relative !important; - overflow: auto !important; - font-size: 1em !important; -} -.syntaxhighlighter.source { - overflow: hidden !important; -} -.syntaxhighlighter .bold { - font-weight: bold !important; -} -.syntaxhighlighter .italic { - font-style: italic !important; -} -.syntaxhighlighter .line { - white-space: pre !important; -} -.syntaxhighlighter table { - width: 100% !important; -} -.syntaxhighlighter table caption { - text-align: left !important; - padding: .5em 0 0.5em 1em !important; -} -.syntaxhighlighter table td.code { - width: 100% !important; -} -.syntaxhighlighter table td.code .container { - position: relative !important; -} -.syntaxhighlighter table td.code .container textarea { - box-sizing: border-box !important; - position: absolute !important; - left: 0 !important; - top: 0 !important; - width: 100% !important; - height: 100% !important; - border: none !important; - background: white !important; - padding-left: 1em !important; - overflow: hidden !important; - white-space: pre !important; -} -.syntaxhighlighter table td.gutter .line { - text-align: right !important; - padding: 0 0.5em 0 1em !important; -} -.syntaxhighlighter table td.code .line { - padding: 0 1em !important; -} -.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line { - padding-left: 0em !important; -} -.syntaxhighlighter.show { - display: block !important; -} -.syntaxhighlighter.collapsed table { - display: none !important; -} -.syntaxhighlighter.collapsed .toolbar { - padding: 0.1em 0.8em 0em 0.8em !important; - font-size: 1em !important; - position: static !important; - width: auto !important; - height: auto !important; -} -.syntaxhighlighter.collapsed .toolbar span { - display: inline !important; - margin-right: 1em !important; -} -.syntaxhighlighter.collapsed .toolbar span a { - padding: 0 !important; - display: none !important; -} -.syntaxhighlighter.collapsed .toolbar span a.expandSource { - display: inline !important; -} -.syntaxhighlighter .toolbar { - position: absolute !important; - right: 1px !important; - top: 1px !important; - width: 11px !important; - height: 11px !important; - font-size: 10px !important; - z-index: 10 !important; -} -.syntaxhighlighter .toolbar span.title { - display: inline !important; -} -.syntaxhighlighter .toolbar a { - display: block !important; - text-align: center !important; - text-decoration: none !important; - padding-top: 1px !important; -} -.syntaxhighlighter .toolbar a.expandSource { - display: none !important; -} -.syntaxhighlighter.ie { - font-size: .9em !important; - padding: 1px 0 1px 0 !important; -} -.syntaxhighlighter.ie .toolbar { - line-height: 8px !important; -} -.syntaxhighlighter.ie .toolbar a { - padding-top: 0px !important; -} -.syntaxhighlighter.printing .line.alt1 .content, -.syntaxhighlighter.printing .line.alt2 .content, -.syntaxhighlighter.printing .line.highlighted .number, -.syntaxhighlighter.printing .line.highlighted.alt1 .content, -.syntaxhighlighter.printing .line.highlighted.alt2 .content { - background: none !important; -} -.syntaxhighlighter.printing .line .number { - color: #bbbbbb !important; -} -.syntaxhighlighter.printing .line .content { - color: black !important; -} -.syntaxhighlighter.printing .toolbar { - display: none !important; -} -.syntaxhighlighter.printing a { - text-decoration: none !important; -} -.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a { - color: black !important; -} -.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a { - color: #008200 !important; -} -.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a { - color: blue !important; -} -.syntaxhighlighter.printing .keyword { - color: #006699 !important; - font-weight: bold !important; -} -.syntaxhighlighter.printing .preprocessor { - color: gray !important; -} -.syntaxhighlighter.printing .variable { - color: #aa7700 !important; -} -.syntaxhighlighter.printing .value { - color: #009900 !important; -} -.syntaxhighlighter.printing .functions { - color: #ff1493 !important; -} -.syntaxhighlighter.printing .constants { - color: #0066cc !important; -} -.syntaxhighlighter.printing .script { - font-weight: bold !important; -} -.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a { - color: gray !important; -} -.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a { - color: #ff1493 !important; -} -.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a { - color: red !important; -} -.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a { - color: black !important; -} diff --git a/src/_h5ai/client/css/lib/sh/shThemeDefault.less b/src/_h5ai/client/css/lib/sh/shThemeDefault.less deleted file mode 100644 index 13654117..00000000 --- a/src/_h5ai/client/css/lib/sh/shThemeDefault.less +++ /dev/null @@ -1,117 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: white !important; -} -.syntaxhighlighter .line.alt1 { - background-color: white !important; -} -.syntaxhighlighter .line.alt2 { - background-color: white !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #e0e0e0 !important; -} -.syntaxhighlighter .line.highlighted.number { - color: black !important; -} -.syntaxhighlighter table caption { - color: black !important; -} -.syntaxhighlighter .gutter { - color: #afafaf !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #6ce26c !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #6ce26c !important; - color: white !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: blue !important; - background: white !important; - border: 1px solid #6ce26c !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: blue !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: red !important; -} -.syntaxhighlighter .toolbar { - color: white !important; - background: #6ce26c !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: white !important; -} -.syntaxhighlighter .toolbar a:hover { - color: black !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: black !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #008200 !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: blue !important; -} -.syntaxhighlighter .keyword { - color: #006699 !important; -} -.syntaxhighlighter .preprocessor { - color: gray !important; -} -.syntaxhighlighter .variable { - color: #aa7700 !important; -} -.syntaxhighlighter .value { - color: #009900 !important; -} -.syntaxhighlighter .functions { - color: #ff1493 !important; -} -.syntaxhighlighter .constants { - color: #0066cc !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #006699 !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: gray !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #ff1493 !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: red !important; -} - -.syntaxhighlighter .keyword { - font-weight: bold !important; -} diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index 27c23fa9..9cdb4bfa 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -3,8 +3,6 @@ @import "lib/h5bp-main-header"; @import "lib/mixins"; -@import "lib/sh/shCore"; -@import "lib/sh/shThemeDefault"; @import "inc/general"; @import "inc/topbar"; diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index eed57ba3..9744364c 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -151,6 +151,21 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', if (sh) { sh.highlight({}, $nText[0]); + + var $text = $('#pv-txt-text'), + $lineNos = $text.find('td.gutter .line').addClass('cntlinenr'), + $codeLines = $text.find('td.code .line').addClass('cntline'), + $table = $(''), + i, $tr; + + for (i = 0; i < $lineNos.length; i += 1) { + $tr = $(''); + $(' from table fragments + if ( !jQuery.support.tbody ) { + + // String was a
    ').addClass('nr').append($lineNos.eq(i)).appendTo($tr); + $('').addClass('line').append($codeLines.eq(i)).appendTo($tr); + $table.append($tr); + } + + $text.find('table').replaceWith($table); } }); } From b92298d00711d5514872cd5b842d89dc53738e96 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 21 Oct 2012 23:36:06 +0200 Subject: [PATCH 021/130] More update on text preview. --- src/_h5ai/client/css/inc/preview-txt.less | 21 +++++++++++++++------ src/_h5ai/client/js/inc/ext/preview-txt.js | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index baf4f950..3b7372cd 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -29,7 +29,6 @@ word-break: break-all; .syntaxhighlighter { - overflow: visible !important; tr:hover { background-color: rgba(0,0,0,0.05); @@ -67,10 +66,10 @@ .plain { color: #000; } - .comments, .comments a { + .comments { color: #008200; } - .string, .string a { + .string { color: #1111ff; } .keyword { @@ -96,15 +95,25 @@ color: #006699; font-weight: bold; } - .color1, .color1 a { + .color1 { color: #999; } - .color2, .color2 a { + .color2 { color: #ff1493; } - .color3, .color3 a { + .color3 { color: #ff1111; } + + a, a:active, a:visited { + color: #2080FF; + text-decoration: none; + cursor: pointer; + + &:hover { + color: #68A9FF; + } + } } diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 9744364c..65fbe370 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -155,7 +155,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', var $text = $('#pv-txt-text'), $lineNos = $text.find('td.gutter .line').addClass('cntlinenr'), $codeLines = $text.find('td.code .line').addClass('cntline'), - $table = $(''), + $table = $('
    ').addClass('syntaxhighlighter'), i, $tr; for (i = 0; i < $lineNos.length; i += 1) { @@ -165,7 +165,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', $table.append($tr); } - $text.find('table').replaceWith($table); + $text.find('.syntaxhighlighter').replaceWith($table); } }); } From 0631444c50e46f8d64b94b3c4135791a5d7898d6 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 21 Oct 2012 23:42:48 +0200 Subject: [PATCH 022/130] Updates readme. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 68736220..5cfa885c 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ It profits from these great projects: * removes `aai` mode! * adds smart browsing +* add line wrap and line highlighting on hover to text preview ### v0.22.1 - *2012-10-16* From aded72363ad303fac2b3a90ce9d76928dc18a9e7 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 22 Oct 2012 02:12:07 +0200 Subject: [PATCH 023/130] Updates text preview. --- src/_h5ai/client/css/inc/preview-txt.less | 2 +- src/_h5ai/client/js/inc/ext/preview-txt.js | 65 ++++++++++++++++------ 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index 3b7372cd..8c6c8f7a 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -28,7 +28,7 @@ #pv-txt-text { word-break: break-all; - .syntaxhighlighter { + &.highlighted { tr:hover { background-color: rgba(0,0,0,0.05); diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 65fbe370..304d5de5 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -46,12 +46,49 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', '' + '', - templateText = '
    ',
+		templateText = '
    ',
 		templateMarkdown = '
    ',
 
 		currentEntries = [],
 		currentIdx = 0,
 
+		// adapted from SyntaxHighlighter
+		getHighlightedLines = function (sh, alias, content) {
+
+			var brushes = sh.vars.discoveredBrushes,
+				Brush, brush;
+
+			if (!brushes) {
+				brushes = {};
+
+				_.each(sh.brushes, function (info, brush) {
+
+					var aliases = info.aliases;
+
+					if (aliases) {
+						info.brushName = brush.toLowerCase();
+
+						for (var i = 0; i < aliases.length; i += 1) {
+							brushes[aliases[i]] = brush;
+						}
+					}
+				});
+
+				sh.vars.discoveredBrushes = brushes;
+			}
+
+			Brush = sh.brushes[brushes[alias || 'plain']];
+
+			if (!Brush) {
+				return $();
+			}
+
+			brush = new Brush();
+			brush.init({toolbar: false, gutter: false});
+
+			return $(brush.getHtml(content)).find('.line');
+		},
+
 		loadScript = function (url, globalId, callback) {
 
 			if (window[globalId]) {
@@ -134,7 +171,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
 					var $nText;
 
 					if (current.type === 'markdown') {
-						$nText = $(templateMarkdown).hide();
+						$nText = $(templateMarkdown).hide().text(content);
 						$text.replaceWith($nText);
 
 						loadMarkdown(function (md) {
@@ -144,28 +181,22 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
 							}
 						});
 					} else {
-						$nText = $(templateText).hide().addClass('toolbar: false; brush:').addClass(settings.types[current.type] || 'plain').text(content);
+						$nText = $(templateText).hide().text(content);
 						$text.replaceWith($nText);
 
 						loadSyntaxhighlighter(function (sh) {
 
 							if (sh) {
-								sh.highlight({}, $nText[0]);
+								var $table = $('
    '); - var $text = $('#pv-txt-text'), - $lineNos = $text.find('td.gutter .line').addClass('cntlinenr'), - $codeLines = $text.find('td.code .line').addClass('cntline'), - $table = $('
    ').addClass('syntaxhighlighter'), - i, $tr; + getHighlightedLines(sh, settings.types[current.type], content).each(function (i) { + $('') + .append($(''); - $(']", "i"), - rcheckableType = /^(?:checkbox|radio)$/, + manipulation_rcheckableType = /^(?:checkbox|radio)$/i, // checked="checked" or checked rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, - rscriptType = /\/(java|ecma)script/i, - rcleanScript = /^\s*\s*$/g, + rscriptType = /^$|\/(?:java|ecma)script/i, + rscriptTypeMasked = /^true\/(.*)/, + rcleanScript = /^\s*\s*$/g, + + // We have to close these tags to support XHTML (#13200) wrapMap = { option: [ 1, "" ], legend: [ 1, "
    ", "
    " ], + area: [ 1, "", "" ], + param: [ 1, "", "" ], thead: [ 1, "
    ').addClass('nr').append(i + 1)) + .append($('').addClass('line').append(this)) + .appendTo($table); + }); - for (i = 0; i < $lineNos.length; i += 1) { - $tr = $('
    ').addClass('nr').append($lineNos.eq(i)).appendTo($tr); - $('').addClass('line').append($codeLines.eq(i)).appendTo($tr); - $table.append($tr); - } - - $text.find('.syntaxhighlighter').replaceWith($table); + $nText.empty().append($table); } }); } From 34eed095377043f7e8d2456de96a0c4ff9a9c16f Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 25 Oct 2012 01:37:34 +0200 Subject: [PATCH 024/130] Improves event system. --- README.md | 2 +- src/_h5ai/client/js/inc/core/location.js | 47 ++++++++++++++++- src/_h5ai/client/js/inc/core/refresh.js | 37 ------------- src/_h5ai/client/js/inc/ext/autorefresh.js | 4 +- src/_h5ai/client/js/inc/ext/crumb.js | 12 ----- src/_h5ai/client/js/inc/ext/delete.js | 4 +- src/_h5ai/client/js/inc/ext/dropbox.js | 4 +- src/_h5ai/client/js/inc/ext/sort.js | 4 +- src/_h5ai/client/js/inc/ext/statusbar.js | 36 ++++--------- src/_h5ai/client/js/inc/ext/tree.js | 10 +--- src/_h5ai/client/js/inc/main.js | 6 --- src/_h5ai/client/js/inc/view/items.js | 60 +++++++++++----------- src/_h5ai/conf/options.json | 2 +- 13 files changed, 98 insertions(+), 130 deletions(-) delete mode 100644 src/_h5ai/client/js/inc/core/refresh.js diff --git a/README.md b/README.md index 5cfa885c..31b481ea 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ It profits from these great projects: * removes `aai` mode! * adds smart browsing -* add line wrap and line highlighting on hover to text preview +* add line wrap and line highlighting (on hover) to text preview ### v0.22.1 - *2012-10-16* diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 5529447e..253f98ac 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -72,6 +72,36 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event return modulejs.require('model/entry').get(absHref); }, + load = function (callback) { + + modulejs.require('core/server').request({action: 'get', entries: true, entriesHref: absHref, entriesWhat: 1}, function (json) { + + var Entry = modulejs.require('model/entry'), + entry = Entry.get(absHref); + + if (json) { + + var found = {}; + + _.each(json.entries, function (jsonEntry) { + + var e = Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status, jsonEntry.content); + found[e.absHref] = true; + }); + + _.each(entry.content, function (e) { + + if (!found[e.absHref]) { + Entry.remove(e.absHref); + } + }); + } + if (_.isFunction(callback)) { + callback(entry); + } + }); + }, + setLocation = function (newAbsHref, keepBrowserUrl) { newAbsHref = encodedHref(newAbsHref); @@ -89,12 +119,19 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event } notify.set('loading...'); - modulejs.require('core/refresh')(function () { + load(function () { notify.set(); event.pub('location.changed', getItem()); }); }, + refresh = function () { + + load(function () { + event.pub('location.refreshed', getItem()); + }); + }, + setLink = function ($el, item) { $el.attr('href', item.absHref); @@ -123,13 +160,19 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event } + event.sub('ready', function () { + + setLocation(document.location.href, true); + }); + + return { forceEncoding: forceEncoding, - encodedHref: encodedHref, getDomain: getDomain, getAbsHref: getAbsHref, getItem: getItem, setLocation: setLocation, + refresh: refresh, setLink: setLink }; }); diff --git a/src/_h5ai/client/js/inc/core/refresh.js b/src/_h5ai/client/js/inc/core/refresh.js deleted file mode 100644 index 912b06c4..00000000 --- a/src/_h5ai/client/js/inc/core/refresh.js +++ /dev/null @@ -1,37 +0,0 @@ - -modulejs.define('core/refresh', ['_', 'core/server', 'model/entry', 'core/location'], function (_, server, Entry, location) { - - var parseJson = function (entry, json) { - - var found = {}; - - _.each(json.entries, function (jsonEntry) { - - var e = Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status, jsonEntry.content); - found[e.absHref] = true; - }); - - _.each(entry.content, function (e) { - if (!found[e.absHref]) { - Entry.remove(e.absHref); - } - }); - }, - - refresh = function (callback) { - - var entry = Entry.get(location.getAbsHref()); - - server.request({action: 'get', entries: true, entriesHref: entry.absHref, entriesWhat: 1}, function (json) { - - if (json) { - parseJson(entry, json); - } - if (_.isFunction(callback)) { - callback(entry); - } - }); - }; - - return refresh; -}); diff --git a/src/_h5ai/client/js/inc/ext/autorefresh.js b/src/_h5ai/client/js/inc/ext/autorefresh.js index 7faff453..43e4b020 100644 --- a/src/_h5ai/client/js/inc/ext/autorefresh.js +++ b/src/_h5ai/client/js/inc/ext/autorefresh.js @@ -1,5 +1,5 @@ -modulejs.define('ext/autorefresh', ['_', '$', 'core/settings', 'core/event', 'core/refresh'], function (_, $, allsettings, event, refresh) { +modulejs.define('ext/autorefresh', ['_', '$', 'core/settings', 'core/event', 'core/location'], function (_, $, allsettings, event, location) { var settings = _.extend({ enabled: false, @@ -8,7 +8,7 @@ modulejs.define('ext/autorefresh', ['_', '$', 'core/settings', 'core/event', 'co heartbeat = function () { - refresh(); + location.refresh(); setTimeout(heartbeat, settings.interval); }, diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index b4656b50..43b906f1 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -14,7 +14,6 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ pageHintTemplate = 'has index page', statusHintTemplate = '', - // updates the crumb for this single entry update = function (entry, force) { if (!force && entry.$crumb && entry.$crumb.data('status') === entry.status) { @@ -62,13 +61,6 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ return $html; }, - onContentChanged = function (entry) { - - if (entry.$crumb) { - update(entry, true); - } - }, - onLocationChanged = function (item) { var crumb = item.getCrumb(), @@ -101,10 +93,6 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ return; } - // event.sub('entry.created', onContentChanged); - // event.sub('entry.removed', onContentChanged); - event.sub('entry.changed', onContentChanged); - event.sub('location.changed', onLocationChanged); }; diff --git a/src/_h5ai/client/js/inc/ext/delete.js b/src/_h5ai/client/js/inc/ext/delete.js index 7c99f4de..5e0d5159 100644 --- a/src/_h5ai/client/js/inc/ext/delete.js +++ b/src/_h5ai/client/js/inc/ext/delete.js @@ -1,5 +1,5 @@ -modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/resource', 'core/refresh', 'core/server'], function (_, $, allsettings, event, resource, refresh, server) { +modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/resource', 'core/location', 'core/server'], function (_, $, allsettings, event, resource, location, server) { var settings = _.extend({ enabled: false @@ -31,7 +31,7 @@ modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/re if (!json || json.code) { failed(); } - refresh(); + location.refresh(); }, requestDeletion = function (hrefsStr) { diff --git a/src/_h5ai/client/js/inc/ext/dropbox.js b/src/_h5ai/client/js/inc/ext/dropbox.js index 2d45a5b2..e8a8b78f 100644 --- a/src/_h5ai/client/js/inc/ext/dropbox.js +++ b/src/_h5ai/client/js/inc/ext/dropbox.js @@ -1,5 +1,5 @@ -modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'core/refresh', 'core/server'], function (_, $, allsettings, location, refresh, server) { +modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'core/server'], function (_, $, allsettings, location, server) { var settings = _.extend({ enabled: false, @@ -99,7 +99,7 @@ modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'cor afterAll: function () { - refresh(); + location.refresh(); }, error: function (err, file) { diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js index 89031b21..964528d5 100644 --- a/src/_h5ai/client/js/inc/ext/sort.js +++ b/src/_h5ai/client/js/inc/ext/sort.js @@ -143,8 +143,8 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e event.preventDefault(); }); - event.sub('entry.changed', onContentChanged); - event.sub('entry.created', onContentChanged); + event.sub('location.changed', onContentChanged); + event.sub('location.refreshed', onContentChanged); }; init(); diff --git a/src/_h5ai/client/js/inc/ext/statusbar.js b/src/_h5ai/client/js/inc/ext/statusbar.js index 09edfd47..7956e932 100644 --- a/src/_h5ai/client/js/inc/ext/statusbar.js +++ b/src/_h5ai/client/js/inc/ext/statusbar.js @@ -1,5 +1,5 @@ -modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'core/event', 'core/location'], function (_, $, allsettings, format, event, location) { +modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'core/event'], function (_, $, allsettings, format, event) { var settings = _.extend({ enabled: false @@ -37,36 +37,22 @@ modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'cor var $statusbar = $(template), $folderTotal = $statusbar.find('.folderTotal'), - $fileTotal = $statusbar.find('.fileTotal'); + $fileTotal = $statusbar.find('.fileTotal'), + onLocationChanged = function (item) { + + var stats = item.getStats(); + $folderTotal.text(stats.folders); + $fileTotal.text(stats.files); + }; $statusDefault = $statusbar.find('.status.default'); $statusDynamic = $statusbar.find('.status.dynamic'); - event.sub('location.changed', function (item) { - - var stats = item.getStats(); - $folderTotal.text(stats.folders); - $fileTotal.text(stats.files); - - update(); - }); - - event.sub('statusbar', update); $('#bottombar > .center').append($statusbar); - event.sub('entry.created', function () { - - var stats = location.getItem().getStats(); - $folderTotal.text(stats.folders); - $fileTotal.text(stats.files); - }); - - event.sub('entry.removed', function () { - - var stats = location.getItem().getStats(); - $folderTotal.text(stats.folders); - $fileTotal.text(stats.files); - }); + event.sub('statusbar', update); + event.sub('location.changed', onLocationChanged); + event.sub('location.refreshed', onLocationChanged); event.sub('entry.mouseenter', function (entry) { diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index 00afc7f2..a42787dc 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -20,7 +20,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e magicSequence = '=h5ai=', - // updates the tree for this single entry update = function (entry) { var $html = $(template), @@ -223,7 +222,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e }); }, - // creates the complete tree from entry down to the root init = function () { if (!settings.enabled) { @@ -243,14 +241,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e shiftTree(); }); - event.sub('location.changed', onLocationChanged); - - // strong negative performance impact in aai mode - // event.sub('entry.changed', onContentChanged); - // event.sub('entry.created', onContentChanged); - // event.sub('entry.removed', onContentChanged); - event.sub('ready', adjustSpacing); + event.sub('location.changed', onLocationChanged); $(window).on('resize', function () { diff --git a/src/_h5ai/client/js/inc/main.js b/src/_h5ai/client/js/inc/main.js index 8e92d494..f9513298 100644 --- a/src/_h5ai/client/js/inc/main.js +++ b/src/_h5ai/client/js/inc/main.js @@ -1,14 +1,10 @@ modulejs.define('main', ['_', 'core/event'], function (_, event) { - event.pub('beforeView'); - modulejs.require('view/items'); modulejs.require('view/spacing'); modulejs.require('view/viewmode'); - event.pub('beforeExt'); - _.each(modulejs.state(), function (state, id) { if (/^ext\/.+/.test(id)) { @@ -16,7 +12,5 @@ modulejs.define('main', ['_', 'core/event'], function (_, event) { } }); - modulejs.require('core/location').setLocation(document.location.href, true); - event.pub('ready'); }); diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 702ae024..f5d5420c 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -119,6 +119,36 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core } }, + onLocationRefreshed = function (item) { + + var $extended = $('#extended'), + $ul = $extended.find('ul'), + $empty = $extended.find('.empty'), + $items = $ul.find('.entry:not(.folder-parent)'), + currentItems = _.map($items.get(), function (i) { return $(i).data('entry'); }), + refreshedItems = _.values(item.content), + create = _.difference(refreshedItems, currentItems), + remove = _.difference(currentItems, refreshedItems); + + _.each(create, function (item) { + + update(item, true).hide().appendTo($ul).fadeIn(400); + }); + + _.each(remove, function (item) { + + item.$extended.fadeOut(400, function () { + item.$extended.remove(); + }); + }); + + if (item.isEmpty()) { + setTimeout(function () { $empty.show(); }, 400); + } else { + $empty.hide(); + } + }, + init = function () { var $content = $(contentTemplate), @@ -134,36 +164,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core .on('mouseenter', '.entry a', onMouseenter) .on('mouseleave', '.entry a', onMouseleave); - event.sub('entry.changed', function (entry) { - - if (entry.isInCurrentFolder() && entry.$extended) { - update(entry, true); - } - }); - - event.sub('entry.created', function (entry) { - - if (entry.isInCurrentFolder() && !entry.$extended) { - $emtpy.fadeOut(100, function () { - update(entry, true).hide().appendTo($ul).fadeIn(400); - }); - } - }); - - event.sub('entry.removed', function (entry) { - - if (entry.isInCurrentFolder() && entry.$extended) { - entry.$extended.fadeOut(400, function () { - entry.$extended.remove(); - - if (entry.parent.isEmpty()) { - $emtpy.fadeIn(100); - } - }); - } - }); - event.sub('location.changed', onLocationChanged); + event.sub('location.refreshed', onLocationRefreshed); $content.appendTo('body'); }; diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 759607ce..eb13f916 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -55,7 +55,7 @@ Options - interval: number, update interval in milliseconds, at least 1000 */ "autorefresh": { - "enabled": false, + "enabled": true, "interval": 5000 }, From 2819fd8496870ca2caf1aadd2769045cf0771218 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 26 Oct 2012 00:30:52 +0200 Subject: [PATCH 025/130] Improves event system. --- src/_h5ai/client/js/inc/core/event.js | 6 ++++-- src/_h5ai/client/js/inc/core/location.js | 15 ++++++++++++- src/_h5ai/client/js/inc/ext/autorefresh.js | 22 ++++++++++++++----- src/_h5ai/client/js/inc/ext/preview-img.js | 7 +++++- src/_h5ai/client/js/inc/ext/preview-txt.js | 7 +++++- src/_h5ai/client/js/inc/ext/select.js | 25 ++++++++++++++++------ src/_h5ai/client/js/inc/ext/thumbnails.js | 10 +++++---- src/_h5ai/client/js/inc/model/entry.js | 20 ----------------- src/_h5ai/client/js/inc/view/items.js | 13 ++++------- 9 files changed, 75 insertions(+), 50 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/event.js b/src/_h5ai/client/js/inc/core/event.js index 14fd0d61..ad94b3cb 100644 --- a/src/_h5ai/client/js/inc/core/event.js +++ b/src/_h5ai/client/js/inc/core/event.js @@ -24,12 +24,14 @@ modulejs.define('core/event', ['_'], function (_) { pub = function (topic, data) { - // console.log('EVENT PUB', topic, data); + var args = Array.prototype.slice.call(arguments, 1); + + // console.log('EVENT PUB', topic, args); if (_.isString(topic) && subscriptions[topic]) { _.each(subscriptions[topic], function (callback) { - callback(data); + callback.apply(topic, args); }); } }; diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 253f98ac..886354ff 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -104,6 +104,8 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event setLocation = function (newAbsHref, keepBrowserUrl) { + event.pub('location.beforeChange'); + newAbsHref = encodedHref(newAbsHref); if (absHref !== newAbsHref) { @@ -127,8 +129,19 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event refresh = function () { + + var item = getItem(), + oldItems = _.values(item.content); + + event.pub('location.beforeRefresh'); + load(function () { - event.pub('location.refreshed', getItem()); + + var newItems = _.values(item.content), + added = _.difference(newItems, oldItems), + removed = _.difference(oldItems, newItems); + + event.pub('location.refreshed', item, added, removed); }); }, diff --git a/src/_h5ai/client/js/inc/ext/autorefresh.js b/src/_h5ai/client/js/inc/ext/autorefresh.js index 43e4b020..dba4dcc4 100644 --- a/src/_h5ai/client/js/inc/ext/autorefresh.js +++ b/src/_h5ai/client/js/inc/ext/autorefresh.js @@ -6,10 +6,22 @@ modulejs.define('ext/autorefresh', ['_', '$', 'core/settings', 'core/event', 'co interval: 5000 }, allsettings.autorefresh), + timeoutId = null, + heartbeat = function () { location.refresh(); - setTimeout(heartbeat, settings.interval); + }, + + before = function () { + + clearTimeout(timeoutId); + }, + + after = function () { + + clearTimeout(timeoutId); + timeoutId = setTimeout(heartbeat, settings.interval); }, init = function () { @@ -20,10 +32,10 @@ modulejs.define('ext/autorefresh', ['_', '$', 'core/settings', 'core/event', 'co settings.interval = Math.max(1000, settings.interval); - event.sub('ready', function () { - - setTimeout(heartbeat, settings.interval); - }); + event.sub('location.beforeChange', before); + event.sub('location.beforeRefresh', before); + event.sub('location.changed', after); + event.sub('location.refreshed', after); }; init(); diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index c4a140e1..5ab79e02 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -224,6 +224,11 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', _.each(item.content, initEntry); }, + onLocationRefreshed = function (item, added, removed) { + + _.each(added, initEntry); + }, + init = function () { if (!settings.enabled) { @@ -280,7 +285,7 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', }); event.sub('location.changed', onLocationChanged); - event.sub('entry.created', initEntry); + event.sub('location.refreshed', onLocationRefreshed); $(window).on('resize load', adjustSize); }; diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 304d5de5..7efc3c96 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -275,6 +275,11 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', _.each(item.content, initEntry); }, + onLocationRefreshed = function (item, added, removed) { + + _.each(added, initEntry); + }, + init = function () { if (!settings.enabled) { @@ -303,7 +308,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', }); event.sub('location.changed', onLocationChanged); - event.sub('entry.created', initEntry); + event.sub('location.refreshed', onLocationRefreshed); $(window).on('resize load', adjustSize); }; diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js index 6ae2f4c1..0b2f5c3f 100644 --- a/src/_h5ai/client/js/inc/ext/select.js +++ b/src/_h5ai/client/js/inc/ext/select.js @@ -111,6 +111,23 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio } }, + onLocationRefreshed = function (item, added, removed) { + + var selectionChanged = false; + + _.each(removed, function (item) { + + if (item.$extended && item.$extended.hasClass('selected')) { + item.$extended.removeClass('selected'); + selectionChanged = true; + } + }); + + if (selectionChanged) { + publish(); + } + }, + init = function () { if (!settings.enabled) { @@ -119,13 +136,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio $selectionRect.hide().appendTo('body'); - event.sub('entry.removed', function (entry) { - - if (entry.$extended && entry.$extended.hasClass('selected')) { - entry.$extended.removeClass('selected'); - publish(); - } - }); + event.sub('location.refreshed', onLocationRefreshed); $document .on('mousedown', '.noSelection', noSelection) diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js index d5e65f5d..fd2d8aff 100644 --- a/src/_h5ai/client/js/inc/ext/thumbnails.js +++ b/src/_h5ai/client/js/inc/ext/thumbnails.js @@ -61,6 +61,11 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser }, settings.delay); }, + onLocationRefreshed = function (item, added, removed) { + + _.each(added, checkEntry); + }, + init = function () { if (!settings.enabled || !server.api) { @@ -68,10 +73,7 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser } event.sub('location.changed', onLocationChanged); - event.sub('entry.created', function (entry) { - - checkEntry(entry); - }); + event.sub('location.refreshed', onLocationRefreshed); }; init(); diff --git a/src/_h5ai/client/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/entry.js index 8e2defb4..fbb6248e 100644 --- a/src/_h5ai/client/js/inc/model/entry.js +++ b/src/_h5ai/client/js/inc/model/entry.js @@ -51,39 +51,21 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' return null; } - var created = !cache[absHref], - changed = false; - var self = cache[absHref] || new Entry(absHref); if (_.isNumber(time)) { - if (self.time !== time) { - changed = true; - } self.time = time; } if (_.isNumber(size)) { - if (self.size !== size) { - changed = true; - } self.size = size; } if (status) { - if (self.status !== status) { - changed = true; - } self.status = status; } if (isContentFetched) { self.isContentFetched = true; } - if (created) { - event.pub('entry.created', self); - } else if (changed) { - event.pub('entry.changed', self); - } - return self; }, @@ -102,8 +84,6 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' removeEntry(entry.absHref); }); - - event.pub('entry.removed', self); } }, diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index f5d5420c..5070538e 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -119,23 +119,18 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core } }, - onLocationRefreshed = function (item) { + onLocationRefreshed = function (item, added, removed) { var $extended = $('#extended'), $ul = $extended.find('ul'), - $empty = $extended.find('.empty'), - $items = $ul.find('.entry:not(.folder-parent)'), - currentItems = _.map($items.get(), function (i) { return $(i).data('entry'); }), - refreshedItems = _.values(item.content), - create = _.difference(refreshedItems, currentItems), - remove = _.difference(currentItems, refreshedItems); + $empty = $extended.find('.empty'); - _.each(create, function (item) { + _.each(added, function (item) { update(item, true).hide().appendTo($ul).fadeIn(400); }); - _.each(remove, function (item) { + _.each(removed, function (item) { item.$extended.fadeOut(400, function () { item.$extended.remove(); From 17c6f189105c69cc3045993078f2a09f11830673 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 26 Oct 2012 02:22:47 +0200 Subject: [PATCH 026/130] Updates readme. Markdown problems. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 31b481ea..9c848e40 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ create [a new issue](http://github.com/lrsjng/h5ai/issues/new) on GitHub! ## Install -(**note:** please don't use files from the `src` folder for installation, -they need to be preprocessed to work correctly) +( **note:** please don't use files from the `src` folder for installation, +they need to be preprocessed to work correctly ) You'll find a preprocessed package, as well as detailed installation instructions on the [project page](http://larsjung.de/h5ai/). @@ -16,7 +16,7 @@ instructions on the [project page](http://larsjung.de/h5ai/). ## Build -(there are repositories of the latest [releases](http://release.larsjung.de/h5ai/) and [dev builds](http://release.larsjung.de/h5ai/dev/)) +( there are repositories of the latest [releases](http://release.larsjung.de/h5ai/) and [dev builds](http://release.larsjung.de/h5ai/dev/) ) If you want to build **h5ai** yourself you need to install the build tool [fQuery](http://larsjung.de/fquery/) first: @@ -56,7 +56,7 @@ It profits from these great projects: ## Changelog -(**h5ai** uses [semantic versioning](http://semver.org/)) +( **h5ai** uses [semantic versioning](http://semver.org/) ) ### develop branch From 9163996ac2387b87db04d6c32efe04f096519070 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 27 Oct 2012 02:02:10 +0200 Subject: [PATCH 027/130] Minor style changes. --- src/_h5ai/client/css/inc/delete.less | 20 --- src/_h5ai/client/css/inc/download.less | 20 --- .../client/css/inc/extended-details.less | 16 +- src/_h5ai/client/css/inc/extended-grid.less | 2 +- src/_h5ai/client/css/inc/extended-icons.less | 2 +- src/_h5ai/client/css/inc/extended-list.less | 17 ++- src/_h5ai/client/css/inc/extended.less | 19 ++- src/_h5ai/client/css/inc/filter.less | 2 +- src/_h5ai/client/css/inc/general.less | 6 +- src/_h5ai/client/css/inc/h5ai-info.less | 2 +- src/_h5ai/client/css/inc/preview-txt.less | 6 +- src/_h5ai/client/css/inc/responsive.less | 1 - src/_h5ai/client/js/inc/ext/dropbox.js | 141 ++++++++++-------- src/_h5ai/conf/options.json | 4 +- 14 files changed, 132 insertions(+), 126 deletions(-) diff --git a/src/_h5ai/client/css/inc/delete.less b/src/_h5ai/client/css/inc/delete.less index 6008c9d4..1942ce80 100644 --- a/src/_h5ai/client/css/inc/delete.less +++ b/src/_h5ai/client/css/inc/delete.less @@ -8,23 +8,3 @@ background-color: rgba(255,0,0,0.5); } } - -#delete-auth { - display: none; - position: fixed; - z-index: 5; - left: 0; - top: 0; - .vert-gradient(rgb(241,241,241), rgb(228,228,228)); - border: 1px solid rgb(210,210,210); - - input { - display: block; - margin: 4px 6px; - border: 1px solid rgb(210,210,210); - font-family: Ubuntu, sans-serif; - color: #555; - background-color: rgba(255,255,255,1); - width: 100px; - } -} diff --git a/src/_h5ai/client/css/inc/download.less b/src/_h5ai/client/css/inc/download.less index d56119ec..502b70bf 100644 --- a/src/_h5ai/client/css/inc/download.less +++ b/src/_h5ai/client/css/inc/download.less @@ -8,23 +8,3 @@ background-color: rgba(255,0,0,0.5); } } - -#download-auth { - display: none; - position: fixed; - z-index: 5; - left: 0; - top: 0; - .vert-gradient(rgb(241,241,241), rgb(228,228,228)); - border: 1px solid rgb(210,210,210); - - input { - display: block; - margin: 4px 6px; - border: 1px solid rgb(210,210,210); - font-family: Ubuntu, sans-serif; - color: #555; - background-color: rgba(255,255,255,1); - width: 100px; - } -} diff --git a/src/_h5ai/client/css/inc/extended-details.less b/src/_h5ai/client/css/inc/extended-details.less index 7c30e340..74de0518 100644 --- a/src/_h5ai/client/css/inc/extended-details.less +++ b/src/_h5ai/client/css/inc/extended-details.less @@ -10,12 +10,24 @@ &.entry { a, a:active, a:visited { - border-bottom: 1px solid #e8e8e8; + border-top: 1px solid @item-border-col-sep; + border-bottom: 1px solid @item-border-col-sep; + + &:hover, &.hover { + border-color: @item-border-col-hover; + } } // needs to be here, to not conflict with header fields .icon, .label, .date, .size { - padding: 6px; + padding: 8px 6px; + } + } + + &.entry + .entry { + + a, a:active, a:visited { + border-top: none; } } diff --git a/src/_h5ai/client/css/inc/extended-grid.less b/src/_h5ai/client/css/inc/extended-grid.less index b652c7ca..fceadced 100644 --- a/src/_h5ai/client/css/inc/extended-grid.less +++ b/src/_h5ai/client/css/inc/extended-grid.less @@ -15,7 +15,7 @@ border: 1px solid rgba(0,0,0,0); &:hover, &.hover { - border-color: #e8e8e8; + border-color: @item-border-col-hover; } } } diff --git a/src/_h5ai/client/css/inc/extended-icons.less b/src/_h5ai/client/css/inc/extended-icons.less index 740e358f..5581b284 100644 --- a/src/_h5ai/client/css/inc/extended-icons.less +++ b/src/_h5ai/client/css/inc/extended-icons.less @@ -16,7 +16,7 @@ border: 1px solid rgba(0,0,0,0); &:hover, &.hover { - border-color: #e8e8e8; + border-color: @item-border-col-hover; } } } diff --git a/src/_h5ai/client/css/inc/extended-list.less b/src/_h5ai/client/css/inc/extended-list.less index f32e3e86..d71492c5 100644 --- a/src/_h5ai/client/css/inc/extended-list.less +++ b/src/_h5ai/client/css/inc/extended-list.less @@ -7,7 +7,20 @@ a, a:active, a:visited { height: 56px; - border-bottom: 1px solid #e8e8e8; + padding: 4px 0; + border-top: 1px solid @item-border-col-sep; + border-bottom: 1px solid @item-border-col-sep; + + &:hover, &.hover { + border-color: @item-border-col-hover; + } + } + } + + &.entry + .entry { + + a, a:active, a:visited { + border-top: none; } } @@ -19,7 +32,7 @@ display: inline-block; position: absolute; left: 0; - top: -2px; + top: 2px; width: 100px; } diff --git a/src/_h5ai/client/css/inc/extended.less b/src/_h5ai/client/css/inc/extended.less index e767d296..2bc1edba 100644 --- a/src/_h5ai/client/css/inc/extended.less +++ b/src/_h5ai/client/css/inc/extended.less @@ -9,6 +9,13 @@ background-color: rgba(240,100,0,0.2); } +@item-border-col-sep: #f2f2f2; +// @item-border-col-sep: #e8e8e8; +@item-background-col-hover: #f6f6f6; +@item-border-col-hover: #f0f0f0; +@item-background-col-sel: rgba(240,100,0,0.2); +@item-border-col-sel: rgba(240,100,0,0.2); + #extended { display: none; margin: 0 auto; @@ -67,8 +74,8 @@ &:hover, &.hover { color: #e80; - background-color: #f6f6f6; - border-color: #e8e8e8; + background-color: @item-background-col-hover; + border-color: @item-border-col-hover; } } @@ -76,12 +83,12 @@ a, a:active, a:visited { color: #000; - border-color: rgba(240,100,0,0.2); - background-color: rgba(240,100,0,0.2); + background-color: @item-background-col-sel; + border-color: @item-border-col-sel; &:hover, &.hover { - border-color: rgba(240,100,0,0.2); - background-color: rgba(240,100,0,0.2); + background-color: @item-background-col-sel; + border-color: @item-border-col-sel; } } } diff --git a/src/_h5ai/client/css/inc/filter.less b/src/_h5ai/client/css/inc/filter.less index 8ae0ae6d..b93f590d 100644 --- a/src/_h5ai/client/css/inc/filter.less +++ b/src/_h5ai/client/css/inc/filter.less @@ -5,7 +5,7 @@ input { display: none; border: none; - font-family: Ubuntu, sans-serif; + font-family: @font-family; color: #555; background-color: rgba(0,0,0,0); width: 100px; diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 4546397d..bd6c3a16 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -1,10 +1,14 @@ +@font-family: Ubuntu, sans-serif; +@font-family-mono: "Ubuntu Mono", monospace; + + html { overflow-y: auto; } ::-moz-selection { background: #68A9FF; color: #fff; text-shadow: none; } ::selection { background: #68A9FF; color: #fff; text-shadow: none; } body { - font-family: Ubuntu, sans-serif; + font-family: @font-family; font-size: 13px; color: #555; background-color: #fff; diff --git a/src/_h5ai/client/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less index 1a7cb7a1..48f2b8ac 100644 --- a/src/_h5ai/client/css/inc/h5ai-info.less +++ b/src/_h5ai/client/css/inc/h5ai-info.less @@ -1,6 +1,6 @@ body#h5ai-info { - font-family: Ubuntu, Arial, sans; + font-family: @font-family; margin: 2em auto 4em auto; font-size: 20px; color: #555; diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index 8c6c8f7a..cef9f981 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -40,7 +40,7 @@ td { vertical-align: top; - font-family: "Ubuntu Mono"; + font-family: @font-family-mono; font-size: 16px; line-height: 1.2em; color: #999; @@ -57,7 +57,7 @@ } code { - font-family: "Ubuntu Mono"; + font-family: @font-family-mono; font-size: 16px; line-height: 1.2em; } @@ -132,7 +132,7 @@ } pre, code { - font-family: "Ubuntu Mono", monospace; + font-family: @font-family-mono; } code { color: #008200; diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index 0cd32318..4acb1a7f 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -25,7 +25,6 @@ body { #extended.view-icons { padding: 0; border: none; - // margin: 0 -14px; } #bottombar { .center { diff --git a/src/_h5ai/client/js/inc/ext/dropbox.js b/src/_h5ai/client/js/inc/ext/dropbox.js index e8a8b78f..ee11f236 100644 --- a/src/_h5ai/client/js/inc/ext/dropbox.js +++ b/src/_h5ai/client/js/inc/ext/dropbox.js @@ -1,5 +1,5 @@ -modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'core/server'], function (_, $, allsettings, location, server) { +modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'core/server', 'core/event'], function (_, $, allsettings, location, server, event) { var settings = _.extend({ enabled: false, @@ -21,7 +21,8 @@ modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'cor return; } - var $content = $('#content').append(template); + var $content = $('#content').append(template), + data = {}; var uploads = {}, afterUpload = function (err, file) { @@ -41,73 +42,83 @@ modulejs.define('ext/dropbox', ['_', '$', 'core/settings', 'core/location', 'cor } }; - $content.filedrop({ + event.sub('ready', function () { - paramname: 'userfile', + $content.filedrop({ - maxfiles: settings.maxfiles, - maxfilesize: settings.maxfilesize, - url: server.api, - data: { + paramname: 'userfile', + + maxfiles: settings.maxfiles, + maxfilesize: settings.maxfilesize, + url: location.getAbsHref(), + data: data, + + docEnter: function () { + + $content.addClass('hint'); + }, + + docLeave: function () { + + $content.removeClass('hint'); + }, + + dragOver: function () { + + $content.addClass('match'); + }, + + dragLeave: function () { + + $content.removeClass('match'); + }, + + drop: function () { + + $content.removeClass('hint match'); + }, + + + beforeEach: function (file) { + + uploads[file.name] = $(uploadTemplate).appendTo('#uploads') + .find('.name').text(file.name).end() + .find('.size').text(file.size).end() + .find('.progress .bar').css('width', 0).end(); + }, + + progressUpdated: function (i, file, progress) { + + uploads[file.name].find('.progress .bar').css('width', '' + progress + '%'); + }, + + uploadFinished: function (i, file, response) { + + afterUpload(response.code && response.msg, file); + }, + + afterAll: function () { + + location.refresh(); + }, + + error: function (err, file) { + + afterUpload(err, file); + } + }); + }); + + event.sub('location.changed', function (item) { + + $('#uploads').empty(); + data = { action: 'upload', - href: location.getAbsHref() - }, - - docEnter: function () { - - $content.addClass('hint'); - }, - - docLeave: function () { - - $content.removeClass('hint'); - }, - - dragOver: function () { - - $content.addClass('match'); - }, - - dragLeave: function () { - - $content.removeClass('match'); - }, - - drop: function () { - - $content.removeClass('hint match'); - }, - - - beforeEach: function (file) { - - uploads[file.name] = $(uploadTemplate).appendTo('#uploads') - .find('.name').text(file.name).end() - .find('.size').text(file.size).end() - .find('.progress .bar').css('width', 0).end(); - }, - - progressUpdated: function (i, file, progress) { - - uploads[file.name].find('.progress .bar').css('width', '' + progress + '%'); - }, - - uploadFinished: function (i, file, response) { - - afterUpload(response.code && response.msg, file); - }, - - afterAll: function () { - - location.refresh(); - }, - - error: function (err, file) { - - afterUpload(err, file); - } + href: item.absHref + }; }); }; - init(); + // disabled while broken + // init(); }); diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index eb13f916..bbf9498f 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -80,7 +80,7 @@ Options Allow file deletion. */ "delete": { - "enabled": false + "enabled": true }, /* [EXPERIMENTAL] @@ -91,7 +91,7 @@ Options - maxfilesize: number, file size is in MB */ "dropbox": { - "enabled": false, + "enabled": true, "maxfiles": 10, "maxfilesize": 1000 }, From 1dea89befbb54742528abd4f6d01c69c77aaaa25 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 27 Oct 2012 03:50:35 +0200 Subject: [PATCH 028/130] Semantic changes. --- .../client/css/inc/extended-details.less | 4 +- src/_h5ai/client/css/inc/extended-grid.less | 2 +- src/_h5ai/client/css/inc/extended-icons.less | 2 +- src/_h5ai/client/css/inc/extended-list.less | 4 +- src/_h5ai/client/css/inc/extended.less | 2 +- src/_h5ai/client/css/inc/responsive.less | 4 +- src/_h5ai/client/js/inc/core/location.js | 16 ++-- src/_h5ai/client/js/inc/ext/crumb.js | 33 ++++--- src/_h5ai/client/js/inc/ext/delete.js | 4 +- src/_h5ai/client/js/inc/ext/download.js | 4 +- src/_h5ai/client/js/inc/ext/filter.js | 4 +- src/_h5ai/client/js/inc/ext/l10n.js | 2 +- src/_h5ai/client/js/inc/ext/preview-img.js | 18 ++-- src/_h5ai/client/js/inc/ext/preview-txt.js | 18 ++-- src/_h5ai/client/js/inc/ext/qrcode.js | 16 ++-- src/_h5ai/client/js/inc/ext/select.js | 20 ++-- src/_h5ai/client/js/inc/ext/sort.js | 34 +++---- src/_h5ai/client/js/inc/ext/statusbar.js | 16 ++-- src/_h5ai/client/js/inc/ext/thumbnails.js | 42 +++++---- src/_h5ai/client/js/inc/ext/tree.js | 92 +++++++++---------- .../client/js/inc/model/{entry.js => item.js} | 62 ++++++------- src/_h5ai/client/js/inc/view/items.js | 77 ++++++++-------- src/_h5ai/client/js/inc/view/viewmode.js | 2 +- src/_h5ai/conf/options.json | 2 +- 24 files changed, 243 insertions(+), 237 deletions(-) rename src/_h5ai/client/js/inc/model/{entry.js => item.js} (73%) diff --git a/src/_h5ai/client/css/inc/extended-details.less b/src/_h5ai/client/css/inc/extended-details.less index 74de0518..1641eddf 100644 --- a/src/_h5ai/client/css/inc/extended-details.less +++ b/src/_h5ai/client/css/inc/extended-details.less @@ -7,7 +7,7 @@ display: list-item; } - &.entry { + &.item { a, a:active, a:visited { border-top: 1px solid @item-border-col-sep; @@ -24,7 +24,7 @@ } } - &.entry + .entry { + &.item + .item { a, a:active, a:visited { border-top: none; diff --git a/src/_h5ai/client/css/inc/extended-grid.less b/src/_h5ai/client/css/inc/extended-grid.less index fceadced..3cb979e2 100644 --- a/src/_h5ai/client/css/inc/extended-grid.less +++ b/src/_h5ai/client/css/inc/extended-grid.less @@ -3,7 +3,7 @@ li { - &.entry { + &.item { float: left; a, a:active, a:visited { diff --git a/src/_h5ai/client/css/inc/extended-icons.less b/src/_h5ai/client/css/inc/extended-icons.less index 5581b284..846dd117 100644 --- a/src/_h5ai/client/css/inc/extended-icons.less +++ b/src/_h5ai/client/css/inc/extended-icons.less @@ -4,7 +4,7 @@ li { text-align: center; - &.entry { + &.item { float: left; a, a:active, a:visited { diff --git a/src/_h5ai/client/css/inc/extended-list.less b/src/_h5ai/client/css/inc/extended-list.less index d71492c5..68920925 100644 --- a/src/_h5ai/client/css/inc/extended-list.less +++ b/src/_h5ai/client/css/inc/extended-list.less @@ -3,7 +3,7 @@ li { - &.entry { + &.item { a, a:active, a:visited { height: 56px; @@ -17,7 +17,7 @@ } } - &.entry + .entry { + &.item + .item { a, a:active, a:visited { border-top: none; diff --git a/src/_h5ai/client/css/inc/extended.less b/src/_h5ai/client/css/inc/extended.less index 2bc1edba..5e1e7984 100644 --- a/src/_h5ai/client/css/inc/extended.less +++ b/src/_h5ai/client/css/inc/extended.less @@ -66,7 +66,7 @@ } } - &.entry { + &.item { a, a:active, a:visited { display: block; diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index 4acb1a7f..fb873a38 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -15,10 +15,10 @@ body { } } #extended.view-details { - .header .label, .entry .label { + .header .label, .item .label { margin-right: 110px; } - .header .date, .entry .date { + .header .date, .item .date { display: none; } } diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 886354ff..7b80d34f 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -69,35 +69,35 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event getItem = function () { - return modulejs.require('model/entry').get(absHref); + return modulejs.require('model/item').get(absHref); }, load = function (callback) { modulejs.require('core/server').request({action: 'get', entries: true, entriesHref: absHref, entriesWhat: 1}, function (json) { - var Entry = modulejs.require('model/entry'), - entry = Entry.get(absHref); + var Item = modulejs.require('model/item'), + item = Item.get(absHref); if (json) { var found = {}; - _.each(json.entries, function (jsonEntry) { + _.each(json.entries, function (jsonItem) { - var e = Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status, jsonEntry.content); + var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.status, jsonItem.content); found[e.absHref] = true; }); - _.each(entry.content, function (e) { + _.each(item.content, function (e) { if (!found[e.absHref]) { - Entry.remove(e.absHref); + Item.remove(e.absHref); } }); } if (_.isFunction(callback)) { - callback(entry); + callback(item); } }); }, diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index 43b906f1..aaabc188 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -14,49 +14,48 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ pageHintTemplate = 'has index page', statusHintTemplate = '', - update = function (entry, force) { + update = function (item, force) { - if (!force && entry.$crumb && entry.$crumb.data('status') === entry.status) { - return entry.$crumb; + if (!force && item.$crumb) { + return item.$crumb; } var $html = $(template), $a = $html.find('a'); $html - .addClass(entry.isFolder() ? 'folder' : 'file') - .data('item', entry) - .data('status', entry.status); + .addClass(item.isFolder() ? 'folder' : 'file') + .data('item', item); - location.setLink($a, entry); - $a.find('span').text(entry.label).end(); + location.setLink($a, item); + $a.find('span').text(item.label).end(); - if (entry.isDomain()) { + if (item.isDomain()) { $html.addClass('domain'); $a.find('img').attr('src', resource.image('home')); } - if (entry.isRoot()) { + if (item.isRoot()) { $html.addClass('root'); $a.find('img').attr('src', resource.image('home')); } - if (entry.isCurrentFolder()) { + if (item.isCurrentFolder()) { $html.addClass('current'); } - if (_.isNumber(entry.status)) { - if (entry.status === 200) { + if (_.isNumber(item.status)) { + if (item.status === 200) { $a.append($(pageHintTemplate)); } else { - $a.append($(statusHintTemplate).text('(' + entry.status + ')')); + $a.append($(statusHintTemplate).text('(' + item.status + ')')); } } - if (entry.$crumb) { - entry.$crumb.replaceWith($html); + if (item.$crumb) { + item.$crumb.replaceWith($html); } - entry.$crumb = $html; + item.$crumb = $html; return $html; }, diff --git a/src/_h5ai/client/js/inc/ext/delete.js b/src/_h5ai/client/js/inc/ext/delete.js index 5e0d5159..6c805d9c 100644 --- a/src/_h5ai/client/js/inc/ext/delete.js +++ b/src/_h5ai/client/js/inc/ext/delete.js @@ -45,9 +45,9 @@ modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/re selectedHrefsStr = ''; if (entries.length) { - selectedHrefsStr = _.map(entries, function (entry) { + selectedHrefsStr = _.map(entries, function (item) { - return entry.absHref; + return item.absHref; }).join(':'); $delete.appendTo('#navbar').show(); } else { diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js index bd9c43cd..63f3c98f 100644 --- a/src/_h5ai/client/js/inc/ext/download.js +++ b/src/_h5ai/client/js/inc/ext/download.js @@ -60,9 +60,9 @@ modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'co selectedHrefsStr = ''; if (entries.length) { - selectedHrefsStr = _.map(entries, function (entry) { + selectedHrefsStr = _.map(entries, function (item) { - return entry.absHref; + return item.absHref; }).join(':'); $download.appendTo('#navbar').show(); } else { diff --git a/src/_h5ai/client/js/inc/ext/filter.js b/src/_h5ai/client/js/inc/ext/filter.js index 3d2ce0f6..5ca92e73 100644 --- a/src/_h5ai/client/js/inc/ext/filter.js +++ b/src/_h5ai/client/js/inc/ext/filter.js @@ -22,7 +22,7 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func duration = 200; if (re) { - $('#extended .entry').each(function () { + $('#items .item').each(function () { var label = $(this).find('.label').text(); @@ -33,7 +33,7 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func } }); } else { - match = $('#extended .entry'); + match = $('#items .item'); } if ($(match).length) { diff --git a/src/_h5ai/client/js/inc/ext/l10n.js b/src/_h5ai/client/js/inc/ext/l10n.js index 8095f872..b27d145d 100644 --- a/src/_h5ai/client/js/inc/ext/l10n.js +++ b/src/_h5ai/client/js/inc/ext/l10n.js @@ -55,7 +55,7 @@ modulejs.define('ext/l10n', ['_', '$', 'core/settings', 'core/langs', 'core/form format.setDefaultDateFormat(currentLang.dateFormat); - $('#extended .entry .date').each(function () { + $('#items .item .date').each(function () { var $this = $(this); diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index 5ab79e02..63b0d212 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -201,32 +201,32 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', event.stopImmediatePropagation(); }, - initEntry = function (entry) { + initItem = function (item) { - if (entry.$extended && _.indexOf(settings.types, entry.type) >= 0) { - entry.$extended.find('a').on('click', function (event) { + if (item.$extended && _.indexOf(settings.types, item.type) >= 0) { + item.$extended.find('a').on('click', function (event) { event.preventDefault(); - var matchedEntries = _.compact(_.map($('#extended .entry'), function (entry) { + var matchedEntries = _.compact(_.map($('#items .item'), function (item) { - entry = $(entry).data('entry'); - return _.indexOf(settings.types, entry.type) >= 0 ? entry : null; + item = $(item).data('item'); + return _.indexOf(settings.types, item.type) >= 0 ? item : null; })); - onEnter(matchedEntries, _.indexOf(matchedEntries, entry)); + onEnter(matchedEntries, _.indexOf(matchedEntries, item)); }); } }, onLocationChanged = function (item) { - _.each(item.content, initEntry); + _.each(item.content, initItem); }, onLocationRefreshed = function (item, added, removed) { - _.each(added, initEntry); + _.each(added, initItem); }, init = function () { diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 7efc3c96..462db8c4 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -252,32 +252,32 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', event.stopImmediatePropagation(); }, - initEntry = function (entry) { + initItem = function (item) { - if (entry.$extended && _.indexOf(_.keys(settings.types), entry.type) >= 0) { - entry.$extended.find('a').on('click', function (event) { + if (item.$extended && _.indexOf(_.keys(settings.types), item.type) >= 0) { + item.$extended.find('a').on('click', function (event) { event.preventDefault(); - var matchedEntries = _.compact(_.map($('#extended .entry'), function (entry) { + var matchedEntries = _.compact(_.map($('#item .item'), function (item) { - entry = $(entry).data('entry'); - return _.indexOf(_.keys(settings.types), entry.type) >= 0 ? entry : null; + item = $(item).data('item'); + return _.indexOf(_.keys(settings.types), item.type) >= 0 ? item : null; })); - onEnter(matchedEntries, _.indexOf(matchedEntries, entry)); + onEnter(matchedEntries, _.indexOf(matchedEntries, item)); }); } }, onLocationChanged = function (item) { - _.each(item.content, initEntry); + _.each(item.content, initItem); }, onLocationRefreshed = function (item, added, removed) { - _.each(added, initEntry); + _.each(added, initItem); }, init = function () { diff --git a/src/_h5ai/client/js/inc/ext/qrcode.js b/src/_h5ai/client/js/inc/ext/qrcode.js index 65e807f7..a627cb2b 100644 --- a/src/_h5ai/client/js/inc/ext/qrcode.js +++ b/src/_h5ai/client/js/inc/ext/qrcode.js @@ -26,7 +26,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve } }, - update = function (entry) { + update = function (item) { loadQrCodeExtension(function () { $qrcode.empty().qrcode({ @@ -34,21 +34,21 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve width: settings.size, height: settings.size, color: '#333', - text: 'http://' + document.domain + entry.absHref + text: 'http://' + document.domain + item.absHref }); }); }, - onMouseenter = function (entry) { + onMouseenter = function (item) { - if (!entry.isFolder()) { - update(entry); + if (!item.isFolder()) { + update(item); clearTimeout(hideTimeoutId); $qrcode.stop(true, true).fadeIn(400); } }, - onMouseleave = function (entry) { + onMouseleave = function (item) { hideTimeoutId = setTimeout(function () { @@ -64,8 +64,8 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve $qrcode = $(template).appendTo('body'); - event.sub('entry.mouseenter', onMouseenter); - event.sub('entry.mouseleave', onMouseleave); + event.sub('item.mouseenter', onMouseenter); + event.sub('item.mouseleave', onMouseleave); }; init(); diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js index 0b2f5c3f..d5a180bd 100644 --- a/src/_h5ai/client/js/inc/ext/select.js +++ b/src/_h5ai/client/js/inc/ext/select.js @@ -13,9 +13,9 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio publish = function () { - var entries = _.map($('#extended .entry.selected'), function (entryElement) { + var entries = _.map($('#items .item.selected'), function (itemElement) { - return $(entryElement).data('entry'); + return $(itemElement).data('item'); }); event.pub('selection', entries); @@ -35,13 +35,13 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio .show(); var selRect = $selectionRect.fracs('rect'); - $('#extended .entry').removeClass('selecting').each(function () { + $('#items .item').removeClass('selecting').each(function () { - var $entry = $(this), - rect = $entry.find('a').fracs('rect'), + var $item = $(this), + rect = $item.find('a').fracs('rect'), inter = selRect.intersection(rect); - if (inter && !$entry.hasClass('folder-parent')) { - $entry.addClass('selecting'); + if (inter && !$item.hasClass('folder-parent')) { + $item.addClass('selecting'); } }); }, @@ -50,8 +50,8 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio event.preventDefault(); $document.off('mousemove', selectionUpdate); - $('#extended .entry.selecting.selected').removeClass('selecting').removeClass('selected'); - $('#extended .entry.selecting').removeClass('selecting').addClass('selected'); + $('#items .item.selecting.selected').removeClass('selecting').removeClass('selected'); + $('#items .item.selecting').removeClass('selecting').addClass('selected'); publish(); $selectionRect @@ -87,7 +87,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio $(':focus').blur(); if (!event.ctrlKey && !event.metaKey) { - $('#extended .entry').removeClass('selected'); + $('#items .item').removeClass('selected'); publish(); } diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js index 964528d5..485497c3 100644 --- a/src/_h5ai/client/js/inc/ext/sort.js +++ b/src/_h5ai/client/js/inc/ext/sort.js @@ -8,13 +8,13 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e storekey = 'sort.order', - type = function (entry) { + type = function (item) { - var $entry = $(entry); + var $item = $(item); - if ($entry.hasClass('folder-parent')) { + if ($item.hasClass('folder-parent')) { return 0; - } else if ($entry.hasClass('folder')) { + } else if ($item.hasClass('folder')) { return 1; } return 2; @@ -22,17 +22,17 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e cmpFn = function (rev, getVal) { - return function (entry1, entry2) { + return function (item1, item2) { var res, val1, val2; - res = type(entry1) - type(entry2); + res = type(item1) - type(item2); if (res !== 0) { return res; } - val1 = getVal(entry1); - val2 = getVal(entry2); + val1 = getVal(item1); + val2 = getVal(item2); if (val1 < val2) { return rev ? 1 : -1; } else if (val1 > val2) { @@ -42,17 +42,17 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e }; }, - getName = function (entry) { + getName = function (item) { - return $(entry).find('.label').text().toLowerCase(); + return $(item).find('.label').text().toLowerCase(); }, - getTime = function (entry) { + getTime = function (item) { - return $(entry).find('.date').data('time'); + return $(item).find('.date').data('time'); }, - getSize = function (entry) { + getSize = function (item) { - return $(entry).find('.size').data('bytes'); + return $(item).find('.size').data('bytes'); }, $all, orders, @@ -65,10 +65,10 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e $all.removeClass('ascending').removeClass('descending'); order.head.addClass(order.clas); - $('#extended .entry').detach().sort(order.fn).appendTo('#extended > ul'); + $('#items .item').detach().sort(order.fn).appendTo('#items'); }, - onContentChanged = function (entry) { + onContentChanged = function (item) { sortBy(store.get(storekey) || settings.order); }, @@ -81,7 +81,7 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e var $ascending = $('ascending'), $descending = $('descending'), - $header = $('#extended li.header'), + $header = $('#items li.header'), $label = $header.find('a.label'), $date = $header.find('a.date'), $size = $header.find('a.size'); diff --git a/src/_h5ai/client/js/inc/ext/statusbar.js b/src/_h5ai/client/js/inc/ext/statusbar.js index 7956e932..10cc93a7 100644 --- a/src/_h5ai/client/js/inc/ext/statusbar.js +++ b/src/_h5ai/client/js/inc/ext/statusbar.js @@ -54,25 +54,25 @@ modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'cor event.sub('location.changed', onLocationChanged); event.sub('location.refreshed', onLocationChanged); - event.sub('entry.mouseenter', function (entry) { + event.sub('item.mouseenter', function (item) { - if (entry.isCurrentParentFolder()) { + if (item.isCurrentParentFolder()) { return; } - var $span = $('').append(entry.label); + var $span = $('').append(item.label); - if (_.isNumber(entry.time)) { - $span.append(sepTemplate).append(format.formatDate(entry.time)); + if (_.isNumber(item.time)) { + $span.append(sepTemplate).append(format.formatDate(item.time)); } - if (_.isNumber(entry.size)) { - $span.append(sepTemplate).append(format.formatSize(entry.size)); + if (_.isNumber(item.size)) { + $span.append(sepTemplate).append(format.formatSize(item.size)); } update($span); }); - event.sub('entry.mouseleave', function (entry) { + event.sub('item.mouseleave', function (item) { update(); }); diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js index fd2d8aff..1609a9a4 100644 --- a/src/_h5ai/client/js/inc/ext/thumbnails.js +++ b/src/_h5ai/client/js/inc/ext/thumbnails.js @@ -25,31 +25,41 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser }); }, - checkEntry = function (entry) { + checkItem = function (item) { var type = null; - if (_.indexOf(settings.img, entry.type) >= 0) { + if (_.indexOf(settings.img, item.type) >= 0) { type = 'img'; - } else if (_.indexOf(settings.mov, entry.type) >= 0) { + } else if (_.indexOf(settings.mov, item.type) >= 0) { type = 'mov'; - } else if (_.indexOf(settings.doc, entry.type) >= 0) { + } else if (_.indexOf(settings.doc, item.type) >= 0) { type = 'doc'; } if (type) { - requestThumbSmall(type, entry.absHref, function (src) { + if (item.thumbSmall) { + item.$extended.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall); + } else { + requestThumbSmall(type, item.absHref, function (src) { - if (src && entry.$extended) { - entry.$extended.find('.icon.small img').addClass('thumb').attr('src', src); - } - }); - requestThumbBig(type, entry.absHref, function (src) { + if (src && item.$extended) { + item.thumbSmall = src; + item.$extended.find('.icon.small img').addClass('thumb').attr('src', src); + } + }); + } + if (item.thumbBig) { + item.$extended.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig); + } else { + requestThumbBig(type, item.absHref, function (src) { - if (src && entry.$extended) { - entry.$extended.find('.icon.big img').addClass('thumb').attr('src', src); - } - }); + if (src && item.$extended) { + item.thumbBig = src; + item.$extended.find('.icon.big img').addClass('thumb').attr('src', src); + } + }); + } } }, @@ -57,13 +67,13 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser setTimeout(function () { - _.each(item.content, checkEntry); + _.each(item.content, checkItem); }, settings.delay); }, onLocationRefreshed = function (item, added, removed) { - _.each(added, checkEntry); + _.each(added, checkItem); }, init = function () { diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index a42787dc..bdd62b3c 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -7,7 +7,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e maxSubfolders: 50 }, allsettings.tree), - template = '
    ' + + template = '
    ' + '' + '' + '' + @@ -20,7 +20,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e magicSequence = '=h5ai=', - update = function (entry) { + update = function (item) { var $html = $(template), $indicator = $html.find('.indicator'), @@ -29,26 +29,26 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e $label = $html.find('.label'); $html - .addClass(entry.isFolder() ? 'folder' : 'file') - .data('entry', entry) - .data('status', entry.status); + .addClass(item.isFolder() ? 'folder' : 'file') + .data('item', item) + .data('status', item.status); - location.setLink($a, entry); - $img.attr('src', resource.icon(entry.type)); - $label.text(entry.label); + location.setLink($a, item); + $img.attr('src', resource.icon(item.type)); + $label.text(item.label); - if (entry.isFolder()) { + if (item.isFolder()) { - var subfolders = entry.getSubfolders(); + var subfolders = item.getSubfolders(); // indicator - if (!entry.status || (entry.status === magicSequence && !entry.isContentFetched) || subfolders.length) { + if (!item.status || (item.status === magicSequence && !item.isContentFetched) || subfolders.length) { $indicator.removeClass('none'); - if (!entry.status || (entry.status === magicSequence && !entry.isContentFetched)) { + if (!item.status || (item.status === magicSequence && !item.isContentFetched)) { $indicator.addClass('unknown'); - } else if (entry.isContentVisible) { + } else if (item.isContentVisible) { $indicator.addClass('open'); } else { $indicator.addClass('close'); @@ -56,19 +56,19 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e } // is it the domain? - if (entry.isDomain()) { + if (item.isDomain()) { $html.addClass('domain'); $img.attr('src', resource.icon('folder-home')); } // is it the root? - if (entry.isRoot()) { + if (item.isRoot()) { $html.addClass('root'); $img.attr('src', resource.icon('folder-home')); } // is it the current folder? - if (entry.isCurrentFolder()) { + if (item.isCurrentFolder()) { $html.addClass('current'); $img.attr('src', resource.icon('folder-open')); } @@ -86,27 +86,27 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e if (subfolders.length > settings.maxSubfolders) { $('
  • … ' + (subfolders.length - settings.maxSubfolders) + ' more subfolders
    • ').appendTo($ul); } - if (!entry.isContentVisible) { + if (!item.isContentVisible) { $ul.hide(); } } // reflect folder status - if (_.isNumber(entry.status)) { - if (entry.status === 200) { + if (_.isNumber(item.status)) { + if (item.status === 200) { $img.attr('src', resource.icon('folder-page')); } else { $html.addClass('error'); - $a.append($(statusHintTemplate).text(entry.status)); + $a.append($(statusHintTemplate).text(item.status)); } } } - if (entry.$tree) { - entry.$tree.replaceWith($html); + if (item.$tree) { + item.$tree.replaceWith($html); } - entry.$tree = $html; + item.$tree = $html; return $html; }, @@ -114,9 +114,9 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e createOnIndicatorClick = function () { var $tree = $('#tree'), - slide = function (entry, $indicator, $content, down) { + slide = function (item, $indicator, $content, down) { - entry.isContentVisible = down; + item.isContentVisible = down; $indicator.removeClass('open close').addClass(down ? 'open' : 'close'); $tree.scrollpanel('update', true); $content[down ? 'slideDown' : 'slideUp'](function () { @@ -128,32 +128,32 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e return function () { var $indicator = $(this), - $entry = $indicator.closest('.entry'), - entry = $entry.data('entry'), - $content = $entry.find('> ul.content'); + $item = $indicator.closest('.item'), + item = $item.data('item'), + $content = $item.find('> ul.content'); if ($indicator.hasClass('unknown')) { - entry.fetchContent(function (entry) { + item.fetchContent(function (item) { - entry.isContentVisible = false; + item.isContentVisible = false; - var $entry = update(entry), - $indicator = $entry.find('> .indicator'), - $content = $entry.find('> ul.content'); + var $item = update(item), + $indicator = $item.find('> .indicator'), + $content = $item.find('> ul.content'); if (!$indicator.hasClass('none')) { - slide(entry, $indicator, $content, true); + slide(item, $indicator, $content, true); } }); } else if ($indicator.hasClass('open')) { - slide(entry, $indicator, $content, false); + slide(item, $indicator, $content, false); } else if ($indicator.hasClass('close')) { - slide(entry, $indicator, $content, true); + slide(item, $indicator, $content, true); } }; }, @@ -171,15 +171,15 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e } }, - fetchTree = function (entry, callback) { + fetchTree = function (item, callback) { - entry.isContentVisible = true; - entry.fetchContent(function (entry) { + item.isContentVisible = true; + item.fetchContent(function (item) { - if (entry.parent) { - fetchTree(entry.parent, callback); + if (item.parent) { + fetchTree(item.parent, callback); } else { - callback(entry); + callback(item); } }); }, @@ -199,13 +199,13 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e $tree.scrollpanel('update'); }, - onContentChanged = function (entry) { + onContentChanged = function (item) { - while (entry.parent) { - entry = entry.parent; + while (item.parent) { + item = item.parent; } - update(entry); + update(item); adjustSpacing(); shiftTree(false, true); }, diff --git a/src/_h5ai/client/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/item.js similarity index 73% rename from src/_h5ai/client/js/inc/model/entry.js rename to src/_h5ai/client/js/inc/model/item.js index fbb6248e..b8be6e84 100644 --- a/src/_h5ai/client/js/inc/model/entry.js +++ b/src/_h5ai/client/js/inc/model/item.js @@ -1,5 +1,5 @@ -modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function (_, types, event, settings, server, location) { +modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function (_, types, event, settings, server, location) { var reEndsWithSlash = /\/$/, @@ -39,11 +39,9 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' - // Cache - cache = {}, - getEntry = function (absHref, time, size, status, isContentFetched) { + getItem = function (absHref, time, size, status, isContentFetched) { absHref = location.forceEncoding(absHref); @@ -51,7 +49,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' return null; } - var self = cache[absHref] || new Entry(absHref); + var self = cache[absHref] || new Item(absHref); if (_.isNumber(time)) { self.time = time; @@ -69,7 +67,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' return self; }, - removeEntry = function (absHref) { + removeItem = function (absHref) { absHref = location.forceEncoding(absHref); @@ -80,16 +78,16 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' if (self.parent) { delete self.parent.content[self.absHref]; } - _.each(self.content, function (entry) { + _.each(self.content, function (item) { - removeEntry(entry.absHref); + removeItem(item.absHref); }); } }, fetchContent = function (absHref, callback) { - var self = getEntry(absHref); + var self = getItem(absHref); if (!_.isFunction(callback)) { callback = function () {}; @@ -101,8 +99,8 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' server.request({action: 'get', entries: true, entriesHref: self.absHref, entriesWhat: 1}, function (response) { if (response.entries) { - _.each(response.entries, function (entry) { - getEntry(entry.absHref, entry.time, entry.size, entry.status, entry.content); + _.each(response.entries, function (item) { + getItem(item.absHref, item.time, item.size, item.status, item.content); }); } @@ -113,9 +111,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' - // Entry - - var Entry = function (absHref) { + var Item = function (absHref) { var split = splitPath(absHref); @@ -131,7 +127,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' this.content = {}; if (split.parent) { - this.parent = getEntry(split.parent); + this.parent = getItem(split.parent); this.parent.content[this.absHref] = this; if (_.keys(this.parent.content).length > 1) { this.parent.isContentFetched = true; @@ -139,7 +135,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' } }; - _.extend(Entry.prototype, { + _.extend(Item.prototype, { isFolder: function () { @@ -158,7 +154,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' isCurrentParentFolder: function () { - return this === getEntry(location.getAbsHref()).parent; + return this === getItem(location.getAbsHref()).parent; }, isDomain: function () { @@ -188,12 +184,12 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' getCrumb: function () { - var entry = this, - crumb = [entry]; + var item = this, + crumb = [item]; - while (entry.parent) { - entry = entry.parent; - crumb.unshift(entry); + while (item.parent) { + item = item.parent; + crumb.unshift(item); } return crumb; @@ -201,12 +197,12 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' getSubfolders: function () { - return _.sortBy(_.filter(this.content, function (entry) { + return _.sortBy(_.filter(this.content, function (item) { - return entry.isFolder(); - }), function (entry) { + return item.isFolder(); + }), function (item) { - return entry.label.toLowerCase(); + return item.label.toLowerCase(); }); }, @@ -215,9 +211,9 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' var folders = 0, files = 0; - _.each(this.content, function (entry) { + _.each(this.content, function (item) { - if (entry.isFolder()) { + if (item.isFolder()) { folders += 1; } else { files += 1; @@ -225,11 +221,11 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' }); var depth = 0, - entry = this; + item = this; - while (entry.parent) { + while (item.parent) { depth += 1; - entry = entry.parent; + item = item.parent; } return { @@ -241,7 +237,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings' }); return { - get: getEntry, - remove: removeEntry + get: getItem, + remove: removeItem }; }); diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 5070538e..5e3a99de 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -6,7 +6,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core binaryPrefix: false }, allsettings.view), - template = '
  • ' + + itemTemplate = '
  • ' + '' + '' + '' + @@ -16,7 +16,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core '' + '
    • ', hintTemplate = '', - listTemplate = '
      ' + + itemsTemplate = '
        ' + '
      • ' + '' + '' + @@ -27,14 +27,14 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core emptyTemplate = '
        ', contentTemplate = '
        ', - // updates this single entry - update = function (entry, force) { + // updates this single item + update = function (item, force) { - if (!force && entry.$extended && entry.status && entry.$extended.data('status') === entry.status) { - return entry.$extended; + if (!force && item.$extended) { + return item.$extended; } - var $html = $(template), + var $html = $(itemTemplate), $a = $html.find('a'), $imgSmall = $html.find('.icon.small img'), $imgBig = $html.find('.icon.big img'), @@ -43,30 +43,29 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $size = $html.find('.size'); $html - .addClass(entry.isFolder() ? 'folder' : 'file') - .data('entry', entry) - .data('status', entry.status); + .addClass(item.isFolder() ? 'folder' : 'file') + .data('item', item); - location.setLink($a, entry); + location.setLink($a, item); - $imgSmall.attr('src', resource.icon(entry.type)).attr('alt', entry.type); - $imgBig.attr('src', resource.icon(entry.type, true)).attr('alt', entry.type); - $label.text(entry.label); - $date.data('time', entry.time).text(format.formatDate(entry.time)); - $size.data('bytes', entry.size).text(format.formatSize(entry.size)); + $imgSmall.attr('src', resource.icon(item.type)).attr('alt', item.type); + $imgBig.attr('src', resource.icon(item.type, true)).attr('alt', item.type); + $label.text(item.label); + $date.data('time', item.time).text(format.formatDate(item.time)); + $size.data('bytes', item.size).text(format.formatSize(item.size)); - if (entry.isFolder() && _.isNumber(entry.status)) { - if (entry.status === 200) { + if (item.isFolder() && _.isNumber(item.status)) { + if (item.status === 200) { $html.addClass('page'); $imgSmall.attr('src', resource.icon('folder-page')); $imgBig.attr('src', resource.icon('folder-page', true)); } else { $html.addClass('error'); - $label.append($(hintTemplate).text(' ' + entry.status + ' ')); + $label.append($(hintTemplate).text(' ' + item.status + ' ')); } } - if (entry.isCurrentParentFolder()) { + if (item.isCurrentParentFolder()) { $imgSmall.attr('src', resource.icon('folder-parent')); $imgBig.attr('src', resource.icon('folder-parent', true)); if (!settings.setParentFolderLabels) { @@ -75,41 +74,41 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $html.addClass('folder-parent'); } - if (entry.$extended) { - entry.$extended.replaceWith($html); + if (item.$extended) { + item.$extended.replaceWith($html); } - entry.$extended = $html; + item.$extended = $html; return $html; }, onMouseenter = function () { - var entry = $(this).closest('.entry').data('entry'); - event.pub('entry.mouseenter', entry); + var item = $(this).closest('.item').data('item'); + event.pub('item.mouseenter', item); }, onMouseleave = function () { - var entry = $(this).closest('.entry').data('entry'); - event.pub('entry.mouseleave', entry); + var item = $(this).closest('.item').data('item'); + event.pub('item.mouseleave', item); }, onLocationChanged = function (item) { var $extended = $('#extended'), - $ul = $extended.find('ul'), + $items = $('#items'), $empty = $extended.find('.empty'); - $ul.find('.entry').remove(); + $items.find('.item').remove(); if (item.parent) { - $ul.append(update(item.parent)); + $items.append(update(item.parent, true)); } _.each(item.content, function (e) { - $ul.append(update(e)); + $items.append(update(e, true)); }); if (item.isEmpty()) { @@ -122,12 +121,12 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core onLocationRefreshed = function (item, added, removed) { var $extended = $('#extended'), - $ul = $extended.find('ul'), + $items = $('#items'), $empty = $extended.find('.empty'); _.each(added, function (item) { - update(item, true).hide().appendTo($ul).fadeIn(400); + update(item, true).hide().appendTo($items).fadeIn(400); }); _.each(removed, function (item) { @@ -148,16 +147,18 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core var $content = $(contentTemplate), $extended = $content.find('#extended'), - $ul = $(listTemplate), + $items = $(itemsTemplate), $emtpy = $(emptyTemplate).hide(); format.setDefaultMetric(settings.binaryPrefix); $extended - .append($ul) - .append($emtpy) - .on('mouseenter', '.entry a', onMouseenter) - .on('mouseleave', '.entry a', onMouseleave); + .append($items) + .append($emtpy); + + $items + .on('mouseenter', '.item a', onMouseenter) + .on('mouseleave', '.item a', onMouseleave); event.sub('location.changed', onLocationChanged); event.sub('location.refreshed', onLocationRefreshed); diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js index 559b773c..f1eeebad 100644 --- a/src/_h5ai/client/js/inc/view/viewmode.js +++ b/src/_h5ai/client/js/inc/view/viewmode.js @@ -20,7 +20,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c var contentWidth = $('#content').width(), $extended = $('#extended'), - itemWidth = ($extended.hasClass('view-icons') || $extended.hasClass('view-grid')) ? ($extended.find('.entry').eq(0).width() || 1) : 1; + itemWidth = ($extended.hasClass('view-icons') || $extended.hasClass('view-grid')) ? ($extended.find('.item').eq(0).width() || 1) : 1; $extended.width(Math.floor(contentWidth / itemWidth) * itemWidth); }, diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index bbf9498f..3dcea873 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -55,7 +55,7 @@ Options - interval: number, update interval in milliseconds, at least 1000 */ "autorefresh": { - "enabled": true, + "enabled": false, "interval": 5000 }, From 32d7aa74e58f5fa4f7b06a6aca9c5d1d77f92858 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 27 Oct 2012 04:17:28 +0200 Subject: [PATCH 029/130] More semantic changes. --- src/_h5ai/client/js/inc/core/location.js | 4 +-- src/_h5ai/client/js/inc/ext/delete.js | 6 ++-- src/_h5ai/client/js/inc/ext/download.js | 6 ++-- src/_h5ai/client/js/inc/ext/preview-img.js | 4 +-- src/_h5ai/client/js/inc/ext/preview-txt.js | 4 +-- src/_h5ai/client/js/inc/ext/select.js | 4 +-- src/_h5ai/client/js/inc/model/item.js | 6 ++-- src/_h5ai/conf/options.json | 2 +- src/_h5ai/server/php/inc/Api.php | 6 ++-- src/_h5ai/server/php/inc/App.php | 32 +++++++++---------- .../server/php/inc/{Entry.php => Item.php} | 24 +++++++------- src/_h5ai/server/php/inc/init.php | 6 +++- .../php/{index.php.jade => inc/page.php.jade} | 5 ++- src/_h5ai/server/php/index.php | 1 + 14 files changed, 57 insertions(+), 53 deletions(-) rename src/_h5ai/server/php/inc/{Entry.php => Item.php} (78%) rename src/_h5ai/server/php/{index.php.jade => inc/page.php.jade} (89%) create mode 100644 src/_h5ai/server/php/index.php diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 7b80d34f..4c8b232a 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -74,7 +74,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event load = function (callback) { - modulejs.require('core/server').request({action: 'get', entries: true, entriesHref: absHref, entriesWhat: 1}, function (json) { + modulejs.require('core/server').request({action: 'get', items: true, itemsHref: absHref, itemsWhat: 1}, function (json) { var Item = modulejs.require('model/item'), item = Item.get(absHref); @@ -83,7 +83,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event var found = {}; - _.each(json.entries, function (jsonItem) { + _.each(json.items, function (jsonItem) { var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.status, jsonItem.content); found[e.absHref] = true; diff --git a/src/_h5ai/client/js/inc/ext/delete.js b/src/_h5ai/client/js/inc/ext/delete.js index 6c805d9c..9fb54cca 100644 --- a/src/_h5ai/client/js/inc/ext/delete.js +++ b/src/_h5ai/client/js/inc/ext/delete.js @@ -41,11 +41,11 @@ modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/re server.request({action: 'delete', hrefs: hrefsStr}, handleResponse); }, - onSelection = function (entries) { + onSelection = function (items) { selectedHrefsStr = ''; - if (entries.length) { - selectedHrefsStr = _.map(entries, function (item) { + if (items.length) { + selectedHrefsStr = _.map(items, function (item) { return item.absHref; }).join(':'); diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js index 63f3c98f..0acbb58b 100644 --- a/src/_h5ai/client/js/inc/ext/download.js +++ b/src/_h5ai/client/js/inc/ext/download.js @@ -56,11 +56,11 @@ modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'co }, handleResponse); }, - onSelection = function (entries) { + onSelection = function (items) { selectedHrefsStr = ''; - if (entries.length) { - selectedHrefsStr = _.map(entries, function (item) { + if (items.length) { + selectedHrefsStr = _.map(items, function (item) { return item.absHref; }).join(':'); diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index 63b0d212..dd322b0e 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -150,12 +150,12 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', }); }, - onEnter = function (entries, idx) { + onEnter = function (items, idx) { $(window).on('keydown', onKeydown); $('#pv-img-overlay').stop(true, true).fadeIn(200); - currentEntries = entries; + currentEntries = items; onIndexChange(idx); }, diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 462db8c4..1914726c 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -211,12 +211,12 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', }); }, - onEnter = function (entries, idx) { + onEnter = function (items, idx) { $(window).on('keydown', onKeydown); $('#pv-txt-overlay').stop(true, true).fadeIn(200); - currentEntries = entries; + currentEntries = items; onIndexChange(idx); }, diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js index d5a180bd..704fd6ea 100644 --- a/src/_h5ai/client/js/inc/ext/select.js +++ b/src/_h5ai/client/js/inc/ext/select.js @@ -13,12 +13,12 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio publish = function () { - var entries = _.map($('#items .item.selected'), function (itemElement) { + var items = _.map($('#items .item.selected'), function (itemElement) { return $(itemElement).data('item'); }); - event.pub('selection', entries); + event.pub('selection', items); }, selectionUpdate = function (event) { diff --git a/src/_h5ai/client/js/inc/model/item.js b/src/_h5ai/client/js/inc/model/item.js index b8be6e84..adf7d0d3 100644 --- a/src/_h5ai/client/js/inc/model/item.js +++ b/src/_h5ai/client/js/inc/model/item.js @@ -96,10 +96,10 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', if (self.isContentFetched) { callback(self); } else { - server.request({action: 'get', entries: true, entriesHref: self.absHref, entriesWhat: 1}, function (response) { + server.request({action: 'get', items: true, itemsHref: self.absHref, itemsWhat: 1}, function (response) { - if (response.entries) { - _.each(response.entries, function (item) { + if (response.items) { + _.each(response.items, function (item) { getItem(item.absHref, item.time, item.size, item.status, item.content); }); } diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 3dcea873..bbf9498f 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -55,7 +55,7 @@ Options - interval: number, update interval in milliseconds, at least 1000 */ "autorefresh": { - "enabled": false, + "enabled": true, "interval": 5000 }, diff --git a/src/_h5ai/server/php/inc/Api.php b/src/_h5ai/server/php/inc/Api.php index 3e66af6c..34e12eaf 100644 --- a/src/_h5ai/server/php/inc/Api.php +++ b/src/_h5ai/server/php/inc/Api.php @@ -62,11 +62,11 @@ class Api { $response["custom"] = $this->app->get_customizations($abs_href); } - if (array_key_exists("entries", $_REQUEST)) { + if (array_key_exists("items", $_REQUEST)) { - list($abs_href, $what) = use_optional_request_params("entriesHref", "entriesWhat", "entries"); + list($abs_href, $what) = use_optional_request_params("itemsHref", "itemsWhat", "items"); $what = is_numeric($what) ? intval($what, 10) : 1; - $response["entries"] = $this->app->get_entries($abs_href, $what); + $response["items"] = $this->app->get_items($abs_href, $what); } if (count($_REQUEST)) { diff --git a/src/_h5ai/server/php/inc/App.php b/src/_h5ai/server/php/inc/App.php index 241a195f..fa5f372a 100644 --- a/src/_h5ai/server/php/inc/App.php +++ b/src/_h5ai/server/php/inc/App.php @@ -152,19 +152,19 @@ class App { public function get_generic_json() { - return json_encode(array("entries" => $this->get_entries($this->abs_href, 1))) . "\n"; + return json_encode(array("items" => $this->get_items($this->abs_href, 1))) . "\n"; } - public function get_entries($abs_href, $what) { + public function get_items($abs_href, $what) { $cache = array(); - $folder = Entry::get($this, $this->get_abs_path($abs_href), $cache); + $folder = Item::get($this, $this->get_abs_path($abs_href), $cache); // add content of subfolders if ($what >= 2 && $folder !== null) { - foreach ($folder->get_content($cache) as $entry) { - $entry->get_content($cache); + foreach ($folder->get_content($cache) as $item) { + $item->get_content($cache); } $folder = $folder->get_parent($cache); } @@ -175,10 +175,10 @@ class App { $folder = $folder->get_parent($cache); } - uasort($cache, array("Entry", "cmp")); + uasort($cache, array("Item", "cmp")); $result = array(); - foreach ($cache as $p => $entry) { - $result[] = $entry->to_json_object(); + foreach ($cache as $p => $item) { + $result[] = $item->to_json_object(); } return $result; @@ -190,21 +190,21 @@ class App { date_default_timezone_set("UTC"); $cache = array(); - $folder = Entry::get($this, $this->abs_path, $cache); - $entries = $folder->get_content($cache); - uasort($entries, array("Entry", "cmp")); + $folder = Item::get($this, $this->abs_path, $cache); + $items = $folder->get_content($cache); + uasort($items, array("Item", "cmp")); $html = ""; $html .= ""; if ($folder->get_parent($cache)) { $html .= ""; } - foreach ($entries as $entry) { + foreach ($items as $item) { $html .= ""; - $html .= ""; - $html .= ""; - $html .= ""; - $html .= ""; + $html .= ""; + $html .= ""; + $html .= ""; + $html .= ""; $html .= ""; } $html .= "
        NameLast modifiedSize
        app_abs_href . "client/icons/16x16/folder-parent.png\"/>Parent Directory
        app_abs_href . "client/icons/16x16/" . ($entry->is_folder ? "folder" : "default") . ".png\"/>abs_href . "\">" . basename($entry->abs_path) . "" . date("Y-m-d H:i", $entry->date) . "" . ($entry->size !== null ? intval($entry->size / 1000) . " KB" : "" ) . "app_abs_href . "client/icons/16x16/" . ($item->is_folder ? "folder" : "default") . ".png\"/>abs_href . "\">" . basename($item->abs_path) . "" . date("Y-m-d H:i", $item->date) . "" . ($item->size !== null ? intval($item->size / 1000) . " KB" : "" ) . "
        "; diff --git a/src/_h5ai/server/php/inc/Entry.php b/src/_h5ai/server/php/inc/Item.php similarity index 78% rename from src/_h5ai/server/php/inc/Entry.php rename to src/_h5ai/server/php/inc/Item.php index 580058a0..83b557e9 100644 --- a/src/_h5ai/server/php/inc/Entry.php +++ b/src/_h5ai/server/php/inc/Item.php @@ -1,19 +1,19 @@ is_folder && !$entry2->is_folder) { + if ($item1->is_folder && !$item2->is_folder) { return -1; } - if (!$entry1->is_folder && $entry2->is_folder) { + if (!$item1->is_folder && $item2->is_folder) { return 1; } - return strcasecmp($entry1->abs_path, $entry2->abs_path); + return strcasecmp($item1->abs_path, $item2->abs_path); } public static function get($app, $abs_path, &$cache) { @@ -27,12 +27,12 @@ class Entry { return $cache[$abs_path]; } - $entry = new Entry($app, $abs_path); + $item = new Item($app, $abs_path); if (is_array($cache)) { - $cache[$abs_path] = $entry; + $cache[$abs_path] = $item; } - return $entry; + return $item; } @@ -57,7 +57,7 @@ class Entry { $this->size = null; $options = $app->get_options(); if ($options["foldersize"]["enabled"]) { - $cmd = str_replace("[DIR]", $this->abs_path, Entry::$FOLDER_SIZE_CMD); + $cmd = str_replace("[DIR]", $this->abs_path, Item::$FOLDER_SIZE_CMD); $this->size = intval(preg_replace("/\s.*$/", "", `$cmd`), 10); } } else { @@ -89,7 +89,7 @@ class Entry { $parent_abs_path = normalize_path(dirname($this->abs_path)); if (starts_with($parent_abs_path, $this->app->get_root_abs_path())) { - return Entry::get($this->app, $parent_abs_path, $cache); + return Item::get($this->app, $parent_abs_path, $cache); } return null; } @@ -105,8 +105,8 @@ class Entry { $files = $this->app->read_dir($this->abs_path); foreach ($files as $file) { - $entry = Entry::get($this->app, $this->abs_path . "/" . $file, $cache); - $content[$entry->abs_path] = $entry; + $item = Item::get($this->app, $this->abs_path . "/" . $file, $cache); + $content[$item->abs_path] = $item; } $this->is_content_fetched = true; diff --git a/src/_h5ai/server/php/inc/init.php b/src/_h5ai/server/php/inc/init.php index 333478e7..b5643a0c 100644 --- a/src/_h5ai/server/php/inc/init.php +++ b/src/_h5ai/server/php/inc/init.php @@ -17,7 +17,7 @@ function normalized_require_once($lib) { normalized_require_once("/server/php/inc/util.php"); normalized_require_once("/server/php/inc/App.php"); -normalized_require_once("/server/php/inc/Entry.php"); +normalized_require_once("/server/php/inc/Item.php"); $app = new App(APP_ABS_PATH, APP_ABS_HREF, ABS_HREF); @@ -33,8 +33,12 @@ if (array_key_exists("action", $_REQUEST)) { } else { + header("Content-type: text/html"); + $HREF = $app->get_app_abs_href(); $FALLBACK = $app->get_no_js_fallback(); + + normalized_require_once("/server/php/inc/page.php"); } ?> \ No newline at end of file diff --git a/src/_h5ai/server/php/index.php.jade b/src/_h5ai/server/php/inc/page.php.jade similarity index 89% rename from src/_h5ai/server/php/index.php.jade rename to src/_h5ai/server/php/inc/page.php.jade index 8ea6cbe1..f1c94557 100644 --- a/src/_h5ai/server/php/index.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -1,7 +1,6 @@ -| -- var href = "" -- var fallback = "" +- var href = "" +- var fallback = "" doctype 5 //if lt IE 9 diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php new file mode 100644 index 00000000..dd3bda2d --- /dev/null +++ b/src/_h5ai/server/php/index.php @@ -0,0 +1 @@ + \ No newline at end of file From 6c00a8e669f006624d72cbdaaaf2f5ef8a4c8dc2 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 27 Oct 2012 04:29:55 +0200 Subject: [PATCH 030/130] Moves init code to index file. --- src/_h5ai/server/php/inc/init.php | 44 ------------------------------ src/_h5ai/server/php/index.php | 45 ++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 45 deletions(-) delete mode 100644 src/_h5ai/server/php/inc/init.php diff --git a/src/_h5ai/server/php/inc/init.php b/src/_h5ai/server/php/inc/init.php deleted file mode 100644 index b5643a0c..00000000 --- a/src/_h5ai/server/php/inc/init.php +++ /dev/null @@ -1,44 +0,0 @@ -apply(); - - json_fail(100, "unsupported request"); - -} else { - - header("Content-type: text/html"); - - $HREF = $app->get_app_abs_href(); - $FALLBACK = $app->get_no_js_fallback(); - - normalized_require_once("/server/php/inc/page.php"); -} - -?> \ No newline at end of file diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php index dd3bda2d..aca10b8f 100644 --- a/src/_h5ai/server/php/index.php +++ b/src/_h5ai/server/php/index.php @@ -1 +1,44 @@ - \ No newline at end of file +apply(); + + json_fail(100, "unsupported request"); + +} else { + + header("Content-type: text/html;charset=utf-8"); + + $HREF = $app->get_app_abs_href(); + $FALLBACK = $app->get_no_js_fallback(); + + normalized_require_once("/server/php/inc/page.php"); +} + +?> \ No newline at end of file From a447502703195db722c480cdd4985460aaebc015 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 27 Oct 2012 15:30:25 +0200 Subject: [PATCH 031/130] Small fixes. --- src/_h5ai/client/js/inc/ext/crumb.js | 2 +- src/_h5ai/client/js/inc/ext/preview-txt.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index aaabc188..028a799b 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -81,7 +81,7 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ $ul.find('.crumb').remove(); _.each(crumb, function (e) { - $ul.append(update(e)); + $ul.append(update(e, true)); }); } }, diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 1914726c..acf20155 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -259,7 +259,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', event.preventDefault(); - var matchedEntries = _.compact(_.map($('#item .item'), function (item) { + var matchedEntries = _.compact(_.map($('#items .item'), function (item) { item = $(item).data('item'); return _.indexOf(_.keys(settings.types), item.type) >= 0 ? item : null; From 3a92606e0c04320ac9ada11280d2d1ec784afb94 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 28 Oct 2012 02:55:57 +0200 Subject: [PATCH 032/130] Small improvments in sorting. --- src/_h5ai/client/js/inc/core/event.js | 5 +++-- src/_h5ai/client/js/inc/core/format.js | 18 ++++-------------- src/_h5ai/client/js/inc/ext/sort.js | 9 ++++++++- src/_h5ai/client/js/inc/view/items.js | 4 ++-- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/event.js b/src/_h5ai/client/js/inc/core/event.js index ad94b3cb..1873a5ca 100644 --- a/src/_h5ai/client/js/inc/core/event.js +++ b/src/_h5ai/client/js/inc/core/event.js @@ -1,7 +1,8 @@ modulejs.define('core/event', ['_'], function (_) { - var subscriptions = {}, + var slice = Array.prototype.slice, + subscriptions = {}, sub = function (topic, callback) { @@ -24,7 +25,7 @@ modulejs.define('core/event', ['_'], function (_) { pub = function (topic, data) { - var args = Array.prototype.slice.call(arguments, 1); + var args = slice.call(arguments, 1); // console.log('EVENT PUB', topic, args); if (_.isString(topic) && subscriptions[topic]) { diff --git a/src/_h5ai/client/js/inc/core/format.js b/src/_h5ai/client/js/inc/core/format.js index d2267d5c..9d6cc225 100644 --- a/src/_h5ai/client/js/inc/core/format.js +++ b/src/_h5ai/client/js/inc/core/format.js @@ -14,15 +14,9 @@ modulejs.define('core/format', ['_', 'moment'], function (_, moment) { defaultMetric = decimalMetric, defaultDateFormat = 'YYYY-MM-DD HH:mm', - setDefaultMetric = function (metric) { + setDefaultMetric = function (useBinaryMetric) { - if (!metric) { - defaultMetric = decimalMetric; - } else if (metric === true) { - defaultMetric = binaryMetric; - } else { - defaultMetric = metric; - } + defaultMetric = useBinaryMetric ? binaryMetric : decimalMetric; }, formatSize = function (size, metric) { @@ -48,13 +42,9 @@ modulejs.define('core/format', ['_', 'moment'], function (_, moment) { defaultDateFormat = dateFormat; }, - formatDate = function (millis, dateFormat) { + formatDate = function (millis) { - if (!_.isNumber(millis) || !millis) { - return ''; - } - - return moment(millis).format(dateFormat || defaultDateFormat); + return _.isNumber(millis) && millis ? moment(millis).format(defaultDateFormat) : ''; }; return { diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js index 485497c3..268f6a43 100644 --- a/src/_h5ai/client/js/inc/ext/sort.js +++ b/src/_h5ai/client/js/inc/ext/sort.js @@ -65,7 +65,14 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e $all.removeClass('ascending').removeClass('descending'); order.head.addClass(order.clas); - $('#items .item').detach().sort(order.fn).appendTo('#items'); + var current = $('#items .item'); + var sorted = $('#items .item').sort(order.fn); + for (var i = 0, l = current.length; i < l; i += 1) { + if (current[i] !== sorted[i]) { + sorted.detach().sort(order.fn).appendTo('#items'); + break; + } + } }, onContentChanged = function (item) { diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 5e3a99de..b2b2acbd 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -16,7 +16,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core '' + '
        • ', hintTemplate = '', - itemsTemplate = '
          ' + + itemsTemplate = '
            ' + '
          • ' + '' + '' + @@ -25,7 +25,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core '
            • ' + '
          ', emptyTemplate = '
          ', - contentTemplate = '
          ', + contentTemplate = '
          ', // updates this single item update = function (item, force) { From 84be82d175c7a36b4255dbbe208678b6deab7afc Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 28 Oct 2012 16:43:19 +0100 Subject: [PATCH 033/130] Small fixes and semantics. --- src/_h5ai/client/css/inc/context-menu.less | 2 +- src/_h5ai/client/css/inc/preview-txt.less | 2 +- src/_h5ai/client/css/inc/responsive.less | 4 +- ...xtended-details.less => view-details.less} | 2 +- .../{extended-grid.less => view-grid.less} | 2 +- .../{extended-icons.less => view-icons.less} | 2 +- .../{extended-list.less => view-list.less} | 2 +- .../css/inc/{extended.less => view.less} | 2 +- src/_h5ai/client/css/styles.less | 10 ++-- src/_h5ai/client/js/inc/core/location.js | 17 ++++-- src/_h5ai/client/js/inc/ext/filter.js | 2 +- src/_h5ai/client/js/inc/ext/preview-img.js | 4 +- src/_h5ai/client/js/inc/ext/preview-txt.js | 4 +- src/_h5ai/client/js/inc/ext/select.js | 12 +++- src/_h5ai/client/js/inc/ext/thumbnails.js | 12 ++-- src/_h5ai/client/js/inc/ext/tree.js | 15 +---- src/_h5ai/client/js/inc/view/items.js | 58 +++++++++---------- src/_h5ai/client/js/inc/view/viewmode.js | 12 ++-- 18 files changed, 81 insertions(+), 83 deletions(-) rename src/_h5ai/client/css/inc/{extended-details.less => view-details.less} (96%) rename src/_h5ai/client/css/inc/{extended-grid.less => view-grid.less} (95%) rename src/_h5ai/client/css/inc/{extended-icons.less => view-icons.less} (96%) rename src/_h5ai/client/css/inc/{extended-list.less => view-list.less} (96%) rename src/_h5ai/client/css/inc/{extended.less => view.less} (99%) diff --git a/src/_h5ai/client/css/inc/context-menu.less b/src/_h5ai/client/css/inc/context-menu.less index 6014e527..2fad1e70 100644 --- a/src/_h5ai/client/css/inc/context-menu.less +++ b/src/_h5ai/client/css/inc/context-menu.less @@ -1,5 +1,5 @@ -#extended .context-menu { +#view .context-menu { display: block; position: absolute; diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index cef9f981..69abfc50 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -26,9 +26,9 @@ } #pv-txt-text { - word-break: break-all; &.highlighted { + word-break: break-all; tr:hover { background-color: rgba(0,0,0,0.05); diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index fb873a38..86d9c1da 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -14,7 +14,7 @@ body { display: none; } } -#extended.view-details { +#view.view-details { .header .label, .item .label { margin-right: 110px; } @@ -22,7 +22,7 @@ body { display: none; } } -#extended.view-icons { +#view.view-icons { padding: 0; border: none; } diff --git a/src/_h5ai/client/css/inc/extended-details.less b/src/_h5ai/client/css/inc/view-details.less similarity index 96% rename from src/_h5ai/client/css/inc/extended-details.less rename to src/_h5ai/client/css/inc/view-details.less index 1641eddf..5d1cdeff 100644 --- a/src/_h5ai/client/css/inc/extended-details.less +++ b/src/_h5ai/client/css/inc/view-details.less @@ -1,5 +1,5 @@ -#extended.view-details { +#view.view-details { li { diff --git a/src/_h5ai/client/css/inc/extended-grid.less b/src/_h5ai/client/css/inc/view-grid.less similarity index 95% rename from src/_h5ai/client/css/inc/extended-grid.less rename to src/_h5ai/client/css/inc/view-grid.less index 3cb979e2..19d0971a 100644 --- a/src/_h5ai/client/css/inc/extended-grid.less +++ b/src/_h5ai/client/css/inc/view-grid.less @@ -1,5 +1,5 @@ -#extended.view-grid { +#view.view-grid { li { diff --git a/src/_h5ai/client/css/inc/extended-icons.less b/src/_h5ai/client/css/inc/view-icons.less similarity index 96% rename from src/_h5ai/client/css/inc/extended-icons.less rename to src/_h5ai/client/css/inc/view-icons.less index 846dd117..77415cc1 100644 --- a/src/_h5ai/client/css/inc/extended-icons.less +++ b/src/_h5ai/client/css/inc/view-icons.less @@ -1,5 +1,5 @@ -#extended.view-icons { +#view.view-icons { li { text-align: center; diff --git a/src/_h5ai/client/css/inc/extended-list.less b/src/_h5ai/client/css/inc/view-list.less similarity index 96% rename from src/_h5ai/client/css/inc/extended-list.less rename to src/_h5ai/client/css/inc/view-list.less index 68920925..f1a27bba 100644 --- a/src/_h5ai/client/css/inc/extended-list.less +++ b/src/_h5ai/client/css/inc/view-list.less @@ -1,5 +1,5 @@ -#extended.view-list { +#view.view-list { li { diff --git a/src/_h5ai/client/css/inc/extended.less b/src/_h5ai/client/css/inc/view.less similarity index 99% rename from src/_h5ai/client/css/inc/extended.less rename to src/_h5ai/client/css/inc/view.less index 5e1e7984..a7702ad8 100644 --- a/src/_h5ai/client/css/inc/extended.less +++ b/src/_h5ai/client/css/inc/view.less @@ -16,7 +16,7 @@ @item-background-col-sel: rgba(240,100,0,0.2); @item-border-col-sel: rgba(240,100,0,0.2); -#extended { +#view { display: none; margin: 0 auto; diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index 9cdb4bfa..2d15bb29 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -18,11 +18,11 @@ @import "inc/notify"; @import "inc/content"; -@import "inc/extended"; -@import "inc/extended-details"; -@import "inc/extended-icons"; -@import "inc/extended-list"; -@import "inc/extended-grid"; +@import "inc/view"; +@import "inc/view-details"; +@import "inc/view-icons"; +@import "inc/view-list"; +@import "inc/view-grid"; // @import "inc/context-menu"; @import "inc/dropbox"; @import "inc/no-js-fallback"; diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 4c8b232a..7b3f2be6 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -120,11 +120,18 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event } } - notify.set('loading...'); - load(function () { - notify.set(); - event.pub('location.changed', getItem()); - }); + var item = getItem(); + if (item.isLocationLoaded) { + event.pub('location.changed', item); + refresh(); + } else { + notify.set('loading...'); + load(function () { + item.isLocationLoaded = true; + notify.set(); + event.pub('location.changed', item); + }); + } }, refresh = function () { diff --git a/src/_h5ai/client/js/inc/ext/filter.js b/src/_h5ai/client/js/inc/ext/filter.js index 5ca92e73..4dadc206 100644 --- a/src/_h5ai/client/js/inc/ext/filter.js +++ b/src/_h5ai/client/js/inc/ext/filter.js @@ -88,7 +88,7 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func $filter = $(template).appendTo('#navbar'); $input = $filter.find('input'); - $noMatch = $(noMatchTemplate).appendTo('#extended'); + $noMatch = $(noMatchTemplate).appendTo('#view'); $filter .on('click', function () { diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index dd322b0e..9d38516a 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -203,8 +203,8 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', initItem = function (item) { - if (item.$extended && _.indexOf(settings.types, item.type) >= 0) { - item.$extended.find('a').on('click', function (event) { + if (item.$view && _.indexOf(settings.types, item.type) >= 0) { + item.$view.find('a').on('click', function (event) { event.preventDefault(); diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index acf20155..1ac2a43b 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -254,8 +254,8 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', initItem = function (item) { - if (item.$extended && _.indexOf(_.keys(settings.types), item.type) >= 0) { - item.$extended.find('a').on('click', function (event) { + if (item.$view && _.indexOf(_.keys(settings.types), item.type) >= 0) { + item.$view.find('a').on('click', function (event) { event.preventDefault(); diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js index 704fd6ea..4d14a439 100644 --- a/src/_h5ai/client/js/inc/ext/select.js +++ b/src/_h5ai/client/js/inc/ext/select.js @@ -59,7 +59,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio .animate( { left: l + w * 0.5 * shrink, - top: t + h * 0.5 * shrink, + top: t + h * 0.5 * shrink, width: w * (1 - shrink), height: h * (1 - shrink), opacity: 0 @@ -111,14 +111,19 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio } }, + onLocationChanged = function () { + + publish(); + }, + onLocationRefreshed = function (item, added, removed) { var selectionChanged = false; _.each(removed, function (item) { - if (item.$extended && item.$extended.hasClass('selected')) { - item.$extended.removeClass('selected'); + if (item.$view && item.$view.hasClass('selected')) { + item.$view.removeClass('selected'); selectionChanged = true; } }); @@ -136,6 +141,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio $selectionRect.hide().appendTo('body'); + event.sub('location.changed', onLocationChanged); event.sub('location.refreshed', onLocationRefreshed); $document diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js index 1609a9a4..fd4849f7 100644 --- a/src/_h5ai/client/js/inc/ext/thumbnails.js +++ b/src/_h5ai/client/js/inc/ext/thumbnails.js @@ -39,24 +39,24 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser if (type) { if (item.thumbSmall) { - item.$extended.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall); + item.$view.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall); } else { requestThumbSmall(type, item.absHref, function (src) { - if (src && item.$extended) { + if (src && item.$view) { item.thumbSmall = src; - item.$extended.find('.icon.small img').addClass('thumb').attr('src', src); + item.$view.find('.icon.small img').addClass('thumb').attr('src', src); } }); } if (item.thumbBig) { - item.$extended.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig); + item.$view.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig); } else { requestThumbBig(type, item.absHref, function (src) { - if (src && item.$extended) { + if (src && item.$view) { item.thumbBig = src; - item.$extended.find('.icon.big img').addClass('thumb').attr('src', src); + item.$view.find('.icon.big img').addClass('thumb').attr('src', src); } }); } diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index bdd62b3c..6912b604 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -161,8 +161,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e shiftTree = function (forceVisible, dontAnimate) { var $tree = $("#tree"), - $extended = $("#extended"), - left = ((settings.slide && $tree.outerWidth() < $extended.offset().left) || forceVisible || !$extended.is(':visible')) ? 0 : 18 - $tree.outerWidth(); + $view = $("#view"), + left = ((settings.slide && $tree.outerWidth() < $view.offset().left) || forceVisible || !$view.is(':visible')) ? 0 : 18 - $tree.outerWidth(); if (dontAnimate) { $tree.stop().css({ left: left }); @@ -199,17 +199,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e $tree.scrollpanel('update'); }, - onContentChanged = function (item) { - - while (item.parent) { - item = item.parent; - } - - update(item); - adjustSpacing(); - shiftTree(false, true); - }, - onLocationChanged = function (item) { fetchTree(item, function (root) { diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index b2b2acbd..529a0437 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -16,22 +16,24 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core '' + '', hintTemplate = '', - itemsTemplate = '
            ' + - '
          • ' + - '' + - '' + - '' + - '' + - '
            • ' + - '
          ', - emptyTemplate = '
          ', - contentTemplate = '
          ', + contentTemplate = '
          ' + + '
          ' + + '
            ' + + '
          • ' + + '' + + '' + + '' + + '' + + '
            • ' + + '
          ' + + '
          ' + + '
          ' + + '
          ', - // updates this single item update = function (item, force) { - if (!force && item.$extended) { - return item.$extended; + if (!force && item.$view) { + return item.$view; } var $html = $(itemTemplate), @@ -74,10 +76,10 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $html.addClass('folder-parent'); } - if (item.$extended) { - item.$extended.replaceWith($html); + if (item.$view) { + item.$view.replaceWith($html); } - item.$extended = $html; + item.$view = $html; return $html; }, @@ -96,9 +98,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core onLocationChanged = function (item) { - var $extended = $('#extended'), - $items = $('#items'), - $empty = $extended.find('.empty'); + var $items = $('#items'), + $empty = $('#view').find('.empty'); $items.find('.item').remove(); @@ -120,9 +121,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core onLocationRefreshed = function (item, added, removed) { - var $extended = $('#extended'), - $items = $('#items'), - $empty = $extended.find('.empty'); + var $items = $('#items'), + $empty = $('#view').find('.empty'); _.each(added, function (item) { @@ -131,8 +131,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core _.each(removed, function (item) { - item.$extended.fadeOut(400, function () { - item.$extended.remove(); + item.$view.fadeOut(400, function () { + item.$view.remove(); }); }); @@ -146,16 +146,12 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core init = function () { var $content = $(contentTemplate), - $extended = $content.find('#extended'), - $items = $(itemsTemplate), - $emtpy = $(emptyTemplate).hide(); + $view = $content.find('#view'), + $items = $view.find('#items'), + $emtpy = $view.find('.empty').hide(); format.setDefaultMetric(settings.binaryPrefix); - $extended - .append($items) - .append($emtpy); - $items .on('mouseenter', '.item a', onMouseenter) .on('mouseleave', '.item a', onMouseleave); diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js index f1eeebad..2fe5ef74 100644 --- a/src/_h5ai/client/js/inc/view/viewmode.js +++ b/src/_h5ai/client/js/inc/view/viewmode.js @@ -19,15 +19,15 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c adjustSpacing = function () { var contentWidth = $('#content').width(), - $extended = $('#extended'), - itemWidth = ($extended.hasClass('view-icons') || $extended.hasClass('view-grid')) ? ($extended.find('.item').eq(0).width() || 1) : 1; + $view = $('#view'), + itemWidth = ($view.hasClass('view-icons') || $view.hasClass('view-grid')) ? ($view.find('.item').eq(0).width() || 1) : 1; - $extended.width(Math.floor(contentWidth / itemWidth) * itemWidth); + $view.width(Math.floor(contentWidth / itemWidth) * itemWidth); }, update = function (viewmode) { - var $extended = $('#extended'); + var $view = $('#view'); viewmode = _.indexOf(settings.modes, viewmode) >= 0 ? viewmode : settings.modes[0]; store.put(storekey, viewmode); @@ -35,10 +35,10 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c _.each(modes, function (mode) { if (mode === viewmode) { $('#view-' + mode).addClass('current'); - $extended.addClass('view-' + mode).show(); + $view.addClass('view-' + mode).show(); } else { $('#view-' + mode).removeClass('current'); - $extended.removeClass('view-' + mode); + $view.removeClass('view-' + mode); } }); From 5e280562577eb57289ab561ca8a1fb8375c69e42 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 2 Nov 2012 01:11:08 +0100 Subject: [PATCH 034/130] Fixes lighttpd issues. --- src/_h5ai/client/js/inc/core/location.js | 5 ++--- src/_h5ai/server/php/index.php | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 7b3f2be6..0a62f8c7 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -121,13 +121,13 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event } var item = getItem(); - if (item.isLocationLoaded) { + if (item.isLoaded) { event.pub('location.changed', item); refresh(); } else { notify.set('loading...'); load(function () { - item.isLocationLoaded = true; + item.isLoaded = true; notify.set(); event.pub('location.changed', item); }); @@ -136,7 +136,6 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event refresh = function () { - var item = getItem(), oldItems = _.values(item.content); diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php index aca10b8f..1f3f54b2 100644 --- a/src/_h5ai/server/php/index.php +++ b/src/_h5ai/server/php/index.php @@ -7,7 +7,8 @@ function normalize_path($path, $trailing_slash = false) { } define("APP_ABS_PATH", normalize_path(dirname(dirname(dirname(__FILE__))))); -define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(getenv("SCRIPT_NAME")))), true)); +// define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(getenv("SCRIPT_NAME")))), true)); +define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(preg_replace('#^.*//#', '/', getenv("SCRIPT_NAME"))))), true)); // fixes lighttpd issues define("ABS_HREF", normalize_path(preg_replace('/[^\\/]*$/', '', getenv("REQUEST_URI")), true)); function normalized_require_once($lib) { From d3e7016cd5eac1537a4fd855a77f9d138fad6457 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 7 Nov 2012 20:04:58 +0100 Subject: [PATCH 035/130] Updates lv translation. --- src/_h5ai/conf/l10n/lv.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/_h5ai/conf/l10n/lv.json b/src/_h5ai/conf/l10n/lv.json index 76e96f1f..70b24e1a 100644 --- a/src/_h5ai/conf/l10n/lv.json +++ b/src/_h5ai/conf/l10n/lv.json @@ -1,6 +1,8 @@ { "lang": "latviešu", "details": "detaļas", + "list": "saraksts", + "grid": "režģis", "icons": "ikonas", "name": "Nosaukums", "lastModified": "Pēdējoreiz modificēts", From dc85bc4d5cc6380eee501a46b154c49bf407be28 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 6 Jul 2013 02:31:55 +0200 Subject: [PATCH 036/130] Some new styles. --- src/_h5ai/client/css/inc/bottombar.less | 7 +++++-- src/_h5ai/client/css/inc/general.less | 1 + src/_h5ai/client/css/inc/l10n.less | 9 ++++++--- src/_h5ai/client/css/inc/qrcode.less | 7 +++++-- src/_h5ai/client/css/inc/responsive.less | 11 +++++++---- src/_h5ai/client/css/inc/topbar.less | 14 +++++++++----- src/_h5ai/client/css/inc/tree.less | 19 +++++++++++++------ src/_h5ai/client/images/page.png | Bin 564 -> 317 bytes src/_h5ai/index.html.jade | 2 +- src/_h5ai/server/php/inc/page.php.jade | 2 +- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/_h5ai/client/css/inc/bottombar.less b/src/_h5ai/client/css/inc/bottombar.less index 74c3ef69..e9f0a58d 100644 --- a/src/_h5ai/client/css/inc/bottombar.less +++ b/src/_h5ai/client/css/inc/bottombar.less @@ -7,8 +7,11 @@ left: 0; bottom: 0; padding: 6px 0 8px 0; - .vert-gradient(rgb(241,241,241), rgb(228,228,228)); - border-top: 1px solid rgb(210,210,210); + // .vert-gradient(rgb(241,241,241), rgb(228,228,228)); + // border-top: 1px solid rgb(210,210,210); + background-color: rgb(245,245,245); + border-top: 1px solid rgba(0,0,0,0.05); + // .box-shadow(0 -2px 4px 0 rgba(0, 0, 0, 0.15); color: #999; text-align: center; diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index bd6c3a16..2d6f4ac2 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -9,6 +9,7 @@ html { overflow-y: auto; } body { font-family: @font-family; + font-weight: 300; font-size: 13px; color: #555; background-color: #fff; diff --git a/src/_h5ai/client/css/inc/l10n.less b/src/_h5ai/client/css/inc/l10n.less index 4ece6ed8..e13d5620 100644 --- a/src/_h5ai/client/css/inc/l10n.less +++ b/src/_h5ai/client/css/inc/l10n.less @@ -11,8 +11,10 @@ right: 0; top: 0; max-height: 200px; - background-color: rgb(241,241,241); - border: 1px solid rgb(210,210,210); + // background-color: rgb(241,241,241); + // border: 1px solid rgb(210,210,210); + background-color: rgb(245,245,245); + border: 1px solid rgba(0,0,0,0.05); .sp-scrollbar { margin: 0; @@ -38,7 +40,8 @@ li { padding: 8px 24px 10px 24px; white-space: nowrap; - border-top: 1px solid rgb(231,231,231); + // border-top: 1px solid rgb(231,231,231); + border-top: 1px solid rgba(0,0,0,0.05); .transition(all 0.2s ease-in-out); &.current { diff --git a/src/_h5ai/client/css/inc/qrcode.less b/src/_h5ai/client/css/inc/qrcode.less index 8fa52c13..26459295 100644 --- a/src/_h5ai/client/css/inc/qrcode.less +++ b/src/_h5ai/client/css/inc/qrcode.less @@ -6,8 +6,11 @@ bottom: 50px; z-index: 1; - background-color: #fff; - border: 2px solid #ddd; + // background-color: #fff; + // border: 2px solid #ddd; + // background-color: rgb(245,245,245); + background-color: rgb(255,255,255); + border: 1px solid rgba(0,0,0,0.05); padding: 8px; canvas { diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index 86d9c1da..8d365590 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -1,8 +1,5 @@ -@media only screen and (max-width: 500px) { -body { - margin: 8px; -} +@media only screen and (max-width: 700px) { #topbar { .crumb { display: none; @@ -31,6 +28,12 @@ body { display: none; } } +} + +@media only screen and (max-width: 500px) { +body { + margin: 8px; +} #tree { display: none !important; } diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index 048f0959..eb4a46ad 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -6,13 +6,17 @@ min-height: 30px; left: 0; top: 0; - .vert-gradient(rgb(241,241,241), rgb(228,228,228)); - border-bottom: 1px solid rgb(210,210,210); + // .vert-gradient(rgb(241,241,241), rgb(228,228,228)); + // border-bottom: 1px solid rgb(210,210,210); + background-color: rgb(245,245,245); + border-bottom: 1px solid rgba(0,0,0,0.05); + // .box-shadow(0 2px 4px 0 rgba(0, 0, 0, 0.15); } .topbar-highlight { - background-color: rgba(255,255,255,0.5); + // background-color: rgba(255,255,255,0.5); + background-color: rgba(255,255,255,0.8); opacity: 1.0; } @@ -78,8 +82,8 @@ color: #999; } img.hint { - width: 14px; - height: 14px; + // width: 14px; + // height: 14px; opacity: 0.8; } } diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less index 75d0a7d8..99a104d1 100644 --- a/src/_h5ai/client/css/inc/tree.less +++ b/src/_h5ai/client/css/inc/tree.less @@ -8,8 +8,11 @@ z-index: 3; overflow: auto; padding: 8px; - background-color: rgb(241,241,241); - border-right: 2px solid rgb(221,221,221); + // background-color: rgb(241,241,241); + // border-right: 2px solid rgb(221,221,221); + // border-right: 1px solid rgb(216,216,216); + background-color: rgb(245,245,245); + border-right: 1px solid rgba(0,0,0,0.05); .sp-scrollbar { margin: 8px 8px 8px 0; @@ -63,13 +66,15 @@ padding: 4px 6px; color: #555; border: 1px solid rgba(0,0,0,0); - .border-radius(5px); + .border-radius(3px); text-decoration: none; opacity: 0.7; &:hover, &.hover { color: #e80; - background-color: rgba(255,255,255,0.5); + // background-color: rgba(255,255,255,0.5); + background-color: rgba(255,255,255,0.8); + // border-color: rgba(0,0,0,0.05); opacity: 1; } } @@ -100,8 +105,10 @@ } .current { > a, > a:active, > a:visited { - background-color: rgba(255,255,255,0.5); - border-color: rgb(221,221,221); + // background-color: rgba(255,255,255,0.5); + // border-color: rgb(221,221,221); + background-color: rgba(255,255,255,0.8); + border-color: rgba(0,0,0,0.05); opacity: 1; } } diff --git a/src/_h5ai/client/images/page.png b/src/_h5ai/client/images/page.png index 24655400bab7e0b71a2252ba56638baaa5986f3e..4612fd03c9e0fe88f232669b7dd5e20fd0903b80 100644 GIT binary patch delta 247 zcmVq93yNmjhK)`TNehFWta@J8)9bMsoXYw-zSMu%Dpd&0_(a005Xrq z5sY2e?If-B-e-ZwD1fIgk`jQF63enUwqqhe0cOT93~1Zdj@~hmZ9F7EM5yZ;N-2EF zFE6LGfL*N+0>&7WWeKe{wrz{A(RWZ)73O(%=BW@Lz5}HcnAt(7vY3OWX+T5{E(Bnkm@Qb$4nuFf3kks&aD+yoC6EEds)!CwFX0kla(K~y-)eUq`y z5>XI^zuDbiFo4CprAFrf|Z5Q#)^uHQ27E@^cKE>vGoDu1uQ5q!Agk= zY-Cy1W8qw~A-_(sbLZZ+eA2=f8db1RQ`<;!U^P?RJ`f z=lLrj@`k1ZwSafP8$bY^PDk7AHU)kl2}$>Wx4?ZM0nAy&o<9IDeQiJ_>5e2KXJEiJ z@ClGd+3)u&r@wEtTF-%}&JdS#F1Ah=Ns*b6Wf`m0%DnMwp65Rsjm8TH(Ivnwpc5WY z60_ON27>`{9GmZdE{b9cJOQ2oM|>iGlCFXGK-B=P06-K)!Liqpnvw`E?13UQ zI*5%%Bb8-Inx^b_J2smQ%jNRq&Lo77M-gl?GrHZb*6TI3N0uba%v^2**w+CLfo_md zzkE?2&ay5T5Ex`xhM8ez@=VRX%4Odu!6b#LAzw1c|HU944u`5;rtZRYIt}$%neCZD z9LJ}ssva&Di;rd&K(3r_7$o39k|e+U=PCk##^dp7KA%529*>XtPb5jA$z<{c*x`D^ kS+FL=H{h=4o5BG70V-9xHS4%+ng9R*07*qoM6N<$f}&pPz5oCK diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index 8503be40..e408b1a5 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -13,7 +13,7 @@ html.no-js( lang="en" ) meta( name="viewport", content="width=device-width" ) link( rel="shortcut icon", href="client/images/app-16x16.ico" ) link( rel="apple-touch-icon", type="image/png", href="client/images/app-48x48.png" ) - link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) + link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300,400,700,300italic,400italic,700italic" ) link( rel="stylesheet", href="client/css/styles.css" ) script( src="client/js/scripts.js", data-mode="info" ) diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index f1c94557..71d8c00f 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -17,7 +17,7 @@ html.no-js( lang="en" ) meta( name="viewport", content="width=device-width" ) link( rel="shortcut icon", href!="#{href}client/images/app-16x16.ico" ) link( rel="apple-touch-icon", type="image/png", href!="#{href}client/images/app-48x48.png" ) - link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) + link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300,400,700,300italic,400italic,700italic" ) link( rel="stylesheet", href!="#{href}client/css/styles.css" ) script( src!="#{href}client/js/scripts.js" ) From 49276c157c8b88196abc4a5df279e523d77696fc Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 6 Jul 2013 20:37:08 +0200 Subject: [PATCH 037/130] More style changes. --- src/_h5ai/client/css/inc/bottombar.less | 15 ++++----- src/_h5ai/client/css/inc/content.less | 4 +-- src/_h5ai/client/css/inc/context-menu.less | 10 +++--- src/_h5ai/client/css/inc/filter.less | 2 +- src/_h5ai/client/css/inc/general.less | 35 ++++++++++++++++++-- src/_h5ai/client/css/inc/h5ai-info.less | 2 +- src/_h5ai/client/css/inc/l10n.less | 21 +++++------- src/_h5ai/client/css/inc/no-js-fallback.less | 6 ++-- src/_h5ai/client/css/inc/notify.less | 3 -- src/_h5ai/client/css/inc/qrcode.less | 7 ++-- src/_h5ai/client/css/inc/topbar.less | 20 ++++------- src/_h5ai/client/css/inc/tree.less | 26 ++++++--------- src/_h5ai/client/css/inc/view.less | 28 ++++++++++------ src/_h5ai/conf/options.json | 6 ++-- src/_h5ai/index.html.jade | 2 +- src/_h5ai/server/php/inc/page.php.jade | 2 +- 16 files changed, 100 insertions(+), 89 deletions(-) diff --git a/src/_h5ai/client/css/inc/bottombar.less b/src/_h5ai/client/css/inc/bottombar.less index e9f0a58d..16a3c054 100644 --- a/src/_h5ai/client/css/inc/bottombar.less +++ b/src/_h5ai/client/css/inc/bottombar.less @@ -8,9 +8,8 @@ bottom: 0; padding: 6px 0 8px 0; // .vert-gradient(rgb(241,241,241), rgb(228,228,228)); - // border-top: 1px solid rgb(210,210,210); - background-color: rgb(245,245,245); - border-top: 1px solid rgba(0,0,0,0.05); + background-color: @col-widget-back; + border-top: @border-widget; // .box-shadow(0 -2px 4px 0 rgba(0, 0, 0, 0.15); color: #999; @@ -23,7 +22,7 @@ opacity: 0.7; &:hover { - color: #e80; + color: @col-hover; opacity: 1; } } @@ -43,18 +42,18 @@ padding: 0 8px; } .noJsMsg { - color: #c33; + color: @col-error; margin-left: 16px; } .oldBrowser { display: none; - color: #c33; + color: @col-error; margin-left: 16px; a, a:active, a:visited { - color: #c33; + color: @col-error; text-decoration: underline; &:hover { - color: #e80; + color: @col-hover; } } } diff --git a/src/_h5ai/client/css/inc/content.less b/src/_h5ai/client/css/inc/content.less index 6511f851..188cdae1 100644 --- a/src/_h5ai/client/css/inc/content.less +++ b/src/_h5ai/client/css/inc/content.less @@ -9,12 +9,12 @@ color: #333; a, a:active, a:visited { - color: #2080FF; + color: @col-link; text-decoration: none; cursor: pointer; &:hover { - color: #555; + color: @col-link-hover; } } } diff --git a/src/_h5ai/client/css/inc/context-menu.less b/src/_h5ai/client/css/inc/context-menu.less index 2fad1e70..3135941b 100644 --- a/src/_h5ai/client/css/inc/context-menu.less +++ b/src/_h5ai/client/css/inc/context-menu.less @@ -5,8 +5,8 @@ position: absolute; right: 0; top: 0; - background-color: rgb(241,241,241); - border: 1px solid rgb(210,210,210); + background-color: @col-widget-back; + border: @border-widget; color: #999; z-index: 10; font-size: 0.9em; @@ -20,12 +20,12 @@ li { padding: 8px 12px 10px 12px; white-space: nowrap; - border-top: 1px solid rgb(231,231,231); + border-top: @border-widget-sep; .transition(all 0.2s ease-in-out); &:hover { - color: #e80; - background-color: rgba(255,255,255,0.8); + color: @col-hover; + background-color: @col-widget-back-hover; } } } diff --git a/src/_h5ai/client/css/inc/filter.less b/src/_h5ai/client/css/inc/filter.less index b93f590d..0a5afc88 100644 --- a/src/_h5ai/client/css/inc/filter.less +++ b/src/_h5ai/client/css/inc/filter.less @@ -6,7 +6,7 @@ display: none; border: none; font-family: @font-family; - color: #555; + color: @col; background-color: rgba(0,0,0,0); width: 100px; } diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 2d6f4ac2..2c6255fc 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -1,4 +1,33 @@ +@col: rgb(85,85,85); +@col-back: rgb(255,255,255); +@col-hover: rgb(29,119,194); +@col-border: rgba(0,0,0,0.05); +@col-border-strong: rgba(0,0,0,0.1); + +@col-error: rgb(204,51,51); + +@col-link: rgb(29,119,194); +@col-link-hover: rgb(29,119,194); + +@col-widget-back: rgb(245,245,245); +@col-widget-back-highlight: rgba(255,255,255,0.8); +@col-widget-back-hover: rgba(255,255,255,0.8); +@col-widget-back-sel: rgba(255,255,255,0.8); +@col-widget-sep: @col-border; + +@col-sb-back: rgb(210,210,210); +@col-sb-thumb: rgb(180,180,180); +@col-sb-thumb-active: rgb(150,150,150); + + +@border-widget: 1px solid @col-border; +@border-widget-sep: 1px solid @col-widget-sep; + + + + + @font-family: Ubuntu, sans-serif; @font-family-mono: "Ubuntu Mono", monospace; @@ -9,10 +38,10 @@ html { overflow-y: auto; } body { font-family: @font-family; - font-weight: 300; + // font-weight: 400; font-size: 13px; - color: #555; - background-color: #fff; + color: @col; + background-color: @col-back; margin: 30px; } diff --git a/src/_h5ai/client/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less index 48f2b8ac..e9f03b32 100644 --- a/src/_h5ai/client/css/inc/h5ai-info.less +++ b/src/_h5ai/client/css/inc/h5ai-info.less @@ -3,7 +3,7 @@ body#h5ai-info { font-family: @font-family; margin: 2em auto 4em auto; font-size: 20px; - color: #555; + color: @col; max-width: 600px; text-align: center; diff --git a/src/_h5ai/client/css/inc/l10n.less b/src/_h5ai/client/css/inc/l10n.less index e13d5620..04c0c037 100644 --- a/src/_h5ai/client/css/inc/l10n.less +++ b/src/_h5ai/client/css/inc/l10n.less @@ -11,22 +11,20 @@ right: 0; top: 0; max-height: 200px; - // background-color: rgb(241,241,241); - // border: 1px solid rgb(210,210,210); - background-color: rgb(245,245,245); - border: 1px solid rgba(0,0,0,0.05); + background-color: @col-widget-back; + border: @border-widget; .sp-scrollbar { margin: 0; width: 6px; - background-color: rgb(210,210,210); + background-color: @col-sb-back; cursor: pointer; .sp-thumb { - background-color: rgb(180,180,180); + background-color: @col-sb-thumb; } &.active .sp-thumb { - background-color: rgb(150,150,150); + background-color: @col-sb-thumb-active; } } @@ -40,17 +38,16 @@ li { padding: 8px 24px 10px 24px; white-space: nowrap; - // border-top: 1px solid rgb(231,231,231); - border-top: 1px solid rgba(0,0,0,0.05); + border-top: @border-widget-sep; .transition(all 0.2s ease-in-out); &.current { color: #333; - background-color: rgba(255,255,255,0.8); + background-color: @col-widget-back-sel; } &:hover { - color: #e80; - background-color: rgba(255,255,255,0.8); + color: @col-hover; + background-color: @col-widget-back-hover; } } } diff --git a/src/_h5ai/client/css/inc/no-js-fallback.less b/src/_h5ai/client/css/inc/no-js-fallback.less index c1e2bb97..07908152 100644 --- a/src/_h5ai/client/css/inc/no-js-fallback.less +++ b/src/_h5ai/client/css/inc/no-js-fallback.less @@ -36,9 +36,7 @@ } } td { - border: 1px solid #ddd; - border-left: none; - border-right: none; + border-bottom: 1px solid @col-border; overflow: hidden; white-space: nowrap; font-size: 16px; @@ -50,7 +48,7 @@ cursor: pointer; &:hover { - color: #e80; + color: @col-hover; } } } diff --git a/src/_h5ai/client/css/inc/notify.less b/src/_h5ai/client/css/inc/notify.less index 19e38cef..4ac6545e 100644 --- a/src/_h5ai/client/css/inc/notify.less +++ b/src/_h5ai/client/css/inc/notify.less @@ -8,9 +8,6 @@ z-index: 100; padding: 2px 6px 2px 6px; color: #fff; - // background-color: rgba(240, 100, 0, 0.5); - // border: 2px solid rgba(255, 255, 255, 0.5); - // border: 2px solid rgba(240, 100, 0, 0.9); background-color: rgba(0, 0, 0, 0.2); .border-radius(4px); text-align: center; diff --git a/src/_h5ai/client/css/inc/qrcode.less b/src/_h5ai/client/css/inc/qrcode.less index 26459295..f12c94b4 100644 --- a/src/_h5ai/client/css/inc/qrcode.less +++ b/src/_h5ai/client/css/inc/qrcode.less @@ -6,11 +6,8 @@ bottom: 50px; z-index: 1; - // background-color: #fff; - // border: 2px solid #ddd; - // background-color: rgb(245,245,245); - background-color: rgb(255,255,255); - border: 1px solid rgba(0,0,0,0.05); + background-color: @col-widget-back; + border: @border-widget; padding: 8px; canvas { diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index eb4a46ad..90643624 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -7,34 +7,30 @@ left: 0; top: 0; // .vert-gradient(rgb(241,241,241), rgb(228,228,228)); - // border-bottom: 1px solid rgb(210,210,210); - background-color: rgb(245,245,245); - border-bottom: 1px solid rgba(0,0,0,0.05); + background-color: @col-widget-back; + border-bottom: @border-widget; // .box-shadow(0 2px 4px 0 rgba(0, 0, 0, 0.15); } .topbar-highlight { - // background-color: rgba(255,255,255,0.5); - background-color: rgba(255,255,255,0.8); + background-color: @col-widget-back-highlight; opacity: 1.0; } .topbar-hover { .topbar-highlight; - color: #e80; + color: @col-hover; } -@topbar-sep-border: 1px solid rgba(0,0,0,0.05); - .topbar-left { float: left; - border-right: @topbar-sep-border; + border-right: @border-widget-sep; } .topbar-right { float: right; - border-left: @topbar-sep-border; + border-left: @border-widget-sep; } @@ -45,7 +41,7 @@ padding: 0; a, a:active, a:visited, span.element { - color: #555; + color: @col; cursor: pointer; text-decoration: none; opacity: 0.7; @@ -82,8 +78,6 @@ color: #999; } img.hint { - // width: 14px; - // height: 14px; opacity: 0.8; } } diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less index 99a104d1..8f4f2db2 100644 --- a/src/_h5ai/client/css/inc/tree.less +++ b/src/_h5ai/client/css/inc/tree.less @@ -8,25 +8,22 @@ z-index: 3; overflow: auto; padding: 8px; - // background-color: rgb(241,241,241); - // border-right: 2px solid rgb(221,221,221); - // border-right: 1px solid rgb(216,216,216); - background-color: rgb(245,245,245); - border-right: 1px solid rgba(0,0,0,0.05); + background-color: @col-widget-back; + border-right: @border-widget; .sp-scrollbar { margin: 8px 8px 8px 0; width: 6px; - background-color: rgb(210,210,210); + background-color: @col-sb-back; .border-radius(3px); cursor: pointer; .sp-thumb { - background-color: rgb(180,180,180); + background-color: @col-sb-thumb; .border-radius(3px); } &.active .sp-thumb { - background-color: rgb(150,150,150); + background-color: @col-sb-thumb-active; } } @@ -71,9 +68,8 @@ opacity: 0.7; &:hover, &.hover { - color: #e80; - // background-color: rgba(255,255,255,0.5); - background-color: rgba(255,255,255,0.8); + color: @col-hover; + background-color: @col-widget-back-hover; // border-color: rgba(0,0,0,0.05); opacity: 1; } @@ -105,10 +101,8 @@ } .current { > a, > a:active, > a:visited { - // background-color: rgba(255,255,255,0.5); - // border-color: rgb(221,221,221); - background-color: rgba(255,255,255,0.8); - border-color: rgba(0,0,0,0.05); + background-color: @col-widget-back-sel; + border-color: @col-widget-sep; opacity: 1; } } @@ -116,7 +110,7 @@ > a, > a:active, > a:visited { color: #999; &:hover, &.hover { - color: #e80; + color: @col-hover; } } .hint { diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index a7702ad8..dd2ab451 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -5,16 +5,19 @@ left: 0; top: 0; z-index: 2; - border: 1px dashed rgba(240,100,0,0.5); - background-color: rgba(240,100,0,0.2); + border: 1px dashed @col-border-strong; + background-color: rgba(0,0,0,0.01); } -@item-border-col-sep: #f2f2f2; -// @item-border-col-sep: #e8e8e8; -@item-background-col-hover: #f6f6f6; -@item-border-col-hover: #f0f0f0; -@item-background-col-sel: rgba(240,100,0,0.2); -@item-border-col-sel: rgba(240,100,0,0.2); +@item-border-col-sep: @col-border; + +@item-background-col-hover: rgba(0,0,0,0.02); +@item-border-col-hover: @col-border; + +@item-background-col-sel: rgba(0,0,0,0.04); +@item-border-col-sel: @col-border-strong; + + #view { display: none; @@ -73,7 +76,8 @@ overflow: hidden; &:hover, &.hover { - color: #e80; + // color: #e80; + color: @col-hover; background-color: @item-background-col-hover; border-color: @item-border-col-hover; } @@ -82,7 +86,8 @@ &.selected:not(.selecting), &.selecting:not(.selected) { a, a:active, a:visited { - color: #000; + // color: #000; + // color: @col-hover; background-color: @item-background-col-sel; border-color: @item-border-col-sel; @@ -100,7 +105,8 @@ color: #aaa; &:hover, &.hover { - color: #e80; + // color: #e80; + color: @col-hover; } } diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index bbf9498f..c2dc439a 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -104,7 +104,7 @@ Options - packageName: basename of the download package, null for current foldername */ "download": { - "enabled": false, + "enabled": true, "execution": "shell", "format": "zip", "packageName": null @@ -178,7 +178,7 @@ Options 2: mode, servername and -version */ "mode": { - "enabled": false, + "enabled": true, "display": 2 }, @@ -248,7 +248,7 @@ Options - size: width and height in pixel */ "qrcode": { - "enabled": false, + "enabled": true, "size": 150 }, diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index e408b1a5..8503be40 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -13,7 +13,7 @@ html.no-js( lang="en" ) meta( name="viewport", content="width=device-width" ) link( rel="shortcut icon", href="client/images/app-16x16.ico" ) link( rel="apple-touch-icon", type="image/png", href="client/images/app-48x48.png" ) - link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300,400,700,300italic,400italic,700italic" ) + link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) link( rel="stylesheet", href="client/css/styles.css" ) script( src="client/js/scripts.js", data-mode="info" ) diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index 71d8c00f..f1c94557 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -17,7 +17,7 @@ html.no-js( lang="en" ) meta( name="viewport", content="width=device-width" ) link( rel="shortcut icon", href!="#{href}client/images/app-16x16.ico" ) link( rel="apple-touch-icon", type="image/png", href!="#{href}client/images/app-48x48.png" ) - link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300,400,700,300italic,400italic,700italic" ) + link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" ) link( rel="stylesheet", href!="#{href}client/css/styles.css" ) script( src!="#{href}client/js/scripts.js" ) From f5435802e74a484ea6b1e3bcbad78cd27606ad5c Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 7 Jul 2013 22:34:34 +0200 Subject: [PATCH 038/130] Images are now svg's from the 'Gnome Symbolic Icon Theme'. --- LICENSE.md | 2 +- README.md | 5 +++- src/_h5ai/client/css/inc/general.less | 11 +++++--- src/_h5ai/client/css/inc/preview-img.less | 5 ++-- src/_h5ai/client/css/inc/topbar.less | 2 ++ src/_h5ai/client/css/inc/tree.less | 6 ++-- src/_h5ai/client/css/inc/view-list.less | 2 +- src/_h5ai/client/css/inc/view.less | 2 +- src/_h5ai/client/images/ascending.png | Bin 640 -> 0 bytes src/_h5ai/client/images/ascending.svg | 17 ++++++++++++ src/_h5ai/client/images/blank.png | Bin 227 -> 0 bytes src/_h5ai/client/images/blank.svg | 14 ++++++++++ src/_h5ai/client/images/crumb.png | Bin 458 -> 0 bytes src/_h5ai/client/images/crumb.svg | 19 +++++++++++++ src/_h5ai/client/images/delete.png | Bin 616 -> 0 bytes src/_h5ai/client/images/delete.svg | 17 ++++++++++++ src/_h5ai/client/images/descending.png | Bin 631 -> 0 bytes src/_h5ai/client/images/descending.svg | 17 ++++++++++++ src/_h5ai/client/images/download.png | Bin 528 -> 0 bytes src/_h5ai/client/images/download.svg | 21 ++++++++++++++ src/_h5ai/client/images/filter.png | Bin 706 -> 0 bytes src/_h5ai/client/images/filter.svg | 18 ++++++++++++ src/_h5ai/client/images/folder-page.svg | 18 ++++++++++++ src/_h5ai/client/images/folder.svg | 19 +++++++++++++ src/_h5ai/client/images/home.png | Bin 460 -> 0 bytes src/_h5ai/client/images/home.svg | 17 ++++++++++++ src/_h5ai/client/images/loading.png | Bin 649 -> 0 bytes src/_h5ai/client/images/loading.svg | 17 ++++++++++++ src/_h5ai/client/images/page.png | Bin 317 -> 0 bytes src/_h5ai/client/images/page.svg | 17 ++++++++++++ src/_h5ai/client/images/preview/close.png | Bin 612 -> 0 bytes src/_h5ai/client/images/preview/close.svg | 19 +++++++++++++ src/_h5ai/client/images/preview/crumb.png | Bin 495 -> 0 bytes .../client/images/preview/fullscreen.png | Bin 611 -> 0 bytes .../client/images/preview/fullscreen.svg | 26 ++++++++++++++++++ src/_h5ai/client/images/preview/home.png | Bin 524 -> 0 bytes src/_h5ai/client/images/preview/next.png | Bin 492 -> 0 bytes src/_h5ai/client/images/preview/next.svg | 17 ++++++++++++ .../client/images/preview/no-fullscreen.png | Bin 658 -> 0 bytes .../client/images/preview/no-fullscreen.svg | 25 +++++++++++++++++ src/_h5ai/client/images/preview/play.png | Bin 495 -> 0 bytes src/_h5ai/client/images/preview/prev.png | Bin 499 -> 0 bytes src/_h5ai/client/images/preview/prev.svg | 17 ++++++++++++ src/_h5ai/client/images/preview/raw.png | Bin 597 -> 0 bytes src/_h5ai/client/images/preview/raw.svg | 21 ++++++++++++++ src/_h5ai/client/images/settings.svg | 17 ++++++++++++ src/_h5ai/client/images/tree.png | Bin 458 -> 0 bytes src/_h5ai/client/images/tree.svg | 19 +++++++++++++ src/_h5ai/client/images/view-details.png | Bin 324 -> 0 bytes src/_h5ai/client/images/view-details.svg | 19 +++++++++++++ src/_h5ai/client/images/view-grid.png | Bin 295 -> 0 bytes src/_h5ai/client/images/view-grid.svg | 25 +++++++++++++++++ src/_h5ai/client/images/view-icons.png | Bin 295 -> 0 bytes src/_h5ai/client/images/view-icons.svg | 25 +++++++++++++++++ src/_h5ai/client/images/view-list.png | Bin 324 -> 0 bytes src/_h5ai/client/images/view-list.svg | 19 +++++++++++++ src/_h5ai/client/js/inc/core/resource.js | 4 +-- src/_h5ai/client/js/inc/ext/tree.js | 14 ++++++---- src/_h5ai/client/js/inc/view/items.js | 9 ++++++ 59 files changed, 502 insertions(+), 20 deletions(-) delete mode 100644 src/_h5ai/client/images/ascending.png create mode 100644 src/_h5ai/client/images/ascending.svg delete mode 100644 src/_h5ai/client/images/blank.png create mode 100644 src/_h5ai/client/images/blank.svg delete mode 100644 src/_h5ai/client/images/crumb.png create mode 100644 src/_h5ai/client/images/crumb.svg delete mode 100644 src/_h5ai/client/images/delete.png create mode 100644 src/_h5ai/client/images/delete.svg delete mode 100644 src/_h5ai/client/images/descending.png create mode 100644 src/_h5ai/client/images/descending.svg delete mode 100644 src/_h5ai/client/images/download.png create mode 100644 src/_h5ai/client/images/download.svg delete mode 100644 src/_h5ai/client/images/filter.png create mode 100644 src/_h5ai/client/images/filter.svg create mode 100644 src/_h5ai/client/images/folder-page.svg create mode 100644 src/_h5ai/client/images/folder.svg delete mode 100644 src/_h5ai/client/images/home.png create mode 100644 src/_h5ai/client/images/home.svg delete mode 100644 src/_h5ai/client/images/loading.png create mode 100644 src/_h5ai/client/images/loading.svg delete mode 100644 src/_h5ai/client/images/page.png create mode 100644 src/_h5ai/client/images/page.svg delete mode 100644 src/_h5ai/client/images/preview/close.png create mode 100644 src/_h5ai/client/images/preview/close.svg delete mode 100644 src/_h5ai/client/images/preview/crumb.png delete mode 100644 src/_h5ai/client/images/preview/fullscreen.png create mode 100644 src/_h5ai/client/images/preview/fullscreen.svg delete mode 100644 src/_h5ai/client/images/preview/home.png delete mode 100644 src/_h5ai/client/images/preview/next.png create mode 100644 src/_h5ai/client/images/preview/next.svg delete mode 100644 src/_h5ai/client/images/preview/no-fullscreen.png create mode 100644 src/_h5ai/client/images/preview/no-fullscreen.svg delete mode 100644 src/_h5ai/client/images/preview/play.png delete mode 100644 src/_h5ai/client/images/preview/prev.png create mode 100644 src/_h5ai/client/images/preview/prev.svg delete mode 100644 src/_h5ai/client/images/preview/raw.png create mode 100644 src/_h5ai/client/images/preview/raw.svg create mode 100644 src/_h5ai/client/images/settings.svg delete mode 100644 src/_h5ai/client/images/tree.png create mode 100644 src/_h5ai/client/images/tree.svg delete mode 100644 src/_h5ai/client/images/view-details.png create mode 100644 src/_h5ai/client/images/view-details.svg delete mode 100644 src/_h5ai/client/images/view-grid.png create mode 100644 src/_h5ai/client/images/view-grid.svg delete mode 100644 src/_h5ai/client/images/view-icons.png create mode 100644 src/_h5ai/client/images/view-icons.svg delete mode 100644 src/_h5ai/client/images/view-list.png create mode 100644 src/_h5ai/client/images/view-list.svg diff --git a/LICENSE.md b/LICENSE.md index bab9d95b..35363c3f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2012 Lars Jung, http://larsjung.de +Copyright (c) 2013 Lars Jung, http://larsjung.de Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 9c848e40..59f7a38b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ instructions on the [project page](http://larsjung.de/h5ai/). ## Build -( there are repositories of the latest [releases](http://release.larsjung.de/h5ai/) and [dev builds](http://release.larsjung.de/h5ai/dev/) ) +( there are repositories for the latest [releases](http://release.larsjung.de/h5ai/) and [dev builds](http://release.larsjung.de/h5ai/dev/) ) If you want to build **h5ai** yourself you need to install the build tool [fQuery](http://larsjung.de/fquery/) first: @@ -39,6 +39,7 @@ You'll find a new directory `build` including a fresh zipball. It profits from these great projects: [Faenza icon set](http://tiheum.deviantart.com/art/Faenza-Icons-173323228) (GPL), +[Gnome Symbolic Icon Theme](https://git.gnome.org/browse/gnome-icon-theme-symbolic/) (CC BY-SA 3.0), [HTML5 ★ Boilerplate](http://html5boilerplate.com) (MIT), [jQuery](http://jquery.com) (MIT), [jQuery.filedrop](http://www.github.com/weixiyen/jquery-filedrop) (MIT), @@ -64,6 +65,8 @@ It profits from these great projects: * removes `aai` mode! * adds smart browsing * add line wrap and line highlighting (on hover) to text preview +* new design (colors, images) +* now uses `SVG` images for the interface ### v0.22.1 - *2012-10-16* diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 2c6255fc..58b1c6c5 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -3,7 +3,7 @@ @col-back: rgb(255,255,255); @col-hover: rgb(29,119,194); @col-border: rgba(0,0,0,0.05); -@col-border-strong: rgba(0,0,0,0.1); +@col-border-strong: rgba(0,0,0,0.15); @col-error: rgb(204,51,51); @@ -16,9 +16,12 @@ @col-widget-back-sel: rgba(255,255,255,0.8); @col-widget-sep: @col-border; -@col-sb-back: rgb(210,210,210); -@col-sb-thumb: rgb(180,180,180); -@col-sb-thumb-active: rgb(150,150,150); +// @col-sb-back: rgb(210,210,210); +// @col-sb-thumb: rgb(180,180,180); +// @col-sb-thumb-active: rgb(150,150,150); +@col-sb-back: rgba(0,0,0,0.08); +@col-sb-thumb: rgba(0,0,0,0.15); +@col-sb-thumb-active: rgba(0,0,0,0.25); @border-widget: 1px solid @col-border; diff --git a/src/_h5ai/client/css/inc/preview-img.less b/src/_h5ai/client/css/inc/preview-img.less index c3864013..4dc13823 100644 --- a/src/_h5ai/client/css/inc/preview-img.less +++ b/src/_h5ai/client/css/inc/preview-img.less @@ -97,7 +97,7 @@ opacity: 1.0; } - @bar-sep-border: 1px solid rgba(255,255,255,0.05); + @bar-sep-border: 1px solid rgba(255,255,255,0.08); .bar-button { .bar-label; @@ -125,6 +125,7 @@ height: 32px; left: 0; bottom: 0; - .vert-gradient(rgb(27,27,27), rgb(14,14,14)); + // .vert-gradient(rgb(27,27,27), rgb(14,14,14)); + background-color: rgb(27,27,27); border-top: 1px solid rgb(45,45,45); } diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index 90643624..04b52559 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -79,6 +79,8 @@ } img.hint { opacity: 0.8; + width: 12px; + height: 12px; } } .view { diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less index 8f4f2db2..2f258b6f 100644 --- a/src/_h5ai/client/css/inc/tree.less +++ b/src/_h5ai/client/css/inc/tree.less @@ -12,15 +12,15 @@ border-right: @border-widget; .sp-scrollbar { - margin: 8px 8px 8px 0; + // margin: 8px 8px 8px 0; width: 6px; background-color: @col-sb-back; - .border-radius(3px); + // .border-radius(3px); cursor: pointer; .sp-thumb { background-color: @col-sb-thumb; - .border-radius(3px); + // .border-radius(3px); } &.active .sp-thumb { background-color: @col-sb-thumb-active; diff --git a/src/_h5ai/client/css/inc/view-list.less b/src/_h5ai/client/css/inc/view-list.less index f1a27bba..f2f67c97 100644 --- a/src/_h5ai/client/css/inc/view-list.less +++ b/src/_h5ai/client/css/inc/view-list.less @@ -37,7 +37,7 @@ } .label { - margin: 0 270px 0 106px; + margin: 0 0 0 106px; } .date { diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index dd2ab451..f75c44c7 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -14,7 +14,7 @@ @item-background-col-hover: rgba(0,0,0,0.02); @item-border-col-hover: @col-border; -@item-background-col-sel: rgba(0,0,0,0.04); +@item-background-col-sel: rgba(0,0,0,0.02); @item-border-col-sel: @col-border-strong; diff --git a/src/_h5ai/client/images/ascending.png b/src/_h5ai/client/images/ascending.png deleted file mode 100644 index 4385011ff5fb961cc08e33b4bd72efa261e75629..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 640 zcmV-`0)PF9P) zbI!fr`NO$J68{4aaDft#2L?b4j8bZTe_GO@-|tV`O7@ckrBZ1GeEC-k4lt+88(u3N9y*KLU>$Ye4C zex-OCl3YnQB-QNc+VUJp?)LWf72tJ3+k#_>XLUZ=;U(G6FE1}ghlhvG!NGw843mUQ zOG^ddS|*eEJv%$wMN$}s;k+^CZ5W30c8KL52%Z94zz5)Yid(=|p-^}xsq6sxIF6?z zeU9UJDjDM5-ricJQfXU(VT$j|(IzbR@0!L>J5lI(Yt=3(jm2hEU;hv<)=EgP=N#1Zcyj`tUAM|>?JCe?&<3`e?=XnoDqtOr7 zb^YVx aXW|b$AX;p&kO&R{0000 + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/blank.png b/src/_h5ai/client/images/blank.png deleted file mode 100644 index bef1f600664da97d487c7dc4abece6ed50b9e362..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~rvRT2*AE}w zegFRB&!0cPfB*jb_wT!RZ$5r}|Mly)PoF;g`0?|{k00N^fB*UO=i9fhfByXS@87>) zzkYrD_WkqcFJHcV{rvgk|NsAIFS7yJ$ygHP7tG-B>_!@hljQC0!qCAg>jC6&7I;J! zGca%qgD@k*tT_@uLG}_)Usv|qZ0rKu<`1uiJOm2ydb&7 + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + diff --git a/src/_h5ai/client/images/crumb.png b/src/_h5ai/client/images/crumb.png deleted file mode 100644 index 8e19959cc6f1f1b9b4e96cf4cfa314a50d311359..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=KP)*s9SJ}Q+;>ws?-+v`6h+6L z=RN-n8T$jhS|aig$MI$m1be{3z&t6SYuk3aSS+3-Npc3X2WC@DUHu`K%RSa=wN?-W zH^2?hn+T9jr$4LJYMjsKpXjIap_`2W%d&cfLLsSCD({ZtTmg3mUtjtiWV6|wMx(JU zA{!!N|8+znG7{qw5CWIL+t{f?(g9P;6ysF-2K5Nm02pki2mk;807*qoM6N<$g3sKy A-~a#s diff --git a/src/_h5ai/client/images/crumb.svg b/src/_h5ai/client/images/crumb.svg new file mode 100644 index 00000000..662db546 --- /dev/null +++ b/src/_h5ai/client/images/crumb.svg @@ -0,0 +1,19 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + diff --git a/src/_h5ai/client/images/delete.png b/src/_h5ai/client/images/delete.png deleted file mode 100644 index 9d8afaef4d4ffccb64e545646b2d9f33ab7c0e3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 616 zcmV-u0+;=XP)NB#Epidy%J1W{)3X5}5#^IHZUR05b?N5Wi}Np!0bGUwV#lekRQ3D$Zo|m} zK)dGy03@CR00@d|WlA3kQB^Ag_!$NOfYfoEhxXG4`OdfBkl{q*s+D~Ez7SQ_3V`;g z5Pj#=vTL3<%@~j1);w?8Ikjv6{-_qjdc{m1Z>$yNzPB*R1O!*^dke=KYsGrS9JcdU z3yF7`JEi$pG;@Oq008cmYyp7(y_p4oAJ<)+Uv;Was$cbCh`|@QOIthpT0G`5CP19k zEP3~^AnzU)#97T^On?@Txl3C+`vBZOE+Pu + + + Gnome Symbolic Icon Theme + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + diff --git a/src/_h5ai/client/images/descending.png b/src/_h5ai/client/images/descending.png deleted file mode 100644 index f4341b64e5a89411dcd600643093d5d40fef925e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)4LJ0db34u?BS zCYuNX86dp*pn!3uQaKC+0%w&<zdE!+ix@)TY!I4f-WL=Mdb0a>n@6# zh+GW@gRg-Tzu*5>L^2|x+!6r30Uws#jVrla?!ja-xdjYnvzeJnr5*usw}hBs7&WET z8^bVa{7nSla;;Xo-RX250zZH`FzEGq_sZq+_R0@UM6P>0o>z|JIJ&OuwrxKLzPH=$ z8~J?xrES~4S&voey6$f_n=gvR;%5bntJUgJI2^XB)#}mGM59nBJhN?k4orZVtEP_Q zOiQKGQy{L1hz@K6H-QfD5r}uY-C`n + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/download.png b/src/_h5ai/client/images/download.png deleted file mode 100644 index a6754f42224b1c29258c10d9e8d426258f41bc71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 zcmV+r0`L8aP)GZ)`(Cg2uO_;+y>JB-pnTsK;L$#)YpOBc zCU7(!j}NxnEyfrPY;1wDECXZA!1sNI!{HLR2T;}{o^-q2i>j(V)*Tj(yY~Q{PUrV} zy-tB!0M7y}i=wy+f?xt%*ADEQ1wk+=isA}bHY8i1isQIQ(==}(Z-7mjrgu6X{~<&Pi+nWp0w6wmSq#q^Qxw^=Xq6@WfQG+ zX_JB0K|(~LBuUPJOW-m|l5-J>+OX~wn(&P=p9X`$8NhTp{TYVg4`Ay8?KwCGUN@UC z3>Tx(=&)G>?=0+!`d`=%J}9NWw%Kt*M7{twt^?LN!7FR SPf-{E0000 + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + diff --git a/src/_h5ai/client/images/filter.png b/src/_h5ai/client/images/filter.png deleted file mode 100644 index 0d55aeecbbdb8c17cf1993103774b94923b0f85e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 706 zcmV;z0zLhSP)#?;<-i0rJzv7gHU?YOD~?xK}6_D3?=^ABv38VSV6L6p(PvI?ekz# z;!;H)49vhcKi<4~0g~uY7{CbtO6%MNumhluKZztr21#m@latqk5U&7y2CylFcx@QQ z4U#%Z(VG2j1zHZY-rnBZwryXD$K!8J(<})g4)XbYv{)>Thr{8Qj^o@1@D%|44#LS~ z@;U%(et!NQ$*UwsNsf@rEG;eF0q|*PXy_KnlYR#vsdaUAJx?SOk4Ro5DRm44NRFpc zsYM~g3z7qVfCNC^-`@`<5{VLkj{puj4FV_|hEei7Pp#Ezsy{;sKp+?l?pT&(`!2V2 zU|Cj8mgSATy*&v)zz=Zy`ua8sg~Bj^$Ps|#okGh$;bxr>ExtJPw6I4@eGnKH*=aHk(azW@hG8 oxm*rgmi6p^0qvhiwSv$81aO*bjK4flD*ylh07*qoM6N<$f=vJ~cmMzZ diff --git a/src/_h5ai/client/images/filter.svg b/src/_h5ai/client/images/filter.svg new file mode 100644 index 00000000..2f6ae6bb --- /dev/null +++ b/src/_h5ai/client/images/filter.svg @@ -0,0 +1,18 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + diff --git a/src/_h5ai/client/images/folder-page.svg b/src/_h5ai/client/images/folder-page.svg new file mode 100644 index 00000000..71d42518 --- /dev/null +++ b/src/_h5ai/client/images/folder-page.svg @@ -0,0 +1,18 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + diff --git a/src/_h5ai/client/images/folder.svg b/src/_h5ai/client/images/folder.svg new file mode 100644 index 00000000..23695227 --- /dev/null +++ b/src/_h5ai/client/images/folder.svg @@ -0,0 +1,19 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + diff --git a/src/_h5ai/client/images/home.png b/src/_h5ai/client/images/home.png deleted file mode 100644 index 78d42e7a09b930b578078059db307d6a8155049e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0W + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/loading.png b/src/_h5ai/client/images/loading.png deleted file mode 100644 index bac972a4353b84c6ee8499f1c8c0b8cc58b94f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmV;40(Sk0P)4IPZogXq8{Ax{cHdGWAg zH|L>AjADlZJ9+US9i_U|VFU4C(#ca2#Aehe`g;)VU_mQr43^{$Zq?xF^0UUs5Paa} z3(xy~9$udB_cf9@4m^kOCx9T}cYA&Ub)f3jzmU{=0{MLYbTAmaZLNK2j44`cpZop( zY&M%6m2|SXzg6r{r_&dVF|UD-z_!olD*#)-2V>0pv9Ym4vq`hq)a&(rkH_;Ecr!je zerIQA=c=U3<#PGT^z`(CG3JFa=Izqb(pgDPt3hWh7E1$#?(XiDMx$|2QlBJ`TjR-O zavs>Zt9L`v4S0wcxyx{xV+S + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/page.png b/src/_h5ai/client/images/page.png deleted file mode 100644 index 4612fd03c9e0fe88f232669b7dd5e20fd0903b80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjR|tFX4}k$HPdfI_D{T^vI!PA?61s?F? zM*YVHdt$G@RayJ>UV7tkjfUm=lY| + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/preview/close.png b/src/_h5ai/client/images/preview/close.png deleted file mode 100644 index 6131af8cb7ca3545da4569667732af2953599c8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmV-q0-ODbP)gvr;=px)D2I=B&Xr0=@Rx+Nzl{$Ds8g4p-5IIpeT~v-2r``|F@V)SUd_3QK zh!6tLsTa?31IWk?A%p;U1K=e9R|xU|Wjcwaw04)II?2`sGEXx{)VVHWJCw$+3&@`=gG(UKrC&DmHEz24MXqKbKb}H#bzPr1j>9%VY;r*0JvvvG7myXxmYZIoJ=O~o6TlR2JE^n8w>{XD2hG{ zA^x27r)S(Z8jWA2Qi*cTAwNY?XsuTJ31EM5If;SN>2%&rr_)IkMU~xdcQHAi&!bQ% zc>R8Vuv)FYpHD19TrQViIOngDBmn@d*J}m<^?JPp0F+YXa=A^r-TrV5;^SyE`Wghm zE=^M~#+YFkbHgy^j4_s`DS{x_4Tr;T$3R^T(v7OBccy7Nl+s%OWdLPL>8)v+j;gA6 y0B)`ZNgAR7_ynLV>E)xQ$>xh7{ck<{H~s_Wxh7-ahQ2od0000 + + + Gnome Symbolic Icon Theme + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/crumb.png b/src/_h5ai/client/images/preview/crumb.png deleted file mode 100644 index 79ae88f6aea59c4d567c2f9fc16dbb0358a3939a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmVxI|Lg zGvhxBc?%-i01yT6%*^jW01HCBrtA8-BuRTjv`IwEa|z5mHGqt+>uj3lm#V5tJRaW$ zunvH{eO`+jz_x7|hOron#db7JldIM0A%HC+iUv6WuIs{a9GIpF%d%Fp+3ZoL(>crM z^SeZpCZeD3=KTdC$~2qJI}sWVhY^WH+;+QtmCNOh2ZO;AGaJ4eh_);X{eFKbkx1;< z>-7@=$w_}`7GRb}qtS;f%e7*$*aGnKCqTE`y)P6BYOmM30dURCpMe0jZNFA3m0Lwo zGyoUO{3iC#1dPXHr_pHCN~Kb3I2>LAcwoQGi$N-v%a5s4>J-2MfEB+0O=ko^8h`{K lId5=c^4lz^e&yh=`UV)55Cs8!%6b3*002ovPDHLkV1ico%v=Bf diff --git a/src/_h5ai/client/images/preview/fullscreen.png b/src/_h5ai/client/images/preview/fullscreen.png deleted file mode 100644 index c12ae48aea01e1f322bcd3e4ed3778934de99280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmV-p0-XJcP)5KB$$(WXv>5Z06kCilc+;quVHR@Xaxaf_4)@(ZhzLms z^1zkv``Y(?4O{{FRP0k^&-1h~MvO7ydES#EX#)0aHq${6$YQaO#bO~r5Xfvc)4*jC zuMQ*tlu|E%*T9=YJhvYQ_eA9Pi6bH?rSb>D^YwcDHJ8g3NUSnV6AdX`I%H{ISdHJsEHjnvcv%#{g>UcbEWvA2W&bI9n z@F)P>ipcjvb1QKiH_tJ~7^c(dF4Jf`FwuL`~Ci?)9Ks;-SaWN2Yw9(gImk8UZ#z4yWIx0TJ0V1 z3iu)-yR=3606a?*03Lyl=ZloK%9mPeeO%+CYppe4|L-wf*X#9%;czI!;ZW-J`U7xH x$}we=HHyeiDb;lx=hWC + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/home.png b/src/_h5ai/client/images/preview/home.png deleted file mode 100644 index aaceee0d637aba0c86b68fccb9949eb38da53f96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmV+n0`vWeP)v zq)JGW7ufXa(k76AYhxh@gD`@U6jP+~ih@^}&A<%Tv&|}N;zW}CaEr@5|HnB$=ZdQG zKgwl2h{zFe3^-teD zs@3X?>2$iO&2KUhRYgSdz)8Q~e^aScp08G`%+%vJzN*z~7eJt@sQ`K4q}S`c_B`*@ zTAOJGC>DztW4_kw^;bY3z;U0+_?qj{rJsf01+Q=`$i$N@>K)%xL_d*A7F zULG>Xas0E{Y$ZwYzqGX O0000K}Ov5L!gjCr)Qnj*3TU>(2<$@jlFNV~3kQ7V-VL}XJ$))p#|{80dQN23wP<8jdGbZUlS*cD|>Zyo00G>(u;kYCrB010VZbT#; z$#vb(rLOBprBd`f@2*%Zp0rx62LNv*847f}-Ahf=^koZ6CX+}c5~|&9pXc-WGm?*C z3PBJ+M3(X4`#uJP!AHGbH)p+H3y_>Po6RfBvhI~qHh`!39b|P~KLQZO)o3&hXaC`F z_*$t{uKWG|Er2RXHLn~QqvJTVZF^EE6l$8Ll>ux=ViyUN%jK?N7#4s%0I?|CGJ!1s i#{f1K5oaa;evMy^VjpQTO9 + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/preview/no-fullscreen.png b/src/_h5ai/client/images/preview/no-fullscreen.png deleted file mode 100644 index 20da135516a72ebe2413a522f36ea385ec7b3faf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 658 zcmV;D0&V??P)-DoB2qXvssn_dgzz(pQ#^*>a z5t%EcyhfwJVzB^VZ*T7u@I+*u#w(Nc&q1k&zy^>tp~uF5HU1ayT|}oslLb|;ewxhRUbxw+x;@^WtajB)QoaN)$zZ2`(-!=8oe4 zkkMM>d0x9#tDOL7t%<8pN>!9nm2|vTtDShB*VbB-J3c;c9~~W?0v_-r28~9ekI5E> z!(sC19UL66SS(P$OW>^$(9>3{_1?Da2g|;>9u{y#n&f2!JW@ zCMl$QvyhmF&2zJWO_t1oh>%IAh(*%vcAJ)Ext3+Q-EOzZKe7FfPqttP%AHPUKcCOL s + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/play.png b/src/_h5ai/client/images/preview/play.png deleted file mode 100644 index 79ae88f6aea59c4d567c2f9fc16dbb0358a3939a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmVxI|Lg zGvhxBc?%-i01yT6%*^jW01HCBrtA8-BuRTjv`IwEa|z5mHGqt+>uj3lm#V5tJRaW$ zunvH{eO`+jz_x7|hOron#db7JldIM0A%HC+iUv6WuIs{a9GIpF%d%Fp+3ZoL(>crM z^SeZpCZeD3=KTdC$~2qJI}sWVhY^WH+;+QtmCNOh2ZO;AGaJ4eh_);X{eFKbkx1;< z>-7@=$w_}`7GRb}qtS;f%e7*$*aGnKCqTE`y)P6BYOmM30dURCpMe0jZNFA3m0Lwo zGyoUO{3iC#1dPXHr_pHCN~Kb3I2>LAcwoQGi$N-v%a5s4>J-2MfEB+0O=ko^8h`{K lId5=c^4lz^e&yh=`UV)55Cs8!%6b3*002ovPDHLkV1ico%v=Bf diff --git a/src/_h5ai/client/images/preview/prev.png b/src/_h5ai/client/images/preview/prev.png deleted file mode 100644 index 8c759e262eb58c5860b0454b6cf93071b3c86969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmV0&x`n-p@KPJQWY@2m<50tf3*Hp}`J>f(S`* za&C|tf|i`({sX5V+FWnB?KU^JW@#5eH^C(@I_Nc+a^Y2$AN-d0zW4FHkKZF^#wrji zO#@i_jX*>(06Ks-W`17U0TD%rNUPWD<>7E>Ynrybv;!hiWLe&8x7# z-hUM!A_;)rY&Oqpwc0HarAMO?W@N6W{kAn7IpPUU&d>A%s<_R2;`~UR>AZbUJ+&$_*=iibMchD2j4#S=Li3l{)>C pKtN~{z%_vVu>O|}{)3gT@dJ5`-94akn(_bu002ovPDHLkV1i{C(BA+6 diff --git a/src/_h5ai/client/images/preview/prev.svg b/src/_h5ai/client/images/preview/prev.svg new file mode 100644 index 00000000..9d982b94 --- /dev/null +++ b/src/_h5ai/client/images/preview/prev.svg @@ -0,0 +1,17 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/preview/raw.png b/src/_h5ai/client/images/preview/raw.png deleted file mode 100644 index cde6412eb92c4322cf8fe6b5a39bfc3dc38edd82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 597 zcmV-b0;>IqP)?9t#qY}5?cucP3Wfe z6|#`oxbiVX=t4ptKqwX(3Q_1H#nOelLE^@OQWzwN3l}=I&Xm(dqL>+>J#gS$KJGdH zf4ElxkASDZ6Cgw|{s6bYPZ3$~;T&0(b-7q9T*q<5pNqx9wJhrrI1&;3set3@bo#}0 z-LQxRx+|s7b^UiN7JDTk-~3zyLd)ecEF$D`x%akhdmETYB(!d~d%j+;!$3$W^>XL# zOhj%p0M~T^uxt#&wv;AwLd)I1{k*6?X7}hv6u%?`(EFJ2}(VyR;%yIzrS5jI-QnA zqw)QJ8fd_qY&QG4QmMSvb^WpHy1(l6`o~_c_c`!6_T|0RlT<2oQLEK{q*AF1-~>?r jRN%J*oB~%OVgdXGJ~Ibe${bk*00000NkvXXu0mjfbr=Uo diff --git a/src/_h5ai/client/images/preview/raw.svg b/src/_h5ai/client/images/preview/raw.svg new file mode 100644 index 00000000..22d5be55 --- /dev/null +++ b/src/_h5ai/client/images/preview/raw.svg @@ -0,0 +1,21 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + diff --git a/src/_h5ai/client/images/settings.svg b/src/_h5ai/client/images/settings.svg new file mode 100644 index 00000000..f606f30c --- /dev/null +++ b/src/_h5ai/client/images/settings.svg @@ -0,0 +1,17 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + diff --git a/src/_h5ai/client/images/tree.png b/src/_h5ai/client/images/tree.png deleted file mode 100644 index 8e19959cc6f1f1b9b4e96cf4cfa314a50d311359..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=KP)*s9SJ}Q+;>ws?-+v`6h+6L z=RN-n8T$jhS|aig$MI$m1be{3z&t6SYuk3aSS+3-Npc3X2WC@DUHu`K%RSa=wN?-W zH^2?hn+T9jr$4LJYMjsKpXjIap_`2W%d&cfLLsSCD({ZtTmg3mUtjtiWV6|wMx(JU zA{!!N|8+znG7{qw5CWIL+t{f?(g9P;6ysF-2K5Nm02pki2mk;807*qoM6N<$g3sKy A-~a#s diff --git a/src/_h5ai/client/images/tree.svg b/src/_h5ai/client/images/tree.svg new file mode 100644 index 00000000..662db546 --- /dev/null +++ b/src/_h5ai/client/images/tree.svg @@ -0,0 +1,19 @@ + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + diff --git a/src/_h5ai/client/images/view-details.png b/src/_h5ai/client/images/view-details.png deleted file mode 100644 index d5a6cd33a5bf5dab3e8d23fae564ef9a2b1b282a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4^4f9UJ6yr|PqM<(-TD2^qdQnO^d2y75I3^hxW3!bCv5(qIZrfMRNfjGwcch} zs8H##QuS?dkU{im&xe^W_BvaCj=N;dc9AbURl + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + diff --git a/src/_h5ai/client/images/view-grid.png b/src/_h5ai/client/images/view-grid.png deleted file mode 100644 index a9cb1fe6e86504ccc16559abde246e0a60e6aaa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4FxvI8%;PQPJ4u3eDN$|G_1&8=KzSq7oJhCiZtN2Yyr< + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/view-icons.png b/src/_h5ai/client/images/view-icons.png deleted file mode 100644 index a9cb1fe6e86504ccc16559abde246e0a60e6aaa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4FxvI8%;PQPJ4u3eDN$|G_1&8=KzSq7oJhCiZtN2Yyr< + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/view-list.png b/src/_h5ai/client/images/view-list.png deleted file mode 100644 index d5a6cd33a5bf5dab3e8d23fae564ef9a2b1b282a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4^4f9UJ6yr|PqM<(-TD2^qdQnO^d2y75I3^hxW3!bCv5(qIZrfMRNfjGwcch} zs8H##QuS?dkU{im&xe^W_BvaCj=N;dc9AbURl + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js index f89007b7..db012abe 100644 --- a/src/_h5ai/client/js/inc/core/resource.js +++ b/src/_h5ai/client/js/inc/core/resource.js @@ -1,9 +1,9 @@ modulejs.define('core/resource', ['core/settings'], function (settings) { - var image = function (id, noPngExt) { + var image = function (id, customExt) { - return settings.h5aiAbsHref + 'client/images/' + id + (noPngExt ? '' : '.png'); + return settings.h5aiAbsHref + 'client/images/' + id + (customExt ? '' : '.svg'); }, icon = function (id, big) { diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index 6912b604..69f11414 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -34,7 +34,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e .data('status', item.status); location.setLink($a, item); - $img.attr('src', resource.icon(item.type)); + // $img.attr('src', resource.icon(item.type)); + $img.attr('src', resource.image('folder')); $label.text(item.label); if (item.isFolder()) { @@ -58,19 +59,21 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e // is it the domain? if (item.isDomain()) { $html.addClass('domain'); - $img.attr('src', resource.icon('folder-home')); + // $img.attr('src', resource.icon('folder-home')); + $img.attr('src', resource.image('home')); } // is it the root? if (item.isRoot()) { $html.addClass('root'); - $img.attr('src', resource.icon('folder-home')); + // $img.attr('src', resource.icon('folder-home')); + $img.attr('src', resource.image('home')); } // is it the current folder? if (item.isCurrentFolder()) { $html.addClass('current'); - $img.attr('src', resource.icon('folder-open')); + // $img.attr('src', resource.icon('folder-open')); } // does it have subfolders? @@ -94,7 +97,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e // reflect folder status if (_.isNumber(item.status)) { if (item.status === 200) { - $img.attr('src', resource.icon('folder-page')); + // $img.attr('src', resource.icon('folder-page')); + $img.attr('src', resource.image('folder-page')); } else { $html.addClass('error'); $a.append($(statusHintTemplate).text(item.status)); diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 529a0437..a5e44f2d 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -56,11 +56,20 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $date.data('time', item.time).text(format.formatDate(item.time)); $size.data('bytes', item.size).text(format.formatSize(item.size)); + + // if (item.isFolder()) { + // $imgSmall.attr('src', resource.image('folder')); + // $imgBig.attr('src', resource.image('folder')).width(48); + // } + + if (item.isFolder() && _.isNumber(item.status)) { if (item.status === 200) { $html.addClass('page'); $imgSmall.attr('src', resource.icon('folder-page')); $imgBig.attr('src', resource.icon('folder-page', true)); + // $imgSmall.attr('src', resource.image('folder-page')); + // $imgBig.attr('src', resource.image('folder-page')).width(48); } else { $html.addClass('error'); $label.append($(hintTemplate).text(' ' + item.status + ' ')); From 172ddc1033ec686c9285c3acfbf8f841607c230c Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 8 Jul 2013 00:57:26 +0200 Subject: [PATCH 039/130] Updates tree folder icons. --- src/_h5ai/client/images/folder-open.svg | 147 +++++++++++++++++++++++ src/_h5ai/client/images/folder-page.svg | 147 ++++++++++++++++++++--- src/_h5ai/client/images/folder.svg | 152 +++++++++++++++++++++--- src/_h5ai/client/js/inc/ext/tree.js | 4 +- 4 files changed, 416 insertions(+), 34 deletions(-) create mode 100644 src/_h5ai/client/images/folder-open.svg diff --git a/src/_h5ai/client/images/folder-open.svg b/src/_h5ai/client/images/folder-open.svg new file mode 100644 index 00000000..bb3ef11b --- /dev/null +++ b/src/_h5ai/client/images/folder-open.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + diff --git a/src/_h5ai/client/images/folder-page.svg b/src/_h5ai/client/images/folder-page.svg index 71d42518..708071b8 100644 --- a/src/_h5ai/client/images/folder-page.svg +++ b/src/_h5ai/client/images/folder-page.svg @@ -1,18 +1,135 @@ - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + diff --git a/src/_h5ai/client/images/folder.svg b/src/_h5ai/client/images/folder.svg index 23695227..f08d2a4a 100644 --- a/src/_h5ai/client/images/folder.svg +++ b/src/_h5ai/client/images/folder.svg @@ -1,19 +1,139 @@ - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index 69f11414..e07645b3 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -59,21 +59,19 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e // is it the domain? if (item.isDomain()) { $html.addClass('domain'); - // $img.attr('src', resource.icon('folder-home')); $img.attr('src', resource.image('home')); } // is it the root? if (item.isRoot()) { $html.addClass('root'); - // $img.attr('src', resource.icon('folder-home')); $img.attr('src', resource.image('home')); } // is it the current folder? if (item.isCurrentFolder()) { $html.addClass('current'); - // $img.attr('src', resource.icon('folder-open')); + // $img.attr('src', resource.image('folder-open')); } // does it have subfolders? From 75b5ab5a196f03f595307b78b3744deba118862f Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 8 Jul 2013 01:04:42 +0200 Subject: [PATCH 040/130] Updates h5bp styles and normalization. --- .../client/css/lib/h5bp-main-footer.less | 13 +- .../client/css/lib/h5bp-main-header.less | 2 +- src/_h5ai/client/css/lib/h5bp-normalize.less | 223 ++++++++++-------- 3 files changed, 134 insertions(+), 104 deletions(-) diff --git a/src/_h5ai/client/css/lib/h5bp-main-footer.less b/src/_h5ai/client/css/lib/h5bp-main-footer.less index 9dc81d19..634207e9 100644 --- a/src/_h5ai/client/css/lib/h5bp-main-footer.less +++ b/src/_h5ai/client/css/lib/h5bp-main-footer.less @@ -1,4 +1,3 @@ - /* ========================================================================== Helper classes ========================================================================== */ @@ -19,7 +18,7 @@ content: ""; display: block; width: 0; - height: 100%; + height: 150%; } /* @@ -102,7 +101,7 @@ /* ========================================================================== EXAMPLE Media Queries for Responsive Design. - Theses examples override the primary ('mobile first') styles. + These examples override the primary ('mobile first') styles. Modify as content requires. ========================================================================== */ @@ -110,8 +109,10 @@ /* Style adjustments for viewports that meet the condition */ } -@media only screen and (-webkit-min-device-pixel-ratio: 1.5), - only screen and (min-resolution: 144dpi) { +@media print, + (-o-min-device-pixel-ratio: 5/4), + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { /* Style adjustments for high resolution devices */ } @@ -124,7 +125,7 @@ * { background: transparent !important; color: #000 !important; /* Black prints faster: h5bp.com/s */ - box-shadow:none !important; + box-shadow: none !important; text-shadow: none !important; } diff --git a/src/_h5ai/client/css/lib/h5bp-main-header.less b/src/_h5ai/client/css/lib/h5bp-main-header.less index 724098df..8e4439ab 100644 --- a/src/_h5ai/client/css/lib/h5bp-main-header.less +++ b/src/_h5ai/client/css/lib/h5bp-main-header.less @@ -25,7 +25,7 @@ body { /* * Remove text-shadow in selection highlight: h5bp.com/i - * These selection declarations have to be separate. + * These selection rule sets have to be separate. * Customize the background color to match your design. */ diff --git a/src/_h5ai/client/css/lib/h5bp-normalize.less b/src/_h5ai/client/css/lib/h5bp-normalize.less index d4210aac..8d57e3c9 100644 --- a/src/_h5ai/client/css/lib/h5bp-normalize.less +++ b/src/_h5ai/client/css/lib/h5bp-normalize.less @@ -1,11 +1,11 @@ -/*! normalize.css v1.0.1 | MIT License | git.io/normalize */ +/*! normalize.css v1.1.1 | MIT License | git.io/normalize */ /* ========================================================================== HTML5 display definitions ========================================================================== */ -/* - * Corrects `block` display not defined in IE 6/7/8/9 and Firefox 3. +/** + * Correct `block` display not defined in IE 6/7/8/9 and Firefox 3. */ article, @@ -16,14 +16,15 @@ figure, footer, header, hgroup, +main, nav, section, summary { display: block; } -/* - * Corrects `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. +/** + * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. */ audio, @@ -34,8 +35,8 @@ video { *zoom: 1; } -/* - * Prevents modern browsers from displaying `audio` without controls. +/** + * Prevent modern browsers from displaying `audio` without controls. * Remove excess height in iOS 5 devices. */ @@ -44,9 +45,8 @@ audio:not([controls]) { height: 0; } -/* - * Addresses styling for `hidden` attribute not present in IE 7/8/9, Firefox 3, - * and Safari 4. +/** + * Address styling not present in IE 7/8/9, Firefox 3, and Safari 4. * Known issue: no IE 6 support. */ @@ -58,21 +58,27 @@ audio:not([controls]) { Base ========================================================================== */ -/* - * 1. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using +/** + * 1. Prevent system color scheme's background color being used in Firefox, IE, + * and Opera. + * 2. Prevent system color scheme's text color being used in Firefox, IE, and + * Opera. + * 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using * `em` units. - * 2. Prevents iOS text size adjust after orientation change, without disabling + * 4. Prevent iOS text size adjust after orientation change, without disabling * user zoom. */ html { - font-size: 100%; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ - -ms-text-size-adjust: 100%; /* 2 */ + background: #fff; /* 1 */ + color: #000; /* 2 */ + font-size: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 4 */ + -ms-text-size-adjust: 100%; /* 4 */ } -/* - * Addresses `font-family` inconsistency between `textarea` and other form +/** + * Address `font-family` inconsistency between `textarea` and other form * elements. */ @@ -84,8 +90,8 @@ textarea { font-family: sans-serif; } -/* - * Addresses margins handled incorrectly in IE 6/7. +/** + * Address margins handled incorrectly in IE 6/7. */ body { @@ -96,16 +102,16 @@ body { Links ========================================================================== */ -/* - * Addresses `outline` inconsistency between Chrome and other browsers. +/** + * Address `outline` inconsistency between Chrome and other browsers. */ a:focus { outline: thin dotted; } -/* - * Improves readability when focused and also mouse hovered in all browsers. +/** + * Improve readability when focused and also mouse hovered in all browsers. */ a:active, @@ -117,9 +123,9 @@ a:hover { Typography ========================================================================== */ -/* - * Addresses font sizes and margins set differently in IE 6/7. - * Addresses font sizes within `section` and `article` in Firefox 4+, Safari 5, +/** + * Address font sizes and margins set differently in IE 6/7. + * Address font sizes within `section` and `article` in Firefox 4+, Safari 5, * and Chrome. */ @@ -149,20 +155,20 @@ h5 { } h6 { - font-size: 0.75em; + font-size: 0.67em; margin: 2.33em 0; } -/* - * Addresses styling not present in IE 7/8/9, Safari 5, and Chrome. +/** + * Address styling not present in IE 7/8/9, Safari 5, and Chrome. */ abbr[title] { border-bottom: 1px dotted; } -/* - * Addresses style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. +/** + * Address style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. */ b, @@ -174,16 +180,27 @@ blockquote { margin: 1em 40px; } -/* - * Addresses styling not present in Safari 5 and Chrome. +/** + * Address styling not present in Safari 5 and Chrome. */ dfn { font-style: italic; } -/* - * Addresses styling not present in IE 6/7/8/9. +/** + * Address differences between Firefox and other browsers. + * Known issue: no IE 6/7 normalization. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Address styling not present in IE 6/7/8/9. */ mark { @@ -191,8 +208,8 @@ mark { color: #000; } -/* - * Addresses margins set differently in IE 6/7. +/** + * Address margins set differently in IE 6/7. */ p, @@ -200,8 +217,8 @@ pre { margin: 1em 0; } -/* - * Corrects font family set oddly in IE 6, Safari 4/5, and Chrome. +/** + * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. */ code, @@ -213,8 +230,8 @@ samp { font-size: 1em; } -/* - * Improves readability of pre-formatted text in all browsers. +/** + * Improve readability of pre-formatted text in all browsers. */ pre { @@ -223,16 +240,16 @@ pre { word-wrap: break-word; } -/* - * Addresses CSS quotes not supported in IE 6/7. +/** + * Address CSS quotes not supported in IE 6/7. */ q { quotes: none; } -/* - * Addresses `quotes` property not supported in Safari 4. +/** + * Address `quotes` property not supported in Safari 4. */ q:before, @@ -241,16 +258,16 @@ q:after { content: none; } -/* - * Addresses inconsistent and variable font size in all browsers. +/** + * Address inconsistent and variable font size in all browsers. */ small { font-size: 80%; } -/* - * Prevents `sub` and `sup` affecting `line-height` in all browsers. +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. */ sub, @@ -273,8 +290,8 @@ sub { Lists ========================================================================== */ -/* - * Addresses margins set differently in IE 6/7. +/** + * Address margins set differently in IE 6/7. */ dl, @@ -288,8 +305,8 @@ dd { margin: 0 0 0 40px; } -/* - * Addresses paddings set differently in IE 6/7. +/** + * Address paddings set differently in IE 6/7. */ menu, @@ -298,8 +315,8 @@ ul { padding: 0 0 0 40px; } -/* - * Corrects list images handled incorrectly in IE 7. +/** + * Correct list images handled incorrectly in IE 7. */ nav ul, @@ -312,9 +329,9 @@ nav ol { Embedded content ========================================================================== */ -/* - * 1. Removes border when inside `a` element in IE 6/7/8/9 and Firefox 3. - * 2. Improves image quality when scaled in IE 7. +/** + * 1. Remove border when inside `a` element in IE 6/7/8/9 and Firefox 3. + * 2. Improve image quality when scaled in IE 7. */ img { @@ -322,8 +339,8 @@ img { -ms-interpolation-mode: bicubic; /* 2 */ } -/* - * Corrects overflow displayed oddly in IE 9. +/** + * Correct overflow displayed oddly in IE 9. */ svg:not(:root) { @@ -334,8 +351,8 @@ svg:not(:root) { Figures ========================================================================== */ -/* - * Addresses margin not present in IE 6/7/8/9, Safari 5, and Opera 11. +/** + * Address margin not present in IE 6/7/8/9, Safari 5, and Opera 11. */ figure { @@ -346,15 +363,15 @@ figure { Forms ========================================================================== */ -/* - * Corrects margin displayed oddly in IE 6/7. +/** + * Correct margin displayed oddly in IE 6/7. */ form { margin: 0; } -/* +/** * Define consistent border, margin, and padding. */ @@ -364,10 +381,10 @@ fieldset { padding: 0.35em 0.625em 0.75em; } -/* - * 1. Corrects color not being inherited in IE 6/7/8/9. - * 2. Corrects text not wrapping in Firefox 3. - * 3. Corrects alignment displayed oddly in IE 6/7. +/** + * 1. Correct color not being inherited in IE 6/7/8/9. + * 2. Correct text not wrapping in Firefox 3. + * 3. Correct alignment displayed oddly in IE 6/7. */ legend { @@ -377,11 +394,11 @@ legend { *margin-left: -7px; /* 3 */ } -/* - * 1. Corrects font size not being inherited in all browsers. - * 2. Addresses margins set differently in IE 6/7, Firefox 3+, Safari 5, +/** + * 1. Correct font size not being inherited in all browsers. + * 2. Address margins set differently in IE 6/7, Firefox 3+, Safari 5, * and Chrome. - * 3. Improves appearance and consistency in all browsers. + * 3. Improve appearance and consistency in all browsers. */ button, @@ -394,8 +411,8 @@ textarea { *vertical-align: middle; /* 3 */ } -/* - * Addresses Firefox 3+ setting `line-height` on `input` using `!important` in +/** + * Address Firefox 3+ setting `line-height` on `input` using `!important` in * the UA stylesheet. */ @@ -404,13 +421,25 @@ input { line-height: normal; } -/* +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Chrome, Safari 5+, and IE 6+. + * Correct `select` style inheritance in Firefox 4+ and Opera. + */ + +button, +select { + text-transform: none; +} + +/** * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` * and `video` controls. - * 2. Corrects inability to style clickable `input` types in iOS. - * 3. Improves usability and consistency of cursor style between image-type + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type * `input` and others. - * 4. Removes inner spacing in IE 7 without affecting normal text inputs. + * 4. Remove inner spacing in IE 7 without affecting normal text inputs. * Known issue: inner spacing remains in IE 6. */ @@ -423,19 +452,19 @@ input[type="submit"] { *overflow: visible; /* 4 */ } -/* +/** * Re-set default cursor for disabled elements. */ button[disabled], -input[disabled] { +html input[disabled] { cursor: default; } -/* - * 1. Addresses box sizing set to content-box in IE 8/9. - * 2. Removes excess padding in IE 8/9. - * 3. Removes excess padding in IE 7. +/** + * 1. Address box sizing set to content-box in IE 8/9. + * 2. Remove excess padding in IE 8/9. + * 3. Remove excess padding in IE 7. * Known issue: excess padding remains in IE 6. */ @@ -447,9 +476,9 @@ input[type="radio"] { *width: 13px; /* 3 */ } -/* - * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome +/** + * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome * (include `-moz` to future-proof). */ @@ -460,8 +489,8 @@ input[type="search"] { box-sizing: content-box; } -/* - * Removes inner padding and search cancel button in Safari 5 and Chrome +/** + * Remove inner padding and search cancel button in Safari 5 and Chrome * on OS X. */ @@ -470,8 +499,8 @@ input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -/* - * Removes inner padding and border in Firefox 3+. +/** + * Remove inner padding and border in Firefox 3+. */ button::-moz-focus-inner, @@ -480,9 +509,9 @@ input::-moz-focus-inner { padding: 0; } -/* - * 1. Removes default vertical scrollbar in IE 6/7/8/9. - * 2. Improves readability and alignment in all browsers. +/** + * 1. Remove default vertical scrollbar in IE 6/7/8/9. + * 2. Improve readability and alignment in all browsers. */ textarea { @@ -494,7 +523,7 @@ textarea { Tables ========================================================================== */ -/* +/** * Remove most spacing between table cells. */ From 8159b3c4fd9598f53672a6c71d08e4f5278f328f Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 8 Jul 2013 01:20:24 +0200 Subject: [PATCH 041/130] Updates jQuery to 1.10.2. --- README.md | 2 + src/_h5ai/client/js/lib/jquery-1.8.2.js | 9369 ++++++++++++----------- 2 files changed, 4861 insertions(+), 4510 deletions(-) diff --git a/README.md b/README.md index 59f7a38b..a6da1ce6 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,8 @@ It profits from these great projects: * add line wrap and line highlighting (on hover) to text preview * new design (colors, images) * now uses `SVG` images for the interface +* updates H5BP to 4.2.0 +* updates jQuery to 1.10.2 ### v0.22.1 - *2012-10-16* diff --git a/src/_h5ai/client/js/lib/jquery-1.8.2.js b/src/_h5ai/client/js/lib/jquery-1.8.2.js index 2bb11a0c..c5c64825 100644 --- a/src/_h5ai/client/js/lib/jquery-1.8.2.js +++ b/src/_h5ai/client/js/lib/jquery-1.8.2.js @@ -1,28 +1,38 @@ /*! - * jQuery JavaScript Library v1.8.2 + * jQuery JavaScript Library v1.10.2 * http://jquery.com/ * * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012 jQuery Foundation and other contributors + * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: Thu Sep 20 2012 21:13:05 GMT-0400 (Eastern Daylight Time) + * Date: 2013-07-03T13:48Z */ (function( window, undefined ) { -var - // A central reference to the root jQuery(document) - rootjQuery, +// Can't do this because several apps including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// Support: Firefox 18+ +//"use strict"; +var // The deferred used on DOM ready readyList, + // 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, + // Use the correct document accordingly with window argument (sandbox) - document = window.document, location = window.location, - navigator = window.navigator, + document = window.document, + docElem = document.documentElement, // Map over jQuery in case of overwrite _jQuery = window.jQuery, @@ -30,13 +40,22 @@ var // Map over the $ in case of overwrite _$ = window.$, + // [[Class]] -> type pairs + class2type = {}, + + // List of deleted data cache ids, so we can reuse them + core_deletedIds = [], + + core_version = "1.10.2", + // Save a reference to some core methods - core_push = Array.prototype.push, - core_slice = Array.prototype.slice, - core_indexOf = Array.prototype.indexOf, - core_toString = Object.prototype.toString, - core_hasOwn = Object.prototype.hasOwnProperty, - core_trim = String.prototype.trim, + core_concat = core_deletedIds.concat, + core_push = core_deletedIds.push, + core_slice = core_deletedIds.slice, + core_indexOf = core_deletedIds.indexOf, + core_toString = class2type.toString, + core_hasOwn = class2type.hasOwnProperty, + core_trim = core_version.trim, // Define a local copy of jQuery jQuery = function( selector, context ) { @@ -45,18 +64,18 @@ var }, // Used for matching numbers - core_pnum = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source, + core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, - // Used for detecting and trimming whitespace - core_rnotwhite = /\S/, - core_rspace = /\s+/, + // 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) - rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, // Match a standalone tag rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, @@ -65,7 +84,7 @@ var rvalidchars = /^[\],:{}\s]*$/, rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, - rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g, + rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g, // Matches dashed string for camelizing rmsPrefix = /^-ms-/, @@ -73,42 +92,43 @@ var // Used by jQuery.camelCase as callback to replace() fcamelCase = function( all, letter ) { - return ( letter + "" ).toUpperCase(); + return letter.toUpperCase(); }, - // The ready event handler and self cleanup method - DOMContentLoaded = function() { - if ( document.addEventListener ) { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - jQuery.ready(); - } else if ( document.readyState === "complete" ) { - // we're here because readyState === "complete" in oldIE - // which is good enough for us to call the dom ready! - document.detachEvent( "onreadystatechange", DOMContentLoaded ); + // 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 ); - // [[Class]] -> type pairs - class2type = {}; + } else { + document.detachEvent( "onreadystatechange", completed ); + window.detachEvent( "onload", completed ); + } + }; jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: core_version, + constructor: jQuery, init: function( selector, context, rootjQuery ) { - var match, elem, ret, doc; + var match, elem; - // Handle $(""), $(null), $(undefined), $(false) + // HANDLE: $(""), $(null), $(undefined), $(false) if ( !selector ) { return this; } - // Handle $(DOMElement) - if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - } - // Handle HTML strings if ( typeof selector === "string" ) { if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { @@ -125,15 +145,29 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $(html) -> $(array) if ( match[1] ) { context = context instanceof jQuery ? context[0] : context; - doc = ( context && context.nodeType ? context.ownerDocument || context : document ); // scripts is true for back-compat - selector = jQuery.parseHTML( match[1], doc, true ); + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { - this.attr.call( selector, context, true ); + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } } - return jQuery.merge( this, selector ); + return this; // HANDLE: $(#id) } else { @@ -168,6 +202,12 @@ jQuery.fn = jQuery.prototype = { return this.constructor( context ).find( selector ); } + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + // HANDLE: $(function) // Shortcut for document ready } else if ( jQuery.isFunction( selector ) ) { @@ -185,17 +225,9 @@ jQuery.fn = jQuery.prototype = { // Start with an empty selector selector: "", - // The current version of jQuery being used - jquery: "1.8.2", - // The default length of a jQuery object is 0 length: 0, - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - toArray: function() { return core_slice.call( this ); }, @@ -214,22 +246,15 @@ jQuery.fn = jQuery.prototype = { // Take an array of elements and push it onto the stack // (returning the new matched element set) - pushStack: function( elems, name, selector ) { + pushStack: function( elems ) { // Build a new jQuery matched element set var ret = jQuery.merge( this.constructor(), elems ); // Add the old object onto the stack (as a reference) ret.prevObject = this; - ret.context = this.context; - if ( name === "find" ) { - ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; - } else if ( name ) { - ret.selector = this.selector + "." + name + "(" + selector + ")"; - } - // Return the newly-formed element set return ret; }, @@ -248,11 +273,8 @@ jQuery.fn = jQuery.prototype = { return this; }, - eq: function( i ) { - i = +i; - return i === -1 ? - this.slice( i ) : - this.slice( i, i + 1 ); + slice: function() { + return this.pushStack( core_slice.apply( this, arguments ) ); }, first: function() { @@ -263,9 +285,10 @@ jQuery.fn = jQuery.prototype = { return this.eq( -1 ); }, - slice: function() { - return this.pushStack( core_slice.apply( this, arguments ), - "slice", core_slice.call(arguments).join(",") ); + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); }, map: function( callback ) { @@ -289,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, @@ -353,6 +376,10 @@ 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 ) { if ( window.$ === jQuery ) { window.$ = _$; @@ -391,7 +418,7 @@ jQuery.extend({ // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). if ( !document.body ) { - return setTimeout( jQuery.ready, 1 ); + return setTimeout( jQuery.ready ); } // Remember that the DOM is ready @@ -423,6 +450,7 @@ jQuery.extend({ }, isWindow: function( obj ) { + /* jshint eqeqeq: false */ return obj != null && obj == obj.window; }, @@ -431,12 +459,17 @@ jQuery.extend({ }, type: function( obj ) { - return obj == null ? - String( obj ) : - class2type[ core_toString.call(obj) ] || "object"; + if ( obj == null ) { + return String( obj ); + } + return typeof obj === "object" || typeof obj === "function" ? + class2type[ core_toString.call(obj) ] || "object" : + typeof obj; }, isPlainObject: function( 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 @@ -456,10 +489,16 @@ jQuery.extend({ return false; } + // 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. - - var key; for ( key in obj ) {} return key === undefined || core_hasOwn.call( obj, key ); @@ -479,50 +518,59 @@ jQuery.extend({ // data: string of html // context (optional): If specified, the fragment will be created in this context, defaults to document - // scripts (optional): If true, will include scripts passed in the html string - parseHTML: function( data, context, scripts ) { - var parsed; + // keepScripts (optional): If true, will include scripts passed in the html string + parseHTML: function( data, context, keepScripts ) { if ( !data || typeof data !== "string" ) { return null; } if ( typeof context === "boolean" ) { - scripts = context; - context = 0; + keepScripts = context; + context = false; } context = context || document; + var parsed = rsingleTag.exec( data ), + scripts = !keepScripts && []; + // Single tag - if ( (parsed = rsingleTag.exec( data )) ) { + if ( parsed ) { return [ context.createElement( parsed[1] ) ]; } - parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] ); - return jQuery.merge( [], - (parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes ); + parsed = jQuery.buildFragment( [ data ], context, scripts ); + if ( scripts ) { + jQuery( scripts ).remove(); + } + return jQuery.merge( [], parsed.childNodes ); }, parseJSON: function( data ) { - if ( !data || typeof data !== "string") { - return null; - } - - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); - // Attempt to parse using the native JSON parser first if ( window.JSON && window.JSON.parse ) { return window.JSON.parse( 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 ) )(); - + 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 ); }, @@ -556,7 +604,7 @@ jQuery.extend({ // 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 && core_rnotwhite.test( 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 @@ -578,21 +626,25 @@ jQuery.extend({ // args is for internal usage only each: function( obj, callback, args ) { - var name, + var value, i = 0, length = obj.length, - isObj = length === undefined || jQuery.isFunction( obj ); + isArray = isArraylike( obj ); if ( args ) { - if ( isObj ) { - for ( name in obj ) { - if ( callback.apply( obj[ name ], args ) === false ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { break; } } } else { - for ( ; i < length; ) { - if ( callback.apply( obj[ i++ ], args ) === false ) { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { break; } } @@ -600,15 +652,19 @@ jQuery.extend({ // A special, fast, case for the most common use of each } else { - if ( isObj ) { - for ( name in obj ) { - if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { break; } } } else { - for ( ; i < length; ) { - if ( callback.call( obj[ i ], i, obj[ i++ ] ) === false ) { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { break; } } @@ -635,18 +691,16 @@ jQuery.extend({ // results is for internal usage only makeArray: function( arr, results ) { - var type, - ret = results || []; + var ret = results || []; if ( arr != null ) { - // The window, strings (and functions) also have 'length' - // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 - type = jQuery.type( arr ); - - if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) { - core_push.call( ret, arr ); + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); } else { - jQuery.merge( ret, arr ); + core_push.call( ret, arr ); } } @@ -684,7 +738,6 @@ jQuery.extend({ for ( ; j < l; j++ ) { first[ i++ ] = second[ j ]; } - } else { while ( second[j] !== undefined ) { first[ i++ ] = second[ j++ ]; @@ -717,12 +770,11 @@ jQuery.extend({ // arg is for internal usage only map: function( elems, callback, arg ) { - var value, key, - ret = [], + var value, i = 0, length = elems.length, - // jquery objects are treated as arrays - isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; + isArray = isArraylike( elems ), + ret = []; // Go through the array, translating each of the items to their if ( isArray ) { @@ -736,8 +788,8 @@ jQuery.extend({ // Go through every key on the object, } else { - for ( key in elems ) { - value = callback( elems[ key ], key, arg ); + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); if ( value != null ) { ret[ ret.length ] = value; @@ -746,7 +798,7 @@ jQuery.extend({ } // Flatten any nested arrays - return ret.concat.apply( [], ret ); + return core_concat.apply( [], ret ); }, // A global GUID counter for objects @@ -755,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 ]; @@ -772,7 +824,7 @@ jQuery.extend({ // Simulated bind args = core_slice.call( arguments, 2 ); proxy = function() { - return fn.apply( context, args.concat( core_slice.call( arguments ) ) ); + return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) ); }; // Set the guid of unique handler to the same of original handler, so it can be removed @@ -783,46 +835,46 @@ jQuery.extend({ // Multifunctional method to get and set values of a collection // The value/s can optionally be executed if it's a function - access: function( elems, fn, key, value, chainable, emptyGet, pass ) { - var exec, - bulk = key == null, - i = 0, - length = elems.length; + access: function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + length = elems.length, + bulk = key == null; // Sets many values - if ( key && typeof key === "object" ) { + if ( jQuery.type( key ) === "object" ) { + chainable = true; for ( i in key ) { - jQuery.access( elems, fn, i, key[i], 1, emptyGet, value ); + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); } - chainable = 1; // Sets one value } else if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = pass === undefined && jQuery.isFunction( value ); + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } if ( bulk ) { - // Bulk operations only iterate when executing function values - if ( exec ) { - exec = fn; - fn = function( elem, key, value ) { - return exec.call( jQuery( elem ), value ); - }; - - // Otherwise they run against the entire set - } else { + // Bulk operations run against the entire set + if ( raw ) { fn.call( elems, value ); fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; } } if ( fn ) { - for (; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + for ( ; i < length; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); } } - - chainable = 1; } return chainable ? @@ -836,6 +888,29 @@ jQuery.extend({ 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. + // If support gets modularized, this method should be moved back to the css module. + swap: function( elem, options, callback, args ) { + var ret, name, + old = {}; + + // Remember the old values, and insert the new ones + for ( name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + ret = callback.apply( elem, args || [] ); + + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; + } + + return ret; } }); @@ -849,23 +924,23 @@ jQuery.ready.promise = function( obj ) { // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 if ( document.readyState === "complete" ) { // Handle it asynchronously to allow scripts the opportunity to delay ready - setTimeout( jQuery.ready, 1 ); + setTimeout( jQuery.ready ); // Standards-based browsers support DOMContentLoaded } else if ( document.addEventListener ) { // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + document.addEventListener( "DOMContentLoaded", completed, false ); // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); + 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", DOMContentLoaded ); + document.attachEvent( "onreadystatechange", completed ); // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); + window.attachEvent( "onload", completed ); // If IE and not a frame // continually check to see if the document is ready @@ -887,6 +962,9 @@ jQuery.ready.promise = function( obj ) { return setTimeout( doScrollCheck, 50 ); } + // detach all dom ready events + detach(); + // and execute any waiting functions jQuery.ready(); } @@ -898,19 +976,2015 @@ jQuery.ready.promise = function( obj ) { }; // Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { class2type[ "[object " + name + "]" ] = name.toLowerCase(); }); +function isArraylike( obj ) { + var length = obj.length, + type = jQuery.type( obj ); + + if ( jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.nodeType === 1 && length ) { + return true; + } + + return type === "array" || type !== "function" && + ( length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj ); +} + // All jQuery objects should point back to these rootjQuery = jQuery(document); +/*! + * 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-07-03 + */ +(function( window, undefined ) { + +var i, + support, + cachedruns, + Expr, + getText, + isXML, + compile, + outermostContext, + sortInput, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + -(new Date()), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + hasDuplicate = false, + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + return 0; + }, + + // General-purpose constants + strundefined = typeof undefined, + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf if we can't use a native one + indexOf = arr.indexOf || function( elem ) { + var i = 0, + len = this.length; + for ( ; i < len; i++ ) { + if ( this[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + + "*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", + + // Prefer arguments quoted, + // then not containing pseudos/brackets, + // then attribute selectors/non-parenthetical expressions, + // then anything else + // These preferences are here to reduce the number of selectors + // needing tokenize in the PSEUDO preFilter + pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rsibling = new RegExp( whitespace + "*[+~]" ), + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + // BMP codepoint + high < 0 ? + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + + context = context || document; + results = results || []; + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) { + return []; + } + + if ( documentIsHTML && !seed ) { + + // Shortcuts + if ( (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; + } + } + + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType === 9 && selector; + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", nid ); + } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && context.parentNode || context; + newSelector = groups.join(","); + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * 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 + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key += " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * 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 + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} 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, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Detect xml + * @param {Element|Object} elem An element or a document + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var doc = node ? node.ownerDocument || node : preferredDoc, + parent = doc.defaultView; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Set our document + document = doc; + docElem = doc.documentElement; + + // Support tests + documentIsHTML = !isXML( doc ); + + // 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 + // 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(); + }); + } + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Check if getElementsByClassName can be trusted + support.getElementsByClassName = assert(function( div ) { + div.innerHTML = "
          "; + + // Support: Safari<4 + // Catch class over-caching + div.firstChild.className = "i"; + // Support: Opera<10 + // Catch gEBCN failure to find non-leading classes + return div.getElementsByClassName("i").length === 2; + }); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== strundefined && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== strundefined ) { + return context.getElementsByTagName( tag ); + } + } : + function( tag, context ) { + var elem, + tmp = [], + i = 0, + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + div.innerHTML = ""; + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + }); + + assert(function( div ) { + + // Support: Opera 10-12/IE8 + // ^= $= *= and empty values + // Should not select anything + // Support: Windows 8 Native Apps + // The type attribute is restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "t", "" ); + + if ( div.querySelectorAll("[t^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = docElem.compareDocumentPosition ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b ); + + if ( compare ) { + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === doc || contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } + + // Not directly comparable, sort on existence of method + return a.compareDocumentPosition ? -1 : 1; + } : + function( a, b ) { + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + + // Parentless nodes are either documents or disconnected + } else if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch(e) {} + } + + return Sizzle( expr, document, null, [elem] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val === undefined ? + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null : + val; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + for ( ; (node = elem[i]); i++ ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (see #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[5] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] && match[4] !== undefined ) { + match[2] = match[4]; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf.call( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)), + // not comment, processing instructions, or others + // Thanks to Diego Perini for the nodeName shortcut + // Greater than "@" means alpha characters (specifically not starting with "#" or "?") + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) + // use getAttribute instead to test this case + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +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 ); +} +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, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( tokens = [] ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +} + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var data, cache, outerCache, + dirkey = dirruns + " " + doneName; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) { + if ( (data = cache[1]) === true || data === cachedruns ) { + return data === true; + } + } else { + cache = outerCache[ dir ] = [ dirkey ]; + cache[1] = matcher( elem, context, xml ) || cachedruns; + if ( cache[1] === true ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf.call( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + // A counter to specify which element is currently being matched + var matcherCachedRuns = 0, + bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, expandContext ) { + var elem, j, matcher, + setMatched = [], + matchedCount = 0, + i = "0", + unmatched = seed && [], + outermost = expandContext != null, + contextBackup = outermostContext, + // We must always have either seed elements or context + elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1); + + if ( outermost ) { + outermostContext = context !== document && context; + cachedruns = matcherCachedRuns; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + for ( ; (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + cachedruns = ++matcherCachedRuns; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !group ) { + group = tokenize( selector ); + } + i = group.length; + while ( i-- ) { + cached = matcherFromTokens( group[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + } + return cached; +}; + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function select( selector, context, results, seed ) { + var i, tokens, token, type, find, + match = tokenize( selector ); + + if ( !seed ) { + // Try to minimize operations if there is only one group + if ( match.length === 1 ) { + + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + } + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && context.parentNode || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + } + + // Compile and execute a filtering function + // Provide `match` to avoid retokenization if we modified the selector above + compile( selector, match )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) + ); + return results; +} + +// 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: 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; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + +})( window ); // String to Object options format cache var optionsCache = {}; // Convert String-formatted options into Object-formatted ones and store in cache function createOptions( options ) { var object = optionsCache[ options ] = {}; - jQuery.each( options.split( core_rspace ), function( _, flag ) { + jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) { object[ flag ] = true; }); return object; @@ -946,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 @@ -999,8 +3073,10 @@ jQuery.Callbacks = function( options ) { (function add( args ) { jQuery.each( args, function( _, arg ) { var type = jQuery.type( arg ); - if ( type === "function" && ( !options.unique || !self.has( arg ) ) ) { - list.push( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } } else if ( arg && arg.length && type !== "string" ) { // Inspect recursively add( arg ); @@ -1041,13 +3117,15 @@ jQuery.Callbacks = function( options ) { } return this; }, - // Control if a given callback is in the list + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. has: function( fn ) { - return jQuery.inArray( fn, list ) > -1; + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); }, // Remove all callbacks from the list empty: function() { list = []; + firingLength = 0; return this; }, // Have the list do nothing anymore @@ -1073,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 { @@ -1120,22 +3198,19 @@ jQuery.extend({ return jQuery.Deferred(function( newDefer ) { jQuery.each( tuples, function( i, tuple ) { var action = tuple[ 0 ], - fn = fns[ i ]; + fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[1] ]( jQuery.isFunction( fn ) ? - function() { - var returned = fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .done( newDefer.resolve ) - .fail( newDefer.reject ) - .progress( newDefer.notify ); - } else { - newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); - } - } : - newDefer[ action ] - ); + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); }); fns = null; }).promise(); @@ -1169,8 +3244,11 @@ jQuery.extend({ }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); } - // deferred[ resolve | reject | notify ] = list.fire - deferred[ tuple[0] ] = list.fire; + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; deferred[ tuple[0] + "With" ] = list.fireWith; }); @@ -1238,102 +3316,82 @@ jQuery.extend({ return deferred.promise(); } }); -jQuery.support = (function() { +jQuery.support = (function( support ) { - var support, - all, - a, - select, - opt, - input, - fragment, - eventName, - i, - isSupported, - clickFn, + var all, a, input, select, fragment, opt, eventName, isSupported, i, div = document.createElement("div"); - // Preliminary tests + // Setup div.setAttribute( "className", "t" ); div.innerHTML = "
          a"; - all = div.getElementsByTagName("*"); + // Finish early in limited (non-browser) environments + all = div.getElementsByTagName("*") || []; a = div.getElementsByTagName("a")[ 0 ]; - a.style.cssText = "top:1px;float:left;opacity:.5"; - - // Can't get basic test support - if ( !all || !all.length ) { - return {}; + if ( !a || !a.style || !all.length ) { + return support; } - // First batch of supports tests + // First batch of tests select = document.createElement("select"); opt = select.appendChild( document.createElement("option") ); input = div.getElementsByTagName("input")[ 0 ]; - support = { - // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: ( div.firstChild.nodeType === 3 ), + a.style.cssText = "top:1px;float:left;opacity:.5"; - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - tbody: !div.getElementsByTagName("tbody").length, + // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + support.getSetAttribute = div.className !== "t"; - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName("link").length, + // IE strips leading whitespace when .innerHTML is used + support.leadingWhitespace = div.firstChild.nodeType === 3; - // Get the style information from getAttribute - // (IE uses .cssText instead) - style: /top/.test( a.getAttribute("style") ), + // 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 URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: ( a.getAttribute("href") === "/a" ), + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + support.htmlSerialize = !!div.getElementsByTagName("link").length; - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.5/.test( a.style.opacity ), + // Get the style information from getAttribute + // (IE uses .cssText instead) + support.style = /top/.test( a.getAttribute("style") ); - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - cssFloat: !!a.style.cssFloat, + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + support.hrefNormalized = a.getAttribute("href") === "/a"; - // Make sure that if no value is specified for a checkbox - // that it defaults to "on". - // (WebKit defaults to "" instead) - checkOn: ( input.value === "on" ), + // 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 ); - // 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) - optSelected: opt.selected, + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + support.cssFloat = !!a.style.cssFloat; - // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) - getSetAttribute: div.className !== "t", + // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere) + support.checkOn = !!input.value; - // Tests for enctype support on a form(#6743) - enctype: !!document.createElement("form").enctype, + // 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; - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", + // Tests for enctype support on a form (#6743) + support.enctype = !!document.createElement("form").enctype; - // jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode - boxModel: ( document.compatMode === "CSS1Compat" ), + // 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 - submitBubbles: true, - changeBubbles: true, - focusinBubbles: false, - deleteExpando: true, - noCloneEvent: true, - inlineBlockNeedsLayout: false, - shrinkWrapBlocks: false, - reliableMarginRight: true, - boxSizingReliable: true, - pixelPosition: false - }; + // 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; // Make sure checked status is properly cloned input.checked = true; @@ -1344,76 +3402,71 @@ jQuery.support = (function() { select.disabled = true; support.optDisabled = !opt.disabled; - // Test to see if it's possible to delete an expando from an element - // Fails in Internet Explorer + // Support: IE<9 try { delete div.test; } catch( e ) { support.deleteExpando = false; } - if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { - div.attachEvent( "onclick", clickFn = function() { - // Cloning a node shouldn't copy over any - // bound event handlers (IE does this) - support.noCloneEvent = false; - }); - div.cloneNode( true ).fireEvent("onclick"); - div.detachEvent( "onclick", clickFn ); - } - - // Check if a radio maintains its value - // after being appended to the DOM + // 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.setAttribute( "type", "radio" ); support.radioValue = input.value === "t"; - input.setAttribute( "checked", "checked" ); - // #11217 - WebKit loses check when the name is after the checked attribute + input.setAttribute( "checked", "t" ); input.setAttribute( "name", "t" ); - div.appendChild( input ); fragment = document.createDocumentFragment(); - fragment.appendChild( div.lastChild ); - - // WebKit doesn't clone checked state correctly in fragments - support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; + fragment.appendChild( input ); // Check if a disconnected checkbox will retain its checked // value of true after appended to the DOM (IE6/7) support.appendChecked = input.checked; - fragment.removeChild( input ); - fragment.appendChild( div ); + // WebKit doesn't clone checked state correctly in fragments + support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; - // Technique from Juriy Zaytsev - // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ - // We only care about the case where non-standard event systems - // are used, namely in IE. Short-circuiting here helps us to - // avoid an eval call (in setAttribute) which can cause CSP - // to go haywire. See: https://developer.mozilla.org/en/Security/CSP + // 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 ) { - for ( i in { - submit: true, - change: true, - focusin: true - }) { - eventName = "on" + i; - isSupported = ( eventName in div ); - if ( !isSupported ) { - div.setAttribute( eventName, "return;" ); - isSupported = ( typeof div[ eventName ] === "function" ); - } - support[ i + "Bubbles" ] = isSupported; - } + 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) + 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, div, tds, marginDiv, - divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;", + 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 ) { @@ -1422,20 +3475,17 @@ jQuery.support = (function() { } container = document.createElement("div"); - container.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px"; - body.insertBefore( container, body.firstChild ); + container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px"; - // Construct the test element - div = document.createElement("div"); - container.appendChild( div ); + 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). - // (only IE 8 fails this test) div.innerHTML = "
          t
          "; tds = div.getElementsByTagName("td"); tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none"; @@ -1444,89 +3494,266 @@ jQuery.support = (function() { tds[ 0 ].style.display = ""; tds[ 1 ].style.display = "none"; + // Support: IE8 // Check if empty table cells still have offsetWidth/Height - // (IE <= 8 fail this test) support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); - // Check box-sizing and margin behavior + // Check box-sizing and margin behavior. div.innerHTML = ""; 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%;"; - support.boxSizing = ( div.offsetWidth === 4 ); - support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 ); - // NOTE: To any future maintainer, we've window.getComputedStyle - // because jsdom on node.js will break without it. + // Workaround failing boxSizing test due to offsetWidth returning wrong value + // with some non-1 values of body zoom, ticket #13543 + jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() { + support.boxSizing = div.offsetWidth === 4; + }); + + // Use window.getComputedStyle because jsdom on node.js will break without it. if ( window.getComputedStyle ) { support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%"; support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px"; // Check if div with explicit width and no margin-right incorrectly - // gets computed margin-right based on width of container. For more - // info see bug #3333 + // 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 = document.createElement("div"); + marginDiv = div.appendChild( document.createElement("div") ); marginDiv.style.cssText = div.style.cssText = divReset; marginDiv.style.marginRight = marginDiv.style.width = "0"; div.style.width = "1px"; - div.appendChild( marginDiv ); + support.reliableMarginRight = !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight ); } - if ( typeof div.style.zoom !== "undefined" ) { + 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 - // (IE < 8 does this) 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 - // (IE 6 does this) div.style.display = "block"; - div.style.overflow = "visible"; div.innerHTML = "
          "; div.firstChild.style.width = "5px"; support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); - container.style.zoom = 1; + 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; + } } - // Null elements to avoid leaks in IE body.removeChild( container ); + + // Null elements to avoid leaks in IE container = div = tds = marginDiv = null; }); // Null elements to avoid leaks in IE - fragment.removeChild( div ); - all = a = select = opt = input = fragment = div = null; + all = select = fragment = opt = a = input = null; return support; -})(); +})({}); + var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, rmultiDash = /([A-Z])/g; +function internalData( elem, name, data, pvt /* Internal Use Only */ ){ + if ( !jQuery.acceptData( elem ) ) { + return; + } + + 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; +} + +function internalRemoveData( elem, name, pvt ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var thisCache, i, + isNode = elem.nodeType, + + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + id = isNode ? elem[ jQuery.expando ] : jQuery.expando; + + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } + + if ( name ) { + + thisCache = pvt ? cache[ id ] : cache[ id ].data; + + if ( thisCache ) { + + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { + + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { + + // 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(" "); + } + } + } 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 = name.concat( jQuery.map( name, jQuery.camelCase ) ); + } + + i = name.length; + while ( 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; + } + } + } + + // 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; + } + } + + // 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({ cache: {}, - deletedIds: [], - - // Remove at next major release (1.9/2.0) - uuid: 0, - - // Unique for each copy of jQuery on the page - // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), - // 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", - "applet": true + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" }, hasData: function( elem ) { @@ -1534,187 +3761,30 @@ jQuery.extend({ return !!elem && !isEmptyDataObject( elem ); }, - data: function( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var thisCache, ret, - internalKey = jQuery.expando, - getByName = typeof name === "string", - - // 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)) && getByName && data === undefined ) { - 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 ) { - elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++; - } else { - id = internalKey; - } - } - - if ( !cache[ id ] ) { - cache[ id ] = {}; - - // Avoids exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - if ( !isNode ) { - cache[ id ].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 ( getByName ) { - - // 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: function( elem, name, data ) { + return internalData( elem, name, data ); }, - removeData: function( elem, name, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var thisCache, i, l, - - isNode = elem.nodeType, - - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, - id = isNode ? elem[ jQuery.expando ] : jQuery.expando; - - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } - - if ( name ) { - - thisCache = pvt ? cache[ id ] : cache[ id ].data; - - if ( thisCache ) { - - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { - - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { - - // 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(" "); - } - } - } - - for ( i = 0, l = name.length; i < l; 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 : jQuery.isEmptyObject )( thisCache ) ) { - return; - } - } - } - - // 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; - } - } - - // Destroy the cache - if ( isNode ) { - jQuery.cleanData( [ elem ], true ); - - // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) - } else if ( jQuery.support.deleteExpando || cache != cache.window ) { - delete cache[ id ]; - - // When all else fails, null - } else { - cache[ id ] = null; - } + removeData: function( elem, name ) { + return internalRemoveData( elem, name ); }, // For internal use only. _data: function( elem, name, data ) { - return jQuery.data( elem, name, data, true ); + return internalData( elem, name, data, true ); + }, + + _removeData: function( 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 @@ -1724,10 +3794,13 @@ jQuery.extend({ jQuery.fn.extend({ data: function( key, value ) { - var parts, part, attr, name, l, - elem = this[0], + var attrs, name, + 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 ) { @@ -1735,12 +3808,12 @@ jQuery.fn.extend({ data = jQuery.data( elem ); if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { - attr = elem.attributes; - for ( l = attr.length; i < l; i++ ) { - name = attr[i].name; + attrs = elem.attributes; + for ( ; i < attrs.length; i++ ) { + name = attrs[i].name; - if ( !name.indexOf( "data-" ) ) { - name = jQuery.camelCase( name.substring(5) ); + if ( name.indexOf("data-") === 0 ) { + name = jQuery.camelCase( name.slice(5) ); dataAttr( elem, name, data[ name ] ); } @@ -1759,35 +3832,16 @@ jQuery.fn.extend({ }); } - parts = key.split( ".", 2 ); - parts[1] = parts[1] ? "." + parts[1] : ""; - part = parts[1] + "!"; + return arguments.length > 1 ? - return jQuery.access( this, function( value ) { - - if ( value === undefined ) { - data = this.triggerHandler( "getData" + part, [ parts[0] ] ); - - // Try to fetch any internally stored data first - if ( data === undefined && elem ) { - data = jQuery.data( elem, key ); - data = dataAttr( elem, key, data ); - } - - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; - } - - parts[1] = value; + // Sets one value this.each(function() { - var self = jQuery( this ); - - self.triggerHandler( "setData" + part, parts ); jQuery.data( this, key, value ); - self.triggerHandler( "changeData" + part, parts ); - }); - }, null, value, arguments.length > 1, null, false ); + }) : + + // Gets one value + // Try to fetch any internally stored data first + elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null; }, removeData: function( key ) { @@ -1809,12 +3863,12 @@ function dataAttr( elem, key, data ) { if ( typeof data === "string" ) { try { data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; + data === "false" ? false : + data === "null" ? null : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; } catch( e ) {} // Make sure we set the data so it isn't changed later @@ -1904,8 +3958,8 @@ jQuery.extend({ var key = type + "queueHooks"; return jQuery._data( elem, key ) || jQuery._data( elem, key, { empty: jQuery.Callbacks("once memory").add(function() { - jQuery.removeData( elem, type + "queue", true ); - jQuery.removeData( elem, key, true ); + jQuery._removeData( elem, type + "queue" ); + jQuery._removeData( elem, key ); }) }); } @@ -1990,14 +4044,14 @@ jQuery.fn.extend({ return defer.promise( obj ); } }); -var nodeHook, boolHook, fixSpecified, - rclass = /[\t\r\n]/g, +var nodeHook, boolHook, + rclass = /[\t\r\n\f]/g, rreturn = /\r/g, - rtype = /^(?:button|input)$/i, - rfocusable = /^(?:button|input|object|select|textarea)$/i, - rclickable = /^a(?:rea|)$/i, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - getSetAttribute = jQuery.support.getSetAttribute; + 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 ) { @@ -2026,35 +4080,37 @@ jQuery.fn.extend({ }, addClass: function( value ) { - var classNames, i, l, elem, - setClass, c, cl; + var classes, elem, cur, clazz, j, + i = 0, + len = this.length, + proceed = typeof value === "string" && value; if ( jQuery.isFunction( value ) ) { return this.each(function( j ) { - jQuery( this ).addClass( value.call(this, j, this.className) ); + jQuery( this ).addClass( value.call( this, j, this.className ) ); }); } - if ( value && typeof value === "string" ) { - classNames = value.split( core_rspace ); + if ( proceed ) { + // The disjunction here is for better compressibility (see removeClass) + classes = ( value || "" ).match( core_rnotwhite ) || []; - for ( i = 0, l = this.length; i < l; i++ ) { + for ( ; i < len; i++ ) { elem = this[ i ]; + cur = elem.nodeType === 1 && ( elem.className ? + ( " " + elem.className + " " ).replace( rclass, " " ) : + " " + ); - if ( elem.nodeType === 1 ) { - if ( !elem.className && classNames.length === 1 ) { - elem.className = value; - - } else { - setClass = " " + elem.className + " "; - - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) { - setClass += classNames[ c ] + " "; - } + if ( cur ) { + j = 0; + while ( (clazz = classes[j++]) ) { + if ( cur.indexOf( " " + clazz + " " ) < 0 ) { + cur += clazz + " "; } - elem.className = jQuery.trim( setClass ); } + elem.className = jQuery.trim( cur ); + } } } @@ -2063,30 +4119,36 @@ jQuery.fn.extend({ }, removeClass: function( value ) { - var removes, className, elem, c, cl, i, l; + var classes, elem, cur, clazz, j, + i = 0, + len = this.length, + proceed = arguments.length === 0 || typeof value === "string" && value; if ( jQuery.isFunction( value ) ) { return this.each(function( j ) { - jQuery( this ).removeClass( value.call(this, j, this.className) ); + jQuery( this ).removeClass( value.call( this, j, this.className ) ); }); } - if ( (value && typeof value === "string") || value === undefined ) { - removes = ( value || "" ).split( core_rspace ); + if ( proceed ) { + classes = ( value || "" ).match( core_rnotwhite ) || []; - for ( i = 0, l = this.length; i < l; i++ ) { + for ( ; i < len; i++ ) { elem = this[ i ]; - if ( elem.nodeType === 1 && elem.className ) { + // This expression is here for better compressibility (see addClass) + cur = elem.nodeType === 1 && ( elem.className ? + ( " " + elem.className + " " ).replace( rclass, " " ) : + "" + ); - className = (" " + elem.className + " ").replace( rclass, " " ); - - // loop over each item in the removal list - for ( c = 0, cl = removes.length; c < cl; c++ ) { - // Remove until there is nothing to remove, - while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) { - className = className.replace( " " + removes[ c ] + " " , " " ); + if ( cur ) { + j = 0; + while ( (clazz = classes[j++]) ) { + // Remove *all* instances + while ( cur.indexOf( " " + clazz + " " ) >= 0 ) { + cur = cur.replace( " " + clazz + " ", " " ); } } - elem.className = value ? jQuery.trim( className ) : ""; + elem.className = value ? jQuery.trim( cur ) : ""; } } } @@ -2095,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 ) { @@ -2110,22 +4175,28 @@ jQuery.fn.extend({ var className, i = 0, self = jQuery( this ), - state = stateVal, - classNames = value.split( core_rspace ); + 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 ); + } } - } else if ( type === "undefined" || type === "boolean" ) { + // Toggle whole class name + } else if ( type === core_strundefined || type === "boolean" ) { if ( this.className ) { // store className if set jQuery._data( this, "__className__", this.className ); } - // toggle whole 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 ? "" : jQuery._data( this, "__className__" ) || ""; } }); @@ -2145,7 +4216,7 @@ jQuery.fn.extend({ }, val: function( value ) { - var hooks, ret, isFunction, + var ret, hooks, isFunction, elem = this[0]; if ( !arguments.length ) { @@ -2171,15 +4242,14 @@ jQuery.fn.extend({ isFunction = jQuery.isFunction( value ); return this.each(function( i ) { - var val, - self = jQuery(this); + var val; if ( this.nodeType !== 1 ) { return; } if ( isFunction ) { - val = value.call( this, i, self.val() ); + val = value.call( this, i, jQuery( this ).val() ); } else { val = value; } @@ -2209,34 +4279,34 @@ 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: { get: function( elem ) { - var value, i, max, option, - index = elem.selectedIndex, - values = [], + var value, option, options = elem.options, - one = elem.type === "select-one"; - - // Nothing was selected - if ( index < 0 ) { - return null; - } + index = elem.selectedIndex, + one = elem.type === "select-one" || index < 0, + values = one ? null : [], + max = one ? index + 1 : options.length, + i = index < 0 ? + max : + one ? index : 0; // Loop through all the selected options - i = one ? index : 0; - max = one ? index + 1 : options.length; for ( ; i < max; i++ ) { option = options[ i ]; - // Don't return options that are disabled or in a disabled optgroup - if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && - (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { + // 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 ) && + ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { // Get the specific value for the option value = jQuery( option ).val(); @@ -2251,22 +4321,24 @@ jQuery.extend({ } } - // Fixes Bug #2551 -- select.val() broken in IE after form.reset() - if ( one && !values.length && options.length ) { - return jQuery( options[ index ] ).val(); - } - return values; }, set: function( elem, value ) { - var values = jQuery.makeArray( value ); + var optionSet, option, + options = elem.options, + values = jQuery.makeArray( value ), + i = options.length; - jQuery(elem).find("option").each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; - }); + while ( i-- ) { + option = options[ i ]; + if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) { + optionSet = true; + } + } - if ( !values.length ) { + // force browsers to behave consistently when non-matching value is set + if ( !optionSet ) { elem.selectedIndex = -1; } return values; @@ -2274,11 +4346,8 @@ jQuery.extend({ } }, - // Unused in 1.8, left in so attrFn-stabbers won't die; remove in 1.9 - attrFn: {}, - - attr: function( elem, name, value, pass ) { - var ret, hooks, notxml, + attr: function( elem, name, value ) { + var hooks, ret, nType = elem.nodeType; // don't get/set attributes on text, comment and attribute nodes @@ -2286,31 +4355,25 @@ jQuery.extend({ return; } - if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) { - return jQuery( elem )[ name ]( value ); - } - // Fallback to prop when attributes are not supported - if ( typeof elem.getAttribute === "undefined" ) { + if ( typeof elem.getAttribute === core_strundefined ) { return jQuery.prop( elem, name, value ); } - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - // All attributes are lowercase // Grab necessary hook if one is defined - if ( notxml ) { + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { name = name.toLowerCase(); - hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); + hooks = jQuery.attrHooks[ name ] || + ( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook ); } if ( value !== undefined ) { if ( value === null ) { jQuery.removeAttr( elem, name ); - return; - } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { + } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { return ret; } else { @@ -2318,47 +4381,46 @@ jQuery.extend({ return value; } - } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { + } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { return ret; } else { - - ret = elem.getAttribute( name ); + ret = jQuery.find.attr( elem, name ); // Non-existent attributes return null, we normalize to undefined - return ret === null ? + return ret == null ? undefined : ret; } }, removeAttr: function( elem, value ) { - var propName, attrNames, name, isBool, - i = 0; + var name, propName, + i = 0, + attrNames = value && value.match( core_rnotwhite ); - if ( value && elem.nodeType === 1 ) { + if ( attrNames && elem.nodeType === 1 ) { + while ( (name = attrNames[i++]) ) { + propName = jQuery.propFix[ name ] || name; - attrNames = value.split( core_rspace ); - - for ( ; i < attrNames.length; i++ ) { - name = attrNames[ i ]; - - if ( name ) { - propName = jQuery.propFix[ name ] || name; - isBool = rboolean.test( name ); - - // See #9699 for explanation of this approach (setting first, then removal) - // Do not do this for boolean attributes (see #10870) - if ( !isBool ) { - jQuery.attr( elem, name, "" ); - } - elem.removeAttribute( getSetAttribute ? name : propName ); - - // Set corresponding property to false for boolean attributes - if ( isBool && propName in elem ) { + // Boolean attributes get special treatment (#10870) + if ( jQuery.expr.match.bool.test( name ) ) { + // Set corresponding property to 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( getSetAttribute ? name : propName ); } } }, @@ -2366,13 +4428,9 @@ jQuery.extend({ attrHooks: { type: { set: function( elem, value ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { // Setting the type on a radio button after the value resets the value in IE6-9 - // Reset value to it's default in case type is set after value - // This is for element creation + // Reset value to default in case type is set after value during creation var val = elem.value; elem.setAttribute( "type", value ); if ( val ) { @@ -2381,41 +4439,12 @@ jQuery.extend({ return value; } } - }, - // Use the value property for back compat - // Use the nodeHook for button elements in IE6/7 (#1954) - value: { - get: function( elem, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.get( elem, name ); - } - return name in elem ? - elem.value : - null; - }, - set: function( elem, value, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.set( elem, value, name ); - } - // Does not return so that setAttribute is also used - elem.value = value; - } } }, 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" + "class": "className" }, prop: function( elem, name, value ) { @@ -2436,20 +4465,14 @@ jQuery.extend({ } if ( value !== undefined ) { - if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - return ( elem[ name ] = value ); - } + return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ? + ret : + ( elem[ name ] = value ); } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - return elem[ name ]; - } + return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ? + ret : + elem[ name ]; } }, @@ -2458,115 +4481,154 @@ jQuery.extend({ get: function( elem ) { // 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/ - var attributeNode = elem.getAttributeNode("tabindex"); + // Use proper attribute retrieval(#12072) + var tabindex = jQuery.find.attr( elem, "tabindex" ); - return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : + return tabindex ? + parseInt( tabindex, 10 ) : rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? 0 : - undefined; + -1; } } } }); -// Hook for boolean attributes +// Hooks for boolean attributes boolHook = { - get: function( elem, name ) { - // Align boolean attributes with corresponding properties - // Fall back to attribute presence where some booleans are not supported - var attrNode, - property = jQuery.prop( elem, name ); - return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? - name.toLowerCase() : - undefined; - }, set: function( elem, value, name ) { - var propName; if ( value === false ) { // Remove boolean attributes when set to false jQuery.removeAttr( elem, name ); - } else { - // value is true since we know at this point it's type boolean and not false - // Set boolean attributes to the same name and set the DOM property - propName = jQuery.propFix[ name ] || name; - if ( propName in elem ) { - // Only set the IDL specifically if it already exists on the element - elem[ propName ] = true; - } + } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + // IE<8 needs the *property* name + elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name ); - elem.setAttribute( name, name.toLowerCase() ); + // Use defaultChecked and defaultSelected for oldIE + } else { + 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 ] = 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; + }; +}); + +// 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 ) { - fixSpecified = { - name: true, - id: true, - coords: true - }; - // Use this for any attribute in IE6/7 // This fixes almost every IE6/7 issue - nodeHook = jQuery.valHooks.button = { - get: function( elem, name ) { - var ret; - ret = elem.getAttributeNode( name ); - return ret && ( fixSpecified[ name ] ? ret.value !== "" : ret.specified ) ? - ret.value : - undefined; - }, + nodeHook = { set: function( elem, value, name ) { // Set the existing or create a new attribute node var ret = elem.getAttributeNode( name ); if ( !ret ) { - ret = document.createAttribute( name ); - elem.setAttributeNode( ret ); + elem.setAttributeNode( + (ret = elem.ownerDocument.createAttribute( name )) + ); } - return ( ret.value = value + "" ); + + 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 ] = jQuery.extend( jQuery.attrHooks[ name ], { + jQuery.attrHooks[ name ] = { set: function( elem, value ) { if ( value === "" ) { elem.setAttribute( name, "auto" ); return value; } } - }); + }; }); - - // Set contenteditable to false on removals(#10429) - // Setting to empty string throws an error as an invalid value - jQuery.attrHooks.contenteditable = { - get: nodeHook.get, - set: function( elem, value, name ) { - if ( value === "" ) { - value = "false"; - } - nodeHook.set( elem, value, name ); - } - }; } // Some attributes require a special call on IE +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx if ( !jQuery.support.hrefNormalized ) { - jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { + // href/src property should get the full normalized URL (#10299/#12915) + jQuery.each([ "href", "src" ], function( i, name ) { + jQuery.propHooks[ name ] = { get: function( elem ) { - var ret = elem.getAttribute( name, 2 ); - return ret === null ? undefined : ret; + return elem.getAttribute( name, 4 ); } - }); + }; }); } @@ -2574,8 +4636,9 @@ if ( !jQuery.support.style ) { jQuery.attrHooks.style = { get: function( elem ) { // Return undefined in the case of empty string - // Normalize to lowercase since IE uppercases css property names - return elem.style.cssText.toLowerCase() || undefined; + // 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 + "" ); @@ -2586,7 +4649,7 @@ if ( !jQuery.support.style ) { // 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 = jQuery.extend( jQuery.propHooks.selected, { + jQuery.propHooks.selected = { get: function( elem ) { var parent = elem.parentNode; @@ -2600,43 +4663,65 @@ if ( !jQuery.support.optSelected ) { } return null; } - }); + }; } +jQuery.each([ + "tabIndex", + "readOnly", + "maxLength", + "cellSpacing", + "cellPadding", + "rowSpan", + "colSpan", + "useMap", + "frameBorder", + "contentEditable" +], function() { + jQuery.propFix[ this.toLowerCase() ] = this; +}); + // IE6/7 call enctype encoding if ( !jQuery.support.enctype ) { jQuery.propFix.enctype = "encoding"; } // Radios and checkboxes getter/setter -if ( !jQuery.support.checkOn ) { - jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - get: function( elem ) { - // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified - return elem.getAttribute("value") === null ? "on" : elem.value; - } - }; - }); -} jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { + jQuery.valHooks[ this ] = { set: function( elem, value ) { if ( jQuery.isArray( value ) ) { return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); } } - }); + }; + if ( !jQuery.support.checkOn ) { + jQuery.valHooks[ this ].get = function( elem ) { + // Support: Webkit + // "" is returned instead of "on" if a value isn't specified + return elem.getAttribute("value") === null ? "on" : elem.value; + }; + } }); -var rformElems = /^(?:textarea|input|select)$/i, - rtypenamespace = /^([^\.]*|)(?:\.(.+)|)$/, - rhoverHack = /(?:^|\s)hover(\.\S+|)\b/, +var rformElems = /^(?:input|select|textarea)$/i, rkeyEvent = /^key/, rmouseEvent = /^(?:mouse|contextmenu)|click/, rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - hoverHack = function( events ) { - return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); - }; + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} /* * Helper functions for managing events -- not part of the public interface. @@ -2644,14 +4729,16 @@ var rformElems = /^(?:textarea|input|select)$/i, */ jQuery.event = { + global: {}, + add: function( elem, types, handler, data, selector ) { + var tmp, events, t, handleObjIn, + special, eventHandle, handleObj, + handlers, type, namespaces, origType, + elemData = jQuery._data( elem ); - var elemData, eventHandle, events, - t, tns, type, namespaces, handleObj, - handleObjIn, handlers, special; - - // Don't attach events to noData or text/comment nodes (allow plain objects tho) - if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { return; } @@ -2668,16 +4755,14 @@ jQuery.event = { } // Init the element's event structure and main handler, if this is the first - events = elemData.events; - if ( !events ) { - elemData.events = events = {}; + if ( !(events = elemData.events) ) { + events = elemData.events = {}; } - eventHandle = elemData.handle; - if ( !eventHandle ) { - elemData.handle = eventHandle = function( e ) { + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = function( e ) { // Discard the second event of a jQuery.event.trigger() and // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? + return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ? jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : undefined; }; @@ -2686,13 +4771,17 @@ jQuery.event = { } // Handle multiple events separated by a space - // jQuery(...).bind("mouseover mouseout", fn); - types = jQuery.trim( hoverHack(types) ).split( " " ); - for ( t = 0; t < types.length; t++ ) { + types = ( types || "" ).match( core_rnotwhite ) || [""]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); - tns = rtypenamespace.exec( types[t] ) || []; - type = tns[1]; - namespaces = ( tns[2] || "" ).split( "." ).sort(); + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } // If event changes its type, use the special event handlers for the changed type special = jQuery.event.special[ type ] || {}; @@ -2706,7 +4795,7 @@ jQuery.event = { // handleObj is passed to all event handlers handleObj = jQuery.extend({ type: type, - origType: tns[1], + origType: origType, data: data, handler: handler, guid: handler.guid, @@ -2716,8 +4805,7 @@ jQuery.event = { }, handleObjIn ); // Init the event handler queue if we're the first - handlers = events[ type ]; - if ( !handlers ) { + if ( !(handlers = events[ type ]) ) { handlers = events[ type ] = []; handlers.delegateCount = 0; @@ -2756,13 +4844,12 @@ jQuery.event = { elem = null; }, - global: {}, - // Detach an event or set of events from an element remove: function( elem, types, handler, selector, mappedTypes ) { - - var t, tns, type, origType, namespaces, origCount, - j, events, special, eventType, handleObj, + var j, handleObj, tmp, + origCount, t, events, + special, handlers, type, + namespaces, origType, elemData = jQuery.hasData( elem ) && jQuery._data( elem ); if ( !elemData || !(events = elemData.events) ) { @@ -2770,11 +4857,12 @@ jQuery.event = { } // Once for each type.namespace in types; type may be omitted - types = jQuery.trim( hoverHack( types || "" ) ).split(" "); - for ( t = 0; t < types.length; t++ ) { - tns = rtypenamespace.exec( types[t] ) || []; - type = origType = tns[1]; - namespaces = tns[2]; + types = ( types || "" ).match( core_rnotwhite ) || [""]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); // Unbind all events (on this namespace, if provided) for the element if ( !type ) { @@ -2785,23 +4873,23 @@ jQuery.event = { } special = jQuery.event.special[ type ] || {}; - type = ( selector? special.delegateType : special.bindType ) || type; - eventType = events[ type ] || []; - origCount = eventType.length; - namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); // Remove matching events - for ( j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !namespaces || namespaces.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - eventType.splice( j--, 1 ); + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); if ( handleObj.selector ) { - eventType.delegateCount--; + handlers.delegateCount--; } if ( special.remove ) { special.remove.call( elem, handleObj ); @@ -2811,7 +4899,7 @@ jQuery.event = { // Remove generic event handler if we removed something and no more handlers exist // (avoids potential for endless recursion during removal of special event handlers) - if ( eventType.length === 0 && origCount !== eventType.length ) { + if ( origCount && !handlers.length ) { if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { jQuery.removeEvent( elem, type, elemData.handle ); } @@ -2826,80 +4914,48 @@ jQuery.event = { // removeData also checks for emptiness and clears the expando if empty // so use it instead of delete - jQuery.removeData( elem, "events", true ); + jQuery._removeData( elem, "events" ); } }, - // Events that are safe to short-circuit if no handlers are attached. - // Native DOM events should not be added, they may have inline handlers. - customEvent: { - "getData": true, - "setData": true, - "changeData": true - }, - trigger: function( event, data, elem, onlyHandlers ) { + 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(".") : []; + + cur = tmp = elem = elem || document; + // Don't do events on text and comment nodes - if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { return; } - // Event object or event type - var cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType, - type = event.type || event, - namespaces = []; - // focus/blur morphs to focusin/out; ensure we're not firing them right now if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { return; } - if ( type.indexOf( "!" ) >= 0 ) { - // Exclusive events trigger only for the exact event (no namespaces) - type = type.slice(0, -1); - exclusive = true; - } - - if ( type.indexOf( "." ) >= 0 ) { + if ( type.indexOf(".") >= 0 ) { // Namespaced trigger; create a regexp to match event type in handle() namespaces = type.split("."); type = namespaces.shift(); namespaces.sort(); } + ontype = type.indexOf(":") < 0 && "on" + type; - if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { - // No jQuery handlers for this event type, and it can't have inline handlers - return; - } + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); - // Caller can pass in an Event, Object, or just an event type string - event = typeof event === "object" ? - // jQuery.Event object - event[ jQuery.expando ] ? event : - // Object literal - new jQuery.Event( type, event ) : - // Just the event type (string) - new jQuery.Event( type ); - - event.type = type; - event.isTrigger = true; - event.exclusive = exclusive; - event.namespace = namespaces.join( "." ); - event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") : null; - ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; - - // Handle a global trigger - if ( !elem ) { - - // TODO: Stop taunting the data cache; remove global events and always attach to document - cache = jQuery.cache; - for ( i in cache ) { - if ( cache[ i ].events && cache[ i ].events[ type ] ) { - jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); - } - } - return; - } + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; // Clean up the event in case it is being reused event.result = undefined; @@ -2908,44 +4964,50 @@ jQuery.event = { } // Clone any incoming data and prepend the event, creating the handler arg list - data = data != null ? jQuery.makeArray( data ) : []; - data.unshift( event ); + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); // Allow special events to draw outside the lines special = jQuery.event.special[ type ] || {}; - if ( special.trigger && special.trigger.apply( elem, data ) === false ) { + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { return; } // Determine event propagation path in advance, per W3C events spec (#9951) // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - eventPath = [[ elem, special.bindType || type ]]; if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { bubbleType = special.delegateType || type; - cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; - for ( old = elem; cur; cur = cur.parentNode ) { - eventPath.push([ cur, bubbleType ]); - old = cur; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; } // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( old === (elem.ownerDocument || document) ) { - eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); } } // Fire handlers on the event path - for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - cur = eventPath[i][0]; - event.type = eventPath[i][1]; + event.type = i > 1 ? + bubbleType : + special.bindType || type; + // jQuery handler handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); if ( handle ) { handle.apply( cur, data ); } - // Note that this is a bare JS function and not a jQuery handler + + // Native handler handle = ontype && cur[ ontype ]; if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) { event.preventDefault(); @@ -2956,29 +5018,33 @@ jQuery.event = { // If nobody prevented the default action, do it now if ( !onlyHandlers && !event.isDefaultPrevented() ) { - if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && - !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + 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) - // IE<9 dies on focus/blur to hidden element (#1486) - if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { + if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { // Don't re-trigger an onFOO event when we call its FOO() method - old = elem[ ontype ]; + tmp = elem[ ontype ]; - if ( old ) { + if ( tmp ) { elem[ ontype ] = null; } // 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 ( old ) { - elem[ ontype ] = old; + if ( tmp ) { + elem[ ontype ] = tmp; } } } @@ -2990,15 +5056,13 @@ jQuery.event = { dispatch: function( event ) { // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event || window.event ); + event = jQuery.event.fix( event ); - var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related, - handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), - delegateCount = handlers.delegateCount, + var i, ret, handleObj, matched, j, + handlerQueue = [], args = core_slice.call( arguments ), - run_all = !event.exclusive && !event.namespace, - special = jQuery.event.special[ event.type ] || {}, - handlerQueue = []; + 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 args[0] = event; @@ -3009,62 +5073,29 @@ jQuery.event = { return; } - // Determine handlers that should run if there are delegated events - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && !(event.button && event.type === "click") ) { - - for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { - - // Don't process clicks (ONLY) on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.disabled !== true || event.type !== "click" ) { - selMatch = {}; - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - sel = handleObj.selector; - - if ( selMatch[ sel ] === undefined ) { - selMatch[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) >= 0 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( selMatch[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, matches: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( handlers.length > delegateCount ) { - handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); - } + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); // Run delegates first; they may want to stop propagation beneath us - for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { - matched = handlerQueue[ i ]; + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { event.currentTarget = matched.elem; - for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { - handleObj = matched.matches[ j ]; + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { - // Triggered event must either 1) be non-exclusive and have no namespace, or + // Triggered event must either 1) have no namespace, or // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { - event.data = handleObj.data; event.handleObj = handleObj; + event.data = handleObj.data; ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) .apply( matched.elem, args ); if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { + if ( (event.result = ret) === false ) { event.preventDefault(); event.stopPropagation(); } @@ -3081,9 +5112,103 @@ jQuery.event = { return event.result; }, + handlers: function( event, handlers ) { + var sel, handleObj, matches, i, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + + /* 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.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } + + return handlerQueue; + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: IE<9 + // Fix target property (#1925) + if ( !event.target ) { + event.target = originalEvent.srcElement || document; + } + + // Support: Chrome 23+, Safari? + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // 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 - // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** - props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), fixHooks: {}, @@ -3103,7 +5228,7 @@ jQuery.event = { mouseHooks: { props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), filter: function( event, original ) { - var eventDoc, doc, body, + var body, eventDoc, doc, button = original.button, fromElement = original.fromElement; @@ -3132,64 +5257,57 @@ jQuery.event = { } }, - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, - originalEvent = event, - fixHook = jQuery.event.fixHooks[ event.type ] || {}, - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = jQuery.Event( originalEvent ); - - for ( i = copy.length; i; ) { - prop = copy[ --i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Target should not be a text node (#504, Safari) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // For mouse/key events, metaKey==false if it's undefined (#3368, #11328; IE6/7/8) - event.metaKey = !!event.metaKey; - - return fixHook.filter? fixHook.filter( event, originalEvent ) : event; - }, - special: { load: { // Prevent triggered image.load events from bubbling to window.load noBubble: true }, - focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + 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" }, blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, delegateType: "focusout" }, - - beforeunload: { - setup: function( data, namespaces, eventHandle ) { - // We only want to do this special case on windows - if ( jQuery.isWindow( this ) ) { - this.onbeforeunload = eventHandle; + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { + this.click(); + return false; } }, - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { - this.onbeforeunload = null; + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Even when returnValue equals to undefined Firefox will still show alert + if ( event.result !== undefined ) { + event.originalEvent.returnValue = event.result; } } } @@ -3202,7 +5320,8 @@ jQuery.event = { var e = jQuery.extend( new jQuery.Event(), event, - { type: type, + { + type: type, isSimulated: true, originalEvent: {} } @@ -3218,10 +5337,6 @@ jQuery.event = { } }; -// Some plugins are using, but it's undocumented/deprecated and will be removed. -// The 1.7 special event interface should provide all the hooks needed now. -jQuery.event.handle = jQuery.event.dispatch; - jQuery.removeEvent = document.removeEventListener ? function( elem, type, handle ) { if ( elem.removeEventListener ) { @@ -3233,9 +5348,9 @@ jQuery.removeEvent = document.removeEventListener ? if ( elem.detachEvent ) { - // #8545, #7054, preventing memory leaks for custom events in IE6-8 + // #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 ] === "undefined" ) { + if ( typeof elem[ name ] === core_strundefined ) { elem[ name ] = null; } @@ -3276,54 +5391,51 @@ jQuery.Event = function( src, props ) { this[ jQuery.expando ] = true; }; -function returnFalse() { - return false; -} -function returnTrue() { - return true; -} - // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { - preventDefault: function() { - this.isDefaultPrevented = returnTrue; + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + preventDefault: function() { var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; if ( !e ) { return; } - // if preventDefault exists run it on the original event + // If preventDefault exists, run it on the original event if ( e.preventDefault ) { e.preventDefault(); - // otherwise set the returnValue property of the original event to false (IE) + // Support: IE + // Otherwise set the returnValue property of the original event to false } else { e.returnValue = false; } }, stopPropagation: function() { - this.isPropagationStopped = returnTrue; - var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; if ( !e ) { return; } - // if stopPropagation exists run it on the original event + // If stopPropagation exists, run it on the original event if ( e.stopPropagation ) { e.stopPropagation(); } - // otherwise set the cancelBubble property of the original event to true (IE) + + // Support: IE + // Set the cancelBubble property of the original event to true e.cancelBubble = true; }, stopImmediatePropagation: function() { this.isImmediatePropagationStopped = returnTrue; this.stopPropagation(); - }, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse + } }; // Create mouseenter/leave events using mouseover/out and event-time checks @@ -3339,8 +5451,7 @@ jQuery.each({ var ret, target = this, related = event.relatedTarget, - handleObj = event.handleObj, - selector = handleObj.selector; + handleObj = event.handleObj; // For mousenter/leave call the handler if related is outside the target. // NB: No relatedTarget if the mouse left/entered the browser window @@ -3369,11 +5480,11 @@ if ( !jQuery.support.submitBubbles ) { // 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, "_submit_attached" ) ) { + if ( form && !jQuery._data( form, "submitBubbles" ) ) { jQuery.event.add( form, "submit._submit", function( event ) { event._submit_bubble = true; }); - jQuery._data( form, "_submit_attached", true ); + jQuery._data( form, "submitBubbles", true ); } }); // return undefined since we don't need an event listener @@ -3432,13 +5543,13 @@ if ( !jQuery.support.changeBubbles ) { jQuery.event.add( this, "beforeactivate._change", function( e ) { var elem = e.target; - if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "_change_attached" ) ) { + 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, "_change_attached", true ); + jQuery._data( elem, "changeBubbles", true ); } }); }, @@ -3488,12 +5599,12 @@ 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" ) { // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { // && selector != null + if ( typeof selector !== "string" ) { // ( types-Object, data ) data = data || selector; selector = undefined; @@ -3575,1772 +5686,20 @@ jQuery.fn.extend({ }); }, - bind: function( types, data, fn ) { - return this.on( types, null, data, fn ); - }, - unbind: function( types, fn ) { - return this.off( types, null, fn ); - }, - - live: function( types, data, fn ) { - jQuery( this.context ).on( types, this.selector, data, fn ); - return this; - }, - die: function( types, fn ) { - jQuery( this.context ).off( types, this.selector || "**", fn ); - return this; - }, - - delegate: function( selector, types, data, fn ) { - return this.on( types, selector, data, fn ); - }, - undelegate: function( selector, types, fn ) { - // ( namespace ) or ( selector, types [, fn] ) - return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn ); - }, - trigger: function( type, data ) { return this.each(function() { jQuery.event.trigger( type, data, this ); }); }, triggerHandler: function( type, data ) { - if ( this[0] ) { - return jQuery.event.trigger( type, data, this[0], true ); + var elem = this[0]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); } - }, - - toggle: function( fn ) { - // Save reference to arguments for access in closure - var args = arguments, - guid = fn.guid || jQuery.guid++, - i = 0, - toggler = function( event ) { - // Figure out which function to execute - var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; - }; - - // link all the functions, so any of them can unbind this click handler - toggler.guid = guid; - while ( i < args.length ) { - args[ i++ ].guid = guid; - } - - return this.click( toggler ); - }, - - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); } }); - -jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { - - // Handle event binding - jQuery.fn[ name ] = function( data, fn ) { - if ( fn == null ) { - fn = data; - data = null; - } - - return arguments.length > 0 ? - this.on( name, null, data, fn ) : - this.trigger( name ); - }; - - if ( rkeyEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; - } - - if ( rmouseEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; - } -}); -/*! - * Sizzle CSS Selector Engine - * Copyright 2012 jQuery Foundation and other contributors - * Released under the MIT license - * http://sizzlejs.com/ - */ -(function( window, undefined ) { - -var cachedruns, - assertGetIdNotName, - Expr, - getText, - isXML, - contains, - compile, - sortOrder, - hasDuplicate, - outermostContext, - - baseHasDuplicate = true, - strundefined = "undefined", - - expando = ( "sizcache" + Math.random() ).replace( ".", "" ), - - Token = String, - document = window.document, - docElem = document.documentElement, - dirruns = 0, - done = 0, - pop = [].pop, - push = [].push, - slice = [].slice, - // Use a stripped-down indexOf if a native one is unavailable - indexOf = [].indexOf || function( elem ) { - var i = 0, - len = this.length; - for ( ; i < len; i++ ) { - if ( this[i] === elem ) { - return i; - } - } - return -1; - }, - - // Augment a function for special use by Sizzle - markFunction = function( fn, value ) { - fn[ expando ] = value == null || value; - return fn; - }, - - createCache = function() { - var cache = {}, - keys = []; - - return markFunction(function( key, value ) { - // Only keep the most recent entries - if ( keys.push( key ) > Expr.cacheLength ) { - delete cache[ keys.shift() ]; - } - - return (cache[ key ] = value); - }, cache ); - }, - - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - - // Regex - - // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - // http://www.w3.org/TR/css3-syntax/#characters - characterEncoding = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+", - - // Loosely modeled on CSS identifier characters - // An unquoted value should be a CSS identifier (http://www.w3.org/TR/css3-selectors/#attribute-selectors) - // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = characterEncoding.replace( "w", "w#" ), - - // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors - operators = "([*^$|!~]?=)", - attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + - "*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", - - // Prefer arguments not in parens/brackets, - // then attribute selectors and non-pseudos (denoted by :), - // then anything else - // These preferences are here to reduce the number of selectors - // needing tokenize in the PSEUDO preFilter - pseudos = ":(" + characterEncoding + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + attributes + ")|[^:]|\\\\.)*|.*))\\)|)", - - // For matchExpr.POS and matchExpr.needsContext - pos = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace + - "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ), - rpseudo = new RegExp( pseudos ), - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/, - - rnot = /^:not/, - rsibling = /[\x20\t\r\n\f]*[+~]/, - rendsWithNot = /:not\($/, - - rheader = /h\d/i, - rinputs = /input|select|textarea|button/i, - - rbackslash = /\\(?!\\)/g, - - matchExpr = { - "ID": new RegExp( "^#(" + characterEncoding + ")" ), - "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), - "NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ), - "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "POS": new RegExp( pos, "i" ), - "CHILD": new RegExp( "^:(only|nth|first|last)-child(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - // For use in libraries implementing .is() - "needsContext": new RegExp( "^" + whitespace + "*[>+~]|" + pos, "i" ) - }, - - // Support - - // Used for testing something on an element - assert = function( fn ) { - var div = document.createElement("div"); - - try { - return fn( div ); - } catch (e) { - return false; - } finally { - // release memory in IE - div = null; - } - }, - - // Check if getElementsByTagName("*") returns only elements - assertTagNameNoComments = assert(function( div ) { - div.appendChild( document.createComment("") ); - return !div.getElementsByTagName("*").length; - }), - - // Check if getAttribute returns normalized href attributes - assertHrefNotNormalized = assert(function( div ) { - div.innerHTML = ""; - return div.firstChild && typeof div.firstChild.getAttribute !== strundefined && - div.firstChild.getAttribute("href") === "#"; - }), - - // Check if attributes should be retrieved by attribute nodes - assertAttributes = assert(function( div ) { - div.innerHTML = ""; - var type = typeof div.lastChild.getAttribute("multiple"); - // IE8 returns a string for some attributes even when not present - return type !== "boolean" && type !== "string"; - }), - - // Check if getElementsByClassName can be trusted - assertUsableClassName = assert(function( div ) { - // Opera can't find a second classname (in 9.6) - div.innerHTML = ""; - if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) { - return false; - } - - // Safari 3.2 caches class attributes and doesn't catch changes - div.lastChild.className = "e"; - return div.getElementsByClassName("e").length === 2; - }), - - // Check if getElementById returns elements by name - // Check if getElementsByName privileges form controls or returns elements by ID - assertUsableName = assert(function( div ) { - // Inject content - div.id = expando + 0; - div.innerHTML = "
          "; - docElem.insertBefore( div, docElem.firstChild ); - - // Test - var pass = document.getElementsByName && - // buggy browsers will return fewer than the correct 2 - document.getElementsByName( expando ).length === 2 + - // buggy browsers will return more than the correct 0 - document.getElementsByName( expando + 0 ).length; - assertGetIdNotName = !document.getElementById( expando ); - - // Cleanup - docElem.removeChild( div ); - - return pass; - }); - -// If slice is not available, provide a backup -try { - slice.call( docElem.childNodes, 0 )[0].nodeType; -} catch ( e ) { - slice = function( i ) { - var elem, - results = []; - for ( ; (elem = this[i]); i++ ) { - results.push( elem ); - } - return results; - }; -} - -function Sizzle( selector, context, results, seed ) { - results = results || []; - context = context || document; - var match, elem, xml, m, - nodeType = context.nodeType; - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - if ( nodeType !== 1 && nodeType !== 9 ) { - return []; - } - - xml = isXML( context ); - - if ( !xml && !seed ) { - if ( (match = rquickExpr.exec( selector )) ) { - // Speed-up: Sizzle("#ID") - if ( (m = match[1]) ) { - if ( nodeType === 9 ) { - elem = context.getElementById( m ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE, Opera, and Webkit return items - // by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - } else { - // Context is not a document - if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && - contains( context, elem ) && elem.id === m ) { - results.push( elem ); - return results; - } - } - - // Speed-up: Sizzle("TAG") - } else if ( match[2] ) { - push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) ); - return results; - - // Speed-up: Sizzle(".CLASS") - } else if ( (m = match[3]) && assertUsableClassName && context.getElementsByClassName ) { - push.apply( results, slice.call(context.getElementsByClassName( m ), 0) ); - return results; - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed, xml ); -} - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - return Sizzle( expr, null, null, [ elem ] ).length > 0; -}; - -// Returns a function to use in pseudos for input types -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -// Returns a function to use in pseudos for buttons -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; -} - -// Returns a function to use in pseudos for positionals -function createPositionalPseudo( fn ) { - return markFunction(function( argument ) { - argument = +argument; - return markFunction(function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ (j = matchIndexes[i]) ] ) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); -} - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( nodeType ) { - if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (see #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - } else { - - // If no nodeType, this is expected to be an array - for ( ; (node = elem[i]); i++ ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } - return ret; -}; - -isXML = Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -// Element contains another -contains = Sizzle.contains = docElem.contains ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && adown.contains && adown.contains(bup) ); - } : - docElem.compareDocumentPosition ? - function( a, b ) { - return b && !!( a.compareDocumentPosition( b ) & 16 ); - } : - function( a, b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - return false; - }; - -Sizzle.attr = function( elem, name ) { - var val, - xml = isXML( elem ); - - if ( !xml ) { - name = name.toLowerCase(); - } - if ( (val = Expr.attrHandle[ name ]) ) { - return val( elem ); - } - if ( xml || assertAttributes ) { - return elem.getAttribute( name ); - } - val = elem.getAttributeNode( name ); - return val ? - typeof elem[ name ] === "boolean" ? - elem[ name ] ? name : null : - val.specified ? val.value : null : - null; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - // IE6/7 return a modified href - attrHandle: assertHrefNotNormalized ? - {} : - { - "href": function( elem ) { - return elem.getAttribute( "href", 2 ); - }, - "type": function( elem ) { - return elem.getAttribute("type"); - } - }, - - find: { - "ID": assertGetIdNotName ? - function( id, context, xml ) { - if ( typeof context.getElementById !== strundefined && !xml ) { - var m = context.getElementById( id ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [m] : []; - } - } : - function( id, context, xml ) { - if ( typeof context.getElementById !== strundefined && !xml ) { - var m = context.getElementById( id ); - - return m ? - m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ? - [m] : - undefined : - []; - } - }, - - "TAG": assertTagNameNoComments ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== strundefined ) { - return context.getElementsByTagName( tag ); - } - } : - function( tag, context ) { - var results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - var elem, - tmp = [], - i = 0; - - for ( ; (elem = results[i]); i++ ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }, - - "NAME": assertUsableName && function( tag, context ) { - if ( typeof context.getElementsByName !== strundefined ) { - return context.getElementsByName( name ); - } - }, - - "CLASS": assertUsableClassName && function( className, context, xml ) { - if ( typeof context.getElementsByClassName !== strundefined && !xml ) { - return context.getElementsByClassName( className ); - } - } - }, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( rbackslash, "" ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[4] || match[5] || "" ).replace( rbackslash, "" ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 3 xn-component of xn+y argument ([+-]?\d*n|) - 4 sign of xn-component - 5 x of xn-component - 6 sign of y-component - 7 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1] === "nth" ) { - // nth-child requires argument - if ( !match[2] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[3] = +( match[3] ? match[4] + (match[5] || 1) : 2 * ( match[2] === "even" || match[2] === "odd" ) ); - match[4] = +( ( match[6] + match[7] ) || match[2] === "odd" ); - - // other types prohibit arguments - } else if ( match[2] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var unquoted, excess; - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - if ( match[3] ) { - match[2] = match[3]; - } else if ( (unquoted = match[4]) ) { - // Only check arguments that contain a pseudo - if ( rpseudo.test(unquoted) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - unquoted = unquoted.slice( 0, excess ); - match[0] = match[0].slice( 0, excess ); - } - match[2] = unquoted; - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - "ID": assertGetIdNotName ? - function( id ) { - id = id.replace( rbackslash, "" ); - return function( elem ) { - return elem.getAttribute("id") === id; - }; - } : - function( id ) { - id = id.replace( rbackslash, "" ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); - return node && node.value === id; - }; - }, - - "TAG": function( nodeName ) { - if ( nodeName === "*" ) { - return function() { return true; }; - } - nodeName = nodeName.replace( rbackslash, "" ).toLowerCase(); - - return function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ expando ][ className ]; - if ( !pattern ) { - pattern = classCache( className, new RegExp("(^|" + whitespace + ")" + className + "(" + whitespace + "|$)") ); - } - return function( elem ) { - return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" ); - }; - }, - - "ATTR": function( name, operator, check ) { - return function( elem, context ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.substr( result.length - check.length ) === check : - operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, argument, first, last ) { - - if ( type === "nth" ) { - return function( elem ) { - var node, diff, - parent = elem.parentNode; - - if ( first === 1 && last === 0 ) { - return true; - } - - if ( parent ) { - diff = 0; - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - diff++; - if ( elem === node ) { - break; - } - } - } - } - - // Incorporate the offset (or cast to NaN), then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - }; - } - - return function( elem ) { - var node = elem; - - switch ( type ) { - case "only": - case "first": - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - - if ( type === "first" ) { - return true; - } - - node = elem; - - /* falls through */ - case "last": - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - - return true; - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf.call( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)), - // not comment, processing instructions, or others - // Thanks to Diego Perini for the nodeName shortcut - // Greater than "@" means alpha characters (specifically not starting with "#" or "?") - var nodeType; - elem = elem.firstChild; - while ( elem ) { - if ( elem.nodeName > "@" || (nodeType = elem.nodeType) === 3 || nodeType === 4 ) { - return false; - } - elem = elem.nextSibling; - } - return true; - }, - - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "text": function( elem ) { - var type, attr; - // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) - // use getAttribute instead to test this case - return elem.nodeName.toLowerCase() === "input" && - (type = elem.type) === "text" && - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === type ); - }, - - // Input types - "radio": createInputPseudo("radio"), - "checkbox": createInputPseudo("checkbox"), - "file": createInputPseudo("file"), - "password": createInputPseudo("password"), - "image": createInputPseudo("image"), - - "submit": createButtonPseudo("submit"), - "reset": createButtonPseudo("reset"), - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "focus": function( elem ) { - var doc = elem.ownerDocument; - return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href); - }, - - "active": function( elem ) { - return elem === elem.ownerDocument.activeElement; - }, - - // Positional types - "first": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length, argument ) { - for ( var i = 0; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length, argument ) { - for ( var i = 1; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - for ( var i = argument < 0 ? argument + length : argument; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - for ( var i = argument < 0 ? argument + length : argument; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -function siblingCheck( a, b, ret ) { - if ( a === b ) { - return ret; - } - - var cur = a.nextSibling; - - while ( cur ) { - if ( cur === b ) { - return -1; - } - - cur = cur.nextSibling; - } - - return 1; -} - -sortOrder = docElem.compareDocumentPosition ? - function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - return ( !a.compareDocumentPosition || !b.compareDocumentPosition ? - a.compareDocumentPosition : - a.compareDocumentPosition(b) & 4 - ) ? -1 : 1; - } : - function( a, b ) { - // The nodes are identical, we can exit early - if ( a === b ) { - hasDuplicate = true; - return 0; - - // Fallback to using sourceIndex (in IE) if it's available on both nodes - } else if ( a.sourceIndex && b.sourceIndex ) { - return a.sourceIndex - b.sourceIndex; - } - - var al, bl, - ap = [], - bp = [], - aup = a.parentNode, - bup = b.parentNode, - cur = aup; - - // If the nodes are siblings (or identical) we can do a quick check - if ( aup === bup ) { - return siblingCheck( a, b ); - - // If no parents were found then the nodes are disconnected - } else if ( !aup ) { - return -1; - - } else if ( !bup ) { - return 1; - } - - // Otherwise they're somewhere else in the tree so we need - // to build up a full list of the parentNodes for comparison - while ( cur ) { - ap.unshift( cur ); - cur = cur.parentNode; - } - - cur = bup; - - while ( cur ) { - bp.unshift( cur ); - cur = cur.parentNode; - } - - al = ap.length; - bl = bp.length; - - // Start walking down the tree looking for a discrepancy - for ( var i = 0; i < al && i < bl; i++ ) { - if ( ap[i] !== bp[i] ) { - return siblingCheck( ap[i], bp[i] ); - } - } - - // We ended someplace up the tree so do a sibling check - return i === al ? - siblingCheck( a, bp[i], -1 ) : - siblingCheck( ap[i], b, 1 ); - }; - -// Always assume the presence of duplicates if sort doesn't -// pass them to our comparison function (as in Google Chrome). -[0, 0].sort( sortOrder ); -baseHasDuplicate = !hasDuplicate; - -// Document sorting and removing duplicates -Sizzle.uniqueSort = function( results ) { - var elem, - i = 1; - - hasDuplicate = baseHasDuplicate; - results.sort( sortOrder ); - - if ( hasDuplicate ) { - for ( ; (elem = results[i]); i++ ) { - if ( elem === results[ i - 1 ] ) { - results.splice( i--, 1 ); - } - } - } - - return results; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -function tokenize( selector, parseOnly ) { - var matched, match, tokens, type, soFar, groups, preFilters, - cached = tokenCache[ expando ][ selector ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - soFar = soFar.slice( match[0].length ); - } - groups.push( tokens = [] ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - tokens.push( matched = new Token( match.shift() ) ); - soFar = soFar.slice( matched.length ); - - // Cast descendant combinators to space - matched.type = match[0].replace( rtrim, " " ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - // The last two arguments here are (context, xml) for backCompat - (match = preFilters[ type ]( match, document, true ))) ) { - - tokens.push( matched = new Token( match.shift() ) ); - soFar = soFar.slice( matched.length ); - matched.type = type; - matched.matches = match; - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && combinator.dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( checkNonElements || elem.nodeType === 1 ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching - if ( !xml ) { - var cache, - dirkey = dirruns + " " + doneName + " ", - cachedkey = dirkey + cachedruns; - while ( (elem = elem[ dir ]) ) { - if ( checkNonElements || elem.nodeType === 1 ) { - if ( (cache = elem[ expando ]) === cachedkey ) { - return elem.sizset; - } else if ( typeof cache === "string" && cache.indexOf(dirkey) === 0 ) { - if ( elem.sizset ) { - return elem; - } - } else { - elem[ expando ] = cachedkey; - if ( matcher( elem, context, xml ) ) { - elem.sizset = true; - return elem; - } - elem.sizset = false; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( checkNonElements || elem.nodeType === 1 ) { - if ( matcher( elem, context, xml ) ) { - return elem; - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - // Positional selectors apply to seed elements, so it is invalid to follow them with relative ones - if ( seed && postFinder ) { - return; - } - - var i, elem, postFilterIn, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [], seed ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - postFilterIn = condense( matcherOut, postMap ); - postFilter( postFilterIn, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = postFilterIn.length; - while ( i-- ) { - if ( (elem = postFilterIn[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - // Keep seed and results synchronized - if ( seed ) { - // Ignore postFinder because it can't coexist with seed - i = preFilter && matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - seed[ preMap[i] ] = !(results[ preMap[i] ] = elem); - } - } - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf.call( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ]; - } else { - // The concatenated values are (context, xml) for backCompat - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && tokens.slice( 0, i - 1 ).join("").replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && tokens.join("") - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, expandContext ) { - var elem, j, matcher, - setMatched = [], - matchedCount = 0, - i = "0", - unmatched = seed && [], - outermost = expandContext != null, - contextBackup = outermostContext, - // We must always have either seed elements or context - elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ), - // Nested matchers should use non-integer dirruns - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E); - - if ( outermost ) { - outermostContext = context !== document && context; - cachedruns = superMatcher.el; - } - - // Add elements passing elementMatchers directly to results - for ( ; (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - for ( j = 0; (matcher = elementMatchers[j]); j++ ) { - if ( matcher( elem, context, xml ) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - cachedruns = ++superMatcher.el; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // Apply set filters to unmatched elements - matchedCount += i; - if ( bySet && i !== matchedCount ) { - for ( j = 0; (matcher = setMatchers[j]); j++ ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - superMatcher.el = 0; - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ expando ][ selector ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !group ) { - group = tokenize( selector ); - } - i = group.length; - while ( i-- ) { - cached = matcherFromTokens( group[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - } - return cached; -}; - -function multipleContexts( selector, contexts, results, seed ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results, seed ); - } - return results; -} - -function select( selector, context, results, seed, xml ) { - var i, tokens, token, type, find, - match = tokenize( selector ), - j = match.length; - - if ( !seed ) { - // Try to minimize operations if there is only one group - if ( match.length === 1 ) { - - // Take a shortcut and set the context if the root selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - context.nodeType === 9 && !xml && - Expr.relative[ tokens[1].type ] ) { - - context = Expr.find["ID"]( token.matches[0].replace( rbackslash, "" ), context, xml )[0]; - if ( !context ) { - return results; - } - - selector = selector.slice( tokens.shift().length ); - } - - // Fetch a seed set for right-to-left matching - for ( i = matchExpr["POS"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( rbackslash, "" ), - rsibling.test( tokens[0].type ) && context.parentNode || context, - xml - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && tokens.join(""); - if ( !selector ) { - push.apply( results, slice.call( seed, 0 ) ); - return results; - } - - break; - } - } - } - } - } - - // Compile and execute a filtering function - // Provide `match` to avoid retokenization if we modified the selector above - compile( selector, match )( - seed, - context, - xml, - results, - rsibling.test( selector ) - ); - return results; -} - -if ( document.querySelectorAll ) { - (function() { - var disconnectedMatch, - oldSelect = select, - rescape = /'|\\/g, - rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g, - - // qSa(:focus) reports false when true (Chrome 21), - // A support test would require too much code (would include document ready) - rbuggyQSA = [":focus"], - - // matchesSelector(:focus) reports false when true (Chrome 21), - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - // A support test would require too much code (would include document ready) - // just skip matchesSelector for :active - rbuggyMatches = [ ":active", ":focus" ], - matches = docElem.matchesSelector || - docElem.mozMatchesSelector || - docElem.webkitMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector; - - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function( div ) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explictly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - div.innerHTML = ""; - - // IE8 - Some boolean attributes are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" ); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here (do not put tests after this one) - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - }); - - assert(function( div ) { - - // Opera 10-12/IE9 - ^= $= *= and empty values - // Should not select anything - div.innerHTML = "

          "; - if ( div.querySelectorAll("[test^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here (do not put tests after this one) - div.innerHTML = ""; - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push(":enabled", ":disabled"); - } - }); - - // rbuggyQSA always contains :focus, so no need for a length check - rbuggyQSA = /* rbuggyQSA.length && */ new RegExp( rbuggyQSA.join("|") ); - - select = function( selector, context, results, seed, xml ) { - // Only use querySelectorAll when not filtering, - // when this is not xml, - // and when no QSA bugs apply - if ( !seed && !xml && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - var groups, i, - old = true, - nid = expando, - newContext = context, - newSelector = context.nodeType === 9 && selector; - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - groups = tokenize( selector ); - - if ( (old = context.getAttribute("id")) ) { - nid = old.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", nid ); - } - nid = "[id='" + nid + "'] "; - - i = groups.length; - while ( i-- ) { - groups[i] = nid + groups[i].join(""); - } - newContext = rsibling.test( selector ) && context.parentNode || context; - newSelector = groups.join(","); - } - - if ( newSelector ) { - try { - push.apply( results, slice.call( newContext.querySelectorAll( - newSelector - ), 0 ) ); - return results; - } catch(qsaError) { - } finally { - if ( !old ) { - context.removeAttribute("id"); - } - } - } - } - - return oldSelect( selector, context, results, seed, xml ); - }; - - if ( matches ) { - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - try { - matches.call( div, "[test!='']:sizzle" ); - rbuggyMatches.push( "!=", pseudos ); - } catch ( e ) {} - }); - - // rbuggyMatches always contains :active and :focus, so no need for a length check - rbuggyMatches = /* rbuggyMatches.length && */ new RegExp( rbuggyMatches.join("|") ); - - Sizzle.matchesSelector = function( elem, expr ) { - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - // rbuggyMatches always contains :active, so no need for an existence check - if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && (!rbuggyQSA || !rbuggyQSA.test( expr )) ) { - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch(e) {} - } - - return Sizzle( expr, null, null, [ elem ] ).length > 0; - }; - } - })(); -} - -// Deprecated -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Back-compat -function setFilters() {} -Expr.filters = setFilters.prototype = Expr.pseudos; -Expr.setFilters = new setFilters(); - -// Override sizzle attribute retrieval -Sizzle.attr = jQuery.attr; -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.pseudos; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - -})( window ); -var runtil = /Until$/, +var isSimple = /^.[^:#\[\.,]*$/, rparentsprev = /^(?:parents|prev(?:Until|All))/, - isSimple = /^.[^:#\[\.,]*$/, rneedsContext = jQuery.expr.match.needsContext, // methods guaranteed to produce a unique set when starting from a unique set guaranteedUnique = { @@ -5352,38 +5711,28 @@ var runtil = /Until$/, jQuery.fn.extend({ find: function( selector ) { - var i, l, length, n, r, ret, - self = this; + var i, + ret = [], + self = this, + len = self.length; if ( typeof selector !== "string" ) { - return jQuery( selector ).filter(function() { - for ( i = 0, l = self.length; i < l; i++ ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { if ( jQuery.contains( self[ i ], this ) ) { return true; } } - }); + }) ); } - ret = this.pushStack( "", "find", selector ); - - for ( i = 0, l = this.length; i < l; i++ ) { - length = ret.length; - jQuery.find( selector, this[i], ret ); - - if ( i > 0 ) { - // Make sure that the results are unique - for ( n = length; n < ret.length; n++ ) { - for ( r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { - ret.splice(n--, 1); - break; - } - } - } - } + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); } + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; return ret; }, @@ -5402,22 +5751,24 @@ jQuery.fn.extend({ }, not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); + return this.pushStack( winnow(this, selector || [], true) ); }, filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); + return this.pushStack( winnow(this, selector || [], false) ); }, is: function( selector ) { - return !!selector && ( - typeof selector === "string" ? - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - rneedsContext.test( selector ) ? - jQuery( selector, this.context ).index( this[0] ) >= 0 : - jQuery.filter( selector, this ).length > 0 : - this.filter( selector ).length > 0 ); + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; }, closest: function( selectors, context ) { @@ -5430,20 +5781,22 @@ jQuery.fn.extend({ 0; for ( ; i < l; i++ ) { - cur = this[i]; + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : - while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) { - if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { - ret.push( cur ); + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { + + cur = ret.push( cur ); break; } - cur = cur.parentNode; } } - ret = ret.length > 1 ? jQuery.unique( ret ) : ret; - - return this.pushStack( ret, "closest", selectors ); + return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret ); }, // Determine the position of an element within @@ -5452,7 +5805,7 @@ jQuery.fn.extend({ // No argument, return index in parent if ( !elem ) { - return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; + return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1; } // index in selector @@ -5472,9 +5825,7 @@ jQuery.fn.extend({ jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), all = jQuery.merge( this.get(), set ); - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); + return this.pushStack( jQuery.unique(all) ); }, addBack: function( selector ) { @@ -5484,14 +5835,6 @@ jQuery.fn.extend({ } }); -jQuery.fn.andSelf = jQuery.fn.addBack; - -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). -function isDisconnected( node ) { - return !node || !node.parentNode || node.parentNode.nodeType === 11; -} - function sibling( cur, dir ) { do { cur = cur[ dir ]; @@ -5544,7 +5887,7 @@ jQuery.each({ jQuery.fn[ name ] = function( until, selector ) { var ret = jQuery.map( this, fn, until ); - if ( !runtil.test( name ) ) { + if ( name.slice( -5 ) !== "Until" ) { selector = until; } @@ -5552,25 +5895,35 @@ jQuery.each({ ret = jQuery.filter( selector, ret ); } - ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + ret = jQuery.unique( ret ); + } - if ( this.length > 1 && rparentsprev.test( name ) ) { - ret = ret.reverse(); + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + ret = ret.reverse(); + } } - return this.pushStack( ret, name, core_slice.call( arguments ).join(",") ); + return this.pushStack( ret ); }; }); jQuery.extend({ filter: function( expr, elems, not ) { + var elem = elems[ 0 ]; + if ( not ) { expr = ":not(" + expr + ")"; } - return elems.length === 1 ? - jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : - jQuery.find.matches(expr, elems); + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); }, dir: function( elem, dir, until ) { @@ -5600,42 +5953,37 @@ jQuery.extend({ }); // Implement the identical functionality for filter and not -function winnow( elements, qualifier, keep ) { - - // Can't pass null or undefined to indexOf in Firefox 4 - // Set to 0 to skip string check - qualifier = qualifier || 0; - +function winnow( elements, qualifier, not ) { if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - var retVal = !!qualifier.call( elem, i, elem ); - return retVal === keep; + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; }); - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return ( elem === qualifier ) === keep; - }); - - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; - }); - - if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); - } } - return jQuery.grep(elements, function( elem, i ) { - return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + }); + + } + + if ( typeof qualifier === "string" ) { + if ( isSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; }); } function createSafeFragment( document ) { var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); + safeFrag = document.createDocumentFragment(); if ( safeFrag.createElement ) { while ( list.length ) { @@ -5650,28 +5998,34 @@ function createSafeFragment( document ) { 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 = /
    ", "
    " ], tr: [ 2, "", "
    " ], - td: [ 3, "", "
    " ], col: [ 2, "", "
    " ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] + td: [ 3, "", "
    " ], + + // 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") ); @@ -5680,12 +6034,6 @@ wrapMap.optgroup = wrapMap.option; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; wrapMap.th = wrapMap.td; -// 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. -if ( !jQuery.support.htmlSerialize ) { - wrapMap._default = [ 1, "X
    ", "
    " ]; -} - jQuery.fn.extend({ text: function( value ) { return jQuery.access( this, function( value ) { @@ -5695,6 +6043,689 @@ jQuery.fn.extend({ }, null, value, arguments.length ); }, + append: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + }); + }, + + prepend: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + }); + }, + + before: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + }); + }, + + after: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + }); + }, + + // keepData is for internal use only--do not document + remove: function( selector, keepData ) { + var elem, + elems = selector ? jQuery.filter( selector, this ) : this, + i = 0; + + for ( ; (elem = elems[i]) != null; i++ ) { + + if ( !keepData && elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem ) ); + } + + if ( elem.parentNode ) { + if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { + setGlobalEval( getAll( elem, "script" ) ); + } + elem.parentNode.removeChild( elem ); + } + } + + return this; + }, + + empty: function() { + var elem, + i = 0; + + for ( ; (elem = this[i]) != null; i++ ) { + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + } + + // 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; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map( function () { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + }); + }, + + html: function( value ) { + return jQuery.access( this, function( value ) { + var elem = this[0] || {}, + i = 0, + l = this.length; + + 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 ) && + ( 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++ ) { + // Remove element nodes and prevent memory leaks + elem = this[i] || {}; + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch(e) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var + // Snapshot the DOM in case .domManip sweeps something relevant into its fragment + args = jQuery.map( this, function( elem ) { + return [ elem.nextSibling, elem.parentNode ]; + }), + i = 0; + + // Make the changes, replacing each context element with the new content + this.domManip( arguments, function( elem ) { + var next = args[ i++ ], + parent = args[ i++ ]; + + if ( parent ) { + // Don't use the snapshot next if it has moved (#13810) + if ( next && next.parentNode !== parent ) { + next = this.nextSibling; + } + jQuery( this ).remove(); + parent.insertBefore( elem, next ); + } + // Allow new content to include elements from the context set + }, true ); + + // Force removal if there was no new content (e.g., from empty arguments) + return i ? this : this.remove(); + }, + + detach: function( selector ) { + return this.remove( selector, true ); + }, + + domManip: function( args, callback, allowIntersection ) { + + // Flatten any nested arrays + args = core_concat.apply( [], args ); + + var first, node, hasScripts, + scripts, doc, fragment, + i = 0, + l = this.length, + set = this, + iNoClone = l - 1, + value = args[0], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) { + return this.each(function( index ) { + var self = set.eq( index ); + if ( isFunction ) { + args[0] = value.call( this, index, self.html() ); + } + self.domManip( args, callback, allowIntersection ); + }); + } + + if ( l ) { + fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + if ( first ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( this[i], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + + if ( node.src ) { + // Hope ajax is available... + jQuery._evalUrl( node.src ); + } else { + jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) ); + } + } + } + } + + // Fix #11809: Avoid leaking memory + fragment = first = null; + } + } + + return this; + } +}); + +// 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", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + i = 0, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone(true); + jQuery( insert[i] )[ original ]( elems ); + + // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() + core_push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +}); + +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 destElements, node, clone, i, srcElements, + inPage = jQuery.contains( elem.ownerDocument, 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 ); + + // 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] ); + } + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0; (node = srcElements[i]) != null; i++ ) { + cloneCopyEvent( node, destElements[i] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + destElements = srcElements = node = null; + + // Return the cloned set + return clone; + }, + + buildFragment: function( elems, context, scripts, selection ) { + var j, elem, contains, + tmp, tag, tbody, wrap, + l = elems.length, + + // Ensure a safe fragment + safe = createSafeFragment( context ), + + nodes = [], + i = 0; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || safe.appendChild( context.createElement("div") ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + + tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2]; + + // Descend through wrappers to the right content + j = wrap[0]; + while ( j-- ) { + 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
    , *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 ); + } + } + } + + jQuery.merge( nodes, tmp.childNodes ); + + // 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; + } + } + } + + // 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++ ]) ) { + + // #4087 - If origin and destination elements are the same, and this is + // that element, do not do anything + if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( safe.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( (elem = tmp[ j++ ]) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + tmp = null; + + return safe; + }, + + 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]) != null; i++ ) { + + 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 ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + + // 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 ); + } + } + } + } + }, + + _evalUrl: function( url ) { + return jQuery.ajax({ + url: url, + type: "GET", + dataType: "script", + async: false, + global: false, + "throws": true + }); + } +}); +jQuery.fn.extend({ wrapAll: function( html ) { if ( jQuery.isFunction( html ) ) { return this.each(function(i) { @@ -5758,773 +6789,11 @@ jQuery.fn.extend({ jQuery( this ).replaceWith( this.childNodes ); } }).end(); - }, - - append: function() { - return this.domManip(arguments, true, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 ) { - this.appendChild( elem ); - } - }); - }, - - prepend: function() { - return this.domManip(arguments, true, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 ) { - this.insertBefore( elem, this.firstChild ); - } - }); - }, - - before: function() { - if ( !isDisconnected( this[0] ) ) { - return this.domManip(arguments, false, function( elem ) { - this.parentNode.insertBefore( elem, this ); - }); - } - - if ( arguments.length ) { - var set = jQuery.clean( arguments ); - return this.pushStack( jQuery.merge( set, this ), "before", this.selector ); - } - }, - - after: function() { - if ( !isDisconnected( this[0] ) ) { - return this.domManip(arguments, false, function( elem ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - }); - } - - if ( arguments.length ) { - var set = jQuery.clean( arguments ); - return this.pushStack( jQuery.merge( this, set ), "after", this.selector ); - } - }, - - // keepData is for internal use only--do not document - remove: function( selector, keepData ) { - var elem, - i = 0; - - for ( ; (elem = this[i]) != null; i++ ) { - if ( !selector || jQuery.filter( selector, [ elem ] ).length ) { - if ( !keepData && elem.nodeType === 1 ) { - jQuery.cleanData( elem.getElementsByTagName("*") ); - jQuery.cleanData( [ elem ] ); - } - - if ( elem.parentNode ) { - elem.parentNode.removeChild( elem ); - } - } - } - - return this; - }, - - empty: function() { - var elem, - i = 0; - - for ( ; (elem = this[i]) != null; i++ ) { - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( elem.getElementsByTagName("*") ); - } - - // Remove any remaining nodes - while ( elem.firstChild ) { - elem.removeChild( elem.firstChild ); - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map( function () { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - }); - }, - - html: function( value ) { - return jQuery.access( this, function( value ) { - var elem = this[0] || {}, - i = 0, - l = this.length; - - 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 ) && - ( 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++ ) { - // Remove element nodes and prevent memory leaks - elem = this[i] || {}; - if ( elem.nodeType === 1 ) { - jQuery.cleanData( elem.getElementsByTagName( "*" ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch(e) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function( value ) { - if ( !isDisconnected( this[0] ) ) { - // Make sure that the elements are removed from the DOM before they are inserted - // this can help fix replacing a parent with child elements - if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { - var self = jQuery(this), old = self.html(); - self.replaceWith( value.call( this, i, old ) ); - }); - } - - if ( typeof value !== "string" ) { - value = jQuery( value ).detach(); - } - - return this.each(function() { - var next = this.nextSibling, - parent = this.parentNode; - - jQuery( this ).remove(); - - if ( next ) { - jQuery(next).before( value ); - } else { - jQuery(parent).append( value ); - } - }); - } - - return this.length ? - this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) : - this; - }, - - detach: function( selector ) { - return this.remove( selector, true ); - }, - - domManip: function( args, table, callback ) { - - // Flatten any nested arrays - args = [].concat.apply( [], args ); - - var results, first, fragment, iNoClone, - i = 0, - value = args[0], - scripts = [], - l = this.length; - - // We can't cloneNode fragments that contain checked, in WebKit - if ( !jQuery.support.checkClone && l > 1 && typeof value === "string" && rchecked.test( value ) ) { - return this.each(function() { - jQuery(this).domManip( args, table, callback ); - }); - } - - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { - var self = jQuery(this); - args[0] = value.call( this, i, table ? self.html() : undefined ); - self.domManip( args, table, callback ); - }); - } - - if ( this[0] ) { - results = jQuery.buildFragment( args, this, scripts ); - fragment = results.fragment; - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - if ( first ) { - table = table && jQuery.nodeName( first, "tr" ); - - // Use the original fragment for the last item instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - // Fragments from the fragment cache must always be cloned and never used in place. - for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) { - callback.call( - table && jQuery.nodeName( this[i], "table" ) ? - findOrAppend( this[i], "tbody" ) : - this[i], - i === iNoClone ? - fragment : - jQuery.clone( fragment, true, true ) - ); - } - } - - // Fix #11809: Avoid leaking memory - fragment = first = null; - - if ( scripts.length ) { - jQuery.each( scripts, function( i, elem ) { - if ( elem.src ) { - if ( jQuery.ajax ) { - jQuery.ajax({ - url: elem.src, - type: "GET", - dataType: "script", - async: false, - global: false, - "throws": true - }); - } else { - jQuery.error("no ajax"); - } - } else { - jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) ); - } - - if ( elem.parentNode ) { - elem.parentNode.removeChild( elem ); - } - }); - } - } - - return this; } }); - -function findOrAppend( elem, tag ) { - return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) ); -} - -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 cloneFixAttributes( src, dest ) { - var nodeName; - - // We do not need to do anything for non-Elements - if ( dest.nodeType !== 1 ) { - return; - } - - // clearAttributes removes the attributes, which we don't want, - // but also removes the attachEvent events, which we *do* want - if ( dest.clearAttributes ) { - dest.clearAttributes(); - } - - // mergeAttributes, in contrast, only merges back on the - // original attributes, not the events - if ( dest.mergeAttributes ) { - dest.mergeAttributes( src ); - } - - nodeName = dest.nodeName.toLowerCase(); - - if ( nodeName === "object" ) { - // IE6-10 improperly clones children of object elements using classid. - // IE10 throws NoModificationAllowedError if parent is null, #12132. - 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" && 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.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; - - // IE blanks contents when cloning scripts - } else if ( nodeName === "script" && dest.text !== src.text ) { - dest.text = src.text; - } - - // Event data gets referenced instead of copied if the expando - // gets copied too - dest.removeAttribute( jQuery.expando ); -} - -jQuery.buildFragment = function( args, context, scripts ) { - var fragment, cacheable, cachehit, - first = args[ 0 ]; - - // Set context from what may come in as undefined or a jQuery collection or a node - // Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 & - // also doubles as fix for #8950 where plain objects caused createDocumentFragment exception - context = context || document; - context = !context.nodeType && context[0] || context; - context = context.ownerDocument || context; - - // Only cache "small" (1/2 KB) HTML strings that are associated with the main document - // Cloning options loses the selected state, so don't cache them - // IE 6 doesn't like it when you put or elements in a fragment - // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache - // Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501 - if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document && - first.charAt(0) === "<" && !rnocache.test( first ) && - (jQuery.support.checkClone || !rchecked.test( first )) && - (jQuery.support.html5Clone || !rnoshimcache.test( first )) ) { - - // Mark cacheable and look for a hit - cacheable = true; - fragment = jQuery.fragments[ first ]; - cachehit = fragment !== undefined; - } - - if ( !fragment ) { - fragment = context.createDocumentFragment(); - jQuery.clean( args, context, fragment, scripts ); - - // Update the cache, but only store false - // unless this is a second parsing of the same content - if ( cacheable ) { - jQuery.fragments[ first ] = cachehit && fragment; - } - } - - return { fragment: fragment, cacheable: cacheable }; -}; - -jQuery.fragments = {}; - -jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - i = 0, - ret = [], - insert = jQuery( selector ), - l = insert.length, - parent = this.length === 1 && this[0].parentNode; - - if ( (parent == null || parent && parent.nodeType === 11 && parent.childNodes.length === 1) && l === 1 ) { - insert[ original ]( this[0] ); - return this; - } else { - for ( ; i < l; i++ ) { - elems = ( i > 0 ? this.clone(true) : this ).get(); - jQuery( insert[i] )[ original ]( elems ); - ret = ret.concat( elems ); - } - - return this.pushStack( ret, name, insert.selector ); - } - }; -}); - -function getAll( elem ) { - if ( typeof elem.getElementsByTagName !== "undefined" ) { - return elem.getElementsByTagName( "*" ); - - } else if ( typeof elem.querySelectorAll !== "undefined" ) { - return elem.querySelectorAll( "*" ); - - } else { - return []; - } -} - -// Used in clean, fixes the defaultChecked property -function fixDefaultChecked( elem ) { - if ( rcheckableType.test( elem.type ) ) { - elem.defaultChecked = elem.checked; - } -} - -jQuery.extend({ - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var srcElements, - destElements, - i, - clone; - - 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) ) { - // IE copies events bound via attachEvent when using cloneNode. - // Calling detachEvent on the clone will also remove the events - // from the original. In order to get around this, we use some - // proprietary methods to clear the events. Thanks to MooTools - // guys for this hotness. - - cloneFixAttributes( elem, clone ); - - // Using Sizzle here is crazy slow, so we use getElementsByTagName instead - srcElements = getAll( elem ); - destElements = getAll( clone ); - - // Weird iteration because IE will replace the length property - // with an element if you are cloning the body and one of the - // elements on the page has a name or id of "length" - for ( i = 0; srcElements[i]; ++i ) { - // Ensure that the destination node is not null; Fixes #9587 - if ( destElements[i] ) { - cloneFixAttributes( srcElements[i], destElements[i] ); - } - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - cloneCopyEvent( elem, clone ); - - if ( deepDataAndEvents ) { - srcElements = getAll( elem ); - destElements = getAll( clone ); - - for ( i = 0; srcElements[i]; ++i ) { - cloneCopyEvent( srcElements[i], destElements[i] ); - } - } - } - - srcElements = destElements = null; - - // Return the cloned set - return clone; - }, - - clean: function( elems, context, fragment, scripts ) { - var i, j, elem, tag, wrap, depth, div, hasBody, tbody, len, handleScript, jsTags, - safe = context === document && safeFragment, - ret = []; - - // Ensure that context is a document - if ( !context || typeof context.createDocumentFragment === "undefined" ) { - context = document; - } - - // Use the already-created safe fragment if context permits - for ( i = 0; (elem = elems[i]) != null; i++ ) { - if ( typeof elem === "number" ) { - elem += ""; - } - - if ( !elem ) { - continue; - } - - // Convert html string into DOM nodes - if ( typeof elem === "string" ) { - if ( !rhtml.test( elem ) ) { - elem = context.createTextNode( elem ); - } else { - // Ensure a safe container in which to render the html - safe = safe || createSafeFragment( context ); - div = context.createElement("div"); - safe.appendChild( div ); - - // Fix "XHTML"-style tags in all browsers - elem = elem.replace(rxhtmlTag, "<$1>"); - - // Go to html and back, then peel off extra wrappers - tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - depth = wrap[0]; - div.innerHTML = wrap[1] + elem + wrap[2]; - - // Move to the right depth - while ( depth-- ) { - div = div.lastChild; - } - - // Remove IE's autoinserted from table fragments - if ( !jQuery.support.tbody ) { - - // String was a
    , *may* have spurious - hasBody = rtbody.test(elem); - tbody = tag === "table" && !hasBody ? - div.firstChild && div.firstChild.childNodes : - - // String was a bare or - wrap[1] === "
    " && !hasBody ? - div.childNodes : - []; - - for ( j = tbody.length - 1; j >= 0 ; --j ) { - if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) { - tbody[ j ].parentNode.removeChild( tbody[ j ] ); - } - } - } - - // IE completely kills leading whitespace when innerHTML is used - if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) { - div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild ); - } - - elem = div.childNodes; - - // Take out of fragment container (we need a fresh div each time) - div.parentNode.removeChild( div ); - } - } - - if ( elem.nodeType ) { - ret.push( elem ); - } else { - jQuery.merge( ret, elem ); - } - } - - // Fix #11356: Clear elements from safeFragment - if ( div ) { - elem = div = safe = null; - } - - // Reset defaultChecked for any radios and checkboxes - // about to be appended to the DOM in IE 6/7 (#8060) - if ( !jQuery.support.appendChecked ) { - for ( i = 0; (elem = ret[i]) != null; i++ ) { - if ( jQuery.nodeName( elem, "input" ) ) { - fixDefaultChecked( elem ); - } else if ( typeof elem.getElementsByTagName !== "undefined" ) { - jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked ); - } - } - } - - // Append elements to a provided document fragment - if ( fragment ) { - // Special handling of each script element - handleScript = function( elem ) { - // Check if we consider it executable - if ( !elem.type || rscriptType.test( elem.type ) ) { - // Detach the script and store it in the scripts array (if provided) or the fragment - // Return truthy to indicate that it has been handled - return scripts ? - scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) : - fragment.appendChild( elem ); - } - }; - - for ( i = 0; (elem = ret[i]) != null; i++ ) { - // Check if we're done after handling an executable script - if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) { - // Append to fragment and handle embedded scripts - fragment.appendChild( elem ); - if ( typeof elem.getElementsByTagName !== "undefined" ) { - // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration - jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript ); - - // Splice the scripts into ret after their former ancestor and advance our index beyond them - ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) ); - i += jsTags.length; - } - } - } - } - - return ret; - }, - - cleanData: function( elems, /* internal */ acceptData ) { - var data, id, elem, type, - i = 0, - internalKey = jQuery.expando, - cache = jQuery.cache, - deleteExpando = jQuery.support.deleteExpando, - special = jQuery.event.special; - - for ( ; (elem = elems[i]) != null; i++ ) { - - 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 ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - - // 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 ( elem.removeAttribute ) { - elem.removeAttribute( internalKey ); - - } else { - elem[ internalKey ] = null; - } - - jQuery.deletedIds.push( id ); - } - } - } - } - } -}); -// Limit scope pollution from any deprecated API -(function() { - -var matched, browser; - -// Use of jQuery.browser is frowned upon. -// More details: http://api.jquery.com/jQuery.browser -// jQuery.uaMatch maintained for back-compat -jQuery.uaMatch = function( ua ) { - ua = ua.toLowerCase(); - - var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || - /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || - []; - - return { - browser: match[ 1 ] || "", - version: match[ 2 ] || "0" - }; -}; - -matched = jQuery.uaMatch( navigator.userAgent ); -browser = {}; - -if ( matched.browser ) { - browser[ matched.browser ] = true; - browser.version = matched.version; -} - -// Chrome is Webkit, but Webkit is also Safari. -if ( browser.chrome ) { - browser.webkit = true; -} else if ( browser.webkit ) { - browser.safari = true; -} - -jQuery.browser = browser; - -jQuery.sub = function() { - function jQuerySub( selector, context ) { - return new jQuerySub.fn.init( selector, context ); - } - jQuery.extend( true, jQuerySub, this ); - jQuerySub.superclass = this; - jQuerySub.fn = jQuerySub.prototype = this(); - jQuerySub.fn.constructor = jQuerySub; - jQuerySub.sub = this.sub; - jQuerySub.fn.init = function init( selector, context ) { - if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { - context = jQuerySub( context ); - } - - return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); - }; - jQuerySub.fn.init.prototype = jQuerySub.fn; - var rootjQuerySub = jQuerySub(document); - return jQuerySub; -}; - -})(); -var curCSS, iframe, iframeDoc, +var iframe, getStyles, curCSS, ralpha = /alpha\([^)]*\)/i, - ropacity = /opacity=([^)]*)/, + 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 @@ -6532,8 +6801,8 @@ var curCSS, iframe, iframeDoc, rmargin = /^margin/, rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ), rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ), - rrelNum = new RegExp( "^([-+])=(" + core_pnum + ")", "i" ), - elemdisplay = {}, + rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ), + elemdisplay = { BODY: "block" }, cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssNormalTransform = { @@ -6542,9 +6811,7 @@ var curCSS, iframe, iframeDoc, }, cssExpand = [ "Top", "Right", "Bottom", "Left" ], - cssPrefixes = [ "Webkit", "O", "Moz", "ms" ], - - eventsToggle = jQuery.fn.toggle; + cssPrefixes = [ "Webkit", "O", "Moz", "ms" ]; // return a css property mapped to a potentially vendor prefixed property function vendorPropName( style, name ) { @@ -6570,12 +6837,14 @@ function vendorPropName( style, name ) { } function isHidden( elem, el ) { + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument elem = el || elem; return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); } function showHide( elements, show ) { - var elem, display, + var display, elem, hidden, values = [], index = 0, length = elements.length; @@ -6585,11 +6854,13 @@ function showHide( elements, show ) { if ( !elem.style ) { continue; } + values[ index ] = jQuery._data( elem, "olddisplay" ); + display = elem.style.display; if ( show ) { // Reset the inline display of this element to learn if it is // being hidden by cascaded rules or not - if ( !values[ index ] && elem.style.display === "none" ) { + if ( !values[ index ] && display === "none" ) { elem.style.display = ""; } @@ -6600,10 +6871,13 @@ function showHide( elements, show ) { values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) ); } } else { - display = curCSS( elem, "display" ); - if ( !values[ index ] && display !== "none" ) { - jQuery._data( elem, "olddisplay", display ); + if ( !values[ index ] ) { + hidden = isHidden( elem ); + + if ( display && display !== "none" || !hidden ) { + jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) ); + } } } } @@ -6626,6 +6900,21 @@ function showHide( elements, show ) { jQuery.fn.extend({ css: function( name, value ) { return jQuery.access( this, function( elem, name, value ) { + var len, styles, + map = {}, + i = 0; + + if ( jQuery.isArray( name ) ) { + styles = getStyles( elem ); + len = name.length; + + for ( ; i < len; i++ ) { + map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles ); + } + + return map; + } + return value !== undefined ? jQuery.style( elem, name, value ) : jQuery.css( elem, name ); @@ -6637,15 +6926,13 @@ jQuery.fn.extend({ hide: function() { return showHide( this ); }, - toggle: function( state, fn2 ) { - var bool = typeof state === "boolean"; - - if ( jQuery.isFunction( state ) && jQuery.isFunction( fn2 ) ) { - return eventsToggle.apply( this, arguments ); + toggle: function( state ) { + 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(); @@ -6664,18 +6951,19 @@ jQuery.extend({ // We should always get a number back from opacity var ret = curCSS( elem, "opacity" ); return ret === "" ? "1" : ret; - } } } }, - // Exclude the following css properties to add px + // Don't automatically add "px" to these possibly-unitless properties cssNumber: { + "columnCount": true, "fillOpacity": true, "fontWeight": true, "lineHeight": true, "opacity": true, + "order": true, "orphans": true, "widows": true, "zIndex": true, @@ -6728,8 +7016,15 @@ jQuery.extend({ value += "px"; } + // 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"; + } + // 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 ) { + // Wrapped to prevent IE from throwing errors when 'invalid' values are provided // Fixes bug #5509 try { @@ -6748,8 +7043,8 @@ jQuery.extend({ } }, - css: function( elem, name, numeric, extra ) { - var val, num, hooks, + css: function( elem, name, extra, styles ) { + var num, val, hooks, origName = jQuery.camelCase( name ); // Make sure that we're working with the right name @@ -6766,7 +7061,7 @@ jQuery.extend({ // Otherwise, if a way to get the computed value exists, use that if ( val === undefined ) { - val = curCSS( elem, name ); + val = curCSS( elem, name, styles ); } //convert "normal" to computed value @@ -6775,46 +7070,31 @@ jQuery.extend({ } // Return, converting to number if forced or a qualifier was provided and val looks numeric - if ( numeric || extra !== undefined ) { + if ( extra === "" || extra ) { num = parseFloat( val ); - return numeric || jQuery.isNumeric( num ) ? num || 0 : val; + return extra === true || jQuery.isNumeric( num ) ? num || 0 : val; } return val; - }, - - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var ret, name, - old = {}; - - // Remember the old values, and insert the new ones - for ( name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - ret = callback.call( elem ); - - // Revert the old values - for ( name in options ) { - elem.style[ name ] = old[ name ]; - } - - return ret; } }); -// NOTE: To any future maintainer, we've window.getComputedStyle +// NOTE: we've included the "window" in window.getComputedStyle // because jsdom on node.js will break without it. if ( window.getComputedStyle ) { - curCSS = function( elem, name ) { - var ret, width, minWidth, maxWidth, - computed = window.getComputedStyle( elem, null ), + getStyles = function( elem ) { + return window.getComputedStyle( elem, null ); + }; + + curCSS = function( elem, name, _computed ) { + var width, minWidth, maxWidth, + computed = _computed || getStyles( elem ), + + // getPropertyValue is only needed for .css('filter') in IE9, see #12537 + ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined, style = elem.style; if ( computed ) { - ret = computed[ name ]; if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { ret = jQuery.style( elem, name ); } @@ -6824,13 +7104,17 @@ if ( window.getComputedStyle ) { // 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; @@ -6840,9 +7124,14 @@ if ( window.getComputedStyle ) { return ret; }; } else if ( document.documentElement.currentStyle ) { - curCSS = function( elem, name ) { - var left, rsLeft, - ret = elem.currentStyle && elem.currentStyle[ name ], + 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 @@ -6862,11 +7151,12 @@ if ( window.getComputedStyle ) { // Remember the original values left = style.left; - rsLeft = elem.runtimeStyle && elem.runtimeStyle.left; + rs = elem.runtimeStyle; + rsLeft = rs && rs.left; // Put in the new values to get a computed value out if ( rsLeft ) { - elem.runtimeStyle.left = elem.currentStyle.left; + rs.left = elem.currentStyle.left; } style.left = name === "fontSize" ? "1em" : ret; ret = style.pixelLeft + "px"; @@ -6874,7 +7164,7 @@ if ( window.getComputedStyle ) { // Revert the changed values style.left = left; if ( rsLeft ) { - elem.runtimeStyle.left = rsLeft; + rs.left = rsLeft; } } @@ -6885,11 +7175,12 @@ if ( window.getComputedStyle ) { function setPositiveNumber( elem, value, subtract ) { var matches = rnumsplit.exec( value ); return matches ? - Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) : - value; + // Guard against undefined "subtract", e.g., when used as in cssHooks + Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) : + value; } -function augmentWidthOrHeight( elem, name, extra, isBorderBox ) { +function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) { var i = extra === ( isBorderBox ? "border" : "content" ) ? // If we already have the right measurement, avoid augmentation 4 : @@ -6901,29 +7192,26 @@ function augmentWidthOrHeight( elem, name, extra, isBorderBox ) { for ( ; i < 4; i += 2 ) { // both box models exclude margin, so add it if we want it if ( extra === "margin" ) { - // we use jQuery.css instead of curCSS here - // because of the reliableMarginRight CSS hook! - val += jQuery.css( elem, extra + cssExpand[ i ], true ); + val += jQuery.css( elem, extra + cssExpand[ i ], true, styles ); } - // From this point on we use curCSS for maximum performance (relevant in animations) if ( isBorderBox ) { // border-box includes padding, so remove it if we want content if ( extra === "content" ) { - val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0; + val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); } // at this point, extra isn't border nor margin, so remove border if ( extra !== "margin" ) { - val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0; + val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); } } else { // at this point, extra isn't content, so add padding - val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0; + val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); // at this point, extra isn't content nor padding, so add border if ( extra !== "padding" ) { - val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0; + val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); } } } @@ -6934,16 +7222,17 @@ function augmentWidthOrHeight( elem, name, extra, isBorderBox ) { function getWidthOrHeight( elem, name, extra ) { // Start with offset property, which is equivalent to the border-box value - var val = name === "width" ? elem.offsetWidth : elem.offsetHeight, - valueIsBorderBox = true, - isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"; + var valueIsBorderBox = true, + val = name === "width" ? elem.offsetWidth : elem.offsetHeight, + styles = getStyles( elem ), + isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; // some non-html elements return undefined for offsetWidth, so check for null/undefined // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285 // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668 if ( val <= 0 || val == null ) { // Fall back to computed then uncomputed css if necessary - val = curCSS( elem, name ); + val = curCSS( elem, name, styles ); if ( val < 0 || val == null ) { val = elem.style[ name ]; } @@ -6967,52 +7256,49 @@ function getWidthOrHeight( elem, name, extra ) { elem, name, extra || ( isBorderBox ? "border" : "content" ), - valueIsBorderBox + valueIsBorderBox, + styles ) ) + "px"; } - // Try to determine the default display value of an element function css_defaultDisplay( nodeName ) { - if ( elemdisplay[ nodeName ] ) { - return elemdisplay[ nodeName ]; - } + var doc = document, + display = elemdisplay[ nodeName ]; - var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ), - display = elem.css("display"); - elem.remove(); + if ( !display ) { + display = actualDisplay( nodeName, doc ); - // If the simple way fails, - // get element's real default display by attaching it to a temp iframe - if ( display === "none" || display === "" ) { - // Use the already-created iframe if possible - iframe = document.body.appendChild( - iframe || jQuery.extend( document.createElement("iframe"), { - frameBorder: 0, - width: 0, - height: 0 - }) - ); + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + // Use the already-created iframe if possible + iframe = ( iframe || + jQuery("