Merge remote-tracking branch 'origin/master' into Astro

This commit is contained in:
斟酌 鵬兄 2017-09-26 13:09:21 +08:00
commit 06700757ce

View File

@ -13,15 +13,6 @@ var __readOnly = function( prototype, name, callback )
}.bind( { p: name } ) }.bind( { p: name } )
} ); } );
}; };
var __getter = function( obj, name, callback )
{
Object.defineProperty( obj, name, {
get: callback
, set: function( v ) {
throw new Error( "Setting a read-only property: " + this.p );
}.bind( { p: name } )
} );
};
var __static_method = function( obj, name, callback ) var __static_method = function( obj, name, callback )
{ {
Object.defineProperty( obj, name, { Object.defineProperty( obj, name, {
@ -54,20 +45,14 @@ var BotanEvent = function( name, data )
__static_method( __static_method(
this, "stopPropagating" this, "stopPropagating"
, function() , function() { __propagating = false; }
{
__propagating = false;
}
); );
__const( this, "type", name ); __const( this, "type", name );
__getter( __readOnly(
this, "propagating" this, "propagating"
, function() , function() { return __propagating; }
{
return __propagating;
}
); );
__const( this, "data", data ); __const( this, "data", data );