Skip to content

Commit

Permalink
Finish 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
poteto committed May 15, 2015
2 parents fa4bdcf + b211076 commit cd59c95
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 34 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bower_components/
tests/
tmp/
dist/

.bowerrc
.editorconfig
Expand Down
14 changes: 13 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,19 @@ cache:
directories:
- node_modules

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"

Expand All @@ -20,4 +32,4 @@ install:
- bower install

script:
- npm test
- ember try $EMBER_TRY_SCENARIO test
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "ember-in-viewport",
"dependencies": {
"ember": "1.11.1",
"ember": "1.12.0",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-qunit": "0.3.1",
"ember-qunit": "0.3.2",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
Expand Down
20 changes: 8 additions & 12 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
/* jshint node:true */

module.exports = {
scenarios: [
{
name: 'ember-1.11.1',
dependencies: {
"ember": "1.11.1"
}
name: 'default',
dependencies: { }
},
{
name: 'ember-release',
dependencies: {
"ember": "components/ember#release"
'ember': 'components/ember#release'
},
resolutions: {
"ember": "release"
'ember': 'release'
}
},
{
name: 'ember-beta',
dependencies: {
"ember": "components/ember#beta"
'ember': 'components/ember#beta'
},
resolutions: {
"ember": "beta"
'ember': 'beta'
}
},
{
name: 'ember-canary',
dependencies: {
"ember": "components/ember#canary"
'ember': 'components/ember#canary'
},
resolutions: {
"ember": "canary"
'ember': 'canary'
}
}
]
Expand Down
4 changes: 1 addition & 3 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/* jshint node: true */

'use strict';

module.exports = function(/* environment, appConfig */) {
return {};
return { };
};
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-in-viewport",
"version": "1.2.2",
"version": "1.2.3",
"description": "Detect if an Ember View or Component is in the viewport @ 60FPS",
"directories": {
"doc": "doc",
Expand All @@ -19,18 +19,19 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "0.2.3",
"ember-cli": "0.2.4",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-dependency-checker": "1.0.0",
"ember-cli-htmlbars": "0.7.6",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.10",
"ember-cli-qunit": "0.3.12",
"ember-cli-uglify": "1.0.1",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^0.7.0",
"ember-export-application-global": "^1.0.2",
"ember-suave": "0.1.7",
"ember-suave": "0.1.9",
"ember-try": "0.0.4"
},
"keywords": [
Expand Down
1 change: 1 addition & 0 deletions testem.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"framework": "qunit",
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
"PhantomJS"
],
Expand Down
1 change: 0 additions & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Ember.MODEL_FACTORY_INJECTIONS = true;

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

Expand Down
18 changes: 9 additions & 9 deletions tests/dummy/public/crossdomain.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->

<!-- Most restrictive policy: -->
<site-control permitted-cross-domain-policies="none"/>
<!-- Most restrictive policy: -->
<site-control permitted-cross-domain-policies="none"/>

<!-- Least restrictive policy: -->
<!--
<site-control permitted-cross-domain-policies="all"/>
<allow-access-from domain="*" to-ports="*" secure="false"/>
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-->
<!-- Least restrictive policy: -->
<!--
<site-control permitted-cross-domain-policies="all"/>
<allow-access-from domain="*" to-ports="*" secure="false"/>
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-->
</cross-domain-policy>
1 change: 1 addition & 0 deletions tests/dummy/public/robots.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# http://www.robotstxt.org
User-agent: *
Disallow:

0 comments on commit cd59c95

Please sign in to comment.