rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete ext option, full screen padding

Browse Source
This commit is contained in:
Mo Bitar
2017-01-07 00:10:54 -06:00
parent 71b6e666b4
commit 73edae57a2
8 changed files with 288 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/assets/javascripts/app/frontend/controllers/header.js
View File

@@ -44,7 +44,13 @@ angular.module('app.frontend')
} }
this.submitNewExtensionForm = function() { this.submitNewExtensionForm = function() {
extensionManager.addExtension(this.newExtensionData.url) if(this.newExtensionData.url) {
extensionManager.addExtension(this.newExtensionData.url, function(response){
if(!response) {
alert("Unable to register this extension. Make sure the link is valid and try again.");
}
})
}
} }
this.selectedAction = function(action, extension) { this.selectedAction = function(action, extension) {
@@ -55,6 +61,12 @@ angular.module('app.frontend')
}) })
} }
this.deleteExtension = function(extension) {
if(confirm("Are you sure you want to delete this extension?")) {
extensionManager.deleteExtension(extension);
}
}
this.reloadExtensionsPressed = function() { this.reloadExtensionsPressed = function() {
if(confirm("For your security, reloading extensions will disable any currently enabled repeat actions.")) { if(confirm("For your security, reloading extensions will disable any currently enabled repeat actions.")) {
extensionManager.refreshExtensionsFromServer(); extensionManager.refreshExtensionsFromServer();
@@ -149,18 +161,6 @@ angular.module('app.frontend')
}.bind(this)) }.bind(this))
} }
this.forgotPasswordSubmit = function() {
// $auth.requestPasswordReset(this.resetData)
// .then(function(resp) {
// this.resetData.response = "Success";
// // handle success response
// }.bind(this))
// .catch(function(resp) {
// // handle error response
// this.resetData.response = "Error";
// }.bind(this));
}
this.encryptionStatusForNotes = function() { this.encryptionStatusForNotes = function() {
var allNotes = modelManager.filteredNotes; var allNotes = modelManager.filteredNotes;
var countEncrypted = 0; var countEncrypted = 0;
@@ -173,10 +173,12 @@ angular.module('app.frontend')
return countEncrypted + "/" + allNotes.length + " notes encrypted"; return countEncrypted + "/" + allNotes.length + " notes encrypted";
} }
this.archiveEncryptionFormat = {encrypted: true};
this.downloadDataArchive = function() { this.downloadDataArchive = function() {
var link = document.createElement('a'); var link = document.createElement('a');
link.setAttribute('download', 'notes.json'); link.setAttribute('download', 'notes.json');
link.href = apiController.itemsDataFile(); link.href = apiController.itemsDataFile(this.archiveEncryptionFormat.encrypted);
link.click(); link.click();
} }

26
app/assets/javascripts/app/services/apiController.js
View File

