From c43e0d6e283773b5c531d55fbd652879849b9f4d Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 19 Oct 2018 08:41:01 +0200 Subject: [PATCH 1/2] Move files_external to compiled handlebars Signed-off-by: Roeland Jago Douma --- apps/files_external/js/settings.js | 70 +++---------------- apps/files_external/js/statusmanager.js | 3 +- apps/files_external/js/templates.js | 37 ++++++++++ .../js/templates/credentialsDialog.handlebars | 8 +++ .../templates/mountOptionsDropDown.handlebars | 48 +++++++++++++ apps/files_external/list.php | 1 + apps/files_external/templates/settings.php | 5 +- build/compile-handlebars-templates.sh | 3 + 8 files changed, 112 insertions(+), 63 deletions(-) create mode 100644 apps/files_external/js/templates.js create mode 100644 apps/files_external/js/templates/credentialsDialog.handlebars create mode 100644 apps/files_external/js/templates/mountOptionsDropDown.handlebars diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index b871fe2f74..2d49528152 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -10,58 +10,6 @@ (function(){ -// TODO: move to a separate file -var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = - '
'+ - // FIXME: options are hard-coded for now - '
    '+ - '
  • '+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    • '+ - '
  • '+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    • '+ - '
  • '+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    • '+ - '
  • '+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    • '+ - '
  • '+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    • '+ - '
  • ' + - ' ' + - ' ' + - ' ' + - ' ' + - '
    • ' + - '
  • ' + - ' ' + - ' {{t "files_external" "Delete"}}' + - ' ' + - '
    • ' + - '
'+ - '
'; - /** * Returns the selection of applicable users in the given configuration row * @@ -514,14 +462,16 @@ MountOptionsDropdown.prototype = { MountOptionsDropdown._last.hide(); } - var template = MountOptionsDropdown._template; - if (!template) { - template = Handlebars.compile(MOUNT_OPTIONS_DROPDOWN_TEMPLATE); - MountOptionsDropdown._template = template; - } - - var $el = $(template({ - mountOptionsEncodingLabel: t('files_external', 'Compatibility with Mac NFD encoding (slow)') + var $el = $(OCA.External.Templates.mountOptionsDropDown({ + mountOptionsEncodingLabel: t('files_external', 'Compatibility with Mac NFD encoding (slow)'), + mountOptionsEncryptLabel: t('files_external', 'Enable encryption'), + mountOptionsPreviewsLabel: t('files_external', 'Enable previews'), + mountOptionsSharingLabel: t('files_external', 'Enable sharing'), + mountOptionsFilesystemCheckLabel: t('files_external', 'Check for changes'), + mountOptionsFilesystemCheckOnce: t('files_external', 'Never'), + mountOptionsFilesystemCheckDA: t('files_external', 'Once every direct access'), + mountOptionsReadOnlyLabel: t('files_external', 'Read only'), + deleteLabel: t('files_external', 'Delete') })); this.$el = $el; diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js index a65988353a..b8b5e1a936 100644 --- a/apps/files_external/js/statusmanager.js +++ b/apps/files_external/js/statusmanager.js @@ -392,8 +392,7 @@ OCA.External.StatusManager = { * @param mountData */ showCredentialsDialog: function (mountPoint, mountData) { - var template = Handlebars.compile(OCA.External.StatusManager.credentialsDialogTemplate); - var dialog = $(template({ + var dialog = $(OCA.External.Templates.credentialsDialog({ credentials_text: t('files_external', 'Please enter the credentials for the {mount} mount', { 'mount': mountPoint }), diff --git a/apps/files_external/js/templates.js b/apps/files_external/js/templates.js new file mode 100644 index 0000000000..067b3f5f5d --- /dev/null +++ b/apps/files_external/js/templates.js @@ -0,0 +1,37 @@ +(function() { + var template = Handlebars.template, templates = OCA.External.Templates = OCA.External.Templates || {}; +templates['credentialsDialog'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { + var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; + + return "
\n
" + + alias4(((helper = (helper = helpers.credentials_text || (depth0 != null ? depth0.credentials_text : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"credentials_text","hash":{},"data":data}) : helper))) + + "
\n
\n \n \n
\n
\n
\n"; +},"useData":true}); +templates['mountOptionsDropDown'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { + var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; + + return "
\n
    \n
  • \n \n \n \n \n
    • \n
  • \n \n \n \n \n
    • \n
  • \n \n \n \n \n
    • \n
  • \n \n \n \n \n
    • \n
  • \n \n \n \n \n
    • \n
  • \n \n \n \n \n
    • \n
  • \n \n " + + alias4(((helper = (helper = helpers.deleteLabel || (depth0 != null ? depth0.deleteLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"deleteLabel","hash":{},"data":data}) : helper))) + + "\n \n
    • \n
\n
\n"; +},"useData":true}); +})(); \ No newline at end of file diff --git a/apps/files_external/js/templates/credentialsDialog.handlebars b/apps/files_external/js/templates/credentialsDialog.handlebars new file mode 100644 index 0000000000..c04ceef096 --- /dev/null +++ b/apps/files_external/js/templates/credentialsDialog.handlebars @@ -0,0 +1,8 @@ +
+
{{credentials_text}}
+
+ + +
+
+
diff --git a/apps/files_external/js/templates/mountOptionsDropDown.handlebars b/apps/files_external/js/templates/mountOptionsDropDown.handlebars new file mode 100644 index 0000000000..09b0d70895 --- /dev/null +++ b/apps/files_external/js/templates/mountOptionsDropDown.handlebars @@ -0,0 +1,48 @@ +
+
    +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + {{deleteLabel}} + +
    • +
+
diff --git a/apps/files_external/list.php b/apps/files_external/list.php index bda484d996..35ad6e6044 100644 --- a/apps/files_external/list.php +++ b/apps/files_external/list.php @@ -28,6 +28,7 @@ $tmpl = new OCP\Template('files_external', 'list', ''); /* Load Status Manager */ \OCP\Util::addStyle('files_external', 'external'); \OCP\Util::addScript('files_external', 'statusmanager'); +\OCP\Util::addScript('files_external', 'templates.js'); \OCP\Util::addScript('files_external', 'rollingqueue'); OCP\Util::addScript('files_external', 'app'); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index b3900aaf93..1d1fcee1d8 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -14,7 +14,10 @@ $l->t("Once every direct access"); $l->t('Read only'); - script('files_external', 'settings'); + script('files_external', [ + 'settings', + 'templates' + ]); style('files_external', 'settings'); // load custom JS diff --git a/build/compile-handlebars-templates.sh b/build/compile-handlebars-templates.sh index 493b3757e0..65ad4da12c 100755 --- a/build/compile-handlebars-templates.sh +++ b/build/compile-handlebars-templates.sh @@ -31,6 +31,9 @@ handlebars -n OCA.WorkflowEngine.Templates apps/workflowengine/js/templates -f a # Sharing handlebars -n OCA.Sharing.Templates apps/files_sharing/js/templates -f apps/files_sharing/js/templates.js +# Files external +handlebars -n OCA.External.Templates apps/files_external/js/templates -f apps/files_external/js/templates.js + if [[ $(git diff --name-only) ]]; then echo "Please submit your compiled handlebars templates" echo From 1226c13201e17c8d375303da51d138f86377a197 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 19 Oct 2018 10:41:37 +0200 Subject: [PATCH 2/2] Add .l10nignore Signed-off-by: Morris Jobke --- apps/files_external/.l10nignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 apps/files_external/.l10nignore diff --git a/apps/files_external/.l10nignore b/apps/files_external/.l10nignore new file mode 100644 index 0000000000..3179ed23dd --- /dev/null +++ b/apps/files_external/.l10nignore @@ -0,0 +1,2 @@ +# compiled handlebar templates +js/templates.js