Skip to content

Commit

Permalink
Merge pull request #73 from agoravoting/go-v7
Browse files Browse the repository at this point in the history
Go v7
  • Loading branch information
Findeton authored Oct 23, 2017
2 parents 52a76b4 + c1e98bb commit 3cd3b35
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
28 changes: 14 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'use strict';

var pkg = require('./package.json');
var AV_CONFIG_VERSION = '103111.6';
var AV_CONFIG_VERSION = '103111.7';

//Using exclusion patterns slows down Grunt significantly
//instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
Expand Down Expand Up @@ -204,13 +204,13 @@ module.exports = function (grunt) {
remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
append: [
{selector:'body',html:'<%= variables.booth_html_body_include %>'},
{selector:'body',html:'<!--[if lte IE 8]><script src="/booth/libcompat-v103111.6.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/booth/libnocompat-v103111.6.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/booth/libnocompat-v103111.6.min.js"></script><!--<![endif]-->'},
{selector:'body',html:'<!--[if lte IE 8]><script src="/booth/libcompat-v103111.7.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/booth/libnocompat-v103111.7.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/booth/libnocompat-v103111.7.min.js"></script><!--<![endif]-->'},
{selector:'body',html:'<!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-view/blob/master/README.md -->'},
{selector:'body',html:'<script src="/booth/lib-v103111.6.min.js"></script>'},
{selector:'body',html:'<script src="/booth/avConfig-v103111.6.js"></script>'},
{selector:'body',html:'<script src="/booth/avThemes-v103111.6.js"></script>'},
{selector:'body',html:'<script src="/booth/app-v103111.6.min.js"></script>'},
{selector:'body',html:'<script src="/booth/avPlugins-v103111.6.js"></script>'},
{selector:'body',html:'<script src="/booth/lib-v103111.7.min.js"></script>'},
{selector:'body',html:'<script src="/booth/avConfig-v103111.7.js"></script>'},
{selector:'body',html:'<script src="/booth/avThemes-v103111.7.js"></script>'},
{selector:'body',html:'<script src="/booth/app-v103111.7.min.js"></script>'},
{selector:'body',html:'<script src="/booth/avPlugins-v103111.7.js"></script>'},
{selector:'head',html:'<link rel="stylesheet" id="theme" data-base="/booth/" href="/booth/themes/default/app.min.css">'}
]
},
Expand Down Expand Up @@ -243,9 +243,9 @@ module.exports = function (grunt) {
],
'temp/lib.js': ['<%= dom_munger.data.libjs %>'],
'temp/app.js': ['<%= dom_munger.data.appjs %>','<%= ngtemplates.main.dest %>'],
'dist/avConfig-v103111.6.js': ['avConfig.js'],
'dist/avThemes-v103111.6.js': ['bower_components/avCommon/dist/avThemes-v103111.6.js'],
'dist/avPlugins-v103111.6.js': ['plugins/**/*.js']
'dist/avConfig-v103111.7.js': ['avConfig.js'],
'dist/avThemes-v103111.7.js': ['bower_components/avCommon/dist/avThemes-v103111.7.js'],
'dist/avPlugins-v103111.7.js': ['plugins/**/*.js']
}
}
},
Expand Down Expand Up @@ -277,10 +277,10 @@ module.exports = function (grunt) {
beautify: true
},
files: {
'dist/app-v103111.6.min.js': 'temp/app.js',
'dist/lib-v103111.6.min.js': 'temp/lib.js',
'dist/libnocompat-v103111.6.min.js': 'temp/libnocompat.js',
'dist/libcompat-v103111.6.min.js': 'temp/libcompat.js',
'dist/app-v103111.7.min.js': 'temp/app.js',
'dist/lib-v103111.7.min.js': 'temp/lib.js',
'dist/libnocompat-v103111.7.min.js': 'temp/libnocompat.js',
'dist/libcompat-v103111.7.min.js': 'temp/libcompat.js',
'dist/avWidgets.min.js': 'avWidgets.js',

"dist/locales/moment/en.js": "bower_components/moment/lang/en-gb.js",
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "agoraGuiBooth",
"version" : "103111.6",
"version" : "103111.7",
"main": "index.html",
"ignore": [
"**/.*",
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<script src="/ie8-bind-workaround.js"></script>

<!-- JS from Bower Components -->
<script src="bower_components/avCommon/dist/libnocompat-v103111.6.js" class="libnocompat"></script>
<script src="bower_components/avCommon/dist/libCommon-v103111.6.js" class="lib"></script>
<script src="bower_components/avCommon/dist/libnocompat-v103111.7.js" class="libnocompat"></script>
<script src="bower_components/avCommon/dist/libCommon-v103111.7.js" class="lib"></script>
<script src="bower_components/is_js/is.min.js" class="lib"></script>
<script src="bower_components/dragdroptouch/DragDropTouch.js" class="lib"></script>

Expand All @@ -34,7 +34,7 @@
<script src="avConfig.js"></script>

<!-- avCommon -->
<script src="bower_components/avCommon/dist/appCommon-v103111.6.js" class="app"></script>
<script src="bower_components/avCommon/dist/appCommon-v103111.7.js" class="app"></script>

<script src="crypto/crypto.js" class="app"></script>
<script src="crypto/random-service.js" class="app"></script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "agora-gui-booth",
"version" : "103111.6.0",
"version" : "103111.7.0",
"devDependencies": {
"grunt": "~0.4",
"grunt-angular-templates": "~0.5",
Expand Down

0 comments on commit 3cd3b35

Please sign in to comment.