Permalink
Browse files

Merge branch 'master' into sms

  • Loading branch information...
2 parents f083302 + 06fc6e1 commit de3e287e42bf96811b4620dbbaacf3bd7d3ee196 @timdream committed Apr 5, 2012
View
@@ -23,6 +23,7 @@
</div>
<div id="browser-shade" class="hidden"></div>
<ul id="browser-menu" class="hidden">
+ <li id="menu-clear"><a href="#">Clear</a></li>
<li id="menu-refresh"><a href="#">Reload</a></li>
<li id="menu-forward"><a href="#">Forward</a></li>
</ul>
View
@@ -34,6 +34,11 @@ var Browser = {
return this.menuButton = document.getElementById('browser-menu-button');
},
+ get clearButton() {
+ delete this.clearButton;
+ return this.clearButton = document.getElementById('menu-clear');
+ },
+
get refreshButton() {
delete this.refreshButton;
return this.refreshButton = document.getElementById('menu-refresh');
@@ -47,6 +52,7 @@ var Browser = {
init: function browser_init() {
this.backButton.addEventListener('click', this.goBack.bind(this));
this.menuButton.addEventListener('click', this.toggleMenu.bind(this));
+ this.clearButton.addEventListener('click', this.clear.bind(this));
this.refreshButton.addEventListener('click', this.refresh.bind(this));
this.forwardButton.addEventListener('click', this.goForward.bind(this));
this.shade.addEventListener('click', this.toggleMenu.bind(this));
@@ -125,6 +131,12 @@ var Browser = {
this.urlbar.value = url;
this.updateHistory(url);
},
+
+ clear: function browser_clear() {
+ this.urlbar.value = "";
+ this.urlbar.focus();
+ this.toggleMenu();
+ },
refresh: function browser_refresh() {
var url = this.urlbar.value;
View
@@ -1,36 +1,42 @@
{
"name": "Browser",
- "default_locale": "en-US",
- "icons": {
- "120": "/style/icons/Browser.png"
- },
"description": "Gaia Web Browser",
"launch_path": "/",
+ "developer": {
+ "name": "The Gaia Team",
+ "url": "https://github.com/andreasgal/gaia"
+ },
+ "permissions": [
+ "mozbrowser"
+ ],
"locales": {
- "ru": {
- "name": "\u041d\u0430\u0432\u0438\u0433\u0430\u0442\u043e\u0440",
- "description": "\u0412\u0435\u0431-\u043d\u0430\u0432\u0438\u0433\u0430\u0442\u043e\u0440 Gaia"
+ "ar": {
+ "name": "\u0627\u0644\u0645\u062a\u0635\u0641\u062d",
+ "description": "Gaia \u0645\u062a\u0635\u0641\u062d \u0627\u0644\u0648\u064a\u0628"
},
- "en-US": {
+ "de": {
"name": "Browser",
"description": "Gaia Web Browser"
},
- "ar": {
- "name": "\u0627\u0644\u0645\u062a\u0635\u0641\u062d",
- "description": "Gaia \u0645\u062a\u0635\u0641\u062d \u0627\u0644\u0648\u064a\u0628"
+ "en-US": {
+ "name": "Browser",
+ "description": "Gaia Web Browser"
},
"fr": {
"name": "Navigateur",
"description": "Navigateur Web Gaia"
},
+ "ru": {
+ "name": "\u041d\u0430\u0432\u0438\u0433\u0430\u0442\u043e\u0440",
+ "description": "\u0412\u0435\u0431-\u043d\u0430\u0432\u0438\u0433\u0430\u0442\u043e\u0440 Gaia"
+ },
"zh-TW": {
"name": "\u7db2\u8def\u700f\u89bd\u5668",
"description": "Gaia \u7db2\u8def\u700f\u89bd\u5668"
}
},
- "developer": {
- "url": "https://github.com/andreasgal/gaia",
- "name": "The Gaia Team"
- },
- "permissions": ["mozbrowser"]
-}
+ "default_locale": "en-US",
+ "icons": {
+ "120": "/style/icons/Browser.png"
+ }
+}
@@ -186,6 +186,10 @@ input::-moz-focus-inner {
font-weight: 600;
}
+#menu-clear a {
+ background-image: url('images/clear.png');
+}
+
#menu-refresh a {
background-image: url('images/refresh.png');
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,35 +1,39 @@
{
"name": "Calculator",
- "default_locale": "en-US",
- "icons": {
- "120": "/style/icons/Calculator.png"
- },
"description": "Calculator",
"launch_path": "/",
+ "developer": {
+ "name": "The Gaia Team",
+ "url": "https://github.com/andreasgal/gaia"
+ },
"locales": {
- "ru": {
- "name": "\u041a\u0430\u043b\u044c\u043a\u0443\u043b\u044f\u0442\u043e\u0440",
- "description": "\u041a\u0430\u043b\u044c\u043a\u0443\u043b\u044f\u0442\u043e\u0440"
+ "ar": {
+ "name": "\u0627\u0644\u062d\u0627\u0633\u0628\u0629",
+ "description": "\u0627\u0644\u062d\u0627\u0633\u0628\u0629"
+ },
+ "de": {
+ "name": "Taschenrechner",
+ "description": "Taschenrechner"
},
"en-US": {
"name": "Calculator",
"description": "Calculator"
},
- "ar": {
- "name": "\u0627\u0644\u062d\u0627\u0633\u0628\u0629",
- "description": "\u0627\u0644\u062d\u0627\u0633\u0628\u0629"
- },
"fr": {
"name": "Calculatrice",
"description": "Calculatrice Gaia"
},
+ "ru": {
+ "name": "\u041a\u0430\u043b\u044c\u043a\u0443\u043b\u044f\u0442\u043e\u0440",
+ "description": "\u041a\u0430\u043b\u044c\u043a\u0443\u043b\u044f\u0442\u043e\u0440"
+ },
"zh-TW": {
"name": "\u8a08\u7b97\u6a5f",
"description": "\u8a08\u7b97\u6a5f"
}
},
- "developer": {
- "url": "https://github.com/andreasgal/gaia",
- "name": "The Gaia Team"
+ "default_locale": "en-US",
+ "icons": {
+ "120": "/style/icons/Calculator.png"
}
}
View
@@ -1,36 +1,40 @@
{
"name": "Camera",
- "default_locale": "en-US",
- "icons": {
- "120": "/style/icons/Camera.png"
- },
"description": "Gaia Camera",
"launch_path": "/",
"developer": {
- "url": "https://github.com/andreasgal/gaia",
- "name": "The Gaia Team"
+ "name": "The Gaia Team",
+ "url": "https://github.com/andreasgal/gaia"
},
"locales": {
- "ru": {
- "name": "\u041a\u0430\u043c\u0435\u0440\u0430",
- "description": "\u041a\u0430\u043c\u0435\u0440\u0430 Gaia"
+ "ar": {
+ "name": "\u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627",
+ "description": " Gaia\u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627"
+ },
+ "de": {
+ "name": "Kamera",
+ "description": "Gaia Kamera"
},
"en-US": {
"name": "Camera",
"description": "Gaia Camera"
},
- "ar": {
- "name": "\u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627",
- "description": " Gaia\u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627"
- },
"fr": {
"name": "Photo",
"description": "Appareil photo Gaia"
},
+ "ru": {
+ "name": "\u041a\u0430\u043c\u0435\u0440\u0430",
+ "description": "\u041a\u0430\u043c\u0435\u0440\u0430 Gaia"
+ },
"zh-TW": {
"name": "\u76f8\u6a5f",
"description": "Gaia \u76f8\u6a5f"
}
},
- "hackKillMe": true
+ "default_locale": "en-US",
+ "hackKillMe": true,
+ "icons": {
+ "120": "/style/icons/Camera.png"
+ }
}
@@ -4,6 +4,12 @@ start=بداية
stop=إيقاف
cancel=إلغاء
+[de]
+reset=Zurücksetzen
+start=Starten
+stop=Stoppen
+cancel=Abbrechen
+
[en-US]
reset=Reset
start=Start
View
@@ -1,35 +1,39 @@
{
"name": "Clock",
- "default_locale": "en-US",
- "icons": {
- "120": "/style/icons/Clock.png"
- },
"description": "Gaia Clock",
"launch_path": "/",
+ "developer": {
+ "name": "The Gaia Team",
+ "url": "https://github.com/andreasgal/gaia"
+ },
"locales": {
- "ru": {
- "name": "\u0427\u0430\u0441\u044b",
- "description": "\u0427\u0430\u0441\u044b Gaia"
+ "ar": {
+ "name": "\u0627\u0644\u0633\u0627\u0639\u0629",
+ "description": "Gaia \u0627\u0644\u0633\u0627\u0639\u0629"
+ },
+ "de": {
+ "name": "Uhr",
+ "description": "Gaia Uhr"
},
"en-US": {
"name": "Clock",
"description": "Gaia Clock"
},
- "ar": {
- "name": "\u0627\u0644\u0633\u0627\u0639\u0629",
- "description": "Gaia \u0627\u0644\u0633\u0627\u0639\u0629"
- },
"fr": {
"name": "Horloge",
"description": "Horloge Gaia"
},
+ "ru": {
+ "name": "\u0427\u0430\u0441\u044b",
+ "description": "\u0427\u0430\u0441\u044b Gaia"
+ },
"zh-TW": {
"name": "\u6642\u9418",
"description": "Gaia \u6642\u9418"
}
},
- "developer": {
- "url": "https://github.com/andreasgal/gaia",
- "name": "The Gaia Team"
+ "default_locale": "en-US",
+ "icons": {
+ "120": "/style/icons/Clock.png"
}
}
@@ -1,36 +1,40 @@
{
"name": "CrystalSkull",
- "default_locale": "en-US",
- "icons": {
- "120": "/style/icons/CrystalSkull.png"
- },
"description": "WebGL Demo",
"launch_path": "/",
- "hackKillMe": true,
+ "developer": {
+ "name": "The J3D Team",
+ "url": "https://github.com/andreasgal/gaia"
+ },
"locales": {
- "ru": {
+ "ar": {
"name": "CrystalSkull",
- "description": "\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u044f WebGL"
+ "description": " WebGL \u0639\u0631\u0636"
},
- "en-US": {
+ "de": {
"name": "CrystalSkull",
"description": "WebGL Demo"
},
- "ar": {
+ "en-US": {
"name": "CrystalSkull",
- "description": " WebGL \u0639\u0631\u0636"
+ "description": "WebGL Demo"
},
"fr": {
"name": "CrystalSkull",
"description": "D\u00e9mo WebGL"
},
+ "ru": {
+ "name": "CrystalSkull",
+ "description": "\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u044f WebGL"
+ },
"zh-TW": {
"name": "CrystalSkull",
"description": "WebGL \u793a\u7bc4"
}
},
- "developer": {
- "url": "https://github.com/andreasgal/gaia",
- "name": "The J3D Team"
+ "default_locale": "en-US",
+ "hackKillMe": true,
+ "icons": {
+ "120": "/style/icons/CrystalSkull.png"
}
}
Oops, something went wrong.

0 comments on commit de3e287

Please sign in to comment.