no action placeholder

This commit is contained in:
Mo Bitar
2017-01-07 19:09:50 -06:00
parent 54defb88a0
commit 6823469062
5 changed files with 12 additions and 24 deletions

View File

@@ -51,8 +51,6 @@ class ExtensionManager {
localStorage.setItem("decryptedExtensions", JSON.stringify(this.decryptedExtensions)) localStorage.setItem("decryptedExtensions", JSON.stringify(this.decryptedExtensions))
extension.encrypted = this.extensionUsesEncryptedData(extension); extension.encrypted = this.extensionUsesEncryptedData(extension);
console.log("ext with dec", this.decryptedExtensions);
} }
addExtension(url, callback) { addExtension(url, callback) {
@@ -74,7 +72,6 @@ class ExtensionManager {
} }
retrieveExtensionFromServer(url, callback) { retrieveExtensionFromServer(url, callback) {
console.log("Registering URL", url);
this.Restangular.oneUrl(url, url).get().then(function(response){ this.Restangular.oneUrl(url, url).get().then(function(response){
var ext = this.handleExtensionLoadExternalResponseItem(url, response.plain()); var ext = this.handleExtensionLoadExternalResponseItem(url, response.plain());
if(callback) { if(callback) {
@@ -128,7 +125,6 @@ class ExtensionManager {
switch (action.verb) { switch (action.verb) {
case "get": { case "get": {
this.Restangular.oneUrl(action.url, action.url).get().then(function(response){ this.Restangular.oneUrl(action.url, action.url).get().then(function(response){
console.log("Execute action response", response);
action.error = false; action.error = false;
var items = response.items; var items = response.items;
this.modelManager.mapResponseItemsToLocalModels(items); this.modelManager.mapResponseItemsToLocalModels(items);
@@ -182,8 +178,6 @@ class ExtensionManager {
} }
disableRepeatAction(action, extension) { disableRepeatAction(action, extension) {
console.log("Disabling action", action);
_.pull(this.enabledRepeatActionUrls, action.url); _.pull(this.enabledRepeatActionUrls, action.url);
localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls)); localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls));
this.modelManager.removeItemChangeObserver(action.url); this.modelManager.removeItemChangeObserver(action.url);
@@ -192,8 +186,6 @@ class ExtensionManager {
} }
enableRepeatAction(action, extension) { enableRepeatAction(action, extension) {
// console.log("Enabling repeat action", action);
if(!_.find(this.enabledRepeatActionUrls, action.url)) { if(!_.find(this.enabledRepeatActionUrls, action.url)) {
this.enabledRepeatActionUrls.push(action.url); this.enabledRepeatActionUrls.push(action.url);
localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls)); localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls));
@@ -220,11 +212,11 @@ class ExtensionManager {
return; return;
} }
console.log("Successfully queued", action, this.actionQueue.length); // console.log("Successfully queued", action, this.actionQueue.length);
this.actionQueue.push(action); this.actionQueue.push(action);
setTimeout(function () { setTimeout(function () {
console.log("Performing queued action", action); // console.log("Performing queued action", action);
this.triggerWatchAction(action, extension, changedItems); this.triggerWatchAction(action, extension, changedItems);
_.pull(this.actionQueue, action); _.pull(this.actionQueue, action);
}.bind(this), delay * 1000); }.bind(this), delay * 1000);
@@ -243,7 +235,7 @@ class ExtensionManager {
action.lastExecuted = new Date(); action.lastExecuted = new Date();
console.log("Performing action immediately", action); console.log("Performing action.");
if(action.verb == "post") { if(action.verb == "post") {
var params = {}; var params = {};

View File

@@ -273,9 +273,10 @@ Extensions
font-size: 14px; font-size: 14px;
.extension-link { .extension-link {
margin-top: 6px; margin-top: 8px;
a { a {
color: $blue-color !important;
font-weight: bold; font-weight: bold;
} }
} }

View File

@@ -95,6 +95,7 @@
%a{"ng-click" => "ctrl.toggleExtensions()"} Extensions %a{"ng-click" => "ctrl.toggleExtensions()"} Extensions
.panel.panel-default.account-panel.panel-right.extensions-panel{"ng-if" => "ctrl.showExtensionsMenu"} .panel.panel-default.account-panel.panel-right.extensions-panel{"ng-if" => "ctrl.showExtensionsMenu"}
.panel-body .panel-body
%div{"style" => "font-size: 18px;", "ng-if" => "!ctrl.extensionManager.extensions.length"} No extensions installed
.registered-extensions{"ng-if" => "ctrl.extensionManager.extensions.length"} .registered-extensions{"ng-if" => "ctrl.extensionManager.extensions.length"}
.extension{"ng-repeat" => "extension in ctrl.extensionManager.extensions"} .extension{"ng-repeat" => "extension in ctrl.extensionManager.extensions"}
.name {{extension.name}} .name {{extension.name}}
@@ -146,6 +147,8 @@
.extension-link .extension-link
%a{"ng-click" => "ctrl.reloadExtensionsPressed()", "ng-if" => "ctrl.extensionManager.extensions.length > 0"} Reload all extensions %a{"ng-click" => "ctrl.reloadExtensionsPressed()", "ng-if" => "ctrl.extensionManager.extensions.length > 0"} Reload all extensions
.extension-link
%a{"href" => "https://standardnotes.org/extensions", "target" => "_blank"} List of available extensions
.item .item
%a{"href" => "https://standardnotes.org", "target" => "_blank"} %a{"href" => "https://standardnotes.org", "target" => "_blank"}

View File

@@ -2968,8 +2968,6 @@ var ExtensionManager = function () {
localStorage.setItem("decryptedExtensions", JSON.stringify(this.decryptedExtensions)); localStorage.setItem("decryptedExtensions", JSON.stringify(this.decryptedExtensions));
extension.encrypted = this.extensionUsesEncryptedData(extension); extension.encrypted = this.extensionUsesEncryptedData(extension);
console.log("ext with dec", this.decryptedExtensions);
} }
}, { }, {
key: 'addExtension', key: 'addExtension',
@@ -3015,7 +3013,6 @@ var ExtensionManager = function () {
}, { }, {
key: 'retrieveExtensionFromServer', key: 'retrieveExtensionFromServer',
value: function retrieveExtensionFromServer(url, callback) { value: function retrieveExtensionFromServer(url, callback) {
console.log("Registering URL", url);
this.Restangular.oneUrl(url, url).get().then(function (response) { this.Restangular.oneUrl(url, url).get().then(function (response) {
var ext = this.handleExtensionLoadExternalResponseItem(url, response.plain()); var ext = this.handleExtensionLoadExternalResponseItem(url, response.plain());
if (callback) { if (callback) {
@@ -3114,7 +3111,6 @@ var ExtensionManager = function () {
case "get": case "get":
{ {
this.Restangular.oneUrl(action.url, action.url).get().then(function (response) { this.Restangular.oneUrl(action.url, action.url).get().then(function (response) {
console.log("Execute action response", response);
action.error = false; action.error = false;
var items = response.items; var items = response.items;
this.modelManager.mapResponseItemsToLocalModels(items); this.modelManager.mapResponseItemsToLocalModels(items);
@@ -3169,8 +3165,6 @@ var ExtensionManager = function () {
}, { }, {
key: 'disableRepeatAction', key: 'disableRepeatAction',
value: function disableRepeatAction(action, extension) { value: function disableRepeatAction(action, extension) {
console.log("Disabling action", action);
_.pull(this.enabledRepeatActionUrls, action.url); _.pull(this.enabledRepeatActionUrls, action.url);
localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls)); localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls));
this.modelManager.removeItemChangeObserver(action.url); this.modelManager.removeItemChangeObserver(action.url);
@@ -3180,8 +3174,6 @@ var ExtensionManager = function () {
}, { }, {
key: 'enableRepeatAction', key: 'enableRepeatAction',
value: function enableRepeatAction(action, extension) { value: function enableRepeatAction(action, extension) {
// console.log("Enabling repeat action", action);
if (!_.find(this.enabledRepeatActionUrls, action.url)) { if (!_.find(this.enabledRepeatActionUrls, action.url)) {
this.enabledRepeatActionUrls.push(action.url); this.enabledRepeatActionUrls.push(action.url);
localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls)); localStorage.setItem("enabledRepeatActionUrls", JSON.stringify(this.enabledRepeatActionUrls));
@@ -3208,11 +3200,11 @@ var ExtensionManager = function () {
return; return;
} }
console.log("Successfully queued", action, this.actionQueue.length); // console.log("Successfully queued", action, this.actionQueue.length);
this.actionQueue.push(action); this.actionQueue.push(action);
setTimeout(function () { setTimeout(function () {
console.log("Performing queued action", action); // console.log("Performing queued action", action);
this.triggerWatchAction(action, extension, changedItems); this.triggerWatchAction(action, extension, changedItems);
_.pull(this.actionQueue, action); _.pull(this.actionQueue, action);
}.bind(this), delay * 1000); }.bind(this), delay * 1000);
@@ -3232,7 +3224,7 @@ var ExtensionManager = function () {
action.lastExecuted = new Date(); action.lastExecuted = new Date();
console.log("Performing action immediately", action); console.log("Performing action.");
if (action.verb == "post") { if (action.verb == "post") {
var params = {}; var params = {};

File diff suppressed because one or more lines are too long