--- a/cms/app-client/.gitignore Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/.gitignore Fri Dec 02 09:33:53 2016 +0100
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/dist
--- a/cms/app-client/.travis.yml Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/.travis.yml Fri Dec 02 09:33:53 2016 +0100
@@ -7,7 +7,8 @@
cache:
directories:
- - node_modules
+ - $HOME/.npm
+ - $HOME/.cache # includes bowers cache
before_install:
- npm config set spin false
--- a/cms/app-client/app/app.js Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/app/app.js Fri Dec 02 09:33:53 2016 +0100
@@ -8,10 +8,10 @@
Ember.MODEL_FACTORY_INJECTIONS = true;
App = Ember.Application.extend({
- rootElement: config.rootElement,
- modulePrefix: config.modulePrefix,
- podModulePrefix: config.podModulePrefix,
- Resolver
+ rootElement: config.rootElement,
+ modulePrefix: config.modulePrefix,
+ podModulePrefix: config.podModulePrefix,
+ Resolver
});
loadInitializers(App, config.modulePrefix);
--- a/cms/app-client/app/components/transcript-annotation-component.js Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/app/components/transcript-annotation-component.js Fri Dec 02 09:33:53 2016 +0100
@@ -2,9 +2,8 @@
export default Ember.Component.extend({
- // classNameBindings: ['isPlaying:active'],
-
hasPlayer: Ember.computed.bool('player'),
+ hideSpeaker: Ember.computed.not('annotation.showSpeaker'),
begin: Ember.computed.readOnly('annotation.begin'),
end: Ember.computed.readOnly('annotation.end'),
@@ -15,11 +14,6 @@
literal: Ember.computed.readOnly('annotation.literal'),
translation: Ember.computed.readOnly('annotation.translation'),
- // isPlaying: Ember.computed("hasPlayer","player.progress", "begin", "end", function() {
- // var progress = this.get('player.progress');
- // return this.get('hasPlayer') && progress && (progress >= this.get('begin')) && (progress < this.get('end'));
- // }),
-
didInsertElement: function() {
if(this.get('hasPlayer') && this.get('intervals')) {
this.get('intervals').add(this.get('begin'), this.get('end'), this.get('elementId'), this.$());
--- a/cms/app-client/app/router.js Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/app/router.js Fri Dec 02 09:33:53 2016 +0100
@@ -19,7 +19,7 @@
Router.map(function() {
this.route('document', { path: '/doc/:doc_id'});
- this.route('tabs/langues', { path: '/' });
+ this.route('index', { path: '/' });
this.route('tabs/langues', { path: '/langues' });
this.route('tabs/carto', { path: '/cartographie' });
this.route('tabs/thematiques', { path: '/thematiques' });
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/routes/index.js Fri Dec 02 09:33:53 2016 +0100
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+ beforeModel() {
+ this.transitionTo('tabs/langues');
+ }
+});
--- a/cms/app-client/app/templates/components/transcript-annotation-component.hbs Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/app/templates/components/transcript-annotation-component.hbs Fri Dec 02 09:33:53 2016 +0100
@@ -1,13 +1,11 @@
{{#if hasPlayer }}
- {{#unless isPlaying}}
<i class="fa fa-play" {{action play begin}}>Play</i>
- {{/unless}}
{{#if title}}<span class="title">{{title}}</span>{{/if}}
{{/if}}
<div class="fragment">
{{#if original}}
<p class="original">
- {{#if speaker}}<span class="speaker {{if hideSpeaker 'hidden-speaker'}}">{{speaker}} :</span>{{/if}}
+ {{#if speaker}}<span class="speaker">{{speaker}} :</span>{{/if}}
{{original}}
</p>
{{/if}}
--- a/cms/app-client/bower.json Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/bower.json Fri Dec 02 09:33:53 2016 +0100
@@ -1,7 +1,7 @@
{
"name": "app-client",
"dependencies": {
- "ember": "~2.9.0",
+ "ember": "~2.10.0",
"ember-cli-shims": "0.1.3",
"jquery": "^2.2",
"qunit": "~1.18.0",
@@ -16,6 +16,7 @@
"chroma-js": "gka/chroma.js#master",
"urijs": "^1.18.2",
"leaflet": "^1.0.0",
- "social-share-kit": "^1.0.13"
+ "social-share-kit": "^1.0.13",
+ "interval-tree2": "IRI-Research/interval-tree2"
}
}
--- a/cms/app-client/config/environment.js Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/config/environment.js Fri Dec 02 09:33:53 2016 +0100
@@ -11,7 +11,11 @@
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
- }
+ },
+ EXTEND_PROTOTYPES: {
+ // Prevent Ember Data from overriding Date.parse.
+ Date: false
+ }
},
APP: {
backRootURL: '/corpus/',
@@ -45,5 +49,5 @@
ENV.APP.backRootURL = '/corpus-back/';
}
- return ENV;
+ return ENV;
};
--- a/cms/app-client/package.json Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/package.json Fri Dec 02 09:33:53 2016 +0100
@@ -2,11 +2,13 @@
"name": "app-client",
"version": "0.0.13",
"description": "Small description for app-client goes here",
- "private": true,
+ "license": "MIT",
+ "author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
+ "repository": "",
"scripts": {
"build": "ember build",
"start": "ember server",
@@ -18,12 +20,6 @@
"prepare-maps": "node lib/scripts/prepare_maps.js",
"set-version": "bash -c 'sed -i \"\" -e \"s/\\([:space:]*\\\"version\\\"[[:space:]]*\\:[[:space:]]*\\\"\\)[\\.0-9]*\\(\\\".*\\)/\\1${1}\\2/\" package.json' 0"
},
- "repository": "",
- "engines": {
- "node": ">= 0.12.0"
- },
- "author": "",
- "license": "MIT",
"devDependencies": {
"bower": "^1.8.0",
"broccoli-asset-rev": "^2.4.5",
@@ -32,7 +28,7 @@
"broccoli-static-compiler": "^0.2.2",
"corpus-common-addon": "file:../../common/corpus-common-addon",
"ember-ajax": "^2.4.1",
- "ember-cli": "2.9.1",
+ "ember-cli": "2.10.0",
"ember-cli-app-version": "^2.0.0",
"ember-cli-babel": "^5.1.7",
"ember-cli-d3": "1.1.6",
@@ -40,7 +36,7 @@
"ember-cli-htmlbars": "^1.0.10",
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
"ember-cli-inject-live-reload": "^1.4.1",
- "ember-cli-jshint": "^1.0.4",
+ "ember-cli-jshint": "^2.0.1",
"ember-cli-mirage": "^0.2.2",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
@@ -48,7 +44,7 @@
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.9.0",
+ "ember-data": "^2.10.0",
"ember-data-fixture-adapter": "1.13.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
@@ -64,5 +60,9 @@
"ember-wormhole": "0.4.0",
"eslint-config-ember": "^0.3.0",
"loader.js": "^4.0.10"
- }
+ },
+ "engines": {
+ "node": ">= 0.12.0"
+ },
+ "private": true
}
--- a/cms/app-client/tests/helpers/start-app.js Fri Dec 02 03:30:51 2016 +0100
+++ b/cms/app-client/tests/helpers/start-app.js Fri Dec 02 09:33:53 2016 +0100
@@ -5,8 +5,8 @@
export default function startApp(attrs) {
let application;
- let attributes = Ember.merge({}, config.APP);
- attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+ // use defaults, but you can override
+ let attributes = Ember.assign({}, config.APP, attrs);
Ember.run(() => {
application = Application.create(attributes);
--- a/common/corpus-common-addon/.gitignore Fri Dec 02 03:30:51 2016 +0100
+++ b/common/corpus-common-addon/.gitignore Fri Dec 02 09:33:53 2016 +0100
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/dist
--- a/common/corpus-common-addon/.travis.yml Fri Dec 02 03:30:51 2016 +0100
+++ b/common/corpus-common-addon/.travis.yml Fri Dec 02 09:33:53 2016 +0100
@@ -7,12 +7,13 @@
cache:
directories:
- - node_modules
+ - $HOME/.npm
+ - $HOME/.cache # includes bowers cache
env:
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
- - EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
+ - EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
--- a/common/corpus-common-addon/bower.json Fri Dec 02 03:30:51 2016 +0100
+++ b/common/corpus-common-addon/bower.json Fri Dec 02 09:33:53 2016 +0100
@@ -1,7 +1,7 @@
{
"name": "corpus-common-addon",
"dependencies": {
- "ember": "~2.9.0",
+ "ember": "~2.10.0",
"ember-cli-shims": "0.1.3"
},
"devDependencies": {
--- a/common/corpus-common-addon/config/ember-try.js Fri Dec 02 03:30:51 2016 +0100
+++ b/common/corpus-common-addon/config/ember-try.js Fri Dec 02 09:33:53 2016 +0100
@@ -2,17 +2,6 @@
module.exports = {
scenarios: [
{
- name: 'ember-1.13',
- bower: {
- dependencies: {
- 'ember': '~1.13.0'
- },
- resolutions: {
- 'ember': '~1.13.0'
- }
- }
- },
- {
name: 'ember-lts-2.4',
bower: {
dependencies: {
@@ -24,6 +13,17 @@
}
},
{
+ name: 'ember-lts-2.8',
+ bower: {
+ dependencies: {
+ 'ember': 'components/ember#lts-2-8'
+ },
+ resolutions: {
+ 'ember': 'lts-2-8'
+ }
+ }
+ },
+ {
name: 'ember-release',
bower: {
dependencies: {
--- a/common/corpus-common-addon/package.json Fri Dec 02 03:30:51 2016 +0100
+++ b/common/corpus-common-addon/package.json Fri Dec 02 09:33:53 2016 +0100
@@ -3,38 +3,43 @@
"version": "0.0.13",
"description": "Common features between cms and bo.",
"private": true,
+ "keywords": [
+ "ember-addon"
+ ],
+ "license": "MIT",
+ "author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
+ "repository": "",
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember try:each",
"set-version": "bash -c 'sed -i \"\" -e \"s/\\([:space:]*\\\"version\\\"[[:space:]]*\\:[[:space:]]*\\\"\\)[\\.0-9]*\\(\\\".*\\)/\\1${1}\\2/\" package.json' 0"
},
- "repository": "",
- "engines": {
- "node": ">= 0.12.0"
+ "dependencies": {
+ "chalk": "^1.1.3",
+ "ember-cli-babel": "^5.1.7"
},
- "author": "",
- "license": "MIT",
"devDependencies": {
"bower": "^1.8.0",
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
- "ember-cli": "2.9.1",
+ "ember-cli": "2.10.0",
"ember-cli-app-version": "^2.0.0",
"ember-cli-dependency-checker": "^1.3.0",
+ "ember-cli-htmlbars": "^1.0.10",
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
"ember-cli-inject-live-reload": "^1.4.1",
- "ember-cli-jshint": "^1.0.4",
+ "ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.9.0",
+ "ember-data": "^2.10.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
@@ -50,13 +55,8 @@
"q": "^1.4.1",
"request": "^2.67.0"
},
- "keywords": [
- "ember-addon"
- ],
- "dependencies": {
- "chalk": "^1.1.3",
- "ember-cli-babel": "^5.1.10",
- "ember-cli-htmlbars": "^1.0.10"
+ "engines": {
+ "node": ">= 0.12.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
--- a/common/corpus-common-addon/tests/helpers/start-app.js Fri Dec 02 03:30:51 2016 +0100
+++ b/common/corpus-common-addon/tests/helpers/start-app.js Fri Dec 02 09:33:53 2016 +0100
@@ -5,8 +5,8 @@
export default function startApp(attrs) {
let application;
- let attributes = Ember.merge({}, config.APP);
- attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+ // use defaults, but you can override
+ let attributes = Ember.assign({}, config.APP, attrs);
Ember.run(() => {
application = Application.create(attributes);
--- a/server/bo_client/.gitignore Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/.gitignore Fri Dec 02 09:33:53 2016 +0100
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/dist
--- a/server/bo_client/.travis.yml Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/.travis.yml Fri Dec 02 09:33:53 2016 +0100
@@ -7,7 +7,8 @@
cache:
directories:
- - node_modules
+ - $HOME/.npm
+ - $HOME/.cache # includes bowers cache
before_install:
- npm config set spin false
--- a/server/bo_client/bower.json Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/bower.json Fri Dec 02 09:33:53 2016 +0100
@@ -1,7 +1,7 @@
{
"name": "bo-client",
"dependencies": {
- "ember": "~2.9.0",
+ "ember": "~2.10.0",
"ember-cli-shims": "0.1.3",
"jquery": "^2.2",
"bootstrap-sass": "bootstrap-sass-official#~3.3.7",
--- a/server/bo_client/config/environment.js Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/config/environment.js Fri Dec 02 09:33:53 2016 +0100
@@ -15,6 +15,10 @@
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
+ },
+ EXTEND_PROTOTYPES: {
+ // Prevent Ember Data from overriding Date.parse.
+ Date: false
}
},
@@ -30,24 +34,15 @@
bnfBaseUrl: "http://data.bnf.fr/",
bnfSparqlUrl: rootURL + "proxy/bnf-sparql"
}
- },
+ }
};
if (environment === 'development') {
- ENV.APP.LOG_RESOLVER = true;
- ENV.APP.LOG_ACTIVE_GENERATION = true;
- ENV.APP.LOG_TRANSITIONS = true;
- ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
- ENV.APP.LOG_VIEW_LOOKUPS = true;
- ENV.contentSecurityPolicy = {
- 'default-src': "'none'",
- 'script-src': "'self'",
- 'font-src': "'self'",
- 'connect-src': "'self' *",
- 'img-src': "'self'",
- 'style-src': "'self' *",
- 'media-src': "'self'"
- };
+ // ENV.APP.LOG_RESOLVER = true;
+ // ENV.APP.LOG_ACTIVE_GENERATION = true;
+ // ENV.APP.LOG_TRANSITIONS = true;
+ // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+ // ENV.APP.LOG_VIEW_LOOKUPS = true;
}
if (environment === 'test') {
--- a/server/bo_client/ember-cli-build.js Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/ember-cli-build.js Fri Dec 02 09:33:53 2016 +0100
@@ -3,7 +3,6 @@
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
var pickFiles = require('broccoli-static-compiler');
-
module.exports = function(defaults) {
var app = new EmberApp(defaults, {
--- a/server/bo_client/package.json Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/package.json Fri Dec 02 09:33:53 2016 +0100
@@ -2,11 +2,13 @@
"name": "bo-client",
"version": "0.0.13",
"description": "Bo client for Corpus Parole",
- "private": true,
+ "license": "Ceccil-C",
+ "author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
+ "repository": "",
"scripts": {
"build": "ember build",
"start": "ember server",
@@ -14,12 +16,6 @@
"dl-documents": "ember dl-fixtures -u http://127.0.0.1:8000/api/v1/documents/ -d server/fixtures/documents.js -p 2 -t documents -f require",
"set-version": "bash -c 'sed -i \"\" -e \"s/\\([:space:]*\\\"version\\\"[[:space:]]*\\:[[:space:]]*\\\"\\)[\\.0-9]*\\(\\\".*\\)/\\1${1}\\2/\" package.json' 0"
},
- "repository": "",
- "engines": {
- "node": ">= 0.12.0"
- },
- "author": "",
- "license": "MIT",
"devDependencies": {
"bower": "^1.8.0",
"broccoli-asset-rev": "^2.4.5",
@@ -29,21 +25,21 @@
"corpus-common-addon": "file:../../common/corpus-common-addon",
"ember-ajax": "^2.4.1",
"ember-aupac-typeahead": "IRI-Research/ember-aupac-typeahead#ember_2.8",
- "ember-cli": "2.9.1",
+ "ember-cli": "2.10.0",
"ember-cli-app-version": "^2.0.0",
"ember-cli-babel": "^5.1.7",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-htmlbars": "^1.0.10",
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
"ember-cli-inject-live-reload": "^1.4.1",
- "ember-cli-jshint": "^1.0.4",
+ "ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sass": "5.5.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.9.0",
+ "ember-data": "^2.10.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-font-awesome": "martndemus/ember-font-awesome#pull/91/head",
@@ -64,5 +60,9 @@
"morgan": "^1.7.0",
"npm-check-updates": "^2.6.1",
"walk-sync": "^0.3.1"
- }
+ },
+ "engines": {
+ "node": ">= 0.12.0"
+ },
+ "private": true
}
--- a/server/bo_client/tests/helpers/start-app.js Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/tests/helpers/start-app.js Fri Dec 02 09:33:53 2016 +0100
@@ -5,8 +5,8 @@
export default function startApp(attrs) {
let application;
- let attributes = Ember.merge({}, config.APP);
- attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+ // use defaults, but you can override
+ let attributes = Ember.assign({}, config.APP, attrs);
Ember.run(() => {
application = Application.create(attributes);