[Rt-commit] rt branch, master, updated. rt-4.1.6-275-g5734d09
Alex Vandiver
alexmv at bestpractical.com
Tue Feb 19 17:28:29 EST 2013
The branch, master has been updated
via 5734d094fb2ff498fac51f55b2bc67ef7832ab4f (commit)
via 748a4895c2515be394406e3d8273bd694fdc1138 (commit)
via 182c5bf71e1219750fef29e01963f7fe35ea2009 (commit)
via 9b725e825bda7d7db45802ecdc5b916212fd25e9 (commit)
via 16206c9ef899ba15cee2f6fb1b4421e4a3f78fc6 (commit)
via d514189e93c11f00bcbccfae030d026437eb9142 (commit)
via 7a00cbb35eac76b8e97e383f156f5051f716867e (commit)
via aa336bc8ac224c2e646ab3ab2a90520ce412bc93 (commit)
via 044b2c4f20539a4d13dc8202450f02b69e157c07 (commit)
from 00b17701095519b081ef45bd37bbfa63f1148863 (commit)
Summary of changes:
lib/RT.pm | 20 ++--
lib/RT/Interface/Web/Handler.pm | 22 +++--
lib/RT/Squish/JS.pm | 22 ++++-
sbin/rt-test-dependencies.in | 2 +
share/html/Admin/Elements/EditRights | 2 +-
share/html/Admin/Elements/SelectNewGroupMembers | 4 +-
share/html/Admin/Groups/index.html | 2 +-
share/html/Admin/Tools/Queries.html | 2 +-
share/html/Admin/Tools/Theme.html | 2 +-
share/html/Admin/Users/index.html | 2 +-
share/html/Elements/EditCustomFieldAutocomplete | 4 +-
share/html/Elements/EditCustomFieldSelect | 4 +-
share/html/Elements/HeaderJavascript | 6 +-
share/html/Elements/JavascriptConfig | 2 +-
share/html/Elements/SelectOwnerAutocomplete | 2 +-
share/html/NoAuth/js/cascaded.js | 104 ---------------------
share/html/NoAuth/js/dhandler | 4 -
share/html/NoAuth/js/event-registration.js | 62 ------------
share/html/NoAuth/js/history-folding.js | 73 ---------------
share/html/NoAuth/js/jquery-ui-patch-datepicker.js | 92 ------------------
share/html/NoAuth/js/jquery.modal-defaults.js | 49 ----------
share/html/NoAuth/js/jquery_noconflict.js | 51 ----------
share/html/NoAuth/js/late.js | 85 -----------------
share/html/NoAuth/js/titlebox-state.js | 83 ----------------
share/html/Widgets/ComboBox | 2 +-
share/html/Widgets/SelectionBox | 4 +-
share/html/m/_elements/header | 2 +-
share/static/js/cascaded.js | 57 +++++++++++
share/{html/NoAuth => static}/js/class.js | 0
share/{html/NoAuth => static}/js/combobox.js | 47 ----------
share/static/js/event-registration.js | 15 +++
share/{html/NoAuth => static}/js/farbtastic.js | 0
share/static/js/history-folding.js | 26 ++++++
.../{html/NoAuth => static}/js/jquery-1.4.2.min.js | 0
.../js/jquery-ui-1.8.4.custom.min.js | 0
share/static/js/jquery-ui-patch-datepicker.js | 45 +++++++++
.../js/jquery-ui-timepicker-addon.js | 0
share/{html/NoAuth => static}/js/jquery.cookie.js | 0
.../NoAuth => static}/js/jquery.event.hover-1.0.js | 0
share/static/js/jquery.modal-defaults.js | 2 +
.../{html/NoAuth => static}/js/jquery.modal.min.js | 0
.../NoAuth => static}/js/jquery.supposition.js | 0
.../NoAuth => static}/js/jquery.tablesorter.min.js | 0
share/static/js/jquery_noconflict.js | 4 +
share/static/js/late.js | 38 ++++++++
share/{html/NoAuth => static}/js/list.js | 0
share/{html/NoAuth => static}/js/superfish.js | 0
share/{html/NoAuth => static}/js/supersubs.js | 0
share/static/js/titlebox-state.js | 36 +++++++
.../{html/NoAuth => static}/js/userautocomplete.js | 49 +---------
share/{html/NoAuth => static}/js/util.js | 51 +---------
t/web/squish.t | 2 +-
t/web/{html/NoAuth => static}/js/not-by-default.js | 0
53 files changed, 292 insertions(+), 789 deletions(-)
delete mode 100644 share/html/NoAuth/js/cascaded.js
delete mode 100644 share/html/NoAuth/js/event-registration.js
delete mode 100644 share/html/NoAuth/js/history-folding.js
delete mode 100644 share/html/NoAuth/js/jquery-ui-patch-datepicker.js
delete mode 100644 share/html/NoAuth/js/jquery.modal-defaults.js
delete mode 100644 share/html/NoAuth/js/jquery_noconflict.js
delete mode 100644 share/html/NoAuth/js/late.js
delete mode 100644 share/html/NoAuth/js/titlebox-state.js
create mode 100644 share/static/js/cascaded.js
rename share/{html/NoAuth => static}/js/class.js (100%)
rename share/{html/NoAuth => static}/js/combobox.js (79%)
create mode 100644 share/static/js/event-registration.js
rename share/{html/NoAuth => static}/js/farbtastic.js (100%)
create mode 100644 share/static/js/history-folding.js
rename share/{html/NoAuth => static}/js/jquery-1.4.2.min.js (100%)
rename share/{html/NoAuth => static}/js/jquery-ui-1.8.4.custom.min.js (100%)
create mode 100644 share/static/js/jquery-ui-patch-datepicker.js
rename share/{html/NoAuth => static}/js/jquery-ui-timepicker-addon.js (100%)
rename share/{html/NoAuth => static}/js/jquery.cookie.js (100%)
rename share/{html/NoAuth => static}/js/jquery.event.hover-1.0.js (100%)
create mode 100644 share/static/js/jquery.modal-defaults.js
rename share/{html/NoAuth => static}/js/jquery.modal.min.js (100%)
rename share/{html/NoAuth => static}/js/jquery.supposition.js (100%)
rename share/{html/NoAuth => static}/js/jquery.tablesorter.min.js (100%)
create mode 100644 share/static/js/jquery_noconflict.js
create mode 100644 share/static/js/late.js
rename share/{html/NoAuth => static}/js/list.js (100%)
rename share/{html/NoAuth => static}/js/superfish.js (100%)
rename share/{html/NoAuth => static}/js/supersubs.js (100%)
create mode 100644 share/static/js/titlebox-state.js
rename share/{html/NoAuth => static}/js/userautocomplete.js (50%)
rename share/{html/NoAuth => static}/js/util.js (80%)
rename t/web/{html/NoAuth => static}/js/not-by-default.js (100%)
- Log -----------------------------------------------------------------
commit 5734d094fb2ff498fac51f55b2bc67ef7832ab4f
Merge: 00b1770 748a489
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Feb 19 17:14:05 2013 -0500
Merge branch '4.2/static-js'
Conflicts:
sbin/rt-test-dependencies.in
share/html/NoAuth/js/cascaded.js
share/html/NoAuth/js/event-registration.js
share/html/NoAuth/js/history-folding.js
share/html/NoAuth/js/jquery-ui-patch-datepicker.js
share/html/NoAuth/js/jquery.modal-defaults.js
share/html/NoAuth/js/jquery_noconflict.js
share/html/NoAuth/js/late.js
share/html/NoAuth/js/titlebox-state.js
share/static/js/combobox.js
share/static/js/userautocomplete.js
share/static/js/util.js
Conflicts are caused by:
* Updated copyrights
* A new JS file (share/html/NoAuth/js/jquery.cookie.js)
* Untabification
* Dependencies in rt-test-depencies are merged and sorted
diff --cc sbin/rt-test-dependencies.in
index 1680c08,18675b5..1498d55
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@@ -207,38 -196,65 +207,40 @@@ HTML::Mason::PSGIHandler 0.5
HTML::Quoted
HTML::Scrubber 0.08
HTML::TreeBuilder
-HTML::FormatText
-Log::Dispatch 2.30
-Sys::Syslog 0.16
++HTTP::Message 6.0
+IPC::Run3
+JSON
++LWP::Simple
+List::MoreUtils
Locale::Maketext 1.06
-Locale::Maketext::Lexicon 0.32
Locale::Maketext::Fuzzy 0.11
-LWP::Simple
-MIME::Entity 5.425
+Locale::Maketext::Lexicon 0.32
+Log::Dispatch 2.30
Mail::Mailer 1.57
-Email::Address
-Text::Wrapper
-Time::ParseDate
-Time::HiRes
-File::Temp 0.19
-Text::Quoted 2.02
-Tree::Simple 1.04
-UNIVERSAL::require
-Regexp::Common
-Scalar::Util
+MIME::Entity 5.425
+Module::Refresh 0.03
Module::Versions::Report 1.05
-Cache::Simple::TimedExpiry
-Encode 2.39
-CSS::Squish 0.06
-File::Glob
-Devel::StackTrace 1.19
-Text::Password::Pronounceable
-Devel::GlobalDestruction
-List::MoreUtils
Net::CIDR
+Plack 0.9971
+Plack::Handler::Starlet
+Regexp::Common
Regexp::Common::net::CIDR
Regexp::IPv6
-Symbol::Global::Name
-HTML::Entities
Role::Basic 0.12
-HTTP::Message 6.00
-.
-
-$deps{'MASON'} = [ text_to_hash( << '.') ];
-HTML::Mason 1.43
-Errno
-Digest::MD5 2.27
-CGI::Cookie 1.20
+Scalar::Util
Storable 2.08
-Apache::Session 1.53
-XML::RSS 1.05
+Symbol::Global::Name
+Sys::Syslog 0.16
+Text::Password::Pronounceable
+Text::Quoted 2.02
+Text::Template 1.44
Text::WikiFormat 0.76
-CSS::Squish 0.06
-Devel::StackTrace 1.19
-JSON
-IPC::Run3
-.
-
-$deps{'PSGI'} = [ text_to_hash( << '.') ];
-CGI 3.38
-CGI::PSGI 0.12
-HTML::Mason::PSGIHandler 0.52
-Plack 0.9971
-Plack::Handler::Starlet
-CGI::Emulate::PSGI
+Text::Wrapper
+Time::HiRes
+Time::ParseDate
+Tree::Simple 1.04
+UNIVERSAL::require
+XML::RSS 1.05
.
$deps{'MAILGATE'} = [ text_to_hash( << '.') ];
diff --cc share/static/js/jquery-ui-patch-datepicker.js
index 0000000,48f0176..c433d48
mode 000000,100644..100644
--- a/share/static/js/jquery-ui-patch-datepicker.js
+++ b/share/static/js/jquery-ui-patch-datepicker.js
@@@ -1,0 -1,45 +1,45 @@@
+ (function($){
+ $.datepicker._newInst_orig = $.datepicker._newInst;
+ $.datepicker._newInst = function(target, inline) {
+ var data = this._newInst_orig(target, inline);
+
+ // Escape single quotes to avoid incorrect quoting in onclick handlers
+ // when other datepicker code interpolates inst.id. They'll already be
+ // escaped by the original _newInst for handing to jQuery's CSS
+ // selector parser.
+ data.id = data.id.replace(/'/g, "\\'");
+
+ return data;
+ };
+
+ $.datepicker._checkOffset_orig = $.datepicker._checkOffset;
+ $.datepicker._checkOffset = function(inst, offset, isFixed) {
+ // copied from the original
+ var dpHeight = inst.dpDiv.outerHeight();
+ var inputHeight = inst.input ? inst.input.outerHeight() : 0;
+ var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
+
+ // save the original offset rather than the new offset because the
+ // original function modifies the passed arg as a side-effect
+ var old_offset = { top: offset.top, left: offset.left };
+ offset = $.datepicker._checkOffset_orig(inst, offset, isFixed);
+
+ // Negate any up or down positioning by adding instead of subtracting
+ offset.top += Math.min(old_offset.top, (old_offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+ Math.abs(dpHeight + inputHeight) : 0);
+
+ return offset;
+ };
+
+
+ $.timepicker._newInst_orig = $.timepicker._newInst;
+ $.timepicker._newInst = function($input, o) {
+ var tp_inst = $.timepicker._newInst_orig($input, o);
+ tp_inst._defaults.onClose = function(dateText, dp_inst) {
- if ($.isFunction(o.onClose))
- o.onClose.call($input[0], dateText, dp_inst, tp_inst);
++ if ($.isFunction(o.onClose))
++ o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+ };
+ return tp_inst;
+ };
+
+ })(jQuery);
diff --cc share/static/js/jquery.cookie.js
index 7b3e701,0000000..7b3e701
mode 100644,000000..100644
--- a/share/static/js/jquery.cookie.js
+++ b/share/static/js/jquery.cookie.js
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list