Skip to content

Commit

Permalink
Merge pull request #167 from jlblcc/develop
Browse files Browse the repository at this point in the history
v0.1.0
  • Loading branch information
jlblcc authored Feb 15, 2018
2 parents e6be2de + 32627a9 commit e562501
Show file tree
Hide file tree
Showing 723 changed files with 41,456 additions and 2,236 deletions.
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
}
};
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,15 +8,18 @@
# dependencies
/node_modules
/bower_components
/**/node_modules
/**/bower_components

# misc
/.sass-cache
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
.project
.idea
# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
22 changes: 10 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
---
language: node_js
node_js:
- "4"
- "6"

sudo: false
dist: trusty

addons:
chrome: stable

cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache

env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- phantomjs --version

install:
- npm install
- bower install

script:
- npm test
14 changes: 7 additions & 7 deletions app/adapters/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import Adapter
from 'ember-local-storage/adapters/adapter';

export default Adapter.extend({
//timestamp updates
updateRecord(store, type, snapshot) {
let date = new Date();

snapshot.record.set('dateUpdated', date);
return this._super.apply(this,[store, type, snapshot]);
}
// //timestamp updates
// updateRecord(store, type, snapshot) {
// //let date = new Date();
//
// //snapshot.record.set('dateUpdated', date.toISOString());
// return this._super.apply(this,[store, type, snapshot]);
// }
});
91 changes: 79 additions & 12 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,24 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

const {
LinkComponent,
Route,
Component,
Application,
get,
getWithDefault,
defineProperty,
computed,
isNone,
assert
} = Ember;

let App;

Ember.MODEL_FACTORY_INJECTIONS = true;
//Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
App = Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
Expand All @@ -23,16 +36,52 @@ App = Ember.Application.extend({
loadInitializers(App, config.modulePrefix);

//for bootstrap
Ember.LinkComponent.reopen({
LinkComponent.reopen({
attributeBindings: ['data-toggle', 'data-placement']
});
//for crumbly
Ember.Route.reopen({
Route.reopen({
//breadCrumb: null
currentRouteModel: function () {
return this.modelFor(this.routeName);
}
});
//for profiles
Component.reopen({
init() {
this._super(...arguments);

let profile = get(this, 'profile');
let path = get(this, 'profilePath');
let visibility = get(this, 'visibility');
let isVisible = isNone(visibility) ? true : visibility;

if(path !== undefined) {
assert(`${path} is not a profile path!`, path.charAt(0) !== '.');
defineProperty(this, 'isVisible', computed(
'profile.active',
function () {
let fullPath = 'profiles.' + get(profile, 'active') +
'.components.' +
path;

//console.log(fullPath);
return getWithDefault(profile, fullPath, isVisible);
}));
}
}
});
export default App;

/**
* Models for the mdEditor data store
* @main data-models
* @module mdeditor
* @submodule data-models
* @category docs
*/

/**
* Components used to create objects or arrays of objects.
*
Expand All @@ -42,11 +91,29 @@ export default App;
* @category docs
*/

/**
* Components used to input scalar or arrays of scalar values.
*
* @module mdeditor
* @submodule components-input
* @main components-input
* @category docs
*/
/**
* Components used to input scalar or arrays of scalar values.
*
* @module mdeditor
* @submodule components-input
* @main components-input
* @category docs
*/

/**
* Components used as UI controls.
*
* @module mdeditor
* @submodule components-control
* @main components-control
* @category docs
*/

/**
* Mixins.
*
* @module mdeditor
* @submodule mixins
* @main mixins
* @category docs
*/
30 changes: 30 additions & 0 deletions app/formats.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
export default {
time: {
hhmmss: {
hour: 'numeric',
minute: 'numeric',
second: 'numeric'
}
},
date: {
hhmmss: {
hour: 'numeric',
minute: 'numeric',
second: 'numeric'
}
},
number: {
EUR: {
style: 'currency',
currency: 'EUR',
minimumFractionDigits: 2,
maximumFractionDigits: 2
},
USD: {
style: 'currency',
currency: 'USD',
minimumFractionDigits: 2,
maximumFractionDigits: 2
}
}
};
4 changes: 1 addition & 3 deletions app/helpers/add-em.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import Ember from 'ember';

export function addEm(params) {
return params.reduce(function (a, b) {
return a + b;
});
return params.reduce((a, b) => Number(a) + Number(b));
}

export default Ember.Helper.helper(addEm);
19 changes: 19 additions & 0 deletions app/helpers/bbox-to-poly.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Ember from 'ember';

export function bboxToPoly(params/*, hash*/) {
let bbox = params[0];

if(!(bbox.southLatitude && bbox.westLongitude &&
bbox.northLatitude && bbox.eastLongitude)) {
return null;
}

return [
[bbox.southLatitude, bbox.westLongitude],
[bbox.northLatitude, bbox.westLongitude],
[bbox.northLatitude, bbox.eastLongitude],
[bbox.southLatitude, bbox.eastLongitude]
];
}

export default Ember.Helper.helper(bboxToPoly);
19 changes: 19 additions & 0 deletions app/helpers/get-dash.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Ember from 'ember';

const {
Helper,
get
} = Ember;

export function getDash(params /*, hash*/ ) {
let obj = params[0];
let prop = params[1].trim();
let val = null;

if(obj) {
val = get(obj, prop);
}
return val || "--";
}

export default Helper.helper(getDash);
23 changes: 17 additions & 6 deletions app/helpers/get-property.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
import Ember from 'ember';

export default Ember.Helper.extend({
compute(params) {
let obj = params[0],
prop = params[1].trim();
return obj[prop] || Ember.String.htmlSafe("<em>Not Defined</em>");
const {
Helper,
get,
String: EmberString
} = Ember;

export default Helper.helper(
function (params) {
let obj = params[0];
let prop = params[1].trim();
let val = null;

if(obj) {
val = get(obj, prop);
}
return val || EmberString.htmlSafe("<em>Not Defined</em>");
}
});
);
27 changes: 27 additions & 0 deletions app/helpers/md-markdown.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import Ember from 'ember';
import marked from 'npm:marked';

const {
String: EmString
} = Ember;

export function mdMarkdown(params /*, hash*/ ) {
marked.setOptions({
renderer: new marked.Renderer(),
gfm: true,
tables: true,
breaks: false,
pedantic: false,
sanitize: false,
smartLists: true,
smartypants: false
});

if(params[0]) {
return EmString.htmlSafe(marked(params[0]));
}

return params[1] || 'No text supplied.';
}

export default Ember.Helper.helper(mdMarkdown);
10 changes: 10 additions & 0 deletions app/helpers/mod.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Ember from 'ember';
const {
Helper
} = Ember;

export function mod(params) {
return params.reduce((a, b) => Number(a) % Number(b));
}

export default Helper.helper(mod);
6 changes: 6 additions & 0 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@

<link rel="shortcut icon" href="{{rootURL}}favicon.ico">

<script type="text/javascript">
if(document.location.host + document.location.pathname === 'www.adiwg.org/mdEditor/') {
document.location.replace('https://go.mdeditor.org');
}
</script>

{{content-for "head-footer"}}
</head>
<body>
Expand Down
Loading

0 comments on commit e562501

Please sign in to comment.