Compare commits

...

5 Commits

Author SHA1 Message Date
Vicent Martí 6aa4e382b2 Tag 1.4.3 2012-04-25 14:12:54 -07:00
Vicent Martí 8051d4f9b0 Fix the public path 2012-04-25 14:11:02 -07:00
Vicent Martí 31a49601b1 Namespace the public assets 2012-04-25 14:11:02 -07:00
Corey Donohoe 4a50635fe1 docs for releasing the gem 2012-04-25 20:52:40 +02:00
Vicent Martí 9b92e9d325 Add Gollum.assets_path hook 2012-04-25 11:46:28 -07:00
23 changed files with 309 additions and 299 deletions
+6
View File
@@ -475,3 +475,9 @@ your changes merged back into core is as follows:
1. If necessary, rebase your commits into logical chunks, without errors 1. If necessary, rebase your commits into logical chunks, without errors
1. Push the branch up to GitHub 1. Push the branch up to GitHub
1. Send a pull request to the github/gollum project. 1. Send a pull request to the github/gollum project.
## RELEASING
$ rake gemspec
$ gem build gollum.gemspec
$ gem push gollum-X.Y.Z.gem
+20 -20
View File
@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
s.rubygems_version = '1.3.5' s.rubygems_version = '1.3.5'
s.name = 'gollum' s.name = 'gollum'
s.version = '1.4.2' s.version = '1.4.3'
s.date = '2012-04-25' s.date = '2012-04-25'
s.rubyforge_project = 'gollum' s.rubyforge_project = 'gollum'
@@ -56,25 +56,25 @@ Gem::Specification.new do |s|
lib/gollum/committer.rb lib/gollum/committer.rb
lib/gollum/file.rb lib/gollum/file.rb
lib/gollum/frontend/app.rb lib/gollum/frontend/app.rb
lib/gollum/frontend/public/css/dialog.css lib/gollum/frontend/public/gollum/css/dialog.css
lib/gollum/frontend/public/css/editor.css lib/gollum/frontend/public/gollum/css/editor.css
lib/gollum/frontend/public/css/gollum.css lib/gollum/frontend/public/gollum/css/gollum.css
lib/gollum/frontend/public/css/ie7.css lib/gollum/frontend/public/gollum/css/ie7.css
lib/gollum/frontend/public/css/template.css lib/gollum/frontend/public/gollum/css/template.css
lib/gollum/frontend/public/images/icon-sprite.png lib/gollum/frontend/public/gollum/images/icon-sprite.png
lib/gollum/frontend/public/javascript/editor/gollum.editor.js lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
lib/gollum/frontend/public/javascript/editor/langs/asciidoc.js lib/gollum/frontend/public/gollum/javascript/editor/langs/asciidoc.js
lib/gollum/frontend/public/javascript/editor/langs/creole.js lib/gollum/frontend/public/gollum/javascript/editor/langs/creole.js
lib/gollum/frontend/public/javascript/editor/langs/markdown.js lib/gollum/frontend/public/gollum/javascript/editor/langs/markdown.js
lib/gollum/frontend/public/javascript/editor/langs/org.js lib/gollum/frontend/public/gollum/javascript/editor/langs/org.js
lib/gollum/frontend/public/javascript/editor/langs/pod.js lib/gollum/frontend/public/gollum/javascript/editor/langs/pod.js
lib/gollum/frontend/public/javascript/editor/langs/rdoc.js lib/gollum/frontend/public/gollum/javascript/editor/langs/rdoc.js
lib/gollum/frontend/public/javascript/editor/langs/textile.js lib/gollum/frontend/public/gollum/javascript/editor/langs/textile.js
lib/gollum/frontend/public/javascript/gollum.dialog.js lib/gollum/frontend/public/gollum/javascript/gollum.dialog.js
lib/gollum/frontend/public/javascript/gollum.js lib/gollum/frontend/public/gollum/javascript/gollum.js
lib/gollum/frontend/public/javascript/gollum.placeholder.js lib/gollum/frontend/public/gollum/javascript/gollum.placeholder.js
lib/gollum/frontend/public/javascript/jquery.color.js lib/gollum/frontend/public/gollum/javascript/jquery.color.js
lib/gollum/frontend/public/javascript/jquery.js lib/gollum/frontend/public/gollum/javascript/jquery.js
lib/gollum/frontend/templates/compare.mustache lib/gollum/frontend/templates/compare.mustache
lib/gollum/frontend/templates/create.mustache lib/gollum/frontend/templates/create.mustache
lib/gollum/frontend/templates/edit.mustache lib/gollum/frontend/templates/edit.mustache
+5 -1
View File
@@ -21,7 +21,11 @@ require File.expand_path('../gollum/tex', __FILE__)
require File.expand_path('../gollum/web_sequence_diagram', __FILE__) require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
module Gollum module Gollum
VERSION = '1.4.2' VERSION = '1.4.3'
def self.assets_path
::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
end
class Error < StandardError; end class Error < StandardError; end
+1 -1
View File
@@ -13,7 +13,7 @@ module Precious
dir = File.dirname(File.expand_path(__FILE__)) dir = File.dirname(File.expand_path(__FILE__))
# We want to serve public assets for now # We want to serve public assets for now
set :public_folder, "#{dir}/public" set :public_folder, "#{dir}/public/gollum"
set :static, true set :static, true
set :default_markup, :markdown set :default_markup, :markdown
@@ -18,7 +18,7 @@
width: 450px; width: 450px;
border: 7px solid #999; border: 7px solid #999;
border: 7px solid rgba(0, 0, 0, 0.3); border: 7px solid rgba(0, 0, 0, 0.3);
border-radius: 5px; border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
@@ -28,7 +28,7 @@
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
padding: 1em; padding: 1em;
background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff)); background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff));
background: -moz-linear-gradient(top, #f7f7f7, #ffffff); background: -moz-linear-gradient(top, #f7f7f7, #ffffff);
} }
@@ -71,7 +71,7 @@
padding: 0; padding: 0;
min-width: 80px; min-width: 80px;
} }
#gollum-dialog-dialog-body fieldset .field input[type="text"] { #gollum-dialog-dialog-body fieldset .field input[type="text"] {
border: 1px solid #ddd; border: 1px solid #ddd;
display: block; display: block;
@@ -82,11 +82,11 @@
padding: 0.3em 0.5em; padding: 0.3em 0.5em;
width: 96.5%; width: 96.5%;
} }
#gollum-dialog-dialog-body fieldset .field input.code { #gollum-dialog-dialog-body fieldset .field input.code {
font-family: 'Monaco', 'Courier New', Courier, monospace; font-family: 'Monaco', 'Courier New', Courier, monospace;
} }
#gollum-dialog-dialog-body fieldset .field:last-child { #gollum-dialog-dialog-body fieldset .field:last-child {
margin: 0 0 1em 0; margin: 0 0 1em 0;
} }
@@ -31,7 +31,7 @@ a {
} }
.ie #gollum-editor { .ie #gollum-editor {
padding-bottom: 1em; padding-bottom: 1em;
} }
#gollum-editor form fieldset { #gollum-editor form fieldset {
@@ -119,11 +119,11 @@ a {
/* text-indent: -5000px; */ /* text-indent: -5000px; */
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
width: 25px; width: 25px;
border-radius: 0.3em; border-radius: 0.3em;
-moz-border-radius: 0.3em; -moz-border-radius: 0.3em;
-webkit-border-radius: 0.3em; -webkit-border-radius: 0.3em;
filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec'); filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec)); background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
background: -moz-linear-gradient(top, #f4f4f4, #ececec); background: -moz-linear-gradient(top, #f4f4f4, #ececec);
@@ -133,7 +133,7 @@ a {
color: #fff; color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
text-decoration: none; text-decoration: none;
filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3'); filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3)); background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
background: -moz-linear-gradient(top, #599bdc, #3072b3); background: -moz-linear-gradient(top, #599bdc, #3072b3);
@@ -162,7 +162,7 @@ a#function-h2 span { background-position: -244px 0; }
a#function-h3 span { background-position: -271px 0; } a#function-h3 span { background-position: -271px 0; }
a#function-link span { background-position: -298px 0; } a#function-link span { background-position: -298px 0; }
a#function-image span { background-position: -324px 0; } a#function-image span { background-position: -324px 0; }
a#function-help span { background-position: -405px 0; } a#function-help span { background-position: -405px 0; }
a#function-bold:hover span { background-position: 0 -28px; } a#function-bold:hover span { background-position: 0 -28px; }
a#function-italic:hover span { background-position: -27px -28px; } a#function-italic:hover span { background-position: -27px -28px; }
@@ -177,7 +177,7 @@ a#function-h2:hover span { background-position: -244px -28px; }
a#function-h3:hover span { background-position: -271px -28px; } a#function-h3:hover span { background-position: -271px -28px; }
a#function-link:hover span { background-position: -298px -28px; } a#function-link:hover span { background-position: -298px -28px; }
a#function-image:hover span { background-position: -324px -28px; } a#function-image:hover span { background-position: -324px -28px; }
a#function-help:hover span { background-position: -405px -28px; } a#function-help:hover span { background-position: -405px -28px; }
#gollum-editor #gollum-editor-function-bar a.disabled { #gollum-editor #gollum-editor-function-bar a.disabled {
@@ -195,11 +195,11 @@ a#function-help:hover span { background-position: -405px -28px; }
padding: 0 0 1.1em 0; padding: 0 0 1.1em 0;
} }
#gollum-editor #gollum-editor-function-bar #gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector select { #gollum-editor-format-selector select {
background-color: #f9f9f9; background-color: #f9f9f9;
border: 1px solid transparent; border: 1px solid transparent;
float: right; float: right;
font-size: 1.1em; font-size: 1.1em;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -207,15 +207,15 @@ a#function-help:hover span { background-position: -405px -28px; }
line-height: 1.6em; line-height: 1.6em;
padding: 0.5em 0.7em; padding: 0.5em 0.7em;
margin-bottom: 0; margin-bottom: 0;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
-moz-outline: none; -moz-outline: none;
} }
#gollum-editor #gollum-editor-function-bar #gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector select:hover { #gollum-editor-format-selector select:hover {
background-color: #fff; background-color: #fff;
border: 1px solid #ddd; border: 1px solid #ddd;
@@ -231,13 +231,13 @@ a#function-help:hover span { background-position: -405px -28px; }
line-height: 1.6em; line-height: 1.6em;
padding: 0.6em 0.5em 0 0; padding: 0.6em 0.5em 0 0;
} }
#gollum-editor #gollum-editor-function-bar #gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector label:after { #gollum-editor-format-selector label:after {
content: ':'; content: ':';
} }
/* @section form-fields */ /* @section form-fields */
#gollum-editor textarea#gollum-editor-body { #gollum-editor textarea#gollum-editor-body {
@@ -322,11 +322,11 @@ a#function-help:hover span { background-position: -405px -28px; }
margin: 0.2em 0.5em 0.75em 0; margin: 0.2em 0.5em 0.75em 0;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
width: 25px; width: 25px;
border-radius: 0.3em; border-radius: 0.3em;
-moz-border-radius: 0.3em; -moz-border-radius: 0.3em;
-webkit-border-radius: 0.3em; -webkit-border-radius: 0.3em;
filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec'); filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec)); background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
background: -moz-linear-gradient(top, #f4f4f4, #ececec); background: -moz-linear-gradient(top, #f4f4f4, #ececec);
@@ -346,7 +346,7 @@ a#function-help:hover span { background-position: -405px -28px; }
color: #fff; color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
text-decoration: none; text-decoration: none;
filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3'); filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3)); background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
background: -moz-linear-gradient(top, #599bdc, #3072b3); background: -moz-linear-gradient(top, #599bdc, #3072b3);
@@ -461,16 +461,16 @@ a#function-help:hover span { background-position: -405px -28px; }
padding: 1em 0; padding: 1em 0;
width: 18%; width: 18%;
} }
#gollum-editor-help-parent { #gollum-editor-help-parent {
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
#gollum-editor-help-list { #gollum-editor-help-list {
background: #fafafa; background: #fafafa;
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
#gollum-editor-help-parent li, #gollum-editor-help-parent li,
#gollum-editor-help-list li { #gollum-editor-help-list li {
font-size: 1.2em; font-size: 1.2em;
@@ -478,7 +478,7 @@ a#function-help:hover span { background-position: -405px -28px; }
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#gollum-editor-help-parent li a, #gollum-editor-help-parent li a,
#gollum-editor-help-list li a { #gollum-editor-help-list li a {
border: 1px solid transparent; border: 1px solid transparent;
@@ -490,16 +490,16 @@ a#function-help:hover span { background-position: -405px -28px; }
padding: 0.2em 1em; padding: 0.2em 1em;
text-shadow: 0 -1px 0 #fff; text-shadow: 0 -1px 0 #fff;
} }
#gollum-editor-help-parent li a:hover, #gollum-editor-help-parent li a:hover,
#gollum-editor-help-list li a:hover { #gollum-editor-help-list li a:hover {
background: #fff; background: #fff;
border-color: #f0f0f0; border-color: #f0f0f0;
text-decoration: none; text-decoration: none;
box-shadow: none; box-shadow: none;
} }
#gollum-editor-help-parent li a.selected, #gollum-editor-help-parent li a.selected,
#gollum-editor-help-list li a.selected { #gollum-editor-help-list li a.selected {
border: 1px solid #eee; border: 1px solid #eee;
@@ -507,29 +507,29 @@ a#function-help:hover span { background-position: -405px -28px; }
border-width: 1px 0; border-width: 1px 0;
background: #fff; background: #fff;
color: #000; color: #000;
box-shadow: 0 1px 2px #f0f0f0; box-shadow: 0 1px 2px #f0f0f0;
} }
#gollum-editor-help-wrapper { #gollum-editor-help-wrapper {
background: #fff; background: #fff;
overflow: auto; overflow: auto;
height: 17em; height: 17em;
padding: 1em; padding: 1em;
} }
#gollum-editor-help-content { #gollum-editor-help-content {
font-size: 1.2em; font-size: 1.2em;
margin: 0 1em 0 0.5em; margin: 0 1em 0 0.5em;
padding: 0; padding: 0;
line-height: 1.8em; line-height: 1.8em;
} }
#gollum-editor-help-content p { #gollum-editor-help-content p {
margin: 0 0 1em 0; margin: 0 0 1em 0;
padding: 0; padding: 0;
} }
/* IE */ /* IE */
.ie #gollum-editor .singleline input { .ie #gollum-editor .singleline input {
padding-top: 0.25em; padding-top: 0.25em;
@@ -45,11 +45,11 @@ a:hover, a:visited {
#head h1 { #head h1 {
display: none; display: none;
} }
#head ul.actions { #head ul.actions {
float: right; float: right;
} }
/* @section content */ /* @section content */
#wiki-content { #wiki-content {
height: 1%; height: 1%;
@@ -77,7 +77,7 @@ a:hover, a:visited {
.has-rightbar #wiki-body { .has-rightbar #wiki-body {
width: 68%; width: 68%;
} }
/* @section rightbar */ /* @section rightbar */
#wiki-rightbar { #wiki-rightbar {
background-color: #f7f7f7; background-color: #f7f7f7;
@@ -86,12 +86,12 @@ a:hover, a:visited {
float: right; float: right;
padding: 7px; padding: 7px;
width: 25%; width: 25%;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
} }
#wiki-rightbar p { #wiki-rightbar p {
margin: 13px 0 0; margin: 13px 0 0;
} }
@@ -107,13 +107,13 @@ a:hover, a:visited {
padding: 0 0 0.5em 0; padding: 0 0 0.5em 0;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
/* Back arrow */ /* Back arrow */
#wiki-rightbar p.parent:before { #wiki-rightbar p.parent:before {
color: #666; color: #666;
content: "← "; content: "← ";
} }
#wiki-rightbar h3 { #wiki-rightbar h3 {
font-size: 1.2em; font-size: 1.2em;
color: #333; color: #333;
@@ -121,12 +121,12 @@ a:hover, a:visited {
padding: 0; padding: 0;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
#wiki-rightbar ul { #wiki-rightbar ul {
margin: 0.5em 0 1em; margin: 0.5em 0 1em;
padding: 0; padding: 0;
} }
#wiki-rightbar ul li { #wiki-rightbar ul li {
color: #bbb; color: #bbb;
margin: 0 0 0 1em; margin: 0 0 0 1em;
@@ -134,23 +134,23 @@ a:hover, a:visited {
line-height: 1.75em; line-height: 1.75em;
list-style-position: inside; list-style-position: inside;
list-style-type: round; list-style-type: round;
} }
#wiki-rightbar #nav ul li a { #wiki-rightbar #nav ul li a {
font-weight: bold; font-weight: bold;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
/* @section footer */ /* @section footer */
#wiki-footer { #wiki-footer {
clear: both; clear: both;
margin: 2em 0 5em; margin: 2em 0 5em;
} }
.has-rightbar #wiki-footer { .has-rightbar #wiki-footer {
width: 70%; width: 70%;
} }
#wiki-footer #footer-content { #wiki-footer #footer-content {
background-color: #f7f7f7; background-color: #f7f7f7;
border: 1px solid #ddd; border: 1px solid #ddd;
@@ -158,12 +158,12 @@ a:hover, a:visited {
line-height: 1.5em; line-height: 1.5em;
margin-top: 1.5em; margin-top: 1.5em;
padding: 1em; padding: 1em;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
} }
#wiki-footer #footer-content h3 { #wiki-footer #footer-content h3 {
font-size: 1.2em; font-size: 1.2em;
color: #333; color: #333;
@@ -171,18 +171,18 @@ a:hover, a:visited {
padding: 0 0 0.2em; padding: 0 0 0.2em;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
#wiki-footer #footer-content p { #wiki-footer #footer-content p {
margin: 0.5em 0 0; margin: 0.5em 0 0;
padding: 0; padding: 0;
} }
#wiki-footer #footer-content ul.links { #wiki-footer #footer-content ul.links {
margin: 0.5em 0 0; margin: 0.5em 0 0;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
} }
#wiki-footer #footer-content ul.links li { #wiki-footer #footer-content ul.links li {
color: #999; color: #999;
float: left; float: left;
@@ -191,33 +191,33 @@ a:hover, a:visited {
padding: 0; padding: 0;
margin-left: 0.75em; margin-left: 0.75em;
} }
#wiki-footer #footer-content ul.links li a { #wiki-footer #footer-content ul.links li a {
font-weight: bold; font-weight: bold;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
#wiki-footer #footer-content ul.links li:first-child { #wiki-footer #footer-content ul.links li:first-child {
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
} }
.ff #wiki-footer #footer-content ul.links li:first-child { .ff #wiki-footer #footer-content ul.links li:first-child {
margin: 0 -0.75em 0 0; margin: 0 -0.75em 0 0;
} }
/* @section page-footer */ /* @section page-footer */
.page #footer { .page #footer {
margin: 1em 0 7em; margin: 1em 0 7em;
} }
#footer p#last-edit { #footer p#last-edit {
font-size: .9em; font-size: .9em;
line-height: 1.6em; line-height: 1.6em;
color: #999; color: #999;
margin: 0.9em 0; margin: 0.9em 0;
} }
#footer p#last-edit span.username { #footer p#last-edit span.username {
font-weight: bold; font-weight: bold;
} }
@@ -243,23 +243,23 @@ a:hover, a:visited {
margin: 2em 0; margin: 2em 0;
padding: 0; padding: 0;
} }
#wiki-history table, #wiki-history tbody { #wiki-history table, #wiki-history tbody {
border-collapse: collapse; border-collapse: collapse;
padding: 0; padding: 0;
margin: 0; margin: 0;
width: 100%; width: 100%;
} }
#wiki-history table tr { #wiki-history table tr {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
#wiki-history table tr { #wiki-history table tr {
background-color: #ebf2f6; background-color: #ebf2f6;
} }
#wiki-history table tr td { #wiki-history table tr td {
border: 1px solid #c0dce9; border: 1px solid #c0dce9;
font-size: 1.2em; font-size: 1.2em;
@@ -267,12 +267,12 @@ a:hover, a:visited {
margin: 0; margin: 0;
padding: 0.3em 0.7em; padding: 0.3em 0.7em;
} }
#wiki-history table tr td.checkbox { #wiki-history table tr td.checkbox {
min-width: 2em; min-width: 2em;
padding: 0.3em; padding: 0.3em;
} }
#wiki-history table tr td.checkbox input { #wiki-history table tr td.checkbox input {
cursor: pointer; cursor: pointer;
display: block; display: block;
@@ -280,39 +280,39 @@ a:hover, a:visited {
padding-top: 0.4em; padding-top: 0.4em;
margin-right: -0.2em; margin-right: -0.2em;
} }
#wiki-history table tr:nth-child(2n), #wiki-history table tr:nth-child(2n),
#wiki-history table tr.alt-row { #wiki-history table tr.alt-row {
background-color: #f3f7fa; background-color: #f3f7fa;
} }
#wiki-history table tr.selected { #wiki-history table tr.selected {
background-color: #ffffea !important; background-color: #ffffea !important;
z-index: 100; z-index: 100;
} }
#wiki-history table tr td.commit-name { #wiki-history table tr td.commit-name {
border-left: 0; border-left: 0;
} }
#wiki-history table tr td.commit-name span.time-elapsed { #wiki-history table tr td.commit-name span.time-elapsed {
color: #999; color: #999;
} }
#wiki-history table tr td.author { #wiki-history table tr td.author {
width: 20%; width: 20%;
} }
#wiki-history table tr td.author a { #wiki-history table tr td.author a {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
#wiki-history table tr td.author a span.username { #wiki-history table tr td.author a span.username {
display: block; display: block;
padding-top: 3px; padding-top: 3px;
} }
#wiki-history table tr td img { #wiki-history table tr td img {
background-color: #fff; background-color: #fff;
border: 1px solid #999; border: 1px solid #999;
@@ -324,7 +324,7 @@ a:hover, a:visited {
width: 18px; width: 18px;
padding: 2px; padding: 2px;
} }
#wiki-history table tr td.commit-name a { #wiki-history table tr td.commit-name a {
font-size: 0.9em; font-size: 0.9em;
font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace; font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace;
@@ -359,25 +359,25 @@ a:hover, a:visited {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
.results #results { .results #results {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
margin-bottom: 2em; margin-bottom: 2em;
padding-bottom: 2em; padding-bottom: 2em;
} }
.results #results ul { .results #results ul {
margin: 2em 0 0 0; margin: 2em 0 0 0;
padding: 0; padding: 0;
} }
.results #results ul li { .results #results ul li {
font-size: 1.2em; font-size: 1.2em;
line-height: 1.6em; line-height: 1.6em;
list-style-position: outside; list-style-position: outside;
padding: 0.2em 0; padding: 0.2em 0;
} }
.results #results ul li span.count { .results #results ul li span.count {
color: #999; color: #999;
} }
@@ -387,11 +387,11 @@ a:hover, a:visited {
line-height: 1.6em; line-height: 1.6em;
margin-top: 2em; margin-top: 2em;
} }
.results #footer ul.actions li { .results #footer ul.actions li {
margin: 0 1em 0 0; margin: 0 1em 0 0;
} }
/* @section compare */ /* @section compare */
.compare h1 { .compare h1 {
@@ -403,26 +403,26 @@ a:hover, a:visited {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
.compare #compare-content { .compare #compare-content {
margin-top: 3em; margin-top: 3em;
} }
.compare .data { .compare .data {
border: 1px solid #ddd; border: 1px solid #ddd;
margin-top: 1em; margin-top: 1em;
overflow: auto; overflow: auto;
} }
.compare .data pre { .compare .data pre {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.compare .data pre div { .compare .data pre div {
padding: 0 0 0 1em; padding: 0 0 0 1em;
} }
.compare .data tr td { .compare .data tr td {
font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace; font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace;
font-size: 1.2em; font-size: 1.2em;
@@ -430,11 +430,11 @@ a:hover, a:visited {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.compare .data td.line_numbers { .compare .data td.line_numbers {
background: #f7f7f7; background: #f7f7f7;
border-right: 1px solid #999; border-right: 1px solid #999;
color: #999; color: #999;
padding: 0 0 0 0.5em; padding: 0 0 0 0.5em;
} }
@@ -443,32 +443,32 @@ a:hover, a:visited {
margin-left: 0; margin-left: 0;
margin-right: 0.6em; margin-right: 0.6em;
} }
/* @control syntax */ /* @control syntax */
.highlight { background: #ffffff; } .highlight { background: #ffffff; }
.highlight .c { color: #999988; font-style: italic } .highlight .c { color: #999988; font-style: italic }
.highlight .err { color: #a61717; background-color: #e3d2d2 } .highlight .err { color: #a61717; background-color: #e3d2d2 }
.highlight .k { font-weight: bold } .highlight .k { font-weight: bold }
.highlight .o { font-weight: bold } .highlight .o { font-weight: bold }
.highlight .cm { color: #999988; font-style: italic } .highlight .cm { color: #999988; font-style: italic }
.highlight .cp { color: #999999; font-weight: bold } .highlight .cp { color: #999999; font-weight: bold }
.highlight .c1 { color: #999988; font-style: italic } .highlight .c1 { color: #999988; font-style: italic }
.highlight .cs { color: #999999; font-weight: bold; font-style: italic } .highlight .cs { color: #999999; font-weight: bold; font-style: italic }
.highlight .gd { color: #000000; background-color: #ffdddd } .highlight .gd { color: #000000; background-color: #ffdddd }
.highlight .gd .x { color: #000000; background-color: #ffaaaa } .highlight .gd .x { color: #000000; background-color: #ffaaaa }
.highlight .ge { font-style: italic } .highlight .ge { font-style: italic }
.highlight .gr { color: #aa0000 } .highlight .gr { color: #aa0000 }
.highlight .gh { color: #999999 } .highlight .gh { color: #999999 }
.highlight .gi { color: #000000; background-color: #ddffdd } .highlight .gi { color: #000000; background-color: #ddffdd }
.highlight .gi .x { color: #000000; background-color: #aaffaa } .highlight .gi .x { color: #000000; background-color: #aaffaa }
.highlight .gc { color: #999; background-color: #EAF2F5 } .highlight .gc { color: #999; background-color: #EAF2F5 }
.highlight .go { color: #888888 } .highlight .go { color: #888888 }
.highlight .gp { color: #555555 } .highlight .gp { color: #555555 }
.highlight .gs { font-weight: bold } .highlight .gs { font-weight: bold }
.highlight .gu { color: #aaaaaa } .highlight .gu { color: #aaaaaa }
.highlight .gt { color: #aa0000 } .highlight .gt { color: #aa0000 }
/* @control minibutton */ /* @control minibutton */
@@ -562,7 +562,7 @@ ul.actions {
margin: -10% 0 0 -35%; margin: -10% 0 0 -35%;
position: absolute; position: absolute;
width: 70%; width: 70%;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
@@ -595,7 +595,7 @@ ul.actions {
background: #fff; background: #fff;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
overflow: hidden; overflow: hidden;
border-radius: 0.3em; border-radius: 0.3em;
-moz-border-radius: 0.3em; -moz-border-radius: 0.3em;
-webkit-border-radius: 0.3em; -webkit-border-radius: 0.3em;
@@ -608,22 +608,22 @@ ul.actions {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 1.2em; font-size: 1.2em;
height: 1.8em; height: 1.8em;
-webkit-focus-ring: none; -webkit-focus-ring: none;
} }
.ff #head #searchbar #searchbar-fauxtext input#search-query { .ff #head #searchbar #searchbar-fauxtext input#search-query {
padding: 0.2em 0 0.2em 0.5em; padding: 0.2em 0 0.2em 0.5em;
} }
.ie #head #searchbar #searchbar-fauxtext input#search-query { .ie #head #searchbar #searchbar-fauxtext input#search-query {
padding: 0.4em 0 0 0.5em; padding: 0.4em 0 0 0.5em;
} }
#head #searchbar #searchbar-fauxtext input#search-query.ph { #head #searchbar #searchbar-fauxtext input#search-query.ph {
color: #999; color: #999;
} }
#head #searchbar #searchbar-fauxtext #search-submit { #head #searchbar #searchbar-fauxtext #search-submit {
border: 0; border: 0;
border-left: 1px solid #d4d4d4; border-left: 1px solid #d4d4d4;
@@ -632,12 +632,12 @@ ul.actions {
padding: 0; padding: 0;
float: right; float: right;
font-size: 1.2em; font-size: 1.2em;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
} }
#head #searchbar #searchbar-fauxtext #search-submit span { #head #searchbar #searchbar-fauxtext #search-submit span {
background-image: url(/images/icon-sprite.png); background-image: url(/images/icon-sprite.png);
background-position: -431px -1px; background-position: -431px -1px;
@@ -38,14 +38,14 @@ a.absent {
margin: 1em 0; margin: 1em 0;
padding: 0; padding: 0;
} }
/* ReST first graf in nested list */ /* ReST first graf in nested list */
#template * li p.first { #template * li p.first {
display: inline-block; display: inline-block;
} }
/* Headings */ /* Headings */
#template h1, #template h2, #template h3, #template h1, #template h2, #template h3,
#template h4, #template h5, #template h6 { #template h4, #template h5, #template h6 {
margin: 0; margin: 0;
padding: 0; padding: 0;
@@ -91,7 +91,7 @@ a.absent {
#template h6 { #template h6 {
color: #666; color: #666;
font-size: 14px; font-size: 14px;
line-height: 26px; line-height: 26px;
margin-bottom: -19px; margin-bottom: -19px;
padding: 18px 0 0; padding: 18px 0 0;
@@ -107,8 +107,8 @@ a.absent {
padding: 0; padding: 0;
} }
/* Border Reset for headers with horizontal rules */ /* Border Reset for headers with horizontal rules */
#template > h2:first-child, #template > h2:first-child,
#template > h1:first-child { #template > h1:first-child {
margin: 12px 0 0; margin: 12px 0 0;
padding: 10px 0 0; padding: 10px 0 0;
@@ -116,20 +116,20 @@ a.absent {
/* Lists, Blockquotes & Such */ /* Lists, Blockquotes & Such */
#template ul, #template ul,
#template ol { #template ol {
margin-top: 1.5em; margin-top: 1.5em;
margin-left: 2.6em; margin-left: 2.6em;
} }
/* Nested Lists */ /* Nested Lists */
#template ul li, #template ul li,
#template ol li, #template ol li,
#template ul li ul, #template ul li ul,
#template ol li ol, #template ol li ol,
#template ul li ol, #template ul li ol,
#template ol li ul, #template ol li ul,
#template ul ul, #template ul ul,
#template ol ol { #template ol ol {
padding: 0; padding: 0;
margin: .5em 0; margin: .5em 0;
@@ -181,7 +181,7 @@ a.absent {
border: 1px solid #ccc; border: 1px solid #ccc;
text-align: left; text-align: left;
margin: 0; margin: 0;
padding: 6px 13px; padding: 6px 13px;
} }
/* Images & Stuff */ /* Images & Stuff */
@@ -267,7 +267,7 @@ a.absent {
} }
#template span.float-right { #template span.float-right {
display: block; display: block;
margin-left: 13px; margin-left: 13px;
overflow: hidden; overflow: hidden;
float: right; float: right;
@@ -316,7 +316,7 @@ pre, code {
} }
/* /*
Highlight rules from pull req 191 Highlight rules from pull req 191
https://github.com/eboto/gollum/commit/5df09477abf4a04c82c7fcaa2bd7ee2a85e7ec82 https://github.com/eboto/gollum/commit/5df09477abf4a04c82c7fcaa2bd7ee2a85e7ec82
*/ */
#template .highlight { background:#fff; } #template .highlight { background:#fff; }

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

@@ -1,24 +1,24 @@
(function($) { (function($) {
var Placeholder = { var Placeholder = {
_PLACEHOLDERS : [], _PLACEHOLDERS : [],
_p : function( $field ) { _p : function( $field ) {
this.fieldObject = $field; this.fieldObject = $field;
this.placeholderText = $field.val(); this.placeholderText = $field.val();
var placeholderText = $field.val(); var placeholderText = $field.val();
$field.addClass('ph'); $field.addClass('ph');
$field.blur(function() { $field.blur(function() {
if ( $(this).val() == '' ) { if ( $(this).val() == '' ) {
$(this).val( placeholderText ); $(this).val( placeholderText );
$(this).addClass('ph'); $(this).addClass('ph');
} }
}); });
$field.focus(function() { $field.focus(function() {
$(this).removeClass('ph'); $(this).removeClass('ph');
if ( $(this).val() == placeholderText ) { if ( $(this).val() == placeholderText ) {
@@ -27,28 +27,28 @@
$(this)[0].select(); $(this)[0].select();
} }
}); });
}, },
add : function( $field ) { add : function( $field ) {
Placeholder._PLACEHOLDERS.push( new Placeholder._p( $field ) ); Placeholder._PLACEHOLDERS.push( new Placeholder._p( $field ) );
}, },
clearAll: function() { clearAll: function() {
for ( var i=0; i < Placeholder._PLACEHOLDERS.length; i++ ) { for ( var i=0; i < Placeholder._PLACEHOLDERS.length; i++ ) {
if ( Placeholder._PLACEHOLDERS[i].fieldObject.val() == if ( Placeholder._PLACEHOLDERS[i].fieldObject.val() ==
Placeholder._PLACEHOLDERS[i].placeholderText ) { Placeholder._PLACEHOLDERS[i].placeholderText ) {
Placeholder._PLACEHOLDERS[i].fieldObject.val(''); Placeholder._PLACEHOLDERS[i].fieldObject.val('');
} }
} }
}, },
exists : function() { exists : function() {
return ( _PLACEHOLDERS.length ); return ( _PLACEHOLDERS.length );
} }
}; };
$.GollumPlaceholder = Placeholder; $.GollumPlaceholder = Placeholder;
})(jQuery); })(jQuery);
@@ -53,7 +53,7 @@
// Otherwise, we're most likely dealing with a named color // Otherwise, we're most likely dealing with a named color
return colors[jQuery.trim(color).toLowerCase()]; return colors[jQuery.trim(color).toLowerCase()];
} }
function getColor(elem, attr) { function getColor(elem, attr) {
var color; var color;
@@ -62,14 +62,14 @@
// Keep going until we find an element that has color, or we hit the body // Keep going until we find an element that has color, or we hit the body
if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") ) if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
break; break;
attr = "backgroundColor"; attr = "backgroundColor";
} while ( elem = elem.parentNode ); } while ( elem = elem.parentNode );
return getRGB(color); return getRGB(color);
}; };
// Some named colors to work with // Some named colors to work with
// From Interface by Stefan Petre // From Interface by Stefan Petre
// http://interface.eyecon.ro/ // http://interface.eyecon.ro/
@@ -119,5 +119,5 @@
white:[255,255,255], white:[255,255,255],
yellow:[255,255,0] yellow:[255,255,0]
}; };
})(jQuery); })(jQuery);
@@ -75,10 +75,10 @@ var jQuery = function( selector, context ) {
// For matching the engine and version of the browser // For matching the engine and version of the browser
browserMatch, browserMatch,
// Has the ready events already been bound? // Has the ready events already been bound?
readyBound = false, readyBound = false,
// The functions to execute on DOM ready // The functions to execute on DOM ready
readyList = [], readyList = [],
@@ -92,7 +92,7 @@ var jQuery = function( selector, context ) {
slice = Array.prototype.slice, slice = Array.prototype.slice,
trim = String.prototype.trim, trim = String.prototype.trim,
indexOf = Array.prototype.indexOf, indexOf = Array.prototype.indexOf,
// [[Class]] -> type pairs // [[Class]] -> type pairs
class2type = {}; class2type = {};
@@ -111,7 +111,7 @@ jQuery.fn = jQuery.prototype = {
this.length = 1; this.length = 1;
return this; return this;
} }
// The body element only exists once, optimize finding it // The body element only exists once, optimize finding it
if ( selector === "body" && !context && document.body ) { if ( selector === "body" && !context && document.body ) {
this.context = document; this.context = document;
@@ -150,9 +150,9 @@ jQuery.fn = jQuery.prototype = {
ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
} }
return jQuery.merge( this, selector ); return jQuery.merge( this, selector );
// HANDLE: $("#id") // HANDLE: $("#id")
} else { } else {
elem = document.getElementById( match[2] ); elem = document.getElementById( match[2] );
@@ -245,7 +245,7 @@ jQuery.fn = jQuery.prototype = {
if ( jQuery.isArray( elems ) ) { if ( jQuery.isArray( elems ) ) {
push.apply( ret, elems ); push.apply( ret, elems );
} else { } else {
jQuery.merge( ret, elems ); jQuery.merge( ret, elems );
} }
@@ -271,7 +271,7 @@ jQuery.fn = jQuery.prototype = {
each: function( callback, args ) { each: function( callback, args ) {
return jQuery.each( this, callback, args ); return jQuery.each( this, callback, args );
}, },
ready: function( fn ) { ready: function( fn ) {
// Attach the listeners // Attach the listeners
jQuery.bindReady(); jQuery.bindReady();
@@ -289,7 +289,7 @@ jQuery.fn = jQuery.prototype = {
return this; return this;
}, },
eq: function( i ) { eq: function( i ) {
return i === -1 ? return i === -1 ?
this.slice( i ) : this.slice( i ) :
@@ -314,7 +314,7 @@ jQuery.fn = jQuery.prototype = {
return callback.call( elem, i, elem ); return callback.call( elem, i, elem );
})); }));
}, },
end: function() { end: function() {
return this.prevObject || jQuery(null); return this.prevObject || jQuery(null);
}, },
@@ -403,14 +403,14 @@ jQuery.extend({
return jQuery; return jQuery;
}, },
// Is the DOM ready to be used? Set to true once it occurs. // Is the DOM ready to be used? Set to true once it occurs.
isReady: false, isReady: false,
// A counter to track how many items to wait for before // A counter to track how many items to wait for before
// the ready event fires. See #6781 // the ready event fires. See #6781
readyWait: 1, readyWait: 1,
// Handle when the DOM is ready // Handle when the DOM is ready
ready: function( wait ) { ready: function( wait ) {
// A third-party is pushing the ready event forwards // A third-party is pushing the ready event forwards
@@ -454,7 +454,7 @@ jQuery.extend({
} }
} }
}, },
bindReady: function() { bindReady: function() {
if ( readyBound ) { if ( readyBound ) {
return; return;
@@ -473,7 +473,7 @@ jQuery.extend({
if ( document.addEventListener ) { if ( document.addEventListener ) {
// Use the handy event callback // Use the handy event callback
document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
// A fallback to window.onload, that will always work // A fallback to window.onload, that will always work
window.addEventListener( "load", jQuery.ready, false ); window.addEventListener( "load", jQuery.ready, false );
@@ -482,7 +482,7 @@ jQuery.extend({
// ensure firing before onload, // ensure firing before onload,
// maybe late but safe also for iframes // maybe late but safe also for iframes
document.attachEvent("onreadystatechange", DOMContentLoaded); document.attachEvent("onreadystatechange", DOMContentLoaded);
// A fallback to window.onload, that will always work // A fallback to window.onload, that will always work
window.attachEvent( "onload", jQuery.ready ); window.attachEvent( "onload", jQuery.ready );
@@ -533,20 +533,20 @@ jQuery.extend({
if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
return false; return false;
} }
// Not own constructor property must be Object // Not own constructor property must be Object
if ( obj.constructor && if ( obj.constructor &&
!hasOwn.call(obj, "constructor") && !hasOwn.call(obj, "constructor") &&
!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
return false; return false;
} }
// Own properties are enumerated firstly, so to speed up, // Own properties are enumerated firstly, so to speed up,
// if last one is own, then all properties are own. // if last one is own, then all properties are own.
var key; var key;
for ( key in obj ) {} for ( key in obj ) {}
return key === undefined || hasOwn.call( obj, key ); return key === undefined || hasOwn.call( obj, key );
}, },
@@ -556,11 +556,11 @@ jQuery.extend({
} }
return true; return true;
}, },
error: function( msg ) { error: function( msg ) {
throw msg; throw msg;
}, },
parseJSON: function( data ) { parseJSON: function( data ) {
if ( typeof data !== "string" || !data ) { if ( typeof data !== "string" || !data ) {
return null; return null;
@@ -568,7 +568,7 @@ jQuery.extend({
// Make sure leading/trailing whitespace is removed (IE can't handle it) // Make sure leading/trailing whitespace is removed (IE can't handle it)
data = jQuery.trim( data ); data = jQuery.trim( data );
// Make sure the incoming data is actual JSON // Make sure the incoming data is actual JSON
// Logic borrowed from http://json.org/json2.js // Logic borrowed from http://json.org/json2.js
if ( rvalidchars.test(data.replace(rvalidescape, "@") if ( rvalidchars.test(data.replace(rvalidescape, "@")
@@ -710,7 +710,7 @@ jQuery.extend({
for ( var l = second.length; j < l; j++ ) { for ( var l = second.length; j < l; j++ ) {
first[ i++ ] = second[ j ]; first[ i++ ] = second[ j ];
} }
} else { } else {
while ( second[j] !== undefined ) { while ( second[j] !== undefined ) {
first[ i++ ] = second[ j++ ]; first[ i++ ] = second[ j++ ];
@@ -790,7 +790,7 @@ jQuery.extend({
// The value/s can be optionally by executed if its a function // The value/s can be optionally by executed if its a function
access: function( elems, key, value, exec, fn, pass ) { access: function( elems, key, value, exec, fn, pass ) {
var length = elems.length; var length = elems.length;
// Setting many attributes // Setting many attributes
if ( typeof key === "object" ) { if ( typeof key === "object" ) {
for ( var k in key ) { for ( var k in key ) {
@@ -798,19 +798,19 @@ jQuery.extend({
} }
return elems; return elems;
} }
// Setting one attribute // Setting one attribute
if ( value !== undefined ) { if ( value !== undefined ) {
// Optionally, function values get executed if exec is true // Optionally, function values get executed if exec is true
exec = !pass && exec && jQuery.isFunction(value); exec = !pass && exec && jQuery.isFunction(value);
for ( var i = 0; i < length; i++ ) { for ( var i = 0; i < length; i++ ) {
fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
} }
return elems; return elems;
} }
// Getting an attribute // Getting an attribute
return length ? fn( elems[0], key ) : undefined; return length ? fn( elems[0], key ) : undefined;
}, },
@@ -1115,7 +1115,7 @@ jQuery.extend({
// Please use with caution // Please use with caution
uuid: 0, uuid: 0,
// Unique for each copy of jQuery on the page // Unique for each copy of jQuery on the page
expando: "jQuery" + jQuery.now(), expando: "jQuery" + jQuery.now(),
// The following elements throw uncatchable exceptions if you // The following elements throw uncatchable exceptions if you
@@ -1607,7 +1607,7 @@ jQuery.fn.extend({
var option = options[ i ]; var option = options[ i ];
// Don't return options that are disabled or in a disabled optgroup // Don't return options that are disabled or in a disabled optgroup
if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
// Get the specific value for the option // Get the specific value for the option
@@ -1630,7 +1630,7 @@ jQuery.fn.extend({
if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) { if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
return elem.getAttribute("value") === null ? "on" : elem.value; return elem.getAttribute("value") === null ? "on" : elem.value;
} }
// Everything else, we just grab the value // Everything else, we just grab the value
return (elem.value || "").replace(rreturn, ""); return (elem.value || "").replace(rreturn, "");
@@ -1696,7 +1696,7 @@ jQuery.extend({
height: true, height: true,
offset: true offset: true
}, },
attr: function( elem, name, value, pass ) { attr: function( elem, name, value, pass ) {
// don't set attributes on text and comment nodes // don't set attributes on text and comment nodes
if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
@@ -1865,7 +1865,7 @@ jQuery.event = {
var eventKey = elem.nodeType ? "events" : "__events__", var eventKey = elem.nodeType ? "events" : "__events__",
events = elemData[ eventKey ], events = elemData[ eventKey ],
eventHandle = elemData.handle; eventHandle = elemData.handle;
if ( typeof events === "function" ) { if ( typeof events === "function" ) {
// On plain objects events is a fn that holds the the data // On plain objects events is a fn that holds the the data
// which prevents this data from being JSON serialized // which prevents this data from being JSON serialized
@@ -1945,9 +1945,9 @@ jQuery.event = {
} }
} }
} }
if ( special.add ) { if ( special.add ) {
special.add.call( elem, handleObj ); special.add.call( elem, handleObj );
if ( !handleObj.handler.guid ) { if ( !handleObj.handler.guid ) {
handleObj.handler.guid = handler.guid; handleObj.handler.guid = handler.guid;
@@ -1986,7 +1986,7 @@ jQuery.event = {
if ( !elemData || !events ) { if ( !elemData || !events ) {
return; return;
} }
if ( typeof events === "function" ) { if ( typeof events === "function" ) {
elemData = events; elemData = events;
events = events.events; events = events.events;
@@ -2024,7 +2024,7 @@ jQuery.event = {
namespaces = type.split("."); namespaces = type.split(".");
type = namespaces.shift(); type = namespaces.shift();
namespace = new RegExp("(^|\\.)" + namespace = new RegExp("(^|\\.)" +
jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)"); jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
} }
@@ -2186,7 +2186,7 @@ jQuery.event = {
isClick = jQuery.nodeName( target, "a" ) && targetType === "click", isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
special = jQuery.event.special[ targetType ] || {}; special = jQuery.event.special[ targetType ] || {};
if ( (!special._default || special._default.call( elem, event ) === false) && if ( (!special._default || special._default.call( elem, event ) === false) &&
!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) { !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
try { try {
@@ -2256,7 +2256,7 @@ jQuery.event = {
event.handler = handleObj.handler; event.handler = handleObj.handler;
event.data = handleObj.data; event.data = handleObj.data;
event.handleObj = handleObj; event.handleObj = handleObj;
var ret = handleObj.handler.apply( this, args ); var ret = handleObj.handler.apply( this, args );
if ( ret !== undefined ) { if ( ret !== undefined ) {
@@ -2355,7 +2355,7 @@ jQuery.event = {
add: function( handleObj ) { add: function( handleObj ) {
jQuery.event.add( this, jQuery.event.add( this,
liveConvert( handleObj.origType, handleObj.selector ), liveConvert( handleObj.origType, handleObj.selector ),
jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
}, },
remove: function( handleObj ) { remove: function( handleObj ) {
@@ -2385,7 +2385,7 @@ jQuery.removeEvent = document.removeEventListener ?
if ( elem.removeEventListener ) { if ( elem.removeEventListener ) {
elem.removeEventListener( type, handle, false ); elem.removeEventListener( type, handle, false );
} }
} : } :
function( elem, type, handle ) { function( elem, type, handle ) {
if ( elem.detachEvent ) { if ( elem.detachEvent ) {
elem.detachEvent( "on" + type, handle ); elem.detachEvent( "on" + type, handle );
@@ -2432,7 +2432,7 @@ jQuery.Event.prototype = {
if ( !e ) { if ( !e ) {
return; return;
} }
// if preventDefault exists run it on the original event // if preventDefault exists run it on the original event
if ( e.preventDefault ) { if ( e.preventDefault ) {
e.preventDefault(); e.preventDefault();
@@ -2528,7 +2528,7 @@ if ( !jQuery.support.submitBubbles ) {
return trigger( "submit", this, arguments ); return trigger( "submit", this, arguments );
} }
}); });
jQuery.event.add(this, "keypress.specialSubmit", function( e ) { jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
var elem = e.target, var elem = e.target,
type = elem.type; type = elem.type;
@@ -2590,7 +2590,7 @@ if ( !jQuery.support.changeBubbles ) {
if ( e.type !== "focusout" || elem.type !== "radio" ) { if ( e.type !== "focusout" || elem.type !== "radio" ) {
jQuery.data( elem, "_change_data", val ); jQuery.data( elem, "_change_data", val );
} }
if ( data === undefined || val === data ) { if ( data === undefined || val === data ) {
return; return;
} }
@@ -2604,7 +2604,7 @@ if ( !jQuery.support.changeBubbles ) {
jQuery.event.special.change = { jQuery.event.special.change = {
filters: { filters: {
focusout: testChange, focusout: testChange,
beforedeactivate: testChange, beforedeactivate: testChange,
@@ -2675,15 +2675,15 @@ if ( document.addEventListener ) {
if ( focusCounts[fix]++ === 0 ) { if ( focusCounts[fix]++ === 0 ) {
document.addEventListener( orig, handler, true ); document.addEventListener( orig, handler, true );
} }
}, },
teardown: function() { teardown: function() {
if ( --focusCounts[fix] === 0 ) { if ( --focusCounts[fix] === 0 ) {
document.removeEventListener( orig, handler, true ); document.removeEventListener( orig, handler, true );
} }
} }
}; };
function handler( e ) { function handler( e ) {
e = jQuery.event.fix( e ); e = jQuery.event.fix( e );
e.type = fix; e.type = fix;
return jQuery.event.trigger( e, null, e.target ); return jQuery.event.trigger( e, null, e.target );
@@ -2700,7 +2700,7 @@ jQuery.each(["bind", "one"], function( i, name ) {
} }
return this; return this;
} }
if ( jQuery.isFunction( data ) || data === false ) { if ( jQuery.isFunction( data ) || data === false ) {
fn = data; fn = data;
data = undefined; data = undefined;
@@ -2740,20 +2740,20 @@ jQuery.fn.extend({
return this; return this;
}, },
delegate: function( selector, types, data, fn ) { delegate: function( selector, types, data, fn ) {
return this.live( types, data, fn, selector ); return this.live( types, data, fn, selector );
}, },
undelegate: function( selector, types, fn ) { undelegate: function( selector, types, fn ) {
if ( arguments.length === 0 ) { if ( arguments.length === 0 ) {
return this.unbind( "live" ); return this.unbind( "live" );
} else { } else {
return this.die( types, null, fn, selector ); return this.die( types, null, fn, selector );
} }
}, },
trigger: function( type, data ) { trigger: function( type, data ) {
return this.each(function() { return this.each(function() {
jQuery.event.trigger( type, data, this ); jQuery.event.trigger( type, data, this );
@@ -2810,12 +2810,12 @@ jQuery.each(["live", "die"], function( i, name ) {
var type, i = 0, match, namespaces, preType, var type, i = 0, match, namespaces, preType,
selector = origSelector || this.selector, selector = origSelector || this.selector,
context = origSelector ? this : jQuery( this.context ); context = origSelector ? this : jQuery( this.context );
if ( typeof types === "object" && !types.preventDefault ) { if ( typeof types === "object" && !types.preventDefault ) {
for ( var key in types ) { for ( var key in types ) {
context[ name ]( key, data, types[key], selector ); context[ name ]( key, data, types[key], selector );
} }
return this; return this;
} }
@@ -2862,7 +2862,7 @@ jQuery.each(["live", "die"], function( i, name ) {
context.unbind( "live." + liveConvert( type, selector ), fn ); context.unbind( "live." + liveConvert( type, selector ), fn );
} }
} }
return this; return this;
}; };
}); });
@@ -2881,7 +2881,7 @@ function liveHandler( event ) {
if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) { if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
return; return;
} }
if ( event.namespace ) { if ( event.namespace ) {
namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)"); namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
} }
@@ -3029,7 +3029,7 @@ var Sizzle = function( selector, context, results, seed ) {
if ( context.nodeType !== 1 && context.nodeType !== 9 ) { if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
return []; return [];
} }
if ( !selector || typeof selector !== "string" ) { if ( !selector || typeof selector !== "string" ) {
return results; return results;
} }
@@ -3039,7 +3039,7 @@ var Sizzle = function( selector, context, results, seed ) {
contextXML = Sizzle.isXML( context ), contextXML = Sizzle.isXML( context ),
parts = [], parts = [],
soFar = selector; soFar = selector;
// Reset the position of the chunker regexp (start from head) // Reset the position of the chunker regexp (start from head)
do { do {
chunker.exec( "" ); chunker.exec( "" );
@@ -3047,9 +3047,9 @@ var Sizzle = function( selector, context, results, seed ) {
if ( m ) { if ( m ) {
soFar = m[3]; soFar = m[3];
parts.push( m[1] ); parts.push( m[1] );
if ( m[2] ) { if ( m[2] ) {
extra = m[3]; extra = m[3];
break; break;
@@ -3073,7 +3073,7 @@ var Sizzle = function( selector, context, results, seed ) {
if ( Expr.relative[ selector ] ) { if ( Expr.relative[ selector ] ) {
selector += parts.shift(); selector += parts.shift();
} }
set = posProcess( selector, set ); set = posProcess( selector, set );
} }
} }
@@ -3202,7 +3202,7 @@ Sizzle.find = function( expr, context, isXML ) {
for ( var i = 0, l = Expr.order.length; i < l; i++ ) { for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
var match, var match,
type = Expr.order[i]; type = Expr.order[i];
if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
var left = match[1]; var left = match[1];
match.splice( 1, 1 ); match.splice( 1, 1 );
@@ -3518,7 +3518,7 @@ var Expr = Sizzle.selectors = {
ATTR: function( match, curLoop, inplace, result, not, isXML ) { ATTR: function( match, curLoop, inplace, result, not, isXML ) {
var name = match[1].replace(/\\/g, ""); var name = match[1].replace(/\\/g, "");
if ( !isXML && Expr.attrMap[name] ) { if ( !isXML && Expr.attrMap[name] ) {
match[1] = Expr.attrMap[name]; match[1] = Expr.attrMap[name];
} }
@@ -3549,7 +3549,7 @@ var Expr = Sizzle.selectors = {
} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
return true; return true;
} }
return match; return match;
}, },
@@ -3559,7 +3559,7 @@ var Expr = Sizzle.selectors = {
return match; return match;
} }
}, },
filters: { filters: {
enabled: function( elem ) { enabled: function( elem ) {
return elem.disabled === false && elem.type !== "hidden"; return elem.disabled === false && elem.type !== "hidden";
@@ -3572,12 +3572,12 @@ var Expr = Sizzle.selectors = {
checked: function( elem ) { checked: function( elem ) {
return elem.checked === true; return elem.checked === true;
}, },
selected: function( elem ) { selected: function( elem ) {
// Accessing this property makes selected-by-default // Accessing this property makes selected-by-default
// options in Safari work properly // options in Safari work properly
elem.parentNode.selectedIndex; elem.parentNode.selectedIndex;
return elem.selected === true; return elem.selected === true;
}, },
@@ -3703,21 +3703,21 @@ var Expr = Sizzle.selectors = {
case "only": case "only":
case "first": case "first":
while ( (node = node.previousSibling) ) { while ( (node = node.previousSibling) ) {
if ( node.nodeType === 1 ) { if ( node.nodeType === 1 ) {
return false; return false;
} }
} }
if ( type === "first" ) { if ( type === "first" ) {
return true; return true;
} }
node = elem; node = elem;
case "last": case "last":
while ( (node = node.nextSibling) ) { while ( (node = node.nextSibling) ) {
if ( node.nodeType === 1 ) { if ( node.nodeType === 1 ) {
return false; return false;
} }
} }
@@ -3730,22 +3730,22 @@ var Expr = Sizzle.selectors = {
if ( first === 1 && last === 0 ) { if ( first === 1 && last === 0 ) {
return true; return true;
} }
var doneName = match[0], var doneName = match[0],
parent = elem.parentNode; parent = elem.parentNode;
if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
var count = 0; var count = 0;
for ( node = parent.firstChild; node; node = node.nextSibling ) { for ( node = parent.firstChild; node; node = node.nextSibling ) {
if ( node.nodeType === 1 ) { if ( node.nodeType === 1 ) {
node.nodeIndex = ++count; node.nodeIndex = ++count;
} }
} }
parent.sizcache = doneName; parent.sizcache = doneName;
} }
var diff = elem.nodeIndex - last; var diff = elem.nodeIndex - last;
if ( first === 0 ) { if ( first === 0 ) {
@@ -3764,7 +3764,7 @@ var Expr = Sizzle.selectors = {
TAG: function( elem, match ) { TAG: function( elem, match ) {
return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
}, },
CLASS: function( elem, match ) { CLASS: function( elem, match ) {
return (" " + (elem.className || elem.getAttribute("class")) + " ") return (" " + (elem.className || elem.getAttribute("class")) + " ")
.indexOf( match ) > -1; .indexOf( match ) > -1;
@@ -3830,7 +3830,7 @@ var makeArray = function( array, results ) {
results.push.apply( results, array ); results.push.apply( results, array );
return results; return results;
} }
return array; return array;
}; };
@@ -4077,7 +4077,7 @@ if ( document.querySelectorAll ) {
if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
return; return;
} }
Sizzle = function( query, context, extra, seed ) { Sizzle = function( query, context, extra, seed ) {
context = context || document; context = context || document;
@@ -4115,7 +4115,7 @@ if ( document.querySelectorAll ) {
} }
} }
} }
return oldSizzle(query, context, extra, seed); return oldSizzle(query, context, extra, seed);
}; };
@@ -4137,7 +4137,7 @@ if ( document.querySelectorAll ) {
// This should fail with an exception // This should fail with an exception
// Gecko does not error, returns false instead // Gecko does not error, returns false instead
matches.call( document.documentElement, "[test!='']:sizzle" ); matches.call( document.documentElement, "[test!='']:sizzle" );
} catch( pseudoError ) { } catch( pseudoError ) {
pseudoWorks = true; pseudoWorks = true;
} }
@@ -4148,7 +4148,7 @@ if ( document.querySelectorAll ) {
expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
if ( !Sizzle.isXML( node ) ) { if ( !Sizzle.isXML( node ) ) {
try { try {
if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
return matches.call( node, expr ); return matches.call( node, expr );
} }
@@ -4177,7 +4177,7 @@ if ( document.querySelectorAll ) {
if ( div.getElementsByClassName("e").length === 1 ) { if ( div.getElementsByClassName("e").length === 1 ) {
return; return;
} }
Expr.order.splice(1, 0, "CLASS"); Expr.order.splice(1, 0, "CLASS");
Expr.find.CLASS = function( match, context, isXML ) { Expr.find.CLASS = function( match, context, isXML ) {
if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
@@ -4228,7 +4228,7 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
if ( elem ) { if ( elem ) {
var match = false; var match = false;
elem = elem[dir]; elem = elem[dir];
while ( elem ) { while ( elem ) {
@@ -4281,7 +4281,7 @@ if ( document.documentElement.contains ) {
Sizzle.isXML = function( elem ) { Sizzle.isXML = function( elem ) {
// documentElement is verified for cases where it doesn't yet exist // documentElement is verified for cases where it doesn't yet exist
// (such as loading iframes in IE - #4833) // (such as loading iframes in IE - #4833)
var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
return documentElement ? documentElement.nodeName !== "HTML" : false; return documentElement ? documentElement.nodeName !== "HTML" : false;
@@ -4373,7 +4373,7 @@ jQuery.fn.extend({
filter: function( selector ) { filter: function( selector ) {
return this.pushStack( winnow(this, selector, true), "filter", selector ); return this.pushStack( winnow(this, selector, true), "filter", selector );
}, },
is: function( selector ) { is: function( selector ) {
return !!selector && jQuery.filter( selector, this ).length > 0; return !!selector && jQuery.filter( selector, this ).length > 0;
}, },
@@ -4391,7 +4391,7 @@ jQuery.fn.extend({
selector = selectors[i]; selector = selectors[i];
if ( !matches[selector] ) { if ( !matches[selector] ) {
matches[selector] = jQuery.expr.match.POS.test( selector ) ? matches[selector] = jQuery.expr.match.POS.test( selector ) ?
jQuery( selector, context || this.context ) : jQuery( selector, context || this.context ) :
selector; selector;
} }
@@ -4414,7 +4414,7 @@ jQuery.fn.extend({
return ret; return ret;
} }
var pos = POS.test( selectors ) ? var pos = POS.test( selectors ) ?
jQuery( selectors, context || this.context ) : null; jQuery( selectors, context || this.context ) : null;
for ( i = 0, l = this.length; i < l; i++ ) { for ( i = 0, l = this.length; i < l; i++ ) {
@@ -4435,10 +4435,10 @@ jQuery.fn.extend({
} }
ret = ret.length > 1 ? jQuery.unique(ret) : ret; ret = ret.length > 1 ? jQuery.unique(ret) : ret;
return this.pushStack( ret, "closest", selectors ); return this.pushStack( ret, "closest", selectors );
}, },
// Determine the position of an element within // Determine the position of an element within
// the matched set of elements // the matched set of elements
index: function( elem ) { index: function( elem ) {
@@ -4519,7 +4519,7 @@ jQuery.each({
}, function( name, fn ) { }, function( name, fn ) {
jQuery.fn[ name ] = function( until, selector ) { jQuery.fn[ name ] = function( until, selector ) {
var ret = jQuery.map( this, fn, until ); var ret = jQuery.map( this, fn, until );
if ( !runtil.test( name ) ) { if ( !runtil.test( name ) ) {
selector = until; selector = until;
} }
@@ -4548,7 +4548,7 @@ jQuery.extend({
jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
jQuery.find.matches(expr, elems); jQuery.find.matches(expr, elems);
}, },
dir: function( elem, dir, until ) { dir: function( elem, dir, until ) {
var matched = [], var matched = [],
cur = elem[ dir ]; cur = elem[ dir ];
@@ -4770,7 +4770,7 @@ jQuery.fn.extend({
return set; return set;
} }
}, },
// keepData is for internal use only--do not document // keepData is for internal use only--do not document
remove: function( selector, keepData ) { remove: function( selector, keepData ) {
for ( var i = 0, elem; (elem = this[i]) != null; i++ ) { for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
@@ -4785,7 +4785,7 @@ jQuery.fn.extend({
} }
} }
} }
return this; return this;
}, },
@@ -4801,7 +4801,7 @@ jQuery.fn.extend({
elem.removeChild( elem.firstChild ); elem.removeChild( elem.firstChild );
} }
} }
return this; return this;
}, },
@@ -4952,9 +4952,9 @@ jQuery.fn.extend({
} else { } else {
results = jQuery.buildFragment( args, this, scripts ); results = jQuery.buildFragment( args, this, scripts );
} }
fragment = results.fragment; fragment = results.fragment;
if ( fragment.childNodes.length === 1 ) { if ( fragment.childNodes.length === 1 ) {
first = fragment = fragment.firstChild; first = fragment = fragment.firstChild;
} else { } else {
@@ -5062,18 +5062,18 @@ jQuery.each({
var ret = [], var ret = [],
insert = jQuery( selector ), insert = jQuery( selector ),
parent = this.length === 1 && this[0].parentNode; parent = this.length === 1 && this[0].parentNode;
if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) { if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
insert[ original ]( this[0] ); insert[ original ]( this[0] );
return this; return this;
} else { } else {
for ( var i = 0, l = insert.length; i < l; i++ ) { for ( var i = 0, l = insert.length; i < l; i++ ) {
var elems = (i > 0 ? this.clone(true) : this).get(); var elems = (i > 0 ? this.clone(true) : this).get();
jQuery( insert[i] )[ original ]( elems ); jQuery( insert[i] )[ original ]( elems );
ret = ret.concat( elems ); ret = ret.concat( elems );
} }
return this.pushStack( ret, name, insert.selector ); return this.pushStack( ret, name, insert.selector );
} }
}; };
@@ -5161,7 +5161,7 @@ jQuery.extend({
for ( i = 0; ret[i]; i++ ) { for ( i = 0; ret[i]; i++ ) {
if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) { if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] ); scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
} else { } else {
if ( ret[i].nodeType === 1 ) { if ( ret[i].nodeType === 1 ) {
ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) ); ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
@@ -5173,22 +5173,22 @@ jQuery.extend({
return ret; return ret;
}, },
cleanData: function( elems ) { cleanData: function( elems ) {
var data, id, cache = jQuery.cache, var data, id, cache = jQuery.cache,
special = jQuery.event.special, special = jQuery.event.special,
deleteExpando = jQuery.support.deleteExpando; deleteExpando = jQuery.support.deleteExpando;
for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
continue; continue;
} }
id = elem[ jQuery.expando ]; id = elem[ jQuery.expando ];
if ( id ) { if ( id ) {
data = cache[ id ]; data = cache[ id ];
if ( data && data.events ) { if ( data && data.events ) {
for ( var type in data.events ) { for ( var type in data.events ) {
if ( special[ type ] ) { if ( special[ type ] ) {
@@ -5199,14 +5199,14 @@ jQuery.extend({
} }
} }
} }
if ( deleteExpando ) { if ( deleteExpando ) {
delete elem[ jQuery.expando ]; delete elem[ jQuery.expando ];
} else if ( elem.removeAttribute ) { } else if ( elem.removeAttribute ) {
elem.removeAttribute( jQuery.expando ); elem.removeAttribute( jQuery.expando );
} }
delete cache[ id ]; delete cache[ id ];
} }
} }
@@ -5819,7 +5819,7 @@ jQuery.extend({
data = tmp; data = tmp;
jQuery.handleSuccess( s, xhr, status, data ); jQuery.handleSuccess( s, xhr, status, data );
jQuery.handleComplete( s, xhr, status, data ); jQuery.handleComplete( s, xhr, status, data );
if ( head ) { if ( head ) {
head.removeChild( script ); head.removeChild( script );
} }
@@ -6078,19 +6078,19 @@ jQuery.extend({
value = jQuery.isFunction(value) ? value() : value; value = jQuery.isFunction(value) ? value() : value;
s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value); s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
}; };
// Set traditional to true for jQuery <= 1.3.2 behavior. // Set traditional to true for jQuery <= 1.3.2 behavior.
if ( traditional === undefined ) { if ( traditional === undefined ) {
traditional = jQuery.ajaxSettings.traditional; traditional = jQuery.ajaxSettings.traditional;
} }
// If an array was passed in, assume that it is an array of form elements. // If an array was passed in, assume that it is an array of form elements.
if ( jQuery.isArray(a) || a.jquery ) { if ( jQuery.isArray(a) || a.jquery ) {
// Serialize the form elements // Serialize the form elements
jQuery.each( a, function() { jQuery.each( a, function() {
add( this.name, this.value ); add( this.name, this.value );
}); });
} else { } else {
// If traditional, encode the "old" way (the way 1.3.2 or older // If traditional, encode the "old" way (the way 1.3.2 or older
// did it), otherwise encode params recursively. // did it), otherwise encode params recursively.
@@ -6123,7 +6123,7 @@ function buildParams( prefix, obj, traditional, add ) {
buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add ); buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
} }
}); });
} else if ( !traditional && obj != null && typeof obj === "object" ) { } else if ( !traditional && obj != null && typeof obj === "object" ) {
if ( jQuery.isEmptyObject( obj ) ) { if ( jQuery.isEmptyObject( obj ) ) {
add( prefix, "" ); add( prefix, "" );
@@ -6134,7 +6134,7 @@ function buildParams( prefix, obj, traditional, add ) {
buildParams( prefix + "[" + k + "]", v, traditional, add ); buildParams( prefix + "[" + k + "]", v, traditional, add );
}); });
} }
} else { } else {
// Serialize scalar item. // Serialize scalar item.
add( prefix, obj ); add( prefix, obj );
@@ -6192,7 +6192,7 @@ jQuery.extend({
jQuery.event.trigger( "ajaxStop" ); jQuery.event.trigger( "ajaxStop" );
} }
}, },
triggerGlobal: function( s, type, args ) { triggerGlobal: function( s, type, args ) {
(s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args); (s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args);
}, },
@@ -6815,7 +6815,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) { jQuery.fn.offset = function( options ) {
var elem = this[0], box; var elem = this[0], box;
if ( options ) { if ( options ) {
return this.each(function( i ) { return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i ); jQuery.offset.setOffset( this, options, i );
}); });
@@ -6857,7 +6857,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) { jQuery.fn.offset = function( options ) {
var elem = this[0]; var elem = this[0];
if ( options ) { if ( options ) {
return this.each(function( i ) { return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i ); jQuery.offset.setOffset( this, options, i );
}); });
@@ -6976,7 +6976,7 @@ jQuery.offset = {
return { top: top, left: left }; return { top: top, left: left };
}, },
setOffset: function( elem, options, i ) { setOffset: function( elem, options, i ) {
var position = jQuery.css( elem, "position" ); var position = jQuery.css( elem, "position" );
@@ -7010,7 +7010,7 @@ jQuery.offset = {
if (options.left != null) { if (options.left != null) {
props.left = (options.left - curOffset.left) + curLeft; props.left = (options.left - curOffset.left) + curLeft;
} }
if ( "using" in options ) { if ( "using" in options ) {
options.using.call( elem, props ); options.using.call( elem, props );
} else { } else {
@@ -7070,7 +7070,7 @@ jQuery.each( ["Left", "Top"], function( i, name ) {
jQuery.fn[ method ] = function(val) { jQuery.fn[ method ] = function(val) {
var elem = this[0], win; var elem = this[0], win;
if ( !elem ) { if ( !elem ) {
return null; return null;
} }
@@ -7138,7 +7138,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
if ( !elem ) { if ( !elem ) {
return size == null ? null : this; return size == null ? null : this;
} }
if ( jQuery.isFunction( size ) ) { if ( jQuery.isFunction( size ) ) {
return this.each(function( i ) { return this.each(function( i ) {
var self = jQuery( this ); var self = jQuery( this );