Skip to content

Commit

Permalink
update prototypejs from 1.6.1 to 1.7 and scriptaculous from 1.8.1 to 1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
darkv authored and Pascal Robert committed Mar 16, 2012
1 parent 4376a3b commit f406e0e
Show file tree
Hide file tree
Showing 12 changed files with 4,770 additions and 2,401 deletions.
12 changes: 4 additions & 8 deletions Frameworks/Ajax/Ajax/Support/scriptaculous_patched.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// TH 20090110
// Removed dynamic loading of scripts according to:
// http://www.boogdesign.com/b2evo/index.php/a/2008/05/27/compressed_prototype_scriptaculous
// script.aculo.us scriptaculous.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010

// script.aculo.us scriptaculous.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009

// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
Expand All @@ -28,7 +24,7 @@
// For details, see the script.aculo.us web site: http://script.aculo.us/

var Scriptaculous = {
Version: '1.8.3',
Version: '1.9.0',
// require: function(libraryName) {
// try{
// // inserting via DOM fails in Safari 2.0, so brute force approach
Expand Down Expand Up @@ -58,7 +54,7 @@ var Scriptaculous = {
Scriptaculous.REQUIRED_PROTOTYPE);

// var js = /scriptaculous\.js(\?.*)?$/;
// $$('head script[src]').findAll(function(s) {
// $$('script[src]').findAll(function(s) {
// return s.src.match(js);
// }).each(function(s) {
// var path = s.src.replace(js, ''),
Expand Down
4 changes: 2 additions & 2 deletions Frameworks/Ajax/Ajax/WebServerResources/builder.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// script.aculo.us builder.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// script.aculo.us builder.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010

// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// 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/
Expand Down
49 changes: 13 additions & 36 deletions Frameworks/Ajax/Ajax/WebServerResources/controls.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// script.aculo.us controls.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010

// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com)
// 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
Expand Down Expand Up @@ -91,7 +91,7 @@ Autocompleter.Base = Class.create({
Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
// AK new option: activateOnFocus
if(this.options.activateOnFocus) {
Event.observe(this.element, 'focus', this.onActivate.bindAsEventListener(this));
Event.observe(this.element, 'focus', this.onActivate.bindAsEventListener(this));
}
},

Expand Down Expand Up @@ -220,37 +220,15 @@ Autocompleter.Base = Class.create({
},

markPrevious: function() {
// Wonder-406 - Part 1 of window jump fix
if(this.index > 0) {
this.index--;
}
else {
this.index = this.entryCount-1;
this.update.scrollTop = this.update.scrollHeight;
}
selection = this.getEntry(this.index);
selection_top = selection.offsetTop;
if(selection_top < this.update.scrollTop){
this.update.scrollTop = this.update.scrollTop-selection.offsetHeight;
}
// End Wonder-406 - Part 1 of window jump fix
},

if(this.index > 0) this.index--;
else this.index = this.entryCount-1;
this.getEntry(this.index).scrollIntoView(true);
},

markNext: function() {
// Wonder-406 - Part 2 of window jump fix
if(this.index < this.entryCount-1) {
this.index++;
}
else {
this.index = 0;
this.update.scrollTop = 0;
}
selection = this.getEntry(this.index);
selection_bottom = selection.offsetTop+selection.offsetHeight;
if(selection_bottom > this.update.scrollTop+this.update.offsetHeight){
this.update.scrollTop = this.update.scrollTop+selection.offsetHeight;
}
// End Wonder-406 - Part 2 of window jump fix
if(this.index < this.entryCount-1) this.index++;
else this.index = 0;
this.getEntry(this.index).scrollIntoView(false);
},

getEntry: function(index) {
Expand Down Expand Up @@ -314,7 +292,6 @@ Autocompleter.Base = Class.create({
}

this.stopIndicator();
this.update.scrollTop = 0; // RP - Part 3 of window jump fix
this.index = 0;

if(this.entryCount==1 && this.options.autoSelect) {
Expand Down
6 changes: 3 additions & 3 deletions Frameworks/Ajax/Ajax/WebServerResources/dragdrop.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// script.aculo.us dragdrop.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// script.aculo.us dragdrop.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010

// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// 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/
Expand Down Expand Up @@ -374,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);
Expand Down
4 changes: 2 additions & 2 deletions Frameworks/Ajax/Ajax/WebServerResources/effects.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// script.aculo.us effects.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010

// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// 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/)
Expand Down
Loading

0 comments on commit f406e0e

Please sign in to comment.