Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
a99ccc5d
Commit
a99ccc5d
authored
Jun 10, 2011
by
Eric Davis
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'schmidt/f/419-update-js-libs/unstable' into release-v2.0.0
parents
ee9b1293
ae84fff8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3715 additions
and
1950 deletions
+3715
-1950
controls.js
public/javascripts/controls.js
+5
-3
dragdrop.js
public/javascripts/dragdrop.js
+8
-7
effects.js
public/javascripts/effects.js
+8
-13
prototype.js
public/javascripts/prototype.js
+3694
-1927
No files found.
public/javascripts/controls.js
View file @
a99ccc5d
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
// script.aculo.us controls.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2010 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2010 Jon Tirsen (http://www.tirsen.com)
// Contributors:
// Richard Livsey
// Rahul Bhargava
...
...
public/javascripts/dragdrop.js
View file @
a99ccc5d
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
// script.aculo.us dragdrop.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
// For details, see the script.aculo.us web site: http://script.aculo.us/
...
...
@@ -311,7 +312,7 @@ var Draggable = Class.create({
tag_name
==
'TEXTAREA'
))
return
;
var
pointer
=
[
Event
.
pointerX
(
event
),
Event
.
pointerY
(
event
)];
var
pos
=
Position
.
cumulativeOffset
(
this
.
element
);
var
pos
=
this
.
element
.
cumulativeOffset
(
);
this
.
offset
=
[
0
,
1
].
map
(
function
(
i
)
{
return
(
pointer
[
i
]
-
pos
[
i
])
});
Draggables
.
activate
(
this
);
...
...
@@ -373,7 +374,7 @@ var Draggable = Class.create({
if
(
this
.
options
.
scroll
==
window
)
{
with
(
this
.
_getWindowScroll
(
this
.
options
.
scroll
))
{
p
=
[
left
,
top
,
left
+
width
,
top
+
height
];
}
}
else
{
p
=
Position
.
page
(
this
.
options
.
scroll
);
p
=
Position
.
page
(
this
.
options
.
scroll
)
.
toArray
()
;
p
[
0
]
+=
this
.
options
.
scroll
.
scrollLeft
+
Position
.
deltaX
;
p
[
1
]
+=
this
.
options
.
scroll
.
scrollTop
+
Position
.
deltaY
;
p
.
push
(
p
[
0
]
+
this
.
options
.
scroll
.
offsetWidth
);
...
...
@@ -454,7 +455,7 @@ var Draggable = Class.create({
},
draw
:
function
(
point
)
{
var
pos
=
Position
.
cumulativeOffset
(
this
.
element
);
var
pos
=
this
.
element
.
cumulativeOffset
(
);
if
(
this
.
options
.
ghosting
)
{
var
r
=
Position
.
realOffset
(
this
.
element
);
pos
[
0
]
+=
r
[
0
]
-
Position
.
deltaX
;
pos
[
1
]
+=
r
[
1
]
-
Position
.
deltaY
;
...
...
@@ -730,7 +731,7 @@ var Sortable = {
}
// keep reference
this
.
sortables
[
element
.
id
]
=
options
;
this
.
sortables
[
element
.
id
entify
()
]
=
options
;
// for onupdate
Draggables
.
addObserver
(
new
SortableObserver
(
element
,
options
.
onUpdate
));
...
...
@@ -825,7 +826,7 @@ var Sortable = {
hide
().
addClassName
(
'dropmarker'
).
setStyle
({
position
:
'absolute'
});
document
.
getElementsByTagName
(
"body"
).
item
(
0
).
appendChild
(
Sortable
.
_marker
);
}
var
offsets
=
Position
.
cumulativeOffset
(
dropon
);
var
offsets
=
dropon
.
cumulativeOffset
(
);
Sortable
.
_marker
.
setStyle
({
left
:
offsets
[
0
]
+
'px'
,
top
:
offsets
[
1
]
+
'px'
});
if
(
position
==
'after'
)
...
...
public/javascripts/effects.js
View file @
a99ccc5d
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// script.aculo.us effects.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// Contributors:
// Justin Palmer (http://encytemedia.com/)
// Mark Pilgrim (http://diveintomark.org/)
...
...
@@ -145,14 +147,13 @@ var Effect = {
'blind'
:
[
'BlindDown'
,
'BlindUp'
],
'appear'
:
[
'Appear'
,
'Fade'
]
},
toggle
:
function
(
element
,
effect
)
{
toggle
:
function
(
element
,
effect
,
options
)
{
element
=
$
(
element
);
effect
=
(
effect
||
'appear'
).
toLowerCase
();
var
options
=
Object
.
extend
({
effect
=
(
effect
||
'appear'
).
toLowerCase
();
return
Effect
[
Effect
.
PAIRS
[
effect
][
element
.
visible
()
?
1
:
0
]
](
element
,
Object
.
extend
({
queue
:
{
position
:
'end'
,
scope
:(
element
.
id
||
'global'
),
limit
:
1
}
},
arguments
[
2
]
||
{
});
Effect
[
element
.
visible
()
?
Effect
.
PAIRS
[
effect
][
1
]
:
Effect
.
PAIRS
[
effect
][
0
]](
element
,
options
);
},
options
||
{}));
}
};
...
...
@@ -228,12 +229,6 @@ Effect.Queue = Effect.Queues.get('global');
Effect
.
Base
=
Class
.
create
({
position
:
null
,
start
:
function
(
options
)
{
function
codeForEvent
(
options
,
eventName
){
return
(
(
options
[
eventName
+
'Internal'
]
?
'this.options.'
+
eventName
+
'Internal(this);'
:
''
)
+
(
options
[
eventName
]
?
'this.options.'
+
eventName
+
'(this);'
:
''
)
);
}
if
(
options
&&
options
.
transition
===
false
)
options
.
transition
=
Effect
.
Transitions
.
linear
;
this
.
options
=
Object
.
extend
(
Object
.
extend
({
},
Effect
.
DefaultOptions
),
options
||
{
});
this
.
currentFrame
=
0
;
...
...
public/javascripts/prototype.js
View file @
a99ccc5d
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment