Skip to content

Commit

Permalink
Drop toolbars, migrate to Ember based demo
Browse files Browse the repository at this point in the history
  • Loading branch information
mixonic committed Sep 30, 2015
1 parent e738b32 commit bd63658
Show file tree
Hide file tree
Showing 71 changed files with 1,459 additions and 1,322 deletions.
4 changes: 0 additions & 4 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ var builder = require('broccoli-multi-builder');
var mergeTrees = require('broccoli-merge-trees');
var testTreeBuilder = require('broccoli-test-builder');
var styles = require('./broccoli/styles');
var demo = require('./broccoli/demo');
var jquery = require('./broccoli/jquery');

var vendoredModules = [
Expand All @@ -20,15 +19,12 @@ var buildOptions = {

var testTree = testTreeBuilder.build({libDirName: 'src'});
testTree = jquery.build(testTree, '/tests/jquery');
var demoTree = demo();
demoTree = jquery.build(demoTree, '/demo/jquery');

module.exports = mergeTrees([
builder.build('amd', buildOptions),
builder.build('global', buildOptions),
// FIXME Later we may want to bring back the commonjs build
// builder.build('commonjs', buildOptions),
styles(),
demoTree,
testTree
]);
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ editor.render(element);

`options` is an object which may include the following properties:

* `stickyToolbar` - a boolean option enabling a persistent header with
formatting tools. Default is true for touch devices.
* `placeholder` - default text to show before a user starts typing.
* `spellcheck` - a boolean option enabling spellcheck. Default is true.
* `autofocus` - a boolean option for grabbing input focus when an editor is
Expand Down
46 changes: 0 additions & 46 deletions broccoli/demo.js

This file was deleted.

4 changes: 4 additions & 0 deletions demo/.bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"directory": "bower_components",
"analytics": false
}
34 changes: 34 additions & 0 deletions demo/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true


[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.html]
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false
9 changes: 9 additions & 0 deletions demo/.ember-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
}
17 changes: 17 additions & 0 deletions demo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp

# dependencies
/node_modules
/bower_components

# misc
/.sass-cache
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
testem.log
32 changes: 32 additions & 0 deletions demo/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"predef": [
"document",
"window",
"-Promise"
],
"browser": true,
"boss": true,
"curly": true,
"debug": false,
"devel": true,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"newcap": true,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"sub": true,
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"unused": true
}
3 changes: 3 additions & 0 deletions demo/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp"]
}
53 changes: 53 additions & 0 deletions demo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Content-kit-demo

This README outlines the details of collaborating on this Ember application.
A short introduction of this app could easily go here.

## Prerequisites

You will need the following things properly installed on your computer.

* [Git](http://git-scm.com/)
* [Node.js](http://nodejs.org/) (with NPM)
* [Bower](http://bower.io/)
* [Ember CLI](http://www.ember-cli.com/)
* [PhantomJS](http://phantomjs.org/)

## Installation

* `git clone <repository-url>` this repository
* change into the new directory
* `npm install`
* `bower install`

## Running / Development

* `ember server`
* Visit your app at [http://localhost:4200](http://localhost:4200).

### Code Generators

Make use of the many generators for code, try `ember help generate` for more details

### Running Tests

* `ember test`
* `ember test --server`

### Building

* `ember build` (development)
* `ember build --environment production` (production)

### Deploying

Specify what it takes to deploy your app.

## Further Reading / Useful Links

* [ember.js](http://emberjs.com/)
* [ember-cli](http://www.ember-cli.com/)
* Development Browser Extensions
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

18 changes: 18 additions & 0 deletions demo/app/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import Ember from 'ember';
import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

var App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
});

loadInitializers(App, config.modulePrefix);

export default App;
Empty file added demo/app/components/.gitkeep
Empty file.
21 changes: 21 additions & 0 deletions demo/app/components/mobiledoc-dom-renderer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Ember from 'ember';
import { cardsHash } from '../mobiledoc-cards/index';

let { computed, run } = Ember;

export default Ember.Component.extend({
domRenderer: computed(function(){
return new window.MobiledocDOMRenderer();
}),
didRender() {
let domRenderer = this.get('domRenderer');
let mobiledoc = this.get('mobiledoc');
run(() => {
let target = this.$('.rendered-mobiledoc');
target.empty();
if (mobiledoc) {
domRenderer.render(mobiledoc, target[0], cardsHash);
}
});
}
});
Empty file added demo/app/controllers/.gitkeep
Empty file.
21 changes: 21 additions & 0 deletions demo/app/controllers/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Ember from 'ember';

import * as mobiledocs from '../mobiledocs/index';

let { $, computed } = Ember;

export default Ember.Controller.extend({
mobiledocName: 'simple',
mobiledoc: computed('mobiledocName', function() {
return mobiledocs[this.get('mobiledocName')];
}),
actions: {
changeMobiledoc() {
let selectElement = $('#select-mobiledoc');
this.set('mobiledocName', selectElement.val());
},
didEdit(value) {
this.set('editedMobiledoc', value);
}
}
});
Empty file added demo/app/helpers/.gitkeep
Empty file.
8 changes: 8 additions & 0 deletions demo/app/helpers/content-kit-cards-list.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Ember from 'ember';
import { cardsList } from '../mobiledoc-cards/index';

export function contentKitCardsList() {
return cardsList;
}

export default Ember.Helper.helper(contentKitCardsList);
7 changes: 7 additions & 0 deletions demo/app/helpers/format-object.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Ember from 'ember';

export function formatObject([object]) {
return JSON.stringify(object, null, ' ');
}

export default Ember.Helper.helper(formatObject);
26 changes: 26 additions & 0 deletions demo/app/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Content-Kit Demo</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

{{content-for 'head'}}

<link rel="stylesheet" href="assets/vendor.css">
<link href="http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic|Merriweather+Sans:700" rel="stylesheet">
<link rel="stylesheet" href="assets/content-kit-demo.css">

{{content-for 'head-footer'}}
</head>
<body>
{{content-for 'body'}}

<script src="assets/vendor.js"></script>
<script src="assets/content-kit-demo.js"></script>

{{content-for 'body-footer'}}
</body>
</html>
15 changes: 15 additions & 0 deletions demo/app/mobiledoc-cards/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { inputCard } from './input';
import { simpleCard } from './simple';
import { selfieCard } from './selfie';

export let cardsList = [
inputCard,
simpleCard,
selfieCard
];

export let cardsHash = {
['input-card']: inputCard,
['simple-card']: simpleCard,
['selfie-card']: selfieCard
};
Loading

0 comments on commit bd63658

Please sign in to comment.