Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Update Less to 1.7.0 #6730

Merged
redmunds merged 7 commits into from
May 13, 2014
Merged

Update Less to 1.7.0 #6730

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c172614
Update Less to 1.6.2
WebsiteDeveloper Feb 7, 2014
b3a77f8
Fix parsing error
WebsiteDeveloper Feb 7, 2014
60fa486
Merge branch 'master' into lessUpdate
WebsiteDeveloper Feb 11, 2014
842a03c
Update less to 1.7.0 to remove unnessecarry log messages
WebsiteDeveloper Mar 10, 2014
fb46548
Add newline at end of file
WebsiteDeveloper Mar 10, 2014
6bc8002
Merge remote-tracking branch 'upstream/master' into lessUpdate
WebsiteDeveloper May 9, 2014
6b91317
Change filename of less config file
WebsiteDeveloper May 9, 2014
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
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ module.exports = function (grunt) {
'src/thirdparty/CodeMirror2/addon/selection/active-line.js',
'src/thirdparty/mustache/mustache.js',
'src/thirdparty/path-utils/path-utils.min',
'src/thirdparty/less-1.4.2.min.js'
'src/thirdparty/less-1.7.0.min.js'
],
helpers : [
'test/spec/PhantomHelper.js'
Expand Down
3 changes: 3 additions & 0 deletions src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var less = {
logLevel: 2
};
3 changes: 2 additions & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@

<!-- Pre-load third party scripts that cannot be async loaded. -->
<!-- build:js thirdparty/thirdparty.min.js -->
<script src="thirdparty/less-1.4.2.min.js"></script>
<script src="config.js"></script>
Copy link
Copy Markdown
Contributor

@redmunds redmunds Mar 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not crazy about the idea of introducing a new top-level script include file just to set the logging level, and it creates an object in the global namespace. I'll have to see what the rest of the team thinks about that.

At the very least this file needs to be renamed to something more descriptive such as less-config.js and moved to the thirdparty/ folder.

Copy link
Copy Markdown
Contributor Author

@WebsiteDeveloper WebsiteDeveloper Mar 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't like the idea either but as to the object in global namespace, less does that anyway.
I also thought of changing the default value in less itself.
The reason i put this into a file is that we can't include inline scripts for chromebook deployment.

Copy link
Copy Markdown
Contributor

@redmunds redmunds Mar 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be ok. Please move and rename the new file to thirdparty/less-config.js.

Copy link
Copy Markdown
Contributor

@redmunds redmunds Apr 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WebsiteDeveloper I forgot to add your id, so maybe you missed my previous comment?

<script src="thirdparty/less-1.7.0.min.js"></script>
<script src="thirdparty/mustache/mustache.js"></script>
<script src="thirdparty/jquery-2.0.1.min.js"></script>
<script src="thirdparty/CodeMirror2/lib/codemirror.js"></script>
Expand Down
11 changes: 0 additions & 11 deletions src/thirdparty/less-1.4.2.min.js
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions src/thirdparty/less-1.7.0.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/SpecRunner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<script src="../src/thirdparty/CodeMirror2/addon/selection/active-line.js"></script>
<script src="../src/thirdparty/mustache/mustache.js"></script>
<script src="../src/thirdparty/path-utils/path-utils.js"></script>
<script src="../src/thirdparty/less-1.4.2.min.js"></script>
<script src="../src/thirdparty/less-1.7.0.min.js"></script>
<script src="thirdparty/bootstrap2/js/bootstrap.min.js"></script>

<!-- All other scripts are loaded through require. -->
Expand Down
⚡