@@ -273,8 +273,8 @@ angular.module('app.frontend')
return this.paramsForItem(item, !item.isPublic(), additionalFields, false); return this.paramsForItem(item, !item.isPublic(), additionalFields, false);
} }
this.paramsForExportFile = function(item) { this.paramsForExportFile = function(item, encrypted) {
return _.omit(this.paramsForItem(item, false, ["created_at", "updated_at"], true), ["deleted"]); return _.omit(this.paramsForItem(item, encrypted, ["created_at", "updated_at"], true), ["deleted"]);
} }
this.paramsForExtension = function(item, encrypted) { this.paramsForExtension = function(item, encrypted) {
@@ -358,6 +358,8 @@ angular.module('app.frontend')
this.importJSONData = function(jsonString, callback) { this.importJSONData = function(jsonString, callback) {
var data = JSON.parse(jsonString); var data = JSON.parse(jsonString);
console.log("importing data", data);
this.decryptItems(data.items);
modelManager.mapResponseItemsToLocalModels(data.items); modelManager.mapResponseItemsToLocalModels(data.items);
modelManager.items.forEach(function(item){ modelManager.items.forEach(function(item){
item.setDirty(true); item.setDirty(true);
@@ -369,7 +371,7 @@ angular.module('app.frontend')
Export Export
*/ */
this.itemsDataFile = function() { this.itemsDataFile = function(encrypted) {
var textFile = null; var textFile = null;
var makeTextFile = function (text) { var makeTextFile = function (text) {
var data = new Blob([text], {type: 'text/json'}); var data = new Blob([text], {type: 'text/json'});
@@ -387,7 +389,7 @@ angular.module('app.frontend')
}.bind(this); }.bind(this);
var items = _.map(modelManager.allItemsMatchingTypes(["Tag", "Note"]), function(item){ var items = _.map(modelManager.allItemsMatchingTypes(["Tag", "Note"]), function(item){
return this.paramsForExportFile(item); return this.paramsForExportFile(item, encrypted);
}.bind(this)); }.bind(this));
var data = { var data = {
@@ -532,13 +534,15 @@ angular.module('app.frontend')
if(item.deleted == true) { if(item.deleted == true) {
continue; continue;
} }
var isString = typeof item.content === 'string' || item.content instanceof String;
if(item.content.substring(0, 3) == "001" && item.enc_item_key) { if(isString) {
// is encrypted if(item.content.substring(0, 3) == "001" && item.enc_item_key) {
this.decryptSingleItem(item, masterKey); // is encrypted
} else { this.decryptSingleItem(item, masterKey);
// is base64 encoded } else {
item.content = Neeto.crypto.base64Decode(item.content.substring(3, item.content.length)) // is base64 encoded
item.content = Neeto.crypto.base64Decode(item.content.substring(3, item.content.length))
}
} }
} }
} }

28
app/assets/javascripts/app/services/extensionManager.js
View File

@@ -55,8 +55,22 @@ class ExtensionManager {
console.log("ext with dec", this.decryptedExtensions); console.log("ext with dec", this.decryptedExtensions);
} }
addExtension(url) { addExtension(url, callback) {
this.retrieveExtensionFromServer(url, null); this.retrieveExtensionFromServer(url, callback);
}
deleteExtension(extension) {
for(var action of extension.actions) {
_.pull(this.decryptedExtensions, extension);
if(action.repeat_type) {
if(this.isRepeatActionEnabled(action)) {
this.disableRepeatAction(action);
}
}
}
this.modelManager.setItemToBeDeleted(extension);
this.apiController.sync(null);
} }
retrieveExtensionFromServer(url, callback) { retrieveExtensionFromServer(url, callback) {
@@ -69,6 +83,7 @@ class ExtensionManager {
}.bind(this)) }.bind(this))
.catch(function(response){ .catch(function(response){
console.log("Error registering extension", response); console.log("Error registering extension", response);
callback(null);
}) })
} }
@@ -185,10 +200,11 @@ class ExtensionManager {
queueAction(action, extension, delay, changedItems) { queueAction(action, extension, delay, changedItems) {
this.actionQueue = this.actionQueue || []; this.actionQueue = this.actionQueue || [];
if(_.find(this.actionQueue, action)) { if(_.find(this.actionQueue, {url: action.url})) {
return; return;
} }
console.log("Successfully queued", action, this.actionQueue.length);
this.actionQueue.push(action); this.actionQueue.push(action);
setTimeout(function () { setTimeout(function () {
@@ -199,15 +215,13 @@ class ExtensionManager {
} }
triggerWatchAction(action, extension, changedItems) { triggerWatchAction(action, extension, changedItems) {
// console.log("Watch action triggered", action, changedItems);
if(action.repeat_timeout > 0) { if(action.repeat_timeout > 0) {
var lastExecuted = action.lastExecuted; var lastExecuted = action.lastExecuted;
var diffInSeconds = (new Date() - lastExecuted)/1000; var diffInSeconds = (new Date() - lastExecuted)/1000;
console.log("last executed", action.lastExecuted, "diff", diffInSeconds, "repeatFreq", action.repeatFrequency);
if(diffInSeconds < action.repeat_timeout) { if(diffInSeconds < action.repeat_timeout) {
var delay = action.repeat_timeout - diffInSeconds; var delay = action.repeat_timeout - diffInSeconds;
console.log("delaying action by", delay); console.log("Delaying action by", delay);
this.queueAction(action, delay, changedItems); this.queueAction(action, extension, delay, changedItems);
return; return;
} }
} }

55
app/assets/stylesheets/app/_editor.scss
View File

@@ -12,6 +12,21 @@
.section-title-bar { .section-title-bar {
border-bottom: none !important; border-bottom: none !important;
&.fullscreen {
opacity: 0.0;
-webkit-transition: all 300ms ease-in-out;
-moz-transition: all 300ms ease-in-out;
-ms-transition: all 300ms ease-in-out;
-o-transition: all 300ms ease-in-out;
transition: all 300ms ease-in-out;
&:hover {
opacity: 1.0;
}
// z-index: -1;
}
} }
$heading-height: 90px; $heading-height: 90px;
@@ -65,6 +80,26 @@
} }
.fullscreen-ghost-bar {
position: absolute;
width: 20%;
height: 200px;
z-index: 100;
//
// &:hover + .section-title-bar {
// // show section title bar when hover over ghost bar
// opacity: 1.0;
// z-index: 100;
// }
// &:not(:hover) + .section-title-bar {
// // display: none;
// opacity: 1.0;
// }
}
.editor-content { .editor-content {
max-height: 100%; max-height: 100%;
@@ -74,9 +109,14 @@
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
overflow: auto; overflow: auto;
text-align: center; // centers children div horizontally
z-index: 10;
padding-top: $heading-height; padding-top: $heading-height;
&.fullscreen {
padding-top: 0px;
}
.sampler-container { .sampler-container {
margin-top: 10px; margin-top: 10px;
padding: 15px; padding: 15px;
@@ -101,6 +141,12 @@
padding-top: 17px; padding-top: 17px;
font-size: 17px; font-size: 17px;
resize: none; resize: none;
&.fullscreen {
padding: 85px 10%;
max-width: 1200px;
display: inline-block;;
}
} }
.preview { .preview {
@@ -110,6 +156,13 @@
line-height: 23px; line-height: 23px;
overflow-y: scroll; overflow-y: scroll;
padding: 0px 15px; padding: 0px 15px;
text-align: left;
&.fullscreen {
padding: 85px 10%;
max-width: 1200px;
display: inline-block;;
}
} }
} }
} }

9
app/assets/templates/frontend/editor.html.haml
View File

@@ -1,6 +1,7 @@
.section.editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen}"} .section.editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen}"}
.content .content
.section-title-bar.editor-heading{"ng-class" => "{'shared' : ctrl.note.isPublic() }"} -# %span.fullscreen-ghost-bar{"ng-if" => "ctrl.fullscreen"}
.section-title-bar.editor-heading{"ng-class" => "{'shared' : ctrl.note.isPublic(), 'fullscreen' : ctrl.fullscreen }"}
.title .title
%input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)", %input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)",
"ng-disabled" => "ctrl.note.locked", "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()", "ng-disabled" => "ctrl.note.locked", "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()",
@@ -55,10 +56,10 @@
"ng-disabled" => "ctrl.note.locked", "ng-change" => "ctrl.urlChanged()", "ng-focus" => "ctrl.onUrlFocus()", "ng-disabled" => "ctrl.note.locked", "ng-change" => "ctrl.urlChanged()", "ng-focus" => "ctrl.onUrlFocus()",
"select-on-click" => "true", "autofocus" => "true"} "select-on-click" => "true", "autofocus" => "true"}
.editor-content{"ng-class" => "{'shared' : ctrl.note.isPublic() }"} .editor-content{"ng-class" => "{'shared' : ctrl.note.isPublic(), 'fullscreen' : ctrl.fullscreen }"}
.sampler-container{"ng-if" => "ctrl.showSampler", "ng-click" => "ctrl.focusEditor()"} .sampler-container{"ng-if" => "ctrl.showSampler", "ng-click" => "ctrl.focusEditor()"}
%strong.name-sampler.sampler{"typewrite" => "true", "text" => "ctrl.demoNoteNames", "type-delay" => "30", "initial-delay" => "1.5s", %strong.name-sampler.sampler{"typewrite" => "true", "text" => "ctrl.demoNoteNames", "type-delay" => "30", "initial-delay" => "1.5s",
"iteration-callback" => "ctrl.callback", "prebegin-fn" => "ctrl.prebeginFn", "iteration-delay" => "2000", "cursor" => ""} "iteration-callback" => "ctrl.callback", "prebegin-fn" => "ctrl.prebeginFn", "iteration-delay" => "2000", "cursor" => ""}
%textarea.editable#note-text-editor{"ng-disabled" => "ctrl.note.locked", "ng-show" => "ctrl.editorMode == 'edit'", "ng-model" => "ctrl.note.text", %textarea.editable#note-text-editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen }", "ng-disabled" => "ctrl.note.locked", "ng-show" => "ctrl.editorMode == 'edit'", "ng-model" => "ctrl.note.text",
"ng-change" => "ctrl.contentChanged()", "ng-click" => "ctrl.clickedTextArea()", "ng-focus" => "ctrl.onContentFocus()"} "ng-change" => "ctrl.contentChanged()", "ng-click" => "ctrl.clickedTextArea()", "ng-focus" => "ctrl.onContentFocus()"}
.preview{"ng-if" => "ctrl.editorMode == 'preview'", "ng-bind-html" => "ctrl.renderedContent()", "ng-dblclick" => "ctrl.onPreviewDoubleClick()"} .preview{"ng-class" => "{'fullscreen' : ctrl.fullscreen }", "ng-if" => "ctrl.editorMode == 'preview'", "ng-bind-html" => "ctrl.renderedContent()", "ng-dblclick" => "ctrl.onPreviewDoubleClick()"}

