--- a/cms/app-client/.travis.yml Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/.travis.yml Wed Feb 15 22:53:45 2017 +0100
@@ -12,10 +12,9 @@
before_install:
- npm config set spin false
- - npm install -g bower
+ - npm install -g bower phantomjs-prebuilt
- bower --version
- - npm install phantomjs-prebuilt
- - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+ - phantomjs --version
install:
- npm install
--- a/cms/app-client/app/components/discourses-component.js Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/app/components/discourses-component.js Wed Feb 15 22:53:45 2017 +0100
@@ -32,7 +32,10 @@
var array = discourses.map(function (d) { return d.get('count'); });
var width = self.$().parent().width();
- var height = self.$().parent().height() - self.$().siblings().outerHeight(true);
+ var height = self.$().parent().height();
+ self.$().siblings().each(function(elem) {
+ height -= Ember.$(elem).outerHeight(true);
+ });
//Determine the minimum circle width
var longerStr = _.max(
@@ -58,6 +61,8 @@
scale = scale.domain([min, max]).range([scaleFactor, 1]);
}
+ console.log("WIDTH : ", width, "HEIGHT : ", height);
+
var bubble = d3h.pack()
.size([width, height])
.padding(10);
--- a/cms/app-client/app/templates/components/filter-component.hbs Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/app/templates/components/filter-component.hbs Wed Feb 15 22:53:45 2017 +0100
@@ -1,4 +1,4 @@
-{{#if (ifOr filter.location filter.language filter.discourse filter.date filter.theme)}}
+{{#if (if-or filter.location filter.language filter.discourse filter.date filter.theme)}}
<ul>
{{#if filter.location}}
<li class="filter location"><i class="fa fa-globe"></i>{{doc-location url=filter.location}}<span class="fa fa-times"{{action 'removeFilter' 'location'}}>Remove</span></li>
@@ -8,7 +8,7 @@
{{/if}}
{{#if filter.discourse}}
{{#each filter.discourse as |discourse| }}
- <li class="filter discourse"><i class="fa fa-comments"></i>{{component (getLinkType discourse) url=discourse }}<span class="fa fa-times"{{action 'removeFilter' 'discourse' discourse}}>Remove</span></li>
+ <li class="filter discourse"><i class="fa fa-comments"></i>{{component (get-link-type discourse) url=discourse }}<span class="fa fa-times"{{action 'removeFilter' 'discourse' discourse}}>Remove</span></li>
{{/each}}
{{/if}}
{{#if filter.date}}
@@ -18,7 +18,7 @@
{{/if}}
{{#if filter.theme}}
{{#each filter.theme as |theme| }}
- <li class="filter theme"><i class="fa fa-bookmark"></i>{{component (getLinkType theme) url=theme }}<span class="fa fa-times"{{action 'removeFilter' 'theme' theme}}>Remove</span></li>
+ <li class="filter theme"><i class="fa fa-bookmark"></i>{{component (get-link-type theme) url=theme }}<span class="fa fa-times"{{action 'removeFilter' 'theme' theme}}>Remove</span></li>
{{/each}}
{{/if}}
</ul>
--- a/cms/app-client/app/templates/components/notice-component.hbs Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/app/templates/components/notice-component.hbs Wed Feb 15 22:53:45 2017 +0100
@@ -19,7 +19,7 @@
</tr>
<tr>
<td class="title">Langue</td>
- <td>{{#each item.languages as |lang index|}}{{if index ", "}}{{ component (getLinkType lang) url=lang class="language" onClick=(action 'addLanguageFilter' lang) displayUrlLink=true}}{{/each}}</td>
+ <td>{{#each item.languages as |lang index|}}{{if index ", "}}{{ component (get-link-type lang) url=lang class="language" onClick=(action 'addLanguageFilter' lang) displayUrlLink=true}}{{/each}}</td>
</tr>
<tr>
<td class="title">Sujet{{#if (if-operator item.subjects.length '>' 1)}}s{{/if}}</td>
@@ -27,7 +27,7 @@
<ul>
{{#each item.subjects as |subject|}}
<li>
- {{component (getLinkType subject) url=subject onClick=(action "addThemeFilter" subject) displayUrlLink=true}}
+ {{component (get-link-type subject) url=subject onClick=(action "addThemeFilter" subject) displayUrlLink=true}}
</li>
{{/each}}
</ul>
@@ -39,7 +39,7 @@
<ul>
{{#each item.types as |type|}}
<li>
- {{component (getLinkType type) url=type onClick=(action "addThemeFilter" type) displayUrlLink=true}}
+ {{component (get-link-type type) url=type onClick=(action "addThemeFilter" type) displayUrlLink=true}}
</li>
{{/each}}
</ul>
@@ -62,7 +62,7 @@
<td>
<ul>
{{#each participants as |participant|}}
- <li>{{component (getLinkType participant.identifier) url=participant.identifier }} ({{#each participant.role as |r index| }}{{if index ", "}}{{r}}{{/each}})</li>
+ <li>{{component (get-link-type participant.identifier) url=participant.identifier }} ({{#each participant.role as |r index| }}{{if index ", "}}{{r}}{{/each}})</li>
{{/each}}
</ul>
</td>
--- a/cms/app-client/app/templates/components/playlist-component.hbs Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/app/templates/components/playlist-component.hbs Wed Feb 15 22:53:45 2017 +0100
@@ -12,20 +12,20 @@
<div class="tools">
<div>
{{#if document.transcript_url}}
- {{#if (ifAnd (eq player.item document.id) player.transcriptLoading) }}
+ {{#if (if-and (eq player.item document.id) player.transcriptLoading) }}
<i class="fa fa-circle-o-notch fa-spin" aria-hidden="true" {{action 'displayTranscript' bubbles=false}}></i>
{{else}}
- <i title="Transcript" class="fa fa-text-height{{if (ifAnd (eq player.window 'transcript') (eq player.item document.id)) ' active'}}"{{action 'displayTranscript' bubbles=false}}>Transcript</i>
+ <i title="Transcript" class="fa fa-text-height{{if (if-and (eq player.window 'transcript') (eq player.item document.id)) ' active'}}"{{action 'displayTranscript' bubbles=false}}>Transcript</i>
{{/if}}
{{/if}}
- {{#if (ifAnd (eq player.playing true) (eq player.item document.id))}}
+ {{#if (if-and (eq player.playing true) (eq player.item document.id))}}
<i title="Pause" class="fa fa-pause" {{ action 'pause' bubbles=false }}>Pause</i>
{{else}}
<i title="Lecture" class="fa fa-play" {{ action 'play' document.id bubbles=false }}>Lecture</i>
{{/if}}
</div>
<div>
- <button title="Notice" {{action 'displayNotice' document.id bubbles=false}} class="notice{{if (ifAnd (eq player.window 'notice') (eq player.item document.id)) ' active'}}">
+ <button title="Notice" {{action 'displayNotice' document.id bubbles=false}} class="notice{{if (if-and (eq player.window 'notice') (eq player.item document.id)) ' active'}}">
Notice
</button>
<i title="Partage notice" class="fa fa-share-alt playlist-share-button" id='playlist-share-button-{{index}}'>Partage notice</i>
--- a/cms/app-client/bower.json Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/bower.json Wed Feb 15 22:53:45 2017 +0100
@@ -1,8 +1,6 @@
{
"name": "app-client",
"dependencies": {
- "ember": "~2.10.0",
- "ember-cli-shims": "0.1.3",
"jquery": "^2.2",
"qunit": "~1.18.0",
"bootstrap-sass": "bootstrap-sass-official#~3.3.6",
--- a/cms/app-client/ember-cli-build.js Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/ember-cli-build.js Wed Feb 15 22:53:45 2017 +0100
@@ -6,7 +6,7 @@
module.exports = function(defaults) {
var app = new EmberApp(defaults, {
// Add options here
- babel: {
+ 'ember-cli-babel': {
includePolyfill: true,
},
sassOptions: {
--- a/cms/app-client/package.json Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/package.json Wed Feb 15 22:53:45 2017 +0100
@@ -28,37 +28,39 @@
"broccoli-static-compiler": "^0.2.2",
"corpus-common-addon": "file:../../common/corpus-common-addon",
"ember-ajax": "^2.4.1",
- "ember-cli": "2.10.0",
+ "ember-cli": "2.11.1",
"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-htmlbars": "^1.1.1",
+ "ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-mirage": "^0.2.2",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sass": "5.3.1",
+ "ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-d3": "0.3.0",
- "ember-data": "^2.10.0",
+ "ember-data": "^2.11.0",
"ember-data-fixture-adapter": "1.13.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-font-awesome": "^2.1.1",
"ember-leaflet": "3.0.5",
- "ember-load-initializers": "^0.5.1",
+ "ember-load-initializers": "^0.6.0",
"ember-lodash": "0.0.10",
"ember-resolver": "^2.0.3",
"ember-tether": "0.3.1",
"ember-tooltips": "2.4.0",
"ember-truth-helpers": "1.2.0",
- "ember-welcome-page": "^1.0.3",
+ "ember-welcome-page": "^2.0.2",
"ember-wormhole": "0.4.0",
"eslint-config-ember": "^0.3.0",
+ "ember-source": "~2.11.0",
"loader.js": "^4.0.10"
},
"engines": {
--- a/cms/app-client/tests/helpers/start-app.js Wed Feb 15 10:51:26 2017 +0100
+++ b/cms/app-client/tests/helpers/start-app.js Wed Feb 15 22:53:45 2017 +0100
@@ -5,8 +5,8 @@
export default function startApp(attrs) {
let application;
- // use defaults, but you can override
- let attributes = Ember.assign({}, config.APP, attrs);
+ let attributes = Ember.merge({}, config.APP);
+ attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
Ember.run(() => {
application = Application.create(attributes);
--- a/common/corpus-common-addon/.travis.yml Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/.travis.yml Wed Feb 15 22:53:45 2017 +0100
@@ -17,6 +17,7 @@
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
+ - EMBER_TRY_SCENARIO=ember-default
matrix:
fast_finish: true
@@ -25,10 +26,9 @@
before_install:
- npm config set spin false
- - npm install -g bower
+ - npm install -g bower phantomjs-prebuilt
- bower --version
- - npm install phantomjs-prebuilt
- - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+ - phantomjs --version
install:
- npm install
@@ -37,4 +37,4 @@
script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+ - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
--- a/common/corpus-common-addon/README.md Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/README.md Wed Feb 15 22:53:45 2017 +0100
@@ -1,4 +1,4 @@
-# Corpus-common-addon
+# corpus-common-addon
This README outlines the details of collaborating on this Ember addon.
@@ -24,4 +24,4 @@
* `ember build`
-For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
--- a/common/corpus-common-addon/bower.json Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/bower.json Wed Feb 15 22:53:45 2017 +0100
@@ -1,8 +1,6 @@
{
"name": "corpus-common-addon",
"dependencies": {
- "ember": "~2.10.0",
- "ember-cli-shims": "0.1.3"
},
"devDependencies": {
"store": "https://github.com/marcuswestin/store.js.git#v1.3.20"
--- a/common/corpus-common-addon/config/ember-try.js Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/config/ember-try.js Wed Feb 15 22:53:45 2017 +0100
@@ -10,6 +10,11 @@
resolutions: {
'ember': 'lts-2-4'
}
+ },
+ npm: {
+ devDependencies: {
+ 'ember-source': null
+ }
}
},
{
@@ -21,6 +26,11 @@
resolutions: {
'ember': 'lts-2-8'
}
+ },
+ npm: {
+ devDependencies: {
+ 'ember-source': null
+ }
}
},
{
@@ -32,6 +42,11 @@
resolutions: {
'ember': 'release'
}
+ },
+ npm: {
+ devDependencies: {
+ 'ember-source': null
+ }
}
},
{
@@ -43,6 +58,11 @@
resolutions: {
'ember': 'beta'
}
+ },
+ npm: {
+ devDependencies: {
+ 'ember-source': null
+ }
}
},
{
@@ -54,6 +74,17 @@
resolutions: {
'ember': 'canary'
}
+ },
+ npm: {
+ devDependencies: {
+ 'ember-source': null
+ }
+ }
+ },
+ {
+ name: 'ember-default',
+ npm: {
+ devDependencies: {}
}
}
]
--- a/common/corpus-common-addon/package.json Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/package.json Wed Feb 15 22:53:45 2017 +0100
@@ -21,30 +21,32 @@
},
"dependencies": {
"chalk": "^1.1.3",
- "ember-cli-babel": "^5.1.7",
- "ember-cli-htmlbars": "^1.0.10",
- "ember-cli-htmlbars-inline-precompile": "^0.3.3"
+ "ember-cli-babel": "^5.1.7"
},
"devDependencies": {
"bower": "^1.8.0",
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
- "ember-cli": "2.10.0",
+ "ember-cli": "2.11.1",
"ember-cli-app-version": "^2.0.0",
"ember-cli-dependency-checker": "^1.3.0",
+ "ember-cli-htmlbars": "^1.1.1",
+ "ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
+ "ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.10.0",
+ "ember-data": "^2.11.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
- "ember-load-initializers": "^0.5.1",
+ "ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
- "ember-welcome-page": "^1.0.3",
+ "ember-source": "~2.11.0",
+ "ember-welcome-page": "^2.0.2",
"eslint": "^3.5.0",
"eslint-config-ember": "^0.3.0",
"eslint-config-standard": "^6.2.1",
--- a/common/corpus-common-addon/tests/dummy/app/templates/application.hbs Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/tests/dummy/app/templates/application.hbs Wed Feb 15 22:53:45 2017 +0100
@@ -1,3 +1,5 @@
-<h2 id="title">Welcome to Ember</h2>
+{{!-- The following component displays Ember's default welcome message. --}}
+{{welcome-page}}
+{{!-- Feel free to remove this! --}}
{{outlet}}
--- a/common/corpus-common-addon/tests/helpers/start-app.js Wed Feb 15 10:51:26 2017 +0100
+++ b/common/corpus-common-addon/tests/helpers/start-app.js Wed Feb 15 22:53:45 2017 +0100
@@ -5,8 +5,8 @@
export default function startApp(attrs) {
let application;
- // use defaults, but you can override
- let attributes = Ember.assign({}, config.APP, attrs);
+ let attributes = Ember.merge({}, config.APP);
+ attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
Ember.run(() => {
application = Application.create(attributes);