keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

RuntimeInfo.beta

This commit is contained in:
antelle 2017-12-16 13:12:30 +01:00
parent 70eb727d7a
commit afaf9ebd02
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@ -89,6 +89,7 @@ module.exports = function(grunt) {
pattern: /@@VERSION/g,
replacement: function () { return pkg.version + (grunt.option('beta') ? '-beta' : '') }
},
{pattern: /@@BETA/g, replacement: function () { return grunt.option('beta') ? '1' : '' }},
{ pattern: /@@DATE/g, replacement: function() { return dt; } },
{ pattern: /@@COMMIT/g, replacement: function() { return grunt.config.get('gitinfo.local.branch.current.shortSHA'); } }
]})},

1
app/scripts/comp/runtime-info.js
View File

@ -2,6 +2,7 @@ const Launcher = require('../comp/launcher');
const RuntimeInfo = {
version: '@@VERSION',
beta: !!'@@BETA',
buildDate: '@@DATE',
commit: '@@COMMIT',
userAgent: navigator.userAgent,

3
app/scripts/models/app-model.js
View File

@ -17,6 +17,7 @@ const Format = require('../util/format');
const UrlUtil = require('../util/url-util');
const AutoType = require('../auto-type');
const Launcher = require('../comp/launcher');
const RuntimeInfo = require('../comp/runtime-info')
const PluginManager = require('../plugins/plugin-manager');
require('../mixins/protected-value-ex');
@ -33,7 +34,7 @@ const AppModel = Backbone.Model.extend({
this.sort = 'title';
this.settings = AppSettingsModel.instance;
this.activeEntryId = null;
this.isBeta = FeatureDetector.isBeta;
this.isBeta = RuntimeInfo.beta
this.listenTo(Backbone, 'refresh', this.refresh);
this.listenTo(Backbone, 'set-filter', this.setFilter);

1
app/scripts/util/feature-detector.js
View File

@ -12,7 +12,6 @@ const FeatureDetector = {
isPopup: !!((window.parent !== window.top) || window.opener),
isStandalone: !!navigator.standalone,
isFrame: window.top !== window,
isBeta: window.location.href.toLowerCase().indexOf('beta.') > 0,
isSelfHosted: !isDesktop && !/^http(s?):\/\/((localhost:8085)|((app|beta)\.keeweb\.info))/.test(location.href),
needFixClicks: /Edge\/14/.test(navigator.appVersion),