Commit Graph

1281 Commits

Author SHA1 Message Date
Luke Page
953f70c879 Fix browser tests 2014-08-14 18:08:31 +01:00
Luke Page
ddba055461 Fix merge errors and node tests 2014-08-14 18:03:59 +01:00
Luke Page
f85f253586 merge from master 2014-08-14 17:27:16 +01:00
Luke Page
466bc39a10 Merge pull request #2136 from SomMeri/data-uri-1959
Fragment handling in data-uri function 1959
2014-08-14 17:13:25 +01:00
Luke Page
169bbada40 Merge pull request #2135 from SomMeri/charset-2126
Charsets should float on top #2126
2014-08-14 17:12:12 +01:00
Luke Page
3735d8118c Merge pull request #2128 from SomMeri/issue-2127
Mixin wrongly called
2014-08-14 17:11:22 +01:00
Luke Page
7503268b6f Merge branch 'master' of https://github.com/less/less.js 2014-08-14 16:35:21 +01:00
Luke Page
74766691cc Support for /deep/ selector. Fixes #2023 2014-08-14 16:35:13 +01:00
jurcovicovam
0f8bd724f8 Fragment handling in data-uri function 1959
The change removes #fragment from filePath before readig the file and adds
it back to the end of the generated uri.
2014-08-03 13:20:02 +02:00
jurcovicovam
e7c81125b7 Charsets should float on top #2126 2014-08-03 10:37:10 +02:00
jurcovicovam
62eb799b40 Issue #2127, selectors matching function ignored * selector. 2014-07-29 15:36:24 +02:00
jurcovicovam
86c1b0d557 Fix interpolated import into media #1645
Media objects do not have ruleset property. They have rules property which
always contains one-member array with fake ruleset in it.
2014-07-28 13:15:50 +02:00
Luke Page
a168b1f638 1.7.4 release 2014-07-27 21:04:20 +01:00
Luke Page
1e04f3364d better error message when import missing a semi-colon or malformed. 2014-07-27 20:47:19 +01:00
Luke Page
4ec83bc940 Merge branch 'master' of github.com:MiguelCastillo/less.js 2014-07-27 16:19:16 +01:00
Luke Page
d750151536 Found race condition that caused file not to be skipped in importOnce, leading to random exceptions. Fixes #1931 2014-07-27 16:09:17 +01:00
Luke Page
4b40773f64 Merge pull request #2121 from SomMeri/font-face-property-merge-2-2035
Properties merging should work also inside directives #2035
2014-07-27 15:23:27 +01:00
jurcovicovam
8daa61f220 Merge https://github.com/less/less.js into font-face-property-merge-2-2035
Conflicts:
	test/sourcemaps/basic.json
2014-07-27 14:02:38 +02:00
jurcovicovam
95beef2135 Merge https://github.com/less/less.js into misleading-error-message-2069
Conflicts:
	test/sourcemaps/basic.json
2014-07-27 13:50:40 +02:00
jurcovicovam
c9c6ddbdfc Properties merging should work also inside directives #2035
Fixes issue #2035 - property merge inside @font-face. The _mergeRules function is now called also for directives with rules. It used to be called only for rulesets.

