Skip to content

Commit 63fd3bf

Browse files
nzakasnzakas
committed
v0.1.9
1 parent 9a970e5 commit 63fd3bf

File tree

14 files changed

+94
-44
lines changed

14 files changed

+94
-44
lines changed

‎CHANGELOG‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
July 23, 2012 - v0.1.9
2+
3+
* Expose vendor prefix for @keyframes (fixes #29) (Nicholas C. Zakas)
4+
* Add support for o-keyframes and remove ms-keyframes (Nicholas C. Zakas)
5+
* Fix changelog (Nicholas C. Zakas)
6+
7+
18
July 23, 2012 - v0.1.8
29

310
* Merge branch 'master' of github.com:nzakas/parser-lib (Nicholas C. Zakas)
@@ -242,5 +249,7 @@ November 28, 2011 - v0.1.0
242249

243250

244251

252+
253+
245254

246255

‎build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project name="parserlib" default="build.all">
22

33
<!-- version number -->
4-
<property name="parserlib.version" value="0.1.8" />
4+
<property name="parserlib.version" value="0.1.9" />
55

66
<!-- the directories containing the source files -->
77
<property name="src.dir" value="./src" />

‎build/node-parserlib.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
24+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
934+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,

‎build/npm/lib/node-parserlib.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
24+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
934+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,

‎build/parserlib-core.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
24+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
2525
var parserlib = {};
2626
(function(){
2727

‎build/parserlib-css.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
24+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
2525
(function(){
2626
var EventTarget = parserlib.util.EventTarget,
2727
TokenStreamBase = parserlib.util.TokenStreamBase,

‎build/parserlib.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
24+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v@VERSION@, Build time: 23-July-2012 10:50:53 */
934+
/* Version v@VERSION@, Build time: 23-July-2012 10:52:31 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,

‎release/node-parserlib.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.1.8, Build time: 23-July-2012 09:55:09 */
24+
/* Version v0.1.9, Build time: 23-July-2012 10:52:31 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v0.1.8, Build time: 23-July-2012 09:55:09 */
934+
/* Version v0.1.9, Build time: 23-July-2012 10:52:31 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -2999,9 +2999,15 @@ Parser.prototype = function(){
29992999
var tokenStream = this._tokenStream,
30003000
token,
30013001
tt,
3002-
name;
3002+
name,
3003+
prefix = "";
30033004

30043005
tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
3006+
token = tokenStream.token();
3007+
if (/^@\-([^\-]+)\-/.test(token.value)) {
3008+
prefix = RegExp.$1;
3009+
}
3010+
30053011
this._readWhitespace();
30063012
name = this._keyframe_name();
30073013

@@ -3011,8 +3017,9 @@ Parser.prototype = function(){
30113017
this.fire({
30123018
type: "startkeyframes",
30133019
name: name,
3014-
line: name.line,
3015-
col: name.col
3020+
prefix: prefix,
3021+
line: token.startLine,
3022+
col: token.startCol
30163023
});
30173024

30183025
this._readWhitespace();
@@ -3028,8 +3035,9 @@ Parser.prototype = function(){
30283035
this.fire({
30293036
type: "endkeyframes",
30303037
name: name,
3031-
line: name.line,
3032-
col: name.col
3038+
prefix: prefix,
3039+
line: token.startLine,
3040+
col: token.startCol
30333041
});
30343042

30353043
this._readWhitespace();
@@ -5556,7 +5564,7 @@ var Tokens = [
55565564
//{ name: "ATKEYWORD"},
55575565

55585566
//CSS3 animations
5559-
{ name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-ms-keyframes" ] },
5567+
{ name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-o-keyframes" ] },
55605568

55615569
//important symbol
55625570
{ name: "IMPORTANT_SYM"},

‎release/npm/lib/node-parserlib.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
2323
*/
24-
/* Version v0.1.8, Build time: 23-July-2012 09:55:09 */
24+
/* Version v0.1.9, Build time: 23-July-2012 10:52:31 */
2525
var parserlib = {};
2626
(function(){
2727

@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
931931
THE SOFTWARE.
932932
933933
*/
934-
/* Version v0.1.8, Build time: 23-July-2012 09:55:09 */
934+
/* Version v0.1.9, Build time: 23-July-2012 10:52:31 */
935935
(function(){
936936
var EventTarget = parserlib.util.EventTarget,
937937
TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -2999,9 +2999,15 @@ Parser.prototype = function(){
29992999
var tokenStream = this._tokenStream,
30003000
token,
30013001
tt,
3002-
name;
3002+
name,
3003+
prefix = "";
30033004

30043005
tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
3006+
token = tokenStream.token();
3007+
if (/^@\-([^\-]+)\-/.test(token.value)) {
3008+
prefix = RegExp.$1;
3009+
}
3010+
30053011
this._readWhitespace();
30063012
name = this._keyframe_name();
30073013

@@ -3011,8 +3017,9 @@ Parser.prototype = function(){
30113017
this.fire({
30123018
type: "startkeyframes",
30133019
name: name,
3014-
line: name.line,
3015-
col: name.col
3020+
prefix: prefix,
3021+
line: token.startLine,
3022+
col: token.startCol
30163023
});
30173024

30183025
this._readWhitespace();
@@ -3028,8 +3035,9 @@ Parser.prototype = function(){
30283035
this.fire({
30293036
type: "endkeyframes",
30303037
name: name,
3031-
line: name.line,
3032-
col: name.col
3038+
prefix: prefix,
3039+
line: token.startLine,
3040+
col: token.startCol
30333041
});
30343042

30353043
this._readWhitespace();
@@ -5556,7 +5564,7 @@ var Tokens = [
55565564
//{ name: "ATKEYWORD"},
55575565

55585566
//CSS3 animations
5559-
{ name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-ms-keyframes" ] },
5567+
{ name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-o-keyframes" ] },
55605568

55615569
//important symbol
55625570
{ name: "IMPORTANT_SYM"},

‎release/npm/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parserlib",
3-
"version": "0.1.8",
3+
"version": "0.1.9",
44
"description": "CSSLint",
55
"author": "Nicholas C. Zakas",
66
"os": ["darwin", "linux"],

0 commit comments

Comments
 (0)