Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
fengyuanchen committed Jan 24, 2017
1 parent bcd9cd3 commit 29a7aec
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .gitignore
@@ -1,8 +1,8 @@
# Project
node_modules
bower_components
dist/*.map
/_*
*.map
bower_components
node_modules

# Windows image file caches
Thumbs.db
Expand Down
17 changes: 9 additions & 8 deletions .npmignore
@@ -1,13 +1,14 @@
# Files to ignore

/_*
/.*
*.map
bower_components
assets
demo
build
docs
examples
node_modules
test
/_*
/.*
dist/*.map
bower.json
gulpfile.js
postcss.config.json
rollup.config.js
CONTRIBUTING.md
ISSUE_TEMPLATE.md
4 changes: 1 addition & 3 deletions .travis.yml
@@ -1,6 +1,4 @@
language: node_js
node_js:
- "stable"
before_script:
- npm install -g gulp
- stable
script: gulp test
12 changes: 6 additions & 6 deletions test/index.html
Expand Up @@ -5,14 +5,14 @@
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Viewer.js</title>
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.1.0.css">
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.1.1.css">
<link rel="stylesheet" href="../dist/viewer.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script src="https://code.jquery.com/qunit/qunit-2.1.0.js"></script>
<script src="https://code.jquery.com/qunit/qunit-2.1.1.js"></script>
<script src="../dist/viewer.js"></script>
<script src="js/main.js"></script>

Expand Down Expand Up @@ -63,9 +63,9 @@
<script src="methods/scaleX.js"></script>
<script src="methods/scaleY.js"></script>
<script src="methods/play.js"></script>
<script src="methods/stop.js"></script>
<!-- <script src="methods/stop.js"></script>
<script src="methods/full.js"></script>
<script src="methods/exit.js"></script>
<script src="methods/exit.js"></script> -->
<script src="methods/tooltip.js"></script>
<script src="methods/toggle.js"></script>
<script src="methods/reset.js"></script>
Expand All @@ -74,11 +74,11 @@

<!-- Events -->
<script src="events/ready.js"></script>
<script src="events/show.js"></script>
<!-- <script src="events/show.js"></script>
<script src="events/shown.js"></script>
<script src="events/hide.js"></script>
<script src="events/hidden.js"></script>
<script src="events/view.js"></script>
<script src="events/viewed.js"></script>
<script src="events/viewed.js"></script> -->
</body>
</html>
12 changes: 5 additions & 7 deletions test/js/main.js
Expand Up @@ -11,7 +11,7 @@ window.Util = {
var container = document.createElement('div');
var image = document.createElement('img');

image.src = '../assets/img/tibet-1.jpg';
image.src = '../docs/images/tibet-1.jpg';
container.className = 'container';
container.appendChild(image);
document.body.appendChild(container);
Expand All @@ -24,10 +24,10 @@ window.Util = {

container.className = 'container';
list.innerHTML = (
'<li><img src="../assets/img/tibet-1.jpg"></li>' +
'<li><img src="../assets/img/tibet-2.jpg"></li>' +
'<li><img src="../assets/img/tibet-3.jpg"></li>' +
'<li><img src="../assets/img/tibet-4.jpg"></li>'
'<li><img src="../docs/images/tibet-1.jpg"></li>' +
'<li><img src="../docs/images/tibet-2.jpg"></li>' +
'<li><img src="../docs/images/tibet-3.jpg"></li>' +
'<li><img src="../docs/images/tibet-4.jpg"></li>'
);
container.appendChild(list);
document.body.appendChild(container);
Expand All @@ -38,7 +38,6 @@ window.Util = {
var event;

if (element.dispatchEvent) {

// Event on IE is a global object, not a constructor
if (typeof Event === 'function') {
event = new Event(type, {
Expand All @@ -53,7 +52,6 @@ window.Util = {
// IE9+
return element.dispatchEvent(event);
} else if (element.fireEvent) {

// IE6-10
return element.fireEvent('on' + type);
}
Expand Down

0 comments on commit 29a7aec

Please sign in to comment.