I had to turn off jasmine tests for merge.less, because it was replacing all urls by their assumed full paths. For example, the url(something.eot) was changed into url(http://localhost:8081/test/less/something.eot). The result did not matched with expected css and failed.

Note: I'm not sure why values order in source map changed. It does not seem to be caused by my change, it was failing before I made them.
2014-07-26 00:22:49 +02:00
jurcovicovam
d44a524b92 Raise error in case of an empty selector inside :extend. 2014-07-25 22:35:51 +02:00
jurcovicovam
f4d0442dbc Removing useless comments. 2014-07-24 14:13:43 +02:00
jurcovicovam
864c63d27b Fix ordering of @import and @charset rules #1954 #2013
The genCss method of ruleset.js splits child nodes into two groups:
* rules,
* rulesets.

Rules are always printed first and have special handling for last rule.
Rulesets are always printed second. Wrong ordering was caused by the
condition that determined what is rule and what is ruleset.

Issue #2013: The condition made no difference between @charset and @page,
because both are compiled into tree.Directive nodes. I added isRulesetLike
method to the tree.Directive to differentiate between them.

Issue #1954: The condition treated all tree.Anonymous types as rules and
caused them to float up. That is incorrect, because `@import (inline)` is
compiled into tree.Anonymous too, but should be treated as ruleset and
stay where it is.
2014-07-22 14:46:58 +02:00
Miguel Castillo
b7224670c9 Adding handling for upper case drive letter in Windows
The check fails when the path starts with a Windows letter drive that’s
upper case, causing the path to then include the currentDirectory.
This fails when a rootPath is specified along with an import statements
like:

@import url("brackets_colors.less");
2014-07-11 18:36:03 -04:00
Luke Page
546bedd344 1.7.3 release 2014-06-22 16:12:14 +01:00
Luke Page
383027886c merge from master 2014-06-22 16:05:09 +01:00
Luke Page
5e13673674 Merge branch 'master' of https://github.com/less/less.js 2014-06-22 11:24:02 +01:00
Luke Page
fc26d5c77e Fix backtracking on multiplication to support dimension /|* keyword, with or without strict maths. Fixes #2066. 2014-06-22 11:23:33 +01:00
Luke Page
73c34ac24f improve some of the error messages when not using the chunker. 2014-06-22 10:43:05 +01:00
seven-phases-max
91fdb3940f don't round values returned by colour query functions. 2014-06-19 22:43:28 +04:00
Luke Page
94f746b5e7 move some dependencies out of chunker. make chunker optional. start fixing error messages chunker handled 2014-06-19 18:23:19 +01:00
Luke Page
7ad43291f5 1.7.2 release 2014-06-19 06:20:20 +01:00
Luke Page
04cb8bdfb2 fix regression with jsifying code - all dimensions would be rounded. Fixes #2057 2014-06-18 06:18:02 +01:00
Luke Page
4c094e70b5 Merge branch 'master' of https://github.com/less/less.js 2014-06-18 06:05:08 +01:00
Luke Page
0c2c1b2ba3 suport passing strings to paths 2014-06-18 06:04:34 +01:00
Luke Page
f615fcb53e Merge pull request #2045 from tim-smart/feature/sourcemaps-base64
Base64 encode source maps
2014-06-10 22:41:37 +01:00
Luke Page
fdd01f6b00 merge in latest 1.7.1 release 2014-06-10 19:30:21 +01:00
Luke Page
12fdcab084 1.7.1 release 2014-06-08 17:18:47 +01:00
Luke Page
dcdc76f9d0 Merge pull request #2022 from ForbesLindesay/2_0_0-refactor-chunker-and-less-error
2.0.0 refactor chunker and less error
2014-06-08 17:10:25 +01:00
Forbes Lindesay
01a5d7cd8c Fix incorrect variable name for error 2014-06-06 11:03:06 +01:00
Forbes Lindesay
be151fb21d Add missing semicolon 2014-06-06 11:00:54 +01:00
Forbes Lindesay
78a92e702d Fix LessError being used before being defined 2014-06-06 11:00:08 +01:00
Forbes Lindesay
8c978cd767 Pass env to chunker for use in error messages 2014-06-06 10:58:29 +01:00
Luke Page
c872caa289 Merge pull request #1976 from peruginni/master
Added condition to check if HEX code contain only valid characters (issue #1015)
2014-06-06 08:11:50 +01:00
Luke Page
cd63bc520a Merge pull request #2019 from gdelhumeau/remove-done-output
Remove the "done" message displayed at the end of the compilation with Rhino.
2014-06-06 08:07:25 +01:00
Dmitri Pyatkov
81f949b19a window.ActiveXObject in IE11: fix boolean casting
in Internet Explorer 11:
window.ActiveXObject // function ActiveXObject() {[native code]}
!window.ActiveXObject // *true*
2014-06-04 16:54:27 +08:00
Tim Smart
ac0db09759 Base64 encode source maps
This prevents some edge cases where encodeURIComponent fails to create a valid
source map.

This particular edge case was identified when trying to create source maps for
the lesshat mixin library.

Signed-off-by: Tim Smart <tim.smart@designworks.co.nz>
2014-06-04 11:20:07 +12:00
Forbes Lindesay
07f9ba258e Move chunker and LessError into separate files
This begins the process of cleaning up parser.js
[see #1902]
2014-05-20 16:12:18 +01:00
Forbes Lindesay
815d609223 Use native Promises when available 2014-05-20 15:39:04 +01:00
Forbes Lindesay
b2820b09f4 Return a promise rather than an event emitter
[discussed in #1902]
2014-05-20 15:37:43 +01:00