Skip to content

GPII-309, GPII-1073: Implementation of webanywere and a fix to allow combination of any number of fetchers #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaspermarkus wants to merge 7 commits into
base: master
Choose a base branch
from
Open

GPII-309, GPII-1073: Implementation of webanywere and a fix to allow combination of any number of fetchers #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4949451
GPII-309: Webanywhere a little bit of work
kaspermarkus Dec 26, 2014
9942478
Merge remote-tracking branch 'upstream/master' into GPII-309
kaspermarkus Jan 16, 2015
381c988
GPII-309,GPII-1073: Implementation of webanywere and a fix to allow c…
kaspermarkus Jan 17, 2015
b5c6a6d
GPII-309: cleaned everything up, removed unecessary file
kaspermarkus Jan 17, 2015
8ec7675
GPII-309: cleaned everything up, removed unecessary file
kaspermarkus Jan 17, 2015
8998fb0
GPII-1073: Updated to latest master, resolve minor conflicts and adde…
Jun 2, 2015
81e4f8f
GPII-1073: Moved the settingsResolver to a separate function
Jun 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions gpii/node_modules/lifecycleActions/src/LifecycleActions.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

94 changes: 94 additions & 0 deletions gpii/node_modules/lifecycleActions/test/LifecycleActionsTests.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 41 additions & 5 deletions gpii/node_modules/lifecycleManager/src/LifecycleManager.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions gpii/node_modules/lifecycleManager/test/js/LifecycleManagerTests.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions testData/deviceReporter/installedSolutions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@
},

{
"id": "webinsight.webAnywhere.windows"
},

{
"id": "webinsight.webAnywhere.linux"
"id": "webinsight.webAnywhere"
},

{
Expand Down
6 changes: 1 addition & 5 deletions testData/deviceReporter/linux_installedSolutions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@
},

{
"id": "webinsight.webAnywhere.windows"
},

{
"id": "webinsight.webAnywhere.linux"
"id": "webinsight.webAnywhere"
}
]
}
6 changes: 1 addition & 5 deletions testData/deviceReporter/win32_installedSolutions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@
},

{
"id": "webinsight.webAnywhere.windows"
},

{
"id": "webinsight.webAnywhere.linux"
"id": "webinsight.webAnywhere"
},

{
Expand Down
16 changes: 16 additions & 0 deletions testData/preferences/webanywhere.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"flat": {
"contexts": {
"gpii-default": {
"name": "Default preferences",
"preferences": {
"http://registry.gpii.net/applications/webinsight.webAnywhere": {
"locale": "en",
"voicepitch": 12,
"voicespeed": 400
}
}
}
}
}
}
14 changes: 14 additions & 0 deletions testData/preferences/webanywhere_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"flat": {
"contexts": {
"gpii-default": {
"name": "Default preferences",
"preferences": {
"http://registry.gpii.net/common/language": "es",
"http://registry.gpii.net/common/pitch": 0.4,
"http://registry.gpii.net/common/speechRate": 160
}
}
}
}
}
30 changes: 19 additions & 11 deletions testData/solutions/linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@
}
},

"webinsight.webAnywhere.linux": {
"webinsight.webAnywhere": {
"name": "Web Anywhere",
"contexts": {
"OS": [
Expand All @@ -1285,26 +1285,34 @@
"type": "gpii.settingsHandlers.noSettings",
"capabilities": [
"display.screenReader",
"applications.webinsight\\.webAnywhere\\.linux.id",
"display.screenReader.applications.webinsight\\.webAnywhere\\.linux.name"
]
"applications.webinsight\\.webAnywhere.id"
],
"capabilitiesTransformations": {
"locale": "http://registry\\.gpii\\.net/common/language",
"voicepitch": "http://registry\\.gpii\\.net/common/pitch",
"voicespeed": "http://registry\\.gpii\\.net/common/speechRate"
}
}
],
"lifecycleManager" : {
"start": [
"start": [
{
"type": "gpii.launch.exec",
"command": "google-chrome http://webanywhere.cs.washington.edu/beta/?starting_url=http%3A%2F%2Fcloud4all.info"
"type": "gpii.launch.browser",
"URL": "http://webanywhere.cs.washington.edu/beta/",
"parameters": {
"locale": "${{settings.webinsight.webAnywhere.locale}}",
"voicepitch": "${{settings.webinsight.webAnywhere.voicepitch}}",
"voicespeed": "${{settings.webinsight.webAnywhere.voicespeed}}"


}
}
],
"stop": [
{
"type": "gpii.launch.exec",
"command": "pkill -2 chrome"
}
]
}
},

"org.freedesktop.xrandr": {
"name": "Xrandr",
"contexts": {
Expand Down
Loading