From 47413d2a30f31d977529610f4ec8f5567d004fde Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Sat, 8 Feb 2014 08:47:33 -0500
Subject: more stuff
---
.gitmodules | 3 +++
Makefile | 7 ++++---
spin.js | 1 +
www/css/anim.css | 21 ---------------------
www/css/index.css | 26 ++++++++++++++++++++++++--
www/index.html | 4 ----
www/js/html5ks.js | 7 -------
www/js/lib/spin.js | 1 +
www/js/menu.js | 22 ++++++++++++++--------
9 files changed, 47 insertions(+), 45 deletions(-)
create mode 160000 spin.js
delete mode 100644 www/css/anim.css
create mode 120000 www/js/lib/spin.js
diff --git a/.gitmodules b/.gitmodules
index 2cc00d1..7a6f1c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "fastclick"]
path = fastclick
url = https://github.com/ftlabs/fastclick.git
+[submodule "spin.js"]
+ path = spin.js
+ url = https://github.com/fgnass/spin.js.git
diff --git a/Makefile b/Makefile
index 9911df0..2d369b8 100644
--- a/Makefile
+++ b/Makefile
@@ -122,9 +122,10 @@ $(DUMP)/ui/ctc_anim.webp: $(CTC_ANIM_TMP_WEBP)
# === JS ===
-JSCODE := www/js/html5ks.js www/js/menu.js www/js/api.js www/js/characters.js www/js/imachine.js www/js/i18n.js
+MYJS := www/js/html5ks.js www/js/menu.js www/js/api.js www/js/characters.js www/js/imachine.js www/js/i18n.js
+JSLIBS := www/js/lib/when/when.js www/js/lib/fastclick/lib/fastclick.js www/js/lib/modernizr-build.min.js
JSDATA := www/js/play.js www/js/images.js
-JS := $(JSCODE) $(JSDATA)
+JS := $(JSLIBS) $(MYJS) $(JSDATA)
js: www/js/all.min.js
@@ -136,7 +137,7 @@ www/js/all.min.js: $(JS)
clean:
$(RM) $(CVIDEO) $(CAUDIO) $(CIMAGE)
-jshint: $(JSCODE)
+jshint: $(MYJS)
jshint $^
space:
diff --git a/spin.js b/spin.js
new file mode 160000
index 0000000..7c0fde9
--- /dev/null
+++ b/spin.js
@@ -0,0 +1 @@
+Subproject commit 7c0fde992df65b66e097e4bab6c2f8474bf3080d
diff --git a/www/css/anim.css b/www/css/anim.css
deleted file mode 100644
index f6a321b..0000000
--- a/www/css/anim.css
+++ /dev/null
@@ -1,21 +0,0 @@
-@-webkit-keyframes blink {
- 0% { opacity: 0; }
- 25% { opacity: 0; }
- 50% { opacity: 1; }
- 75% { opacity: 1; }
- 100% { opacity: 0; }
-}
-@-moz-keyframes blink {
- 0% { opacity: 0; }
- 25% { opacity: 0; }
- 50% { opacity: 1; }
- 75% { opacity: 1; }
- 100% { opacity: 0; }
-}
-@keyframes blink {
- 0% { opacity: 0; }
- 25% { opacity: 0; }
- 50% { opacity: 1; }
- 75% { opacity: 1; }
- 100% { opacity: 0; }
-}
diff --git a/www/css/index.css b/www/css/index.css
index 92b2f36..c0d1191 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -1,14 +1,12 @@
/* font-face */
@font-face {
font-family: "Playtime";
- /* src: url("playtime.ttf"); */
src: url("font/playtime-webfont.woff") format('woff'),
url("font/playtime-webfont.ttf") format('ttf'),
url("font/playtime-webfont.svg") format('svg');
}
@font-face {
font-family: "Gentium";
- /* src: url("gentium.ttf"); */
src: url("font/GentiumPlus.svg");
src: url("font/GentiumPlus.ttf");
src: url("font/GentiumPlus.woff");
@@ -317,3 +315,27 @@ input[type="checkbox"]:checked + span:before {
.webp input[type="checkbox"]:checked + span:before {
background-image: url("../dump/ui/bt-cf-checked.webp");
}
+
+/* anim */
+
+@-webkit-keyframes blink {
+ 0% { opacity: 0; }
+ 25% { opacity: 0; }
+ 50% { opacity: 1; }
+ 75% { opacity: 1; }
+ 100% { opacity: 0; }
+}
+@-moz-keyframes blink {
+ 0% { opacity: 0; }
+ 25% { opacity: 0; }
+ 50% { opacity: 1; }
+ 75% { opacity: 1; }
+ 100% { opacity: 0; }
+}
+@keyframes blink {
+ 0% { opacity: 0; }
+ 25% { opacity: 0; }
+ 50% { opacity: 1; }
+ 75% { opacity: 1; }
+ 100% { opacity: 0; }
+}
diff --git a/www/index.html b/www/index.html
index cf09da2..b801386 100644
--- a/www/index.html
+++ b/www/index.html
@@ -14,11 +14,7 @@
</script>
<link rel="shortcut icon" type="image/png" href="dump/ui/icon.png">
<link rel="apple-touch-icon" href="dump/ui/icon.png">
- <link rel="stylesheet" type="text/css" href="css/anim.css">
<link rel="stylesheet" type="text/css" href="css/index.css">
- <script src="js/lib/when/when.js"></script>
- <script src="js/lib/fastclick/lib/fastclick.js"></script>
- <script src="js/lib/modernizr-build.min.js"></script>
<script src="js/all.min.js"></script>
</head>
<body><div id="all">
diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 2e093e1..338ea9b 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -168,13 +168,6 @@ window.html5ks = {
this.menu.init();
},
start: function () {
- this.fetch("json", "script").then(function (d) {
- for (var k in d) {
- if (k.slice(0, 3) === (html5ks.persistent.language === "en" ? "fr_" : "en_")) {
- delete d[k];
- }
- }
- }, console.error);
html5ks.api.movie_cutscene("4ls", true).then(function () {
html5ks.menu.mainMenu();
}, console.error);
diff --git a/www/js/lib/spin.js b/www/js/lib/spin.js
new file mode 120000
index 0000000..e381b49
--- /dev/null
+++ b/www/js/lib/spin.js
@@ -0,0 +1 @@
+../../../spin.js/
\ No newline at end of file
diff --git a/www/js/menu.js b/www/js/menu.js
index bcbb039..00d40b7 100644
--- a/www/js/menu.js
+++ b/www/js/menu.js
@@ -164,14 +164,20 @@
this.initOptions();
when.all([html5ks.fetch("json", "imachine"),
- html5ks.fetch("json", "script")]).then(function () {
- var start = this.elements.main.start;
- start.addEventListener("click", function () {
- this.elements.mainMenu.style.display = "none";
- html5ks.imachine.start().then(this.mainMenu.bind(this), console.error);
- }.bind(this), false);
- start.classList.remove("disabled");
- }.bind(this), console.error);
+ html5ks.fetch("json", "script").then(function (d) {
+ for (var k in d) {
+ if (k.slice(0, 3) === (html5ks.persistent.language === "en" ? "fr_" : "en_")) {
+ delete d[k];
+ }
+ }
+ }, console.error)]).then(function () {
+ var start = this.elements.main.start;
+ start.addEventListener("click", function () {
+ this.elements.mainMenu.style.display = "none";
+ html5ks.imachine.start().then(this.mainMenu.bind(this), console.error);
+ }.bind(this), false);
+ start.classList.remove("disabled");
+ }.bind(this), console.error);
},
_state: null,
--
cgit v1.2.3-70-g09d2