Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(web-server): serve css files #601

Merged
merged 1 commit into from
Jul 3, 2013
Merged

Conversation

timols
Copy link
Contributor

@timols timols commented Jun 26, 2013

Closes #431

@vojtajina
Copy link
Contributor

Great job @timols, let's fix couple of small issues and we can merge it in:

@@ -113,7 +115,14 @@ var createKarmaSourceHandler = function(promiseContainer, staticFolder, adapterF
}
}

return util.format(SCRIPT_TAG, scriptType, filePath);
if (filePath.search(/.css/) > 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

can you write this in "node" style:

if (xxx) {
  return util.format(LINK_TAG, ...);
}

return util.format(SCRIPT_TAG, ...);

Also, change the regexp to not match /some.css/folder/file.js:

if (/\.css$/.test(filePath))

@timols
Copy link
Contributor Author

timols commented Jun 28, 2013

Great. Thanks for the feedback. I'll fix these issues shortly.

@timols
Copy link
Contributor Author

timols commented Jul 2, 2013

@vojtajina I think all items are now resolved. Please let me know if I need to address anything else.

vojtajina added a commit that referenced this pull request Jul 3, 2013
feat(web-server): serve css files
@vojtajina vojtajina merged commit b72691c into karma-runner:master Jul 3, 2013
@vojtajina
Copy link
Contributor

Great, thank you very much @timols !

@timols
Copy link
Contributor Author

timols commented Jul 9, 2013

Any chance we can get a canary build out for these changes?

@vojtajina
Copy link
Contributor

@bkbiker thanks for reporting this! @timols do you have time to look into it ?

Creating an issue for this #636

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Include css files in browser
3 participants