Skip to content

Commit e9a9e80

Browse files
author
Lionel Laské
committed
Merge branch 'feature/directlink' into dev
2 parents 70facc1 + a49463c commit e9a9e80

File tree

77 files changed

+1075
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1075
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Added
9+
- Launch activity directly from url of CLI
10+
811
### Fixed
912
- Images go under each other while editing in Fototoon #1552
1013
- Missalignment of icons and text in Fototoon activity "clean all" button #1596

‎activities/Abacus.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/Abecedarium.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/ActivityTemplate/VanillaJS/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/ActivityTemplate/VueJS/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/Blockrain.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/Calculate.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/Calligra.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/Chart.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

‎activities/Chat.activity/lib/sugar-web/activity/activity.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
5252

5353
datastoreObject = new datastore.DatastoreObject();
5454

55+
datastore.localStorage.load(function() {
56+
var preferences = datastore.localStorage.getValue('sugar_settings');
57+
if (preferences != null && preferences.name !== undefined) {
58+
return;
59+
}
60+
if (window.location.protocol != "file:") {
61+
location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
62+
} else {
63+
let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
64+
server = server.substring(0, server.lastIndexOf("/"));
65+
server = server.substring(0, server.lastIndexOf("/"));
66+
server = server.substring(0, server.lastIndexOf("/"));
67+
location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
68+
}
69+
return;
70+
});
71+
5572
var activityButton = document.getElementById("activity-button");
5673

5774
var activityPalette = new activitypalette.ActivityPalette(

0 commit comments

Comments
 (0)