From 678f8d73bc16979139aaab9a92a3a5c1934edff1 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Mon, 3 Jun 2019 11:41:08 -0500 Subject: [PATCH] No debounce while offline, static index.html page, 3.0.10-beta2 --- .bowerrc | 3 -- .gitignore | 1 + .npmignore | 49 ++++++++++--------- app/assets/javascripts/app/constants.js | 2 +- .../javascripts/app/controllers/editor.js | 7 ++- circle.yml | 19 ------- index.html | 36 ++++++++++++++ 7 files changed, 70 insertions(+), 47 deletions(-) delete mode 100644 .bowerrc delete mode 100644 circle.yml create mode 100644 index.html diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 041a6dc82..000000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "allow_root": true -} diff --git a/.gitignore b/.gitignore index 6f7b30833..4065e876d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ /app/assets/templates/generated/ /node_modules +/dist /dist/javascripts/app.js /dist/javascripts/compiled.js /dist/javascripts/transpiled.js diff --git a/.npmignore b/.npmignore index 40c5f7c39..c0797a167 100644 --- a/.npmignore +++ b/.npmignore @@ -1,37 +1,40 @@ -# See https://help.github.com/articles/ignoring-files for more about ignoring files. -# -# If you find yourself ignoring temporary files generated by your text editor -# or operating system, you probably want to add a global ignore instead: -# git config --global core.excludesfile '~/.gitignore_global' - -# OS & IDE .DS_Store - -# Ignore bundler config. /.bundle -# Ignore all logfiles and tempfiles. +.git +/.sass-cache +/app +/bin +/config +/db +/lib +/log +/node_modules +/test +/vendor + /log/* !/log/.keep /tmp - -/config/cap.yml - -/app/assets/templates/generated/ - -/node_modules - -/.sass-cache - -# Ignore ENV variables config .env .ssh dump.rdb -# Ignore compiled assets /public/assets - -# Ignore user uploads /public/uploads/* !/public/uploads/.keep + +.babelrc +.gitignore +.gitmodules +.npmignore +Capfile +config.ru +Gemfile +Gemfile.lock +Gruntfile.js +package-lock.json +package.json +Rakefile +testing-server.js diff --git a/app/assets/javascripts/app/constants.js b/app/assets/javascripts/app/constants.js index 09c2090cb..fb5de4266 100644 --- a/app/assets/javascripts/app/constants.js +++ b/app/assets/javascripts/app/constants.js @@ -1,5 +1,5 @@ angular.module('app') -.constant('appVersion', '3.0.10-beta1') +.constant('appVersion', '3.0.10-beta2') ; \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js index 48d8613a7..821b1f156 100644 --- a/app/assets/javascripts/app/controllers/editor.js +++ b/app/assets/javascripts/app/controllers/editor.js @@ -303,7 +303,12 @@ angular.module('app') $timeout.cancel(this.saveTimeout); } - let syncDebouceMs = bypassDebouncer ? SyncNoDebounce : SyncDebouce; + let syncDebouceMs; + if(authManager.offline() || bypassDebouncer) { + syncDebouceMs = SyncNoDebounce; + } else { + syncDebouceMs = SyncDebouce; + } this.saveTimeout = $timeout(() => { syncManager.sync().then((response) => { diff --git a/circle.yml b/circle.yml deleted file mode 100644 index a8597534c..000000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -machine: - ruby: - version: - 2.3.1 - node: - version: - 6.1.0 - -dependencies: - pre: - - npm install -g grunt - override: - - bundle install - - npm install - - grunt - -test: - override: - - npm test diff --git a/index.html b/index.html new file mode 100644 index 000000000..6054b15f5 --- /dev/null +++ b/index.html @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + Notes ยท Standard Notes + + + + + + + + + +
+ + +