mirror of
https://github.com/documize/community.git
synced 2025-07-20 13:49:42 +02:00
updated to latest Ember.js releases
This commit is contained in:
parent
2bcef7831d
commit
8d13d78092
5 changed files with 22 additions and 15 deletions
|
@ -37,6 +37,13 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
|
||||||
},
|
},
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
|
onSavePage(page, meta) {
|
||||||
|
this.set('page', page);
|
||||||
|
this.set('meta', meta);
|
||||||
|
this.set('editMode', false);
|
||||||
|
this.get('onSavePage')(page, meta);
|
||||||
|
},
|
||||||
|
|
||||||
onSavePageAsBlock(block) {
|
onSavePageAsBlock(block) {
|
||||||
this.attrs.onSavePageAsBlock(block);
|
this.attrs.onSavePageAsBlock(block);
|
||||||
},
|
},
|
||||||
|
@ -75,11 +82,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
|
||||||
|
|
||||||
onCancelEdit() {
|
onCancelEdit() {
|
||||||
this.set('editMode', false);
|
this.set('editMode', false);
|
||||||
},
|
|
||||||
|
|
||||||
onSavePage(page, meta) {
|
|
||||||
this.get('onSavePage')(page, meta);
|
|
||||||
this.set('editMode', false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -17,6 +17,9 @@ export default Ember.Component.extend({
|
||||||
|
|
||||||
didReceiveAttrs() {
|
didReceiveAttrs() {
|
||||||
this._super(...arguments);
|
this._super(...arguments);
|
||||||
|
if (this.get('isDestroyed') || this.get('isDestroying')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
|
CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
|
||||||
|
|
||||||
|
@ -44,6 +47,9 @@ export default Ember.Component.extend({
|
||||||
|
|
||||||
didInsertElement() {
|
didInsertElement() {
|
||||||
this._super(...arguments);
|
this._super(...arguments);
|
||||||
|
if (this.get('isDestroyed') || this.get('isDestroying')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
let page = this.get('page');
|
let page = this.get('page');
|
||||||
let elem = `page-${page.id}-code`;
|
let elem = `page-${page.id}-code`;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<div id="page-{{ page.id }}" class="is-a-page wysiwyg" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
|
<div id="page-{{ page.id }}" class="is-a-page wysiwyg" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
|
||||||
{{#unless editMode}}
|
{{#unless editMode}}
|
||||||
{{document/page-heading tagName=page.tagName document=document folder=folder page=page isEditor=isEditor tabMode=tabMode
|
{{document/page-heading tagName=page.tagName document=document folder=folder page=page isEditor=isEditor tabMode=tabMode
|
||||||
onEdit=(action 'onEdit')
|
onEdit=(action 'onEdit') onSavePageAsBlock=(action 'onSavePageAsBlock')
|
||||||
onSavePageAsBlock=(action 'onSavePageAsBlock') onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}}
|
onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}}
|
||||||
{{section/base-renderer page=page}}
|
{{section/base-renderer page=page}}
|
||||||
{{else}}
|
{{else}}
|
||||||
{{document/document-editor document=document folder=folder page=page meta=meta onCancel=(action 'onCancelEdit') onAction=(action 'onSavePage')}}
|
{{document/document-editor document=document folder=folder page=page meta=meta onCancel=(action 'onCancelEdit') onAction=(action 'onSavePage')}}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "documize",
|
"name": "documize",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ember": "~2.10.0",
|
|
||||||
"ember-cli-shims": "0.1.3"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
"start": "ember server",
|
"start": "ember server",
|
||||||
"test": "ember test"
|
"test": "ember test"
|
||||||
},
|
},
|
||||||
"repository": "",
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.10.0"
|
"node": ">= 0.10.0"
|
||||||
},
|
},
|
||||||
|
@ -22,26 +21,28 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"broccoli-asset-rev": "^2.4.5",
|
"broccoli-asset-rev": "^2.4.5",
|
||||||
"ember-ajax": "^2.4.1",
|
"ember-ajax": "^2.4.1",
|
||||||
"ember-cli": "2.10.0",
|
"ember-cli": "2.11.1",
|
||||||
"ember-cli-app-version": "^2.0.0",
|
"ember-cli-app-version": "^2.0.0",
|
||||||
"ember-cli-babel": "^5.1.7",
|
"ember-cli-babel": "^5.1.7",
|
||||||
"ember-cli-dependency-checker": "^1.3.0",
|
"ember-cli-dependency-checker": "^1.3.0",
|
||||||
"ember-cli-htmlbars": "^1.0.10",
|
"ember-cli-htmlbars": "^1.1.1",
|
||||||
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
|
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
|
||||||
"ember-cli-inject-live-reload": "^1.4.1",
|
"ember-cli-inject-live-reload": "^1.4.1",
|
||||||
"ember-cli-jshint": "^2.0.1",
|
"ember-cli-jshint": "^2.0.1",
|
||||||
"ember-cli-mirage": "^0.2.0",
|
"ember-cli-mirage": "^0.2.0",
|
||||||
"ember-cli-qunit": "^3.0.1",
|
"ember-cli-qunit": "^3.0.1",
|
||||||
"ember-cli-release": "^0.2.9",
|
"ember-cli-release": "^0.2.9",
|
||||||
"ember-cli-sass": "5.3.1",
|
"ember-cli-sass": "5.3.1",
|
||||||
|
"ember-cli-shims": "^1.0.2",
|
||||||
"ember-cli-sri": "^2.1.0",
|
"ember-cli-sri": "^2.1.0",
|
||||||
"ember-cli-test-loader": "^1.1.0",
|
"ember-cli-test-loader": "^1.1.0",
|
||||||
"ember-cli-uglify": "^1.2.0",
|
"ember-cli-uglify": "^1.2.0",
|
||||||
"ember-data": "^2.10.0",
|
"ember-data": "^2.11.0",
|
||||||
"ember-export-application-global": "^1.0.5",
|
"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-resolver": "^2.0.3",
|
||||||
"ember-simple-auth": "git+https://github.com/documize/ember-simple-auth.git#21e638f9e33267d8944835002ee96884d34d568a",
|
"ember-simple-auth": "git+https://github.com/documize/ember-simple-auth.git#21e638f9e33267d8944835002ee96884d34d568a",
|
||||||
|
"ember-source": "~2.11.0",
|
||||||
"loader.js": "^4.0.10"
|
"loader.js": "^4.0.10"
|
||||||
},
|
},
|
||||||
"ember-addon": {
|
"ember-addon": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue