Skip to content

Commit bd94a6d

Browse files
committed
Merge branch 'master' into develop
* master: (327 commits) Skip unnecessary function creation when filtering out types DOM: Add folder argument to getCompositions DOM: Add deep argument to getItems Project: Update findFolder to return null when no folder is found Docs: Add documentation for attr and arrayEx.attr misc/file.js: Fixes writeFile not checking encoding properly Docs: rebuild docs Docs: Add tutorials section Docs: Change template back to docdash Docs/gulp: rename some files Demo: add some small snippets aeq.layer: return aeq.arrayEx in more functions Docs: Add code highlighting to css Update readme 0.2.1 Other: Update and rename CONTRIBUTORS Other: Rename changelog file Other: Fix formatting in changelog 0.2.0 Fixes build:docs failing on windows due to evil backslashes ...
2 parents 3bd9d2e + e43603c commit bd94a6d

File tree

135 files changed

+61847
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+61847
-628
lines changed

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
*.sublime-project
2+
*.sublime-workspace
13
.DS_Store
2-
node_modules
34
build
4-
dist
5+
config.json
6+
dist
7+
node_modules

.jsdocrc.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"plugins": ["plugins/markdown"],
3+
"opts": {
4+
"template": "node_modules/docdash",
5+
"tutorials": "./tutorials",
6+
"destination": "./docs",
7+
"readme": "./README.md",
8+
"encoding": "utf8",
9+
"recurse": true
10+
},
11+
12+
"source": {
13+
"exclude": ["lib/intro.js", "lib/outro.js"]
14+
},
15+
"linenums": true,
16+
17+
"templates": {
18+
"useLongnameInNav": true,
19+
"showInheritedInNav": true,
20+
"cleverLinks": true,
21+
"applicationName": "AEQuery"
22+
}
23+
}

CHANGELOG.md

Lines changed: 16 additions & 0 deletions

CONTRIBUTORS.md

Lines changed: 7 additions & 0 deletions

README.md

Lines changed: 63 additions & 1 deletion

bitbucket-pipelines.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
image: node:6.9.1
3+
4+
pipelines:
5+
branches:
6+
master:
7+
- step:
8+
script: # Modify the commands below to build your repository.
9+
- npm install
10+
- npm run-script deploy-bitbucket
11+
- curl -X POST "https://${RUNEGAN_AUTH_STRING}@api.bitbucket.org/2.0/repositories/motiondesign/aequery/downloads" --form files=@"$(pwd)/dist/aequery.js"
12+
- git checkout docs # Gulp updates the docs dir, but git ftp does not like that
13+
- apt-get update
14+
- apt-get -qq install git-ftp
15+
- git ftp push --syncroot docs/ --user $DOCS_FTP_USER --passwd $DOCS_FTP_PASS $DOCS_FTP_SERVER

contributors.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

demo/addMotionBlur.jsx

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* Adds motion blur to all layers that are animated in the currenlty open comp.
3+
*/
4+
( function () {
5+
//@include ../dist/aeq.js
6+
7+
var comp = aeq.getActiveComp();
8+
9+
if ( comp === null ) {
10+
return;
11+
}
12+
13+
aeq.createUndoGroup( "Add motionblur", addMotionBlurToCompLayers, [ comp ] );
14+
15+
function addMotionBlurToCompLayers( comp ) {
16+
aeq( "layer:not(motionBlur)", comp ).forEach( function( layer ) {
17+
aeq.forEachProperty( layer, function( property ) {
18+
if ( property.isTimeVarying ) {
19+
addMotionBlur( layer );
20+
return false;
21+
}
22+
} );
23+
} );
24+
}
25+
26+
function addMotionBlur( layer ) {
27+
var children = aeq.layer.children( layer );
28+
29+
aeq.forEach( children, addMotionBlur );
30+
if ( layer.motionBlur !== undefined && !layer.nullLayer ) {
31+
layer.motionBlur = true;
32+
}
33+
}
34+
}() );

demo/addToExpressions.jsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Add posterize(0.00001) to expressions on selected properties
2+
//@include "../dist/aeq.js";
3+
aeq.snippet.forEachSelectedProperty( 'Posterize', function ( prop ) {
4+
if ( prop.expression ) {
5+
prop.expression = 'posterizeTime(0.000001);\n' + props[i].expression
6+
}
7+
})

demo/removeExpressions.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Remove expressions from active comp
2+
//@include "../dist/aeq.js";
3+
aeq.snippet.activeComp( 'Remove Expressions', function ( comp ) {
4+
aeq( 'prop[canSetExpression]:not(expression="")', comp ).attr( 'expression', '' )
5+
})

0 commit comments

Comments
 (0)