This repository has been archived by the owner. It is now read-only.

T1911 #754

Merged
merged 2 commits into from Aug 16, 2012

Conversation

Projects
None yet
3 participants
@dseif
Member

dseif commented Aug 9, 2012

No description provided.

@jbuck

This comment has been minimized.

Show comment
Hide comment
@jbuck

jbuck Aug 9, 2012

Member

/botio check

Member

jbuck commented Aug 9, 2012

/botio check

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 9, 2012

From: Bot.io (butyr.org)


Received

Command cmd_check from @jbuck received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/bb978d1de7d42b9/output.txt

ghost commented Aug 9, 2012

From: Bot.io (butyr.org)


Received

Command cmd_check from @jbuck received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/bb978d1de7d42b9/output.txt

@jbuck

This comment has been minimized.

Show comment
Hide comment
@jbuck

jbuck Aug 9, 2012

Member

/botio preview

Member

jbuck commented Aug 9, 2012

/botio preview

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 9, 2012

From: Bot.io (butyr.org)


Received

Command cmd_preview from @jbuck received. Current queue size: 1

Live output at: http://botio.butyr.org:8000/3c16a5c5cb01b66/output.txt

ghost commented Aug 9, 2012

From: Bot.io (butyr.org)


Received

Command cmd_preview from @jbuck received. Current queue size: 1

Live output at: http://botio.butyr.org:8000/3c16a5c5cb01b66/output.txt

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 9, 2012

From: Bot.io (butyr.org)


Failed

Full output at http://botio.butyr.org:8000/bb978d1de7d42b9/output.txt

Total script time: 0.65 mins

ghost commented Aug 9, 2012

From: Bot.io (butyr.org)


Failed

Full output at http://botio.butyr.org:8000/bb978d1de7d42b9/output.txt

Total script time: 0.65 mins

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 9, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/3c16a5c5cb01b66/output.txt

Total script time: 0.92 mins

Server is running on http://pr754.butyr.org/templates/basic/

ghost commented Aug 9, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/3c16a5c5cb01b66/output.txt

Total script time: 0.92 mins

Server is running on http://pr754.butyr.org/templates/basic/

@jbuck

This comment has been minimized.

Show comment
Hide comment
@jbuck

jbuck Aug 9, 2012

Member

/botio check

Member

jbuck commented Aug 9, 2012

/botio check

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 9, 2012

From: Bot.io (butyr.org)


Received

Command cmd_check from @jbuck received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/4c0d8e490ade9c4/output.txt

ghost commented Aug 9, 2012

From: Bot.io (butyr.org)


Received

Command cmd_check from @jbuck received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/4c0d8e490ade9c4/output.txt

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 9, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/4c0d8e490ade9c4/output.txt

Total script time: 0.96 mins

ghost commented Aug 9, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/4c0d8e490ade9c4/output.txt

Total script time: 0.96 mins

@jbuck

View changes

templates/assets/plugins/stop/popcorn.stop.js
+ };
+ },
+ start: function( event, options ) {
+ this.pause();

This comment has been minimized.

@jbuck

jbuck Aug 9, 2012

Member

_this?

@jbuck

jbuck Aug 9, 2012

Member

_this?

This comment has been minimized.

@dseif

dseif Aug 13, 2012

Member

I only need _this for inside the setTimeout, otherwise I just use this

@dseif

dseif Aug 13, 2012

Member

I only need _this for inside the setTimeout, otherwise I just use this

@jbuck

View changes

templates/assets/plugins/stop/popcorn.stop.js
+ }, options.duration * 1000 );
+ }
+ },
+ end: function( event, options ) {

This comment has been minimized.

@jbuck

jbuck Aug 9, 2012

Member

Is it possible to remove this empty end() function?

@jbuck

jbuck Aug 9, 2012

Member

Is it possible to remove this empty end() function?

@jbuck

View changes

templates/basic/config.json
@@ -36,7 +40,8 @@
"zoink",
"googlemap",
"twitter",
- "image"
+ "image",
+ "pause"

This comment has been minimized.

@jbuck

jbuck Aug 13, 2012

Member

Shouldn't this be "stop" to match with above?

@jbuck

jbuck Aug 13, 2012

Member

Shouldn't this be "stop" to match with above?

This comment has been minimized.

@dseif

dseif Aug 13, 2012

Member

my bad, will fix

On Mon, Aug 13, 2012 at 3:56 PM, Jon Buckley notifications@github.comwrote:

In templates/basic/config.json:

@@ -36,7 +40,8 @@
"zoink",
"googlemap",
"twitter",

  •  "image"
    
  •  "image",
    
  •  "pause"
    

Shouldn't this be "stop" to match with above?


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/butter/pull/754/files#r1365871.

@dseif

dseif Aug 13, 2012

Member

my bad, will fix

On Mon, Aug 13, 2012 at 3:56 PM, Jon Buckley notifications@github.comwrote:

In templates/basic/config.json:

@@ -36,7 +40,8 @@
"zoink",
"googlemap",
"twitter",

  •  "image"
    
  •  "image",
    
  •  "pause"
    

Shouldn't this be "stop" to match with above?


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/butter/pull/754/files#r1365871.

+ this.pause();
+ if ( +options.duration > 0 ) {
+ _timeout = setTimeout(function() {
+ _this.play();

This comment has been minimized.

@jbuck

jbuck Aug 15, 2012

Member

Add a this.off( ... ) call here too so that the normal case doesn't leak.

@jbuck

jbuck Aug 15, 2012

Member

Add a this.off( ... ) call here too so that the normal case doesn't leak.

@mjschranz

View changes

templates/assets/plugins/stop/popcorn.stop.js
+ "default": "0"
+ },
+ "target": {
+ "default": "overlay"

This comment has been minimized.

@mjschranz

mjschranz Aug 16, 2012

Contributor

remove this and change it to

hidden: true

The plugin itself doesn't use a target, and having this here would confuse the user when a target list is appearing in the editor.

@mjschranz

mjschranz Aug 16, 2012

Contributor

remove this and change it to

hidden: true

The plugin itself doesn't use a target, and having this here would confuse the user when a target list is appearing in the editor.

This comment has been minimized.

@dseif

dseif Aug 16, 2012

Member

ah good call, thanks

@dseif

dseif Aug 16, 2012

Member

ah good call, thanks

@mjschranz

View changes

src/editor/default.js
- // Attach the onchange handler to trackEvent is updated when <select> is changed
- _this.attachSelectChangeHandler( selectElement, trackEvent, "target" );
- optionsContainer.appendChild( targetList );
+ if ( trackEvent.manifest.options.target[ "default" ] !== "hidden" ) {

This comment has been minimized.

@mjschranz

mjschranz Aug 16, 2012

Contributor

you mistook my comment for how I wanted it defined :( See below

@mjschranz

mjschranz Aug 16, 2012

Contributor

you mistook my comment for how I wanted it defined :( See below

@mjschranz

View changes

templates/assets/plugins/repeat/popcorn.repeat.js
@@ -40,7 +39,7 @@
"label": "Out"
},
"target": {
- "default": "overlay"
+ "default": "hidden"

This comment has been minimized.

@mjschranz

mjschranz Aug 16, 2012

Contributor

You don't really want the default here. You just need to specify if you want the target manifest ignored completely.

target: {
  hidden: true
}
@mjschranz

mjschranz Aug 16, 2012

Contributor

You don't really want the default here. You just need to specify if you want the target manifest ignored completely.

target: {
  hidden: true
}
@mjschranz

This comment has been minimized.

Show comment
Hide comment
@mjschranz

mjschranz Aug 16, 2012

Contributor

/botio check

Contributor

mjschranz commented Aug 16, 2012

/botio check

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 16, 2012

From: Bot.io (butyr.org)


Received

Command cmd_check from @mjschranz received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/7b0b37193f8c45e/output.txt

ghost commented Aug 16, 2012

From: Bot.io (butyr.org)


Received

Command cmd_check from @mjschranz received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/7b0b37193f8c45e/output.txt

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 16, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/7b0b37193f8c45e/output.txt

Total script time: 1.30 mins

ghost commented Aug 16, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/7b0b37193f8c45e/output.txt

Total script time: 1.30 mins

@mjschranz

This comment has been minimized.

Show comment
Hide comment
@mjschranz

mjschranz Aug 16, 2012

Contributor

/botio preview

Contributor

mjschranz commented Aug 16, 2012

/botio preview

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 16, 2012

From: Bot.io (butyr.org)


Received

Command cmd_preview from @mjschranz received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/4fb866ceb0a978d/output.txt

ghost commented Aug 16, 2012

From: Bot.io (butyr.org)


Received

Command cmd_preview from @mjschranz received. Current queue size: 0

Live output at: http://botio.butyr.org:8000/4fb866ceb0a978d/output.txt

@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Aug 16, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/4fb866ceb0a978d/output.txt

Total script time: 0.66 mins

Server is running on http://pr754.butyr.org/templates/basic/
Run the Test Suite: http://pr754.butyr.org/test/

ghost commented Aug 16, 2012

From: Bot.io (butyr.org)


Success

Full output at http://botio.butyr.org:8000/4fb866ceb0a978d/output.txt

Total script time: 0.66 mins

Server is running on http://pr754.butyr.org/templates/basic/
Run the Test Suite: http://pr754.butyr.org/test/

@dseif dseif merged commit 1cb311f into mozilla:master Aug 16, 2012

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.