Skip to content

Commit

Permalink
build: add compatibility for "$.noConflict()"
Browse files Browse the repository at this point in the history
  • Loading branch information
pmb0 committed Dec 1, 2014
1 parent f1c213a commit 96a75e0
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build/shariff.complete.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions build/shariff.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions demo/jquery-no-conflict.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<title>Demonstration: Shariff</title>
<link rel="stylesheet" type="text/css" href="app.min.css">
<link href="http://www.heise.de/" rel="canonical">
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script type="text/javascript">
$.noConflict();
</script>
</head>
<body>
<dl class="layout-hint">
<dt>data-backend-url:</dt><dd>/shariff/</dd>
<dt>data-info-url:</dt><dd>http://example.com</dd>
<dt>data-lang:</dt><dd>en</dd>
<dt>data-orientation:</dt><dd>default</dd>
<dt>data-services:</dt><dd>default</dd>
<dt>data-theme:</dt><dd>grey</dd>
<dt>data-url:</dt><dd>http://www.heise.de/ct/</dd>
</dl>
<article class="slim">
<header>
<h1>Lorem ipsum dolor sit amet, consectetuer adipiscing elit</h1>
<div data-backend-url="/shariff/" data-theme="grey" data-lang="en" class="shariff" data-url="http://www.heise.de/ct/" data-info-url="http://example.com"></div>
<time datetime="2014-11-13T10:45:00+02:00">13.11.2014 - 12:45 Uhr</time>
</header>
<p class="deck">Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum decided to leave for the far World of Grammar.</p>
</article>

<script src="shariff.min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
],
"browserify-shim": {
"jquery": "global:$"
"jquery": "global:jQuery"
},
"dependencies": {
"font-awesome": "^4.2.0",
Expand Down

0 comments on commit 96a75e0

Please sign in to comment.