Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLionel LASKE <llaske@c2s.fr>2013-03-10 09:55:51 (GMT)
committer Lionel LASKE <llaske@c2s.fr>2013-03-10 09:55:51 (GMT)
commit4a95009b2580fe0e1314f0166c06b4b338957b61 (patch)
treef296ecf40e45c5822fca488144a00398e0d9491f
parent8ba45bdbb610277c6d99df8d82e5848cb00dc758 (diff)
Slideshow
-rw-r--r--html/app.js29
-rw-r--r--html/css/styles.css8
-rw-r--r--html/images/pause.pngbin0 -> 1279 bytes
-rw-r--r--html/images/slideshow.pngbin0 -> 1371 bytes
4 files changed, 37 insertions, 0 deletions
diff --git a/html/app.js b/html/app.js
index 1e841dd..8e8ad98 100644
--- a/html/app.js
+++ b/html/app.js
@@ -17,6 +17,8 @@ enyo.kind({
components: [
{components: [
{name: "colorBar", classes: "colorBar"},
+ {name: "startSlideshow", kind: "Image", src: "images/slideshow.png", showing: false, ontap: "startSlideshow", classes: "slideshow"},
+ {name: "stopSlideshow", kind: "Image", src: "images/pause.png", showing: false, ontap: "stopSlideshow", classes: "slideshow"},
{name: "switchToUpper", kind: "Image", src: "images/case0.png", ontap: "localUpper", classes: "switchCase"},
{name: "switchToScript", kind: "Image", src: "images/case1.png", showing: false, ontap: "localScript", classes: "switchCase"},
{name: "switchToLower", kind: "Image", src: "images/case2.png", showing: false, ontap: "localLower", classes: "switchCase"},
@@ -40,6 +42,7 @@ enyo.kind({
this.theme = this.collection = this.entry = -1;
this.collections = [];
this.playing = null;
+ this.slideshowIndex = -1;
},
// Localization changed
@@ -119,6 +122,8 @@ enyo.kind({
this.$.back.show();
this.$.prev.hide();
this.$.next.hide();
+ this.$.startSlideshow.hide();
+ this.$.stopSlideshow.hide();
this.$.colorBar.removeClass("themeColor-1");
this.$.colorBar.addClass("themeColor"+this.theme);
for (var i = 0 ; i < length ; i++) {
@@ -169,6 +174,8 @@ enyo.kind({
var count = 0;
this.cleanBox();
this.$.back.show();
+ this.$.startSlideshow.show();
+ this.$.stopSlideshow.hide();
length = this.collections.length;
for (var i = position ; i < length ; i++) {
this.$.box.createComponent({ kind: "Abcd.Entry", index:this.collections[i], x: x, y: y, ontap: "play", onEntrySoundEnded: "soundEnd"}, {owner: this}).render();
@@ -257,6 +264,21 @@ enyo.kind({
Abcd.setCase(2);
},
+ // Slideshow handling
+ startSlideshow: function(inSender, inObject) {
+ this.slideshowIndex = 0;
+ this.$.startSlideshow.hide();
+ this.$.stopSlideshow.show();
+ var first = this.$.box.getControls()[this.slideshowIndex];
+ this.play(first);
+ },
+
+ stopSlideshow: function(inSender, inObject) {
+ this.slideshowIndex = -1;
+ this.$.startSlideshow.show();
+ this.$.stopSlideshow.hide();
+ },
+
// Play entry sound
play: function(inSender, inObject) {
if (this.playing != null)
@@ -267,5 +289,12 @@ enyo.kind({
soundEnd: function(inSender, inObject) {
this.playing = null;
+ if (this.slideshowIndex != -1) {
+ var next = this.$.box.getControls()[++this.slideshowIndex];
+ if (next !== undefined)
+ this.play(next);
+ else
+ this.stopSlideshow();
+ }
}
});
diff --git a/html/css/styles.css b/html/css/styles.css
index b75edf2..9d93ba2 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -16,6 +16,14 @@
top: -10px;
}
+.slideshow {
+ position: absolute;
+ width: 50px;
+ height: 50px;
+ left: 560px;
+ top: 10px;
+}
+
.switchCase {
position: absolute;
width: 50px;
diff --git a/html/images/pause.png b/html/images/pause.png
new file mode 100644
index 0000000..e8f38d4
--- /dev/null
+++ b/html/images/pause.png
Binary files differ
diff --git a/html/images/slideshow.png b/html/images/slideshow.png
new file mode 100644
index 0000000..b71b5d9
--- /dev/null
+++ b/html/images/slideshow.png
Binary files differ