Skip to content

Fixes for resource and service; added thumbnail to canvas #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raffazizzi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes for resource and service; added thumbnail to canvas #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce7f432
Fixes bug with resource and service generation
raffazizzi Oct 6, 2016
5647fa4
Added optional thumbnail property
raffazizzi Oct 6, 2016
4ebc894
Removed erroneous reference to non-existing module
raffazizzi Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/annotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Model from 'ampersand-model'
import ResourceCollection from './resource-collection'
import Resource from './resource'

export default Model.extend({
idAttribute: '@id',
Expand All @@ -16,8 +16,8 @@ export default Model.extend({
about: 'string'
},

collections: {
resource: ResourceCollection
children: {
resource: Resource
},

parse: function (response) {
Expand Down
3 changes: 2 additions & 1 deletion src/canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export default Model.extend({
},
label: 'string',
height: 'number',
width: 'number'
width: 'number',
thumbnail: 'string'
Copy link
Copy Markdown
Owner

@sdellis sdellis Oct 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then this should be thumbnail: Thumbnail

},

collections: {
Expand Down
6 changes: 3 additions & 3 deletions src/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Model from 'ampersand-model'
import ServiceCollection from './service-collection'
import Service from './service'

export default Model.extend({
idAttribute: '@id',
Expand All @@ -12,8 +12,8 @@ export default Model.extend({
width: 'number'
},

collections: {
service: ServiceCollection
children: {
service: Service
},

parse: function (response) {
Expand Down