Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lime/css/lime.css.soy.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed lime/demos/pong/compiled/assets/icon.png
Binary file not shown.
Binary file removed lime/demos/pong/compiled/assets/startup.jpg
Binary file not shown.
Binary file removed lime/demos/pong/compiled/assets/startup_ipad.jpg
Binary file not shown.
121 changes: 0 additions & 121 deletions lime/demos/pong/compiled/pong.html

This file was deleted.

569 changes: 0 additions & 569 deletions lime/demos/pong/compiled/pong.js

This file was deleted.

13 changes: 0 additions & 13 deletions lime/demos/pong/compiled/pong.manifest

This file was deleted.

2 changes: 1 addition & 1 deletion lime/demos/zlizer/zlizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ zlizer.start = function() {

zlizer.isBrokenChrome = function(){
return (/Chrome\/9\.0\.597/).test(goog.userAgent.getUserAgentString());
}
};


zlizer.loadMenuScene = function(opt_transition) {
Expand Down
20 changes: 10 additions & 10 deletions lime/src/animation/animation.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
goog.provide('lime.animation.Animation');
goog.provide('lime.animation.Easing');
goog.provide('lime.animation.actionManager');
goog.provide('lime.animation.ActionManager');
goog.provide('lime.animation.Event');


goog.require('goog.array');
goog.require('goog.events.EventTarget');
goog.require('goog.fx.easing');
goog.require('lime.scheduleManager');
goog.require('lime.ScheduleManager');


/**
* General object for running animations on nodes
* @constructor
* @extends goog.events.EventTarget
* @extends {goog.events.EventTarget}
*/
lime.animation.Animation = function() {
goog.events.EventTarget.call(this);
goog.base(this);

/**
* Array of active target nodes
Expand Down Expand Up @@ -297,17 +297,18 @@ lime.animation.Animation.prototype.reverse = function() {
* run together on same targets.
* @constructor
*/
lime.animation.actionManager = new (function() {
lime.animation.ActionManager = function() {
this.actions = {};
});
};

lime.animation.actionManager = new lime.animation.ActionManager();

/**
* Register animation in the manager.
* @param {lime.animation.Animation} action Action.
* @param {lime.Node} target Taget node.
* @this {lime.animation.actionManager}
*/
lime.animation.actionManager.register = function(action, target) {
lime.animation.ActionManager.prototype.register = function(action, target) {
//Todo: probably needs some garbage collection
if (!action.scope.length) return;
var id = goog.getUid(target);
Expand All @@ -323,9 +324,8 @@ lime.animation.actionManager.register = function(action, target) {
/**
* Stop all animations on target.
* @param {lime.Node} target Target node.
* @this {lime.animation.actionManager}
*/
lime.animation.actionManager.stopAll = function(target) {
lime.animation.ActionManager.prototype.stopAll = function(target) {
// todo: doesn't stop scopless action atm. (like sequence)
var id = goog.getUid(target);
if (goog.isDef(this.actions[id])) {
Expand Down
4 changes: 2 additions & 2 deletions lime/src/animation/colorto.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ goog.require('lime.animation.Animation');

/**
* Animation for changing element's fillcolor value
* @param {mixed...} args Color definition.
* @param {...} args Color definition.
* @constructor
* @extends lime.animation.Animation
*/
Expand Down Expand Up @@ -40,7 +40,7 @@ lime.animation.ColorTo.Target = {

/**
* Set the component to apply the animation
* @param {lime.animation.ColorTo.Target} component type.
* @param {lime.animation.ColorTo.Target} target type.
* @return {lime.animation.ColorTo} object itself.
*/
lime.animation.ColorTo.prototype.setTargetComponent = function(target) {
Expand Down
12 changes: 6 additions & 6 deletions lime/src/animation/scaleby.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ goog.require('lime.animation.Animation');
/**
* Scale by a factor
* Also accepts one or two numbers
* @param {goog.math.Vec2} factor Factor to scale.
* @param {goog.math.Vec2|number} factor Factor to scale.
* @param {number=} y
* @constructor
* @extends lime.animation.Animation
* @extends {lime.animation.Animation}
*/
lime.animation.ScaleBy = function(factor) {
lime.animation.Animation.call(this);
lime.animation.ScaleBy = function(factor, y) {
goog.base(this);

if (arguments.length == 1 && goog.isNumber(factor)) {
this.factor_ = new goog.math.Vec2(factor, factor);
Expand All @@ -23,7 +24,6 @@ lime.animation.ScaleBy = function(factor) {
}
else this.factor_ = factor;


};
goog.inherits(lime.animation.ScaleBy, lime.animation.Animation);

Expand Down Expand Up @@ -67,7 +67,7 @@ lime.animation.ScaleBy.prototype.update = function(t, target) {
};

/**
* @inheritDoc
* @param {lime.Node} target
* @see lime.animation.Animation#clearTransition
*/
lime.animation.ScaleBy.prototype.clearTransition = function(target) {
Expand Down
2 changes: 1 addition & 1 deletion lime/src/animation/spawn.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ lime.animation.Spawn.prototype.initTarget = function(target) {
* @see lime.animation.Animation#updateAll
*/
lime.animation.Spawn.prototype.updateAll = function(t, targets) {
if (this.status_ == 0) return undefined;
if (this.status_ == 0) return NaN;
var i = targets.length;
while (--i >= 0) {
this.getTargetProp(targets[i]);
Expand Down
Loading