mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-14 01:22:13 +02:00
Code Issues Releases Wiki Activity

JS API (big) troubles - next try (one more reason to hate IE)

Browse Source
This commit is contained in:
secretr 2009-01-12 12:05:55 +00:00
parent 70a2b51da7
commit 9413f65fa9
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/header.php
View File

@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.28 $
| $Date: 2009-01-09 17:25:50 $
| $Revision: 1.29 $
| $Date: 2009-01-12 12:05:55 $
| $Author: secretr $
+---------------------------------------------------------------+
*/
@ -300,7 +300,7 @@ echo "
echo "<script type='text/javascript'>\n";
echo "<!--\n";
echo "document.observe('dom:loaded', function () {\n";
echo "e107Event.trigger('loaded', {element: null}, document);\n";
echo "e107Event.trigger('loaded', null, document);\n";
echo "});\n";
echo "// -->\n";
echo "</script>\n";

6
e107_files/jslib/core/admin.js
View File

@ -8,8 +8,8 @@
* e107 Admin Helper
*
* $Source: /cvs_backup/e107_0.8/e107_files/jslib/core/admin.js,v $
* $Revision: 1.13 $
* $Date: 2009-01-07 15:34:00 $
* $Revision: 1.14 $
* $Date: 2009-01-12 12:05:55 $
* $Author: secretr $
*
*/
@ -41,7 +41,7 @@ e107Admin.Helper = {
this.allCheckedEventHandler = this.allChecked.bindAsEventListener(this);
this.allUncheckedEventHandler = this.allUnchecked.bindAsEventListener(this);
this.allToggleCheckedEventHandler = this.allToggleChecked.bindAsEventListener(this);
element = event.element() != document ? event.element() : $$('body')[0];
element = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
element.select('.autocheck').invoke('observe', 'click', this.toggleCheckedHandler);
element.select('button.action[name=check_all]', 'input.toggle_all[type=checkbox]').invoke('observe', 'click', this.allCheckedEventHandler);

22
e107_files/jslib/e107.js.php
View File

@ -8,8 +8,8 @@
* e107 Javascript API
*
* $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $
* $Revision: 1.20 $
* $Date: 2009-01-07 15:34:00 $
* $Revision: 1.21 $
* $Date: 2009-01-12 12:05:55 $
* $Author: secretr $
*
*/
@ -823,7 +823,8 @@ Object.extend(e107Helper, {
* @see e107Core#addOnLoad
*/
toggleObserver: function(event) {
Element.select(event.element(), '.e-expandit').invoke('observe', 'click', function(e) {
var element = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
Element.select(element, '.e-expandit').invoke('observe', 'click', function(e) {
var element = e.findElement('a');
if(!element) element = e.element();
if(this.toggle(element, {})) e.stop();
@ -835,7 +836,8 @@ Object.extend(e107Helper, {
* on all <a href='#something" class="scroll-to"> elements
*/
scrollToObserver: function(event) {
Element.select(event.element(), 'a[href^=#].scroll-to:not([href=#])').invoke('observe', 'click', function(e) {
var element = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
Element.select(element, 'a[href^=#].scroll-to:not([href=#])').invoke('observe', 'click', function(e) {
new Effect.ScrollTo(e.element().hash.substr(1));
e.stop();
});
@ -859,7 +861,7 @@ Object.extend(e107Helper, {
//event listener
autoHide: function(event) {
var hideunder = event.element() != document ? event.element() : $$('body')[0];
var hideunder = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
if(hideunder) hideunder.downHide();
},
@ -882,7 +884,7 @@ Object.extend(e107Helper, {
//event listener
autoNoHistory: function(event) {
var down = event.element() != document ? event.element() : $$('body')[0];
var down = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
if(down) down.downNoHistory();
},
@ -904,7 +906,7 @@ Object.extend(e107Helper, {
//event listener
autoExternalLinks: function (event) {
var down = event.element() != document ? event.element() : $$('body')[0];
var down = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
if(down) down.downExternalLinks();
},
@ -2156,6 +2158,7 @@ Ajax.Updater = Class.create(Ajax.Updater, {
var e_responder = {
onCreate: function(request) {
if(request.options['updateElement']) {
request.options.element = request.options.updateElement;
e107Event.trigger('ajax_update_before', request.options, request.options.updateElement);
}
if(request.options['overlayPage']){
@ -2173,7 +2176,8 @@ Ajax.Updater = Class.create(Ajax.Updater, {
e107Event.trigger('ajax_loading_element_end', request.options);
}
if(request.options['updateElement']) {
if(request.options['updateElement']) {
request.options.element = request.options.updateElement;
e107Event.trigger('ajax_update_after', request.options, request.options.updateElement);
}
},
@ -2568,6 +2572,6 @@ function sendInfo(handler, container, form) {
* Core Auto-load
*/
$w('autoExternalLinks autoNoHistory autoHide toggleObserver scrollToObserver').each( function(f) {
e107.runOnLoad(e107Helper[f].bindAsEventListener(e107Helper), null, true);
e107.runOnLoad(e107Helper[f], null, true);
});

2
e107_themes/_blank/admin_theme.php
View File

@ -28,7 +28,7 @@ function theme_head() {
* TODO: add 'adminlist' class to all list core tables, allow theme decorate.
*/
e107.runOnLoad( function(event) {
var element = event.element() != document ? event.element() : $$('body')[0];
var element = event.memo['element'] ? $(event.memo.element) : $$('body')[0];
element.select('table.adminlist:not(.no-decorate)').each(function(element) {
e107Utils.Decorate.table(element, {tr_td: 'first last'});