17
app/assets/templates/frontend/header.html.haml
View File

@@ -74,9 +74,15 @@
.account-item{"ng-if" => "ctrl.user.email"} .account-item{"ng-if" => "ctrl.user.email"}
.meta-container .meta-container
.title Data Archives .title Data Archives
.desc Note: data archives that you download using the link below are decrypted before save. You should take care to store them in a safe location. .options{"style" => "font-size: 12px; margin-top: 4px;"}
%label
%input{"type" => "radio", "ng-model" => "ctrl.archiveEncryptionFormat.encrypted", "ng-value" => "true", "ng-change" => "ctrl.archiveEncryptionFormat.encrypted = true"}
Encrypted
%label
%input{"type" => "radio", "ng-model" => "ctrl.archiveEncryptionFormat.encrypted", "ng-value" => "false", "ng-change" => "ctrl.archiveEncryptionFormat.encrypted = false"}
Decrypted
.action-container .action-container
%a{"ng-click" => "ctrl.downloadDataArchive()"} Download Latest Data Archive %a{"ng-click" => "ctrl.downloadDataArchive()"} Download Data Archive
%br %br
%label#import-archive %label#import-archive
%input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "ctrl.importFileSelected(files)"} %input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "ctrl.importFileSelected(files)"}
@@ -124,15 +130,16 @@
.spinner{"style" => "margin-top: 3px;"} .spinner{"style" => "margin-top: 3px;"}
.last-run{"ng-if" => "action.lastExecuted && !action.running"} .last-run{"ng-if" => "action.lastExecuted && !action.running"}
Last executed {{action.lastExecuted | appDateTime}} Last executed {{action.lastExecuted | appDateTime}}
%a{"ng-click" => "ctrl.deleteExtension(extension)", "style" => "margin-top: 22px; display: block;"} Remove extension
.extension-link .extension-link
%a{"ng-click" => "ctrl.toggleExtensionForm()"} Add new extension %a{"ng-click" => "ctrl.toggleExtensionForm()"} Add new extension
%form.extension-form{"ng-if" => "ctrl.showNewExtensionForm"} %form.extension-form{"ng-if" => "ctrl.showNewExtensionForm"}
.form-tag.has-feedback .form-tag.has-feedback
%input.form-control{:autofocus => 'autofocus', :name => 'url', :placeholder => 'Extension URL', :required => true, :type => 'text', 'ng-model' => 'ctrl.newExtensionData.url'} %input.form-control{:autofocus => 'autofocus', :name => 'url', :placeholder => 'Extension URL', :required => true, :type => 'url', 'ng-model' => 'ctrl.newExtensionData.url'}
%button.btn.dark-button.btn-block{:type => 'submit', "data-style" => "expand-right", "data-size" => "s", "state" => "buttonState"} %button.btn.dark-button.btn-block{"ng-click" => "ctrl.submitNewExtensionForm()", :type => 'submit', "data-style" => "expand-right", "data-size" => "s", "state" => "buttonState"}
%span.ladda-label{"ng-click" => "ctrl.submitNewExtensionForm()"} Add Extension %span.ladda-label Add Extension
.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

