Skip to content

Commit

Permalink
- renamed Swiff.Events to CallBacks, along with the passed option. T…
Browse files Browse the repository at this point in the history
…hey are nothing like events, but Flash Callbacks, so thats the correct name.

 - added a missing return in Swiff CallBacks

git-svn-id: http://svn.mootools.net/trunk@1470 4db308c1-fb21-0410-9919-de62e267375e
  • Loading branch information
kamicane committed Mar 6, 2008
1 parent ebe7b78 commit 37eb5f8
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions Source/Utilities/Swiff.js
Expand Up @@ -25,7 +25,7 @@ var Swiff = new Class({
wMode: 'transparent',
swLiveConnect: true
},
events: {},
callBacks: {},
vars: {}
},

Expand All @@ -41,24 +41,20 @@ var Swiff = new Class({
var id = this.id = options.id || this.instance;
var container = $(options.container);

Swiff.Events[this.instance] = {};
Swiff.CallBacks[this.instance] = {};

var params = options.params, vars = options.vars, events = options.events;
var params = options.params, vars = options.vars, callBacks = options.callBacks;
var properties = $extend({height: options.height, width: options.width}, options.properties);

for (var option in options){
if ((/^on[A-Z]/).test(option)) events[option] = options[option];
}

var self = this;

for (var event in events){
Swiff.Events[this.instance][event] = (function(option){
for (var callBack in callBacks){
Swiff.CallBacks[this.instance][callBack] = (function(option){
return function(){
option.apply(self.object, arguments);
return option.apply(self.object, arguments);
};
})(events[event]);
vars[event] = 'Swiff.Events.' + this.instance + '.' + event;
})(callBacks[callBack]);
vars[callBack] = 'Swiff.CallBacks.' + this.instance + '.' + callBack;
}

params.flashVars = Hash.toQueryString(vars);
Expand Down Expand Up @@ -94,7 +90,7 @@ var Swiff = new Class({

});

Swiff.Events = {};
Swiff.CallBacks = {};

Swiff.remote = function(obj, fn){
var rs = obj.CallFunction('<invoke name="' + fn + '" returntype="javascript">' + __flash__argumentsToXML(arguments, 2) + '</invoke>');
Expand Down

0 comments on commit 37eb5f8

Please sign in to comment.