Skip to content

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@edsilv
edsilv committed Oct 26, 2016
2 parents 14fc208 + 7fd4f24 commit 68a1608
Show file tree
Hide file tree
Showing 680 changed files with 9,459 additions and 45,148 deletions.
4 changes: 2 additions & 2 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"**/.git": true,
"**/.svn": true,
"**/.DS_Store": true,
"node_modules": true,
"dist": true,
//"node_modules": true,
//"dist": true,
"**/*.js": { "when": "$(basename).ts"},
"**/*.js.map": true
}
Expand Down
110 changes: 55 additions & 55 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ module.exports = function (grunt) {

function refresh() {
packageJson = grunt.file.readJSON("package.json");
grunt.config.set('config.dirs.uvVersioned', 'uv-' + packageJson.version);
grunt.config.set('config.dirs.uv', 'uv');
grunt.config.set('config.directories.uvVersioned', 'uv-' + packageJson.version);
grunt.config.set('config.directories.uv', 'uv');
}

refresh();
Expand All @@ -38,17 +38,17 @@ module.exports = function (grunt) {
},

clean: {
build : ['<%= config.dirs.build %>'],
build : ['<%= config.directories.build %>'],
bundle: ['./src/lib/bundle.js', './src/lib/bundle.min.js'],
dist: ['<%= config.dirs.dist %>'],
examples: ['<%= config.dirs.examples %>/uv-*'],
distexamples: ['<%= config.dirs.examples %>/uv-*.zip', '<%= config.dirs.examples %>/uv-*.tar'],
dist: ['<%= config.directories.dist %>'],
examples: ['<%= config.directories.examples %>/uv-*'],
distexamples: ['<%= config.directories.examples %>/uv-*.zip', '<%= config.directories.examples %>/uv-*.tar'],
extension: ['./src/extensions/*/build/*']
},

concat: {
bundle: {
src: grunt.file.expand('src/lib/*').concat(config.deps).concat(['!src/lib/embed.js']),
src: grunt.file.expand('src/lib/*').concat(config.dependencies.libs).concat(['!src/lib/embed.js']),
dest: 'src/lib/bundle.js'
}
},
Expand All @@ -60,7 +60,7 @@ module.exports = function (grunt) {
{
expand: true,
src: ['src/extensions/*/build/*.schema.json'],
dest: '<%= config.dirs.build %>/schema/',
dest: '<%= config.directories.build %>/schema/',
rename: function(dest, src) {
// get the extension name from the src string.
// src/extensions/[extension]/build/[locale].schema.json
Expand All @@ -81,24 +81,24 @@ module.exports = function (grunt) {
flatten: true,
cwd: 'src',
src: ['app.html'],
dest: '<%= config.dirs.build %>'
dest: '<%= config.directories.build %>'
},
// js
{
expand: true,
flatten: true,
cwd: '<%= config.dirs.lib %>',
cwd: '<%= config.directories.lib %>',
src: [
'embed.js',
'bundle.min.js'
],
dest: '<%= config.dirs.build %>/lib/'
dest: '<%= config.directories.build %>/lib/'
},
// extension configuration files
{
expand: true,
src: ['src/extensions/**/build/*.config.json'],
dest: '<%= config.dirs.build %>/lib/',
dest: '<%= config.directories.build %>/lib/',
rename: function(dest, src) {

// get the extension name from the src string.
Expand All @@ -114,7 +114,7 @@ module.exports = function (grunt) {
{
expand: true,
src: ['src/extensions/**/dependencies.js'],
dest: '<%= config.dirs.build %>/lib/',
dest: '<%= config.directories.build %>/lib/',
rename: function(dest, src) {

// get the extension name from the src string.
Expand All @@ -129,15 +129,15 @@ module.exports = function (grunt) {
expand: true,
flatten: true,
src: ['src/extensions/**/lib/*'],
dest: '<%= config.dirs.build %>/lib/'
dest: '<%= config.directories.build %>/lib/'
},
// l10n localisation files
{
expand: true,
flatten: false,
cwd: 'src/modules/',
src: ['**/l10n/**/*.properties'],
dest: '<%= config.dirs.build %>/l10n/',
dest: '<%= config.directories.build %>/l10n/',
rename: function(dest, src) {
// get the locale and .properties files.
var reg = /.*\/l10n\/(.*)/;
Expand All @@ -150,7 +150,7 @@ module.exports = function (grunt) {
{
expand: true,
src: ['src/modules/**/html/*'],
dest: '<%= config.dirs.build %>/html/',
dest: '<%= config.directories.build %>/html/',
rename: function(dest, src) {

var fileName = src.substr(src.lastIndexOf('/'));
Expand All @@ -168,39 +168,39 @@ module.exports = function (grunt) {
// copy contents of /build to /examples/build.
files: [
{
cwd: '<%= config.dirs.build %>',
cwd: '<%= config.directories.build %>',
expand: true,
src: ['**'],
dest: '<%= config.dirs.examples %>/<%= config.dirs.uv %>/'
dest: '<%= config.directories.examples %>/<%= config.directories.uv %>/'
},
// misc
{
expand: true,
flatten: true,
src: ['favicon.ico'],
dest: '<%= config.dirs.examples %>/'
dest: '<%= config.directories.examples %>/'
}
]
},
dist: {
// copy contents of /build to /dist/build.
files: [
{
cwd: '<%= config.dirs.build %>',
cwd: '<%= config.directories.build %>',
expand: true,
src: ['**'],
dest: '<%= config.dirs.dist %>/<%= config.dirs.uvVersioned %>/'
dest: '<%= config.directories.dist %>/<%= config.directories.uvVersioned %>/'
}
]
},
distexamples: {
// copy zip archives to examples
files: [
{
cwd: '<%= config.dirs.dist %>',
cwd: '<%= config.directories.dist %>',
expand: true,
src: ['*.zip', '*.tar'],
dest: '<%= config.dirs.examples %>/'
dest: '<%= config.directories.examples %>/'
}
]
}
Expand All @@ -211,10 +211,10 @@ module.exports = function (grunt) {
files: [
{
// themes
cwd: '<%= config.dirs.bower %>',
cwd: '<%= config.directories.bower %>',
expand: true,
src: ['uv-*-theme/**'],
dest: '<%= config.dirs.themes %>'
dest: '<%= config.directories.themes %>'
}
]
},
Expand All @@ -224,8 +224,8 @@ module.exports = function (grunt) {
// all d.ts files that need to be copied from /node_modules to /src/typings post npm install
expand: true,
flatten: true,
src: config.typings,
dest: '<%= config.dirs.typings %>'
src: config.dependencies.typings,
dest: '<%= config.directories.typings %>'
},
mediaelementExtensionConfig.sync.dependencies,
mediaelementExtensionConfig.sync.typings,
Expand All @@ -243,30 +243,30 @@ module.exports = function (grunt) {
zip: {
options: {
mode: 'zip',
archive: '<%= config.dirs.dist %>/<%= config.dirs.uvVersioned %>.zip',
archive: '<%= config.directories.dist %>/<%= config.directories.uvVersioned %>.zip',
level: 9
},
files: [
{
expand: true,
cwd: '<%= config.dirs.build %>/',
cwd: '<%= config.directories.build %>/',
src: ['**']
}
]
},
tar: {
options: {
mode: 'tar',
archive: '<%= config.dirs.dist %>/<%= config.dirs.uvVersioned %>.tar'
},
files: [
{
expand: true,
cwd: '<%= config.dirs.build %>/',
src: ['**']
}
]
}
}//,
// tar: {
// options: {
// mode: 'tar',
// archive: '<%= config.directories.dist %>/<%= config.directories.uvVersioned %>.tar'
// },
// files: [
// {
// expand: true,
// cwd: '<%= config.directories.build %>/',
// src: ['**']
// }
// ]
// }
},

exec: {
Expand All @@ -279,7 +279,7 @@ module.exports = function (grunt) {
replace: {

html: {
src: ['<%= config.dirs.build %>/app.html'],
src: ['<%= config.directories.build %>/app.html'],
overwrite: true,
replacements: [
{
Expand All @@ -295,7 +295,7 @@ module.exports = function (grunt) {
js: {
// replace window.DEBUG=true
// todo: use a compiler flag when available
src: ['<%= config.dirs.build %>/lib/app.js'],
src: ['<%= config.directories.build %>/lib/app.js'],
overwrite: true,
replacements: [
//{
Expand All @@ -312,7 +312,7 @@ module.exports = function (grunt) {
// ../../img/[module]/[image]
moduleimages: {
// replace img srcs to point to "../../img/[module]/[img]"
src: ['<%= config.dirs.build %>/themes/*/css/*/theme.css'],
src: ['<%= config.directories.build %>/themes/*/css/*/theme.css'],
overwrite: true,
replacements: [{
from: /\((?:'|"|)(?:.*modules\/(.*)\/img\/(.*.\w{3,}))(?:'|"|)\)/g,
Expand All @@ -324,7 +324,7 @@ module.exports = function (grunt) {
// ../../../img/[img]
themeimages: {
// replace img srcs to point to "../../img/[module]/[img]"
src: ['<%= config.dirs.build %>/themes/*/css/*/theme.css'],
src: ['<%= config.directories.build %>/themes/*/css/*/theme.css'],
overwrite: true,
replacements: [{
from: /\((?:'|"|)(?:.*themes\/(.*)\/img\/(.*.\w{3,}))(?:'|"|)\)/g,
Expand All @@ -334,17 +334,17 @@ module.exports = function (grunt) {
versions: {
// replace uv version
src: [
//'<%= config.dirs.examples %>/index.html',
//'<%= config.dirs.examples %>/noeditor.html',
//'<%= config.dirs.examples %>/examples.js',
//'<%= config.dirs.examples %>/uv.js',
//'<%= config.dirs.examples %>/web.config',
//'<%= config.directories.examples %>/index.html',
//'<%= config.directories.examples %>/noeditor.html',
//'<%= config.directories.examples %>/examples.js',
//'<%= config.directories.examples %>/uv.js',
//'<%= config.directories.examples %>/web.config',
'./src/lib/embed.js'
],
overwrite: true,
replacements: [{
from: /uv-\d+\.\d+\.\d+/g,
to: '<%= config.dirs.uvVersioned %>'
to: '<%= config.directories.uvVersioned %>'
}]
}
},
Expand All @@ -357,7 +357,7 @@ module.exports = function (grunt) {
directory: '.',
keepalive: true,
open: {
target: 'http://localhost:<%= global.port %>/<%= config.dirs.examples %>/'
target: 'http://localhost:<%= global.port %>/<%= config.directories.examples %>/'
}
}
}
Expand Down Expand Up @@ -491,7 +491,7 @@ module.exports = function (grunt) {
'clean:dist',
'copy:dist',
'compress:zip',
'compress:tar',
//'compress:tar',
'clean:distexamples',
'copy:distexamples'
);
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Universal Viewer",
"version": "1.8.27",
"version": "1.8.38",
"description": "The Universal Viewer is an open source project to enable cultural heritage institutions to present their digital artifacts in an IIIF-compliant and highly customisable user interface.",
"repository": {
"type": "git",
Expand Down
39 changes: 21 additions & 18 deletions config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,27 @@ var metadata = require('./package');

var Config = (function () {
function Config() {
this.header = '// ' + metadata.name + ' v' + metadata.version + ' ' + metadata.homepage + '\n';
this.deps = [
'node_modules/base-component/dist/base-component.bundle.js',
'node_modules/jquery-plugins/dist/jquery-plugins.js',
'node_modules/jquery-tiny-pubsub/dist/ba-tiny-pubsub.min.js',
'node_modules/key-codes/dist/key-codes.js',
'node_modules/manifold/dist/manifold.bundle.js',
'node_modules/units/Length.min.js',
'node_modules/utils/dist/utils.js'
],
this.dirs = {
this.name = metadata.name;
this.header = '// ' + this.name + ' v' + metadata.version + ' ' + metadata.homepage + '\n';
this.dependencies = {
libs: [
'node_modules/base-component/dist/base-component.bundle.js',
'node_modules/jquery-plugins/dist/jquery-plugins.js',
'node_modules/jquery-tiny-pubsub/dist/ba-tiny-pubsub.min.js',
'node_modules/key-codes/dist/key-codes.js',
'node_modules/manifold/dist/manifold.bundle.js',
'node_modules/units/Length.min.js',
'node_modules/utils/dist/utils.js'
],
typings: [
'node_modules/base-component/dist/base-component.d.ts',
'node_modules/jquery-plugins/typings/jquery-plugins.d.ts',
'node_modules/key-codes/dist/key-codes.d.ts',
'node_modules/manifold/dist/manifold.bundle.d.ts',
'node_modules/utils/dist/utils.d.ts'
]
};
this.directories = {
bower: './lib',
build: './build',
dist: './dist',
Expand All @@ -28,13 +38,6 @@ var Config = (function () {
uvSeadragonExtension: './src/extensions/uv-seadragon-extension',
uvVirtexExtension: './src/extensions/uv-virtex-extension'
};
this.typings = [
'node_modules/base-component/dist/base-component.d.ts',
'node_modules/jquery-plugins/typings/jquery-plugins.d.ts',
'node_modules/key-codes/dist/key-codes.d.ts',
'node_modules/manifold/dist/manifold.bundle.d.ts',
'node_modules/utils/dist/utils.d.ts'
];
this.typescript = {
dev: {
src: ['./src/**/*.ts'],
Expand Down
8 changes: 0 additions & 8 deletions dist/uv-1.8.27/lib/app.js
View file

This file was deleted.

11 changes: 0 additions & 11 deletions dist/uv-1.8.27/lib/bundle.min.js
View file

This file was deleted.

8 changes: 0 additions & 8 deletions dist/uv-1.8.27/lib/imageunavailable.json
View file

This file was deleted.

Binary file removed dist/uv-1.8.27/lib/imageunavailable.png
View file
Binary file not shown.
Loading

0 comments on commit 68a1608

Please sign in to comment.