286
vendor/assets/javascripts/transpiled.js vendored
View File

@@ -756,7 +756,13 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
}; };
this.submitNewExtensionForm = function () { this.submitNewExtensionForm = function () {
extensionManager.addExtension(this.newExtensionData.url); if (this.newExtensionData.url) {
extensionManager.addExtension(this.newExtensionData.url, function (response) {
if (!response) {
alert("Unable to register this extension. Make sure the link is valid and try again.");
}
});
}
}; };
this.selectedAction = function (action, extension) { this.selectedAction = function (action, extension) {
@@ -767,6 +773,12 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
}); });
}; };
this.deleteExtension = function (extension) {
if (confirm("Are you sure you want to delete this extension?")) {
extensionManager.deleteExtension(extension);
}
};
this.reloadExtensionsPressed = function () { this.reloadExtensionsPressed = function () {
if (confirm("For your security, reloading extensions will disable any currently enabled repeat actions.")) { if (confirm("For your security, reloading extensions will disable any currently enabled repeat actions.")) {
extensionManager.refreshExtensionsFromServer(); extensionManager.refreshExtensionsFromServer();
@@ -858,18 +870,6 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
}.bind(this)); }.bind(this));
}; };
this.forgotPasswordSubmit = function () {
// $auth.requestPasswordReset(this.resetData)
// .then(function(resp) {
// this.resetData.response = "Success";
// // handle success response
// }.bind(this))
// .catch(function(resp) {
// // handle error response
// this.resetData.response = "Error";
// }.bind(this));
};
this.encryptionStatusForNotes = function () { this.encryptionStatusForNotes = function () {
var allNotes = modelManager.filteredNotes; var allNotes = modelManager.filteredNotes;
var countEncrypted = 0; var countEncrypted = 0;
@@ -882,10 +882,12 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
return countEncrypted + "/" + allNotes.length + " notes encrypted"; return countEncrypted + "/" + allNotes.length + " notes encrypted";
}; };
this.archiveEncryptionFormat = { encrypted: true };
this.downloadDataArchive = function () { this.downloadDataArchive = function () {
var link = document.createElement('a'); var link = document.createElement('a');
link.setAttribute('download', 'notes.json'); link.setAttribute('download', 'notes.json');
link.href = apiController.itemsDataFile(); link.href = apiController.itemsDataFile(this.archiveEncryptionFormat.encrypted);
link.click(); link.click();
}; };
@@ -2135,8 +2137,8 @@ var User = function User(json_obj) {
return this.paramsForItem(item, !item.isPublic(), additionalFields, false); return this.paramsForItem(item, !item.isPublic(), additionalFields, false);
}; };
this.paramsForExportFile = function (item) { this.paramsForExportFile = function (item, encrypted) {
return _.omit(this.paramsForItem(item, false, ["created_at", "updated_at"], true), ["deleted"]); return _.omit(this.paramsForItem(item, encrypted, ["created_at", "updated_at"], true), ["deleted"]);
}; };
this.paramsForExtension = function (item, encrypted) { this.paramsForExtension = function (item, encrypted) {
@@ -2221,6 +2223,8 @@ var User = function User(json_obj) {
this.importJSONData = function (jsonString, callback) { this.importJSONData = function (jsonString, callback) {
var data = JSON.parse(jsonString); var data = JSON.parse(jsonString);
console.log("importing data", data);
this.decryptItems(data.items);
modelManager.mapResponseItemsToLocalModels(data.items); modelManager.mapResponseItemsToLocalModels(data.items);
modelManager.items.forEach(function (item) { modelManager.items.forEach(function (item) {
item.setDirty(true); item.setDirty(true);
@@ -2232,7 +2236,7 @@ var User = function User(json_obj) {
Export Export
*/ */
this.itemsDataFile = function () { this.itemsDataFile = function (encrypted) {
var textFile = null; var textFile = null;
var makeTextFile = function (text) { var makeTextFile = function (text) {
var data = new Blob([text], { type: 'text/json' }); var data = new Blob([text], { type: 'text/json' });
@@ -2250,7 +2254,7 @@ var User = function User(json_obj) {
}.bind(this); }.bind(this);
var items = _.map(modelManager.allItemsMatchingTypes(["Tag", "Note"]), function (item) { var items = _.map(modelManager.allItemsMatchingTypes(["Tag", "Note"]), function (item) {
return this.paramsForExportFile(item); return this.paramsForExportFile(item, encrypted);
}.bind(this)); }.bind(this));
var data = { var data = {
@@ -2396,13 +2400,15 @@ var User = function User(json_obj) {
if (item.deleted == true) { if (item.deleted == true) {
continue; continue;
} }
var isString = typeof item.content === 'string' || item.content instanceof String;
if (item.content.substring(0, 3) == "001" && item.enc_item_key) { if (isString) {
// is encrypted if (item.content.substring(0, 3) == "001" && item.enc_item_key) {
this.decryptSingleItem(item, masterKey); // is encrypted
} else { this.decryptSingleItem(item, masterKey);
// is base64 encoded } else {
item.content = Neeto.crypto.base64Decode(item.content.substring(3, item.content.length)); // is base64 encoded
item.content = Neeto.crypto.base64Decode(item.content.substring(3, item.content.length));
}
} }
} }
} catch (err) { } catch (err) {
@@ -2939,8 +2945,44 @@ var ExtensionManager = function () {
} }
}, { }, {
key: 'addExtension', key: 'addExtension',
value: function addExtension(url) { value: function addExtension(url, callback) {
this.retrieveExtensionFromServer(url, null); this.retrieveExtensionFromServer(url, callback);
}
}, {
key: 'deleteExtension',
value: function deleteExtension(extension) {
var _iteratorNormalCompletion8 = true;
var _didIteratorError8 = false;
var _iteratorError8 = undefined;
try {
for (var _iterator8 = extension.actions[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
var action = _step8.value;
_.pull(this.decryptedExtensions, extension);
if (action.repeat_type) {
if (this.isRepeatActionEnabled(action)) {
this.disableRepeatAction(action);
}
}
}
} catch (err) {
_didIteratorError8 = true;
_iteratorError8 = err;
} finally {
try {
if (!_iteratorNormalCompletion8 && _iterator8.return) {
_iterator8.return();
}
} finally {
if (_didIteratorError8) {
throw _iteratorError8;
}
}
}
this.modelManager.setItemToBeDeleted(extension);
this.apiController.sync(null);
} }
}, { }, {
key: 'retrieveExtensionFromServer', key: 'retrieveExtensionFromServer',
@@ -2953,6 +2995,7 @@ var ExtensionManager = function () {
} }
}.bind(this)).catch(function (response) { }.bind(this)).catch(function (response) {
console.log("Error registering extension", response); console.log("Error registering extension", response);
callback(null);
}); });
} }
}, { }, {
@@ -2974,43 +3017,16 @@ var ExtensionManager = function () {
}, { }, {
key: 'refreshExtensionsFromServer', key: 'refreshExtensionsFromServer',
value: function refreshExtensionsFromServer() { value: function refreshExtensionsFromServer() {
var _iteratorNormalCompletion8 = true;
var _didIteratorError8 = false;
var _iteratorError8 = undefined;
try {
for (var _iterator8 = this.enabledRepeatActionUrls[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
var url = _step8.value;
var action = this.actionWithURL(url);
this.disableRepeatAction(action);
}
} catch (err) {
_didIteratorError8 = true;
_iteratorError8 = err;
} finally {
try {
if (!_iteratorNormalCompletion8 && _iterator8.return) {
_iterator8.return();
}
} finally {
if (_didIteratorError8) {
throw _iteratorError8;
}
}
}
var _iteratorNormalCompletion9 = true; var _iteratorNormalCompletion9 = true;
var _didIteratorError9 = false; var _didIteratorError9 = false;
var _iteratorError9 = undefined; var _iteratorError9 = undefined;
try { try {
for (var _iterator9 = this.extensions[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) { for (var _iterator9 = this.enabledRepeatActionUrls[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
var ext = _step9.value; var url = _step9.value;
this.retrieveExtensionFromServer(ext.url, function (extension) { var action = this.actionWithURL(url);
extension.setDirty(true); this.disableRepeatAction(action);
});
} }
} catch (err) { } catch (err) {
_didIteratorError9 = true; _didIteratorError9 = true;
@@ -3026,6 +3042,33 @@ var ExtensionManager = function () {
} }
} }
} }
var _iteratorNormalCompletion10 = true;
var _didIteratorError10 = false;
var _iteratorError10 = undefined;
try {
for (var _iterator10 = this.extensions[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
var ext = _step10.value;
this.retrieveExtensionFromServer(ext.url, function (extension) {
extension.setDirty(true);
});
}
} catch (err) {
_didIteratorError10 = true;
_iteratorError10 = err;
} finally {
try {
if (!_iteratorNormalCompletion10 && _iterator10.return) {
_iterator10.return();
}
} finally {
if (_didIteratorError10) {
throw _iteratorError10;
}
}
}
} }
}, { }, {
key: 'executeAction', key: 'executeAction',
@@ -3118,10 +3161,11 @@ var ExtensionManager = function () {
key: 'queueAction', key: 'queueAction',
value: function queueAction(action, extension, delay, changedItems) { value: function queueAction(action, extension, delay, changedItems) {
this.actionQueue = this.actionQueue || []; this.actionQueue = this.actionQueue || [];
if (_.find(this.actionQueue, action)) { if (_.find(this.actionQueue, { url: action.url })) {
return; return;
} }
console.log("Successfully queued", action, this.actionQueue.length);
this.actionQueue.push(action); this.actionQueue.push(action);
setTimeout(function () { setTimeout(function () {
@@ -3133,15 +3177,13 @@ var ExtensionManager = function () {
}, { }, {
key: 'triggerWatchAction', key: 'triggerWatchAction',
value: function triggerWatchAction(action, extension, changedItems) { value: function triggerWatchAction(action, extension, changedItems) {
// console.log("Watch action triggered", action, changedItems);
if (action.repeat_timeout > 0) { if (action.repeat_timeout > 0) {
var lastExecuted = action.lastExecuted; var lastExecuted = action.lastExecuted;
var diffInSeconds = (new Date() - lastExecuted) / 1000; var diffInSeconds = (new Date() - lastExecuted) / 1000;
console.log("last executed", action.lastExecuted, "diff", diffInSeconds, "repeatFreq", action.repeatFrequency);
if (diffInSeconds < action.repeat_timeout) { if (diffInSeconds < action.repeat_timeout) {
var delay = action.repeat_timeout - diffInSeconds; var delay = action.repeat_timeout - diffInSeconds;
console.log("delaying action by", delay); console.log("Delaying action by", delay);
this.queueAction(action, delay, changedItems); this.queueAction(action, extension, delay, changedItems);
return; return;
} }
} }
@@ -3251,13 +3293,13 @@ var ModelManager = function () {
key: 'mapResponseItemsToLocalModelsOmittingFields', key: 'mapResponseItemsToLocalModelsOmittingFields',
value: function mapResponseItemsToLocalModelsOmittingFields(items, omitFields) { value: function mapResponseItemsToLocalModelsOmittingFields(items, omitFields) {
var models = []; var models = [];
var _iteratorNormalCompletion10 = true; var _iteratorNormalCompletion11 = true;
var _didIteratorError10 = false; var _didIteratorError11 = false;
var _iteratorError10 = undefined; var _iteratorError11 = undefined;
try { try {
for (var _iterator10 = items[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) { for (var _iterator11 = items[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
var json_obj = _step10.value; var json_obj = _step11.value;
json_obj = _.omit(json_obj, omitFields || []); json_obj = _.omit(json_obj, omitFields || []);
var item = this.findItem(json_obj["uuid"]); var item = this.findItem(json_obj["uuid"]);
@@ -3284,44 +3326,6 @@ var ModelManager = function () {
models.push(item); models.push(item);
} }
} catch (err) {
_didIteratorError10 = true;
_iteratorError10 = err;
} finally {
try {
if (!_iteratorNormalCompletion10 && _iterator10.return) {
_iterator10.return();
}
} finally {
if (_didIteratorError10) {
throw _iteratorError10;
}
}
}
this.notifySyncObserversOfModels(models);
this.sortItems();
return models;
}
}, {
key: 'notifySyncObserversOfModels',
value: function notifySyncObserversOfModels(models) {
var _iteratorNormalCompletion11 = true;
var _didIteratorError11 = false;
var _iteratorError11 = undefined;
try {
for (var _iterator11 = this.itemSyncObservers[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
var observer = _step11.value;
var relevantItems = models.filter(function (item) {
return item.content_type == observer.type;
});
if (relevantItems.length > 0) {
observer.callback(relevantItems);
}
}
} catch (err) { } catch (err) {
_didIteratorError11 = true; _didIteratorError11 = true;
_iteratorError11 = err; _iteratorError11 = err;
@@ -3336,22 +3340,26 @@ var ModelManager = function () {
} }
} }
} }
this.notifySyncObserversOfModels(models);
this.sortItems();
return models;
} }
}, { }, {
key: 'notifyItemChangeObserversOfModels', key: 'notifySyncObserversOfModels',
value: function notifyItemChangeObserversOfModels(models) { value: function notifySyncObserversOfModels(models) {
var _iteratorNormalCompletion12 = true; var _iteratorNormalCompletion12 = true;
var _didIteratorError12 = false; var _didIteratorError12 = false;
var _iteratorError12 = undefined; var _iteratorError12 = undefined;
try { try {
for (var _iterator12 = this.itemChangeObservers[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) { for (var _iterator12 = this.itemSyncObservers[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
var observer = _step12.value; var observer = _step12.value;
var relevantItems = models.filter(function (item) { var relevantItems = models.filter(function (item) {
return observer.content_types.includes(item.content_type) || observer.content_types.includes("*"); return item.content_type == observer.type;
}); });
if (relevantItems.length > 0) { if (relevantItems.length > 0) {
observer.callback(relevantItems); observer.callback(relevantItems);
} }
@@ -3371,6 +3379,40 @@ var ModelManager = function () {
} }
} }
} }
}, {
key: 'notifyItemChangeObserversOfModels',
value: function notifyItemChangeObserversOfModels(models) {
var _iteratorNormalCompletion13 = true;
var _didIteratorError13 = false;
var _iteratorError13 = undefined;
try {
for (var _iterator13 = this.itemChangeObservers[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
var observer = _step13.value;
var relevantItems = models.filter(function (item) {
return observer.content_types.includes(item.content_type) || observer.content_types.includes("*");
});
if (relevantItems.length > 0) {
observer.callback(relevantItems);
}
}
} catch (err) {
_didIteratorError13 = true;
_iteratorError13 = err;
} finally {
try {
if (!_iteratorNormalCompletion13 && _iterator13.return) {
_iterator13.return();
}
} finally {
if (_didIteratorError13) {
throw _iteratorError13;
}
}
}
}
}, { }, {
key: 'createItem', key: 'createItem',
value: function createItem(json_obj) { value: function createItem(json_obj) {
@@ -3432,13 +3474,13 @@ var ModelManager = function () {
return; return;
} }
var _iteratorNormalCompletion13 = true; var _iteratorNormalCompletion14 = true;
var _didIteratorError13 = false; var _didIteratorError14 = false;
var _iteratorError13 = undefined; var _iteratorError14 = undefined;
try { try {
for (var _iterator13 = contentObject.references[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) { for (var _iterator14 = contentObject.references[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
var reference = _step13.value; var reference = _step14.value;
var referencedItem = this.findItem(reference.uuid); var referencedItem = this.findItem(reference.uuid);
if (referencedItem) { if (referencedItem) {
@@ -3449,16 +3491,16 @@ var ModelManager = function () {
} }
} }
} catch (err) { } catch (err) {
_didIteratorError13 = true; _didIteratorError14 = true;
_iteratorError13 = err; _iteratorError14 = err;
} finally { } finally {
try { try {
if (!_iteratorNormalCompletion13 && _iterator13.return) { if (!_iteratorNormalCompletion14 && _iterator14.return) {
_iterator13.return(); _iterator14.return();
} }
} finally { } finally {
if (_didIteratorError13) { if (_didIteratorError14) {
throw _iteratorError13; throw _iteratorError14;
} }
} }
} }

2
vendor/assets/javascripts/transpiled.js.map vendored
View File

File diff suppressed because one or more lines are too long