Skip to content
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.

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

Meteor 1.8 #42

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
36 changes: 18 additions & 18 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

anti:i18n
meteorhacks:[email protected]
[email protected].1
[email protected].2
[email protected]
less@2.7.11
less@2.8.0
nemo64:bootstrap@=3.3.5_2
practicalmeteor:sinon
meteorhacks:unblock
Expand All @@ -20,7 +20,7 @@ keiths:octicons
jparker:gravatar
[email protected]
local:jobs
[email protected].0
[email protected].1
local:kadira-data
[email protected]
local:permissions-manager
Expand All @@ -30,30 +30,30 @@ meteorhacks:customer-io
kadira:login-state
kadira:blaze-layout
local:user-events
react
react-meteor-data
velocityjs:velocityjs
fortawesome:fontawesome
kadira:flow-router
meteor-base@1.3.0
meteor-base@1.4.0
[email protected]
mongo@1.4.2
mongo@1.6.0
blaze-html-templates
[email protected].7
[email protected].8
[email protected]
tracker@1.1.3
[email protected].19
tracker@1.2.0
[email protected].20
[email protected]
[email protected]
[email protected]
spacebars
[email protected].0
ecmascript@0.10.6
[email protected].1
ecmascript@0.12.0
local:state-manager
[email protected]
[email protected]
[email protected]
ian:accounts-ui-bootstrap-3
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
underscore
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.6.1.1
METEOR@1.8
108 changes: 54 additions & 54 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@
[email protected].2
[email protected].1
[email protected].15
[email protected].3
[email protected].2
[email protected].16
[email protected]
[email protected]
anti:[email protected]
[email protected]
autoupdate@1.4.0
babel-compiler@7.0.6
babel-runtime@1.2.2
autoupdate@1.5.0
babel-compiler@7.2.1
babel-runtime@1.3.0
[email protected]
[email protected].10
[email protected].2
[email protected].11
[email protected].3
[email protected]
[email protected]
boilerplate-generator@1.4.0
caching-compiler@1.1.11
[email protected].2
boilerplate-generator@1.6.0
caching-compiler@1.2.0
[email protected].3
[email protected]
[email protected].0
[email protected].1
chuangbo:[email protected]
coagmano:[email protected]
[email protected]
cosmos:browserify@0.7.4
cosmos:browserify@0.10.0
[email protected]
[email protected].1
[email protected].3
[email protected]
[email protected]
ddp-server@2.1.2
ddp-server@2.2.0
[email protected]
[email protected]
dynamic-import@0.3.0
ecmascript@0.10.6
ecmascript-runtime@0.5.0
ecmascript-runtime-client@0.6.2
ecmascript-runtime-server@0.5.0
dynamic-import@0.5.0
ecmascript@0.12.1
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
fortawesome:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
ian:[email protected]
[email protected]
[email protected]
jparker:[email protected]
jparker:[email protected]
jparker:[email protected]
Expand All @@ -55,7 +58,7 @@ kadira:[email protected]
kadira:[email protected]
keiths:[email protected]
[email protected]
less@2.7.12
less@2.8.0
[email protected]
local:[email protected]
local:[email protected]
Expand All @@ -64,75 +67,72 @@ local:[email protected]
local:[email protected]
local:[email protected]
[email protected]
[email protected].19
[email protected].20
[email protected]
meteor@1.8.3
meteor-base@1.3.0
[email protected].0
[email protected].0
meteor@1.9.2
meteor-base@1.4.0
[email protected].1
[email protected].1
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
minifier-css@1.3.1
minifier-js@2.3.3
[email protected].3
minifier-css@1.4.0
minifier-js@2.4.0
[email protected].5
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].6
[email protected].7
[email protected]
mrt:[email protected]
nemo64:[email protected]_2
nemo64:[email protected]
[email protected]
npm-mongo@2.2.34
[email protected].1
[email protected].0
npm-mongo@3.1.1
[email protected].4
[email protected].1
[email protected]
[email protected]
pahans:[email protected]
practicalmeteor:[email protected]_1
practicalmeteor:[email protected]_2
promise@0.10.2
promise@0.11.1
raix:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
socket-stream-client@0.1.0
socket-stream-client@0.2.2
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
tmeasday:[email protected]
tracker@1.1.3
tracker@1.2.0
[email protected]
[email protected]
[email protected]
velocityjs:[email protected]
webapp@1.5.0
webapp@1.7.0
[email protected]
2 changes: 2 additions & 0 deletions client/components/0common/debug.timeline/component.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

