Skip to content
This repository was archived by the owner on Oct 2, 2018. It is now read-only.

Commit 5f011b8

Browse files
author
Joshua Smith
committed
Add back necessary images, change version to 0.3.1, remove duplicate enumerations, remove browser
1 parent 12ae28c commit 5f011b8

20 files changed

Lines changed: 84 additions & 32 deletions

File tree

about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</head>
5858
<body>
5959
<img src="style/icons/app/120.png" height="100" alt="Firetext" />
60-
<h1 class="title">v0.3</h1>
60+
<h1 class="title">v0.3.1</h1>
6161
<p class="acenter">Firetext is an open source editor developed by the <a href="http://www.codexa.org/" target="_blank">Codexa Organization</a>.</p>
6262
<p class="acenter">More information is on <a href="http://firetext.codexa.org/" target="_blank">our site</a>.</p>
6363
<hr/>

index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,6 @@ <h1>Insert Table</h1>
510510
</section>
511511
<div class="background"></div>
512512

513-
<section role="dialog" id="browser">
514-
<button data-click="navBack" class="top-button">Back</button>
515-
<iframe src="" role="main" id="browserFrame" remote></iframe>
516-
</section>
517-
<div class="background"></div>
518-
519513
<section role="region" id="settings">
520514
<header>
521515
<button data-click="navBack"><span class="icon icon-back"></span></button>

manifest.webapp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "Firetext",
33
"description": "A Word Processor for Firefox OS",
4-
"version": "0.3",
4+
"version": "0.3.1",
55
"type": "privileged",
66
"launch_path": "/index.html",
77
"developer": {
88
"name": "Codexa",
9-
"url": "http://www.codexa.org"
9+
"url": "http://firetext.codexa.org"
1010
},
1111
"icons": {
1212
"32": "/style/icons/app/32.png",

scripts/firetext.js

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -924,13 +924,6 @@ function processActions(eventAttribute, target) {
924924
loadToEditor(target.getAttribute(eventAttribute + '-directory'), target.getAttribute(eventAttribute + '-filename'), target.getAttribute(eventAttribute + '-filetype'), target.getAttribute(eventAttribute + '-location'));
925925
} else if (calledFunction == 'nav') {
926926
var navLocation = target.getAttribute(eventAttribute + '-location');
927-
if (navLocation == 'welcome') {
928-
updateDocLists(['recents', 'cloud']);
929-
} else if (navLocation == 'open') {
930-
updateDocLists(['cloud']);
931-
} else if (navLocation == 'settings') {
932-
firetext.settings.init();
933-
}
934927
if (document.getElementById(navLocation).getAttribute('role') != 'dialog') {
935928
editFullScreen(false);
936929
}
@@ -999,14 +992,9 @@ function processActions(eventAttribute, target) {
999992
} else {
1000993
editFullScreen();
1001994
}
1002-
} else if (calledFunction == 'browser') {
1003-
var browseLocation = '';
1004-
var browserFrame = document.getElementById('browserFrame');
1005-
1006-
// Set browser frame's src to blank
1007-
browserFrame.src = 'about:blank';
1008-
995+
} else if (calledFunction == 'browser') {
1009996
// Get location
997+
var browseLocation = '';
1010998
if (target.getAttribute(eventAttribute + '-location') == 'about') {
1011999
browseLocation = 'about.html';
10121000
} else if (target.getAttribute(eventAttribute + '-location') == 'support') {
@@ -1017,15 +1005,8 @@ function processActions(eventAttribute, target) {
10171005
browseLocation = target.getAttribute(eventAttribute + '-location');
10181006
}
10191007

1020-
// Open a new tab on desktop browsers
1021-
if (deviceType == 'desktop') {
1022-
window.open(browseLocation);
1023-
return;
1024-
}
1025-
1026-
// Open the internal browser on mobile
1027-
browserFrame.src = browseLocation;
1028-
regions.nav('browser');
1008+
// Open a new tab
1009+
window.open(browseLocation);
10291010
} else if (calledFunction == 'justify') {
10301011
var justifyDirection = justifySelect.value;
10311012
if (justifyDirection == 'Justified') {

style/icons/app/120.png

11.1 KB
Loading

style/icons/app/256.png

12.2 KB
Loading

style/icons/app/32.png

4.24 KB
Loading

style/icons/app/60.png

6.44 KB
Loading

style/icons/app/90.png

8.51 KB
Loading

style/icons/app/codexa.png

23.2 KB
Loading

0 commit comments

Comments
 (0)