diff options
| author | “Ryder <“r@okfoc.us”> | 2016-04-15 10:36:41 -0400 |
|---|---|---|
| committer | “Ryder <“r@okfoc.us”> | 2016-04-15 10:36:41 -0400 |
| commit | 4233a653e99a02e40f226698d4c18fd153330de3 (patch) | |
| tree | 8dcceb293889c307ff02a6c4007c87fe12b87b15 | |
| parent | 603d917c9dcccadd2fa59ff6548afb4b634a33c8 (diff) | |
| parent | cf9931416c5ff69c46075e4f849b4000e29b2a37 (diff) | |
Merge branch 'master' of https://github.com/okfocus/portfolio
| -rw-r--r-- | index.js | 14 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 4 |
3 files changed, 15 insertions, 5 deletions
@@ -1,7 +1,12 @@ + +require('dotenv').config(); + var okcms = require('okcms') var isProduction = process.env.OK_PRODUCTION === 'true' +var PORT = isProduction ? 6502 : 1337 + var viewConfig = { template: 'index', data: [ @@ -67,10 +72,15 @@ var app = okcms.createApp({ image: { allowed: true, preserveFilename: false, maxbytes: 2*1024*1024 }, video: { allowed: true, preserveFilename: true, maxbytes: 200*1024*1024 }, audio: { allowed: true, preserveFilename: true, maxbytes: 100*1024*1024 }, + }, + webhook: { + active: isProduction, + secret: process.env.WEBHOOK_SECRET, + command: '/home/okfocus/portfolio/build.sh', }, } -}).listen(process.env.PORT || 1337) +}).listen(PORT || 1337) -console.log('Server listening at port ' + (process.env.PORT || 1337) + '...'); +console.log('Server listening at port ' + (PORT || 1337) + '...'); diff --git a/package.json b/package.json index d404e09..1767c9c 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "dotenv": "^2.0.0", "object-assign": "^2.0.0", - "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.32" + "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.33" }, "devDependencies": { "grunt": "^0.4.5", diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 2c53cf5..ff70753 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -28,7 +28,7 @@ var ProjectView = View.extend({ } } else { - // don't put iframes/videos in galleries if not necessary + // don't put iframes/videos in galleries unnecessarily - less performant if (this.$iframes.length || this.$videos.length) { this.$images.remove() } @@ -77,7 +77,7 @@ var ProjectView = View.extend({ }, show: function(){ - var audio = this.$("audio") + // var audio = this.$("audio") app.header.updatePageNumber( this.page_number ) app.header.updateSlideNumber( 0 ) app.header.updateSlideCount( this.slide_count ) |