var component = FlowComponents.define('debug.timeline', function(props) {
var self = this;
var sessionId = props.sessionId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
TimelineComponent.Grid = React.createClass({
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';

TimelineComponent.Grid = createReactClass({
displayName: 'TimelineComponent.Grid',
propTypes: {
width: React.PropTypes.number.isRequired
width: PropTypes.number.isRequired
},
_getGridPattern() {
return 'M 0 0 L 0 0 0 ' + this.props.width;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
TimelineComponent.ItemList = React.createClass({
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';

TimelineComponent.ItemList = createReactClass({
displayName: 'TimelineComponent.ItemList',
propTypes: {
// array of items
items: React.PropTypes.array.isRequired,
items: PropTypes.array.isRequired,

// EVENTS
onClick: React.PropTypes.func
onClick: PropTypes.func
},
_getItemName(item) {
var itemName = item.name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
TimelineComponent.TimeBar = React.createClass({
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';

TimelineComponent.TimeBar = createReactClass({
displayName: 'TimelineComponent.TimeBar',
propTypes: {
// id for the timebar
itemId: React.PropTypes.string.isRequired,
itemId: PropTypes.string.isRequired,
// array of sections in the timebar
sections: React.PropTypes.array.isRequired
sections: PropTypes.array.isRequired
},
createTimeBarSection(section, index) {
var itemId = this.props.itemId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
TimelineComponent.TimeChart = React.createClass({
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';

TimelineComponent.TimeChart = createReactClass({
displayName: 'TimelineComponent.TimeChart',
propTypes: {
// positional props
height: React.PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
// width can be both a number or a percentage like "100%"
width: React.PropTypes.number.isRequired,
width: PropTypes.number.isRequired,
// width of the background grid
gridWidth: React.PropTypes.number.isRequired,
gridWidth: PropTypes.number.isRequired,
// Timebar list
items: React.PropTypes.array.isRequired
items: PropTypes.array.isRequired
},
_buildTimeBar(item) {
var props = _.clone(item);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
TimelineComponent.Timeline = React.createClass({
import createReactClass from 'create-react-class';

TimelineComponent.Timeline = createReactClass({
displayName: 'TimelineComponent.Timeline',
mixins: [ReactMeteorData],
getMeteorData() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
TimelineComponent.TraceTimeBar = React.createClass({
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';

TimelineComponent.TraceTimeBar = createReactClass({
displayName: 'TimelineComponent.TraceTimeBar',
propTypes: {
maxSectionWidth: React.PropTypes.number.isRequired,
sectionHeight: React.PropTypes.number.isRequired,
sectionPadding: React.PropTypes.number.isRequired,
sections: React.PropTypes.array.isRequired
maxSectionWidth: PropTypes.number.isRequired,
sectionHeight: PropTypes.number.isRequired,
sectionPadding: PropTypes.number.isRequired,
sections: PropTypes.array.isRequired
},
componentWillMount() {
// find the max time in the sections. Usefull getting the width
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
TimelineComponent.Zoomer = React.createClass({
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';

TimelineComponent.Zoomer = createReactClass({
propTypes: {
// initial scale of the zoomer
initialScale: React.PropTypes.number.isRequired,
initialScale: PropTypes.number.isRequired,

// EVENTS
onChange: React.PropTypes.func
onChange: PropTypes.func
},
getInitialState() {
var state = { scale: this.props.initialScale };
Expand Down
2 changes: 2 additions & 0 deletions client/components/0common/react/component.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

FlowComponents.define('react', function(props) {
this.onRendered(function() {
var dom = this.find('div');
Expand Down
Loading