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.

Sign up for GitHub

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

Don't trigger onFinishLoad before every operations are done #82

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't trigger onFinishLoad before every operations are done #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c451c7
Clean whitespace in example
Silex Jan 13, 2014
306aecf
Don't trigger onFinishLoad before every operations are done
Silex Jul 30, 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
4 changes: 2 additions & 2 deletions jquery.iviewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,12 +446,12 @@ $.widget( "ui.iviewer", $.ui.mouse, {
this.set_zoom(this.options.zoom, true);
}

this._trigger('onFinishLoad', 0, src);

if(this.options.fill_container)
{
this.fill_container(true);
}

this._trigger('onFinishLoad', 0, src);
},

/**
Expand Down
52 changes: 26 additions & 26 deletions test/index3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@
var relative_y = y - this.y;
return Math.sqrt(relative_x*relative_x + relative_y*relative_y) <= this.r;
}

function isInRectangle(x, y) {
return (this.x1 <= x && x <= this.x2) && (this.y1 <= y && y<= this.y2);
}

function getCircleCenter() { return {x: this.x, y: this.y}; }

function getRectangleCenter() { return {x: (this.x2+this.x1)/2, y: (this.y2+this.y1)/2}; }

var objects = [
{x: 100, y: 100, r: 50, isInObject: isInCircle, title: 'big circle', getCenter: getCircleCenter },
{x: 150, y: 250, r: 35, isInObject: isInCircle, title: 'middle circle', getCenter: getCircleCenter },
{x: 500, y: 300, r: 10, isInObject: isInCircle, title: 'small circle', getCenter: getCircleCenter },
{x1: 200, y1: 400, x2: 300, y2: 500, isInObject: isInRectangle, title: 'rectangle', getCenter: getRectangleCenter }
]

function whereIam(x, y) {
for (var i=0; i<objects.length; i++) {
var obj = objects[i];
if (obj.isInObject(x, y))
return obj;
}

return null;
}

function showMe(ev, a) {
$.each(objects, function(i, object) {
if (object.title == $(a).html()) {
Expand All @@ -55,50 +55,50 @@
pointer.css('display', 'block');
pointer.css('left', offset.x+'px');
pointer.css('top', offset.y+'px');
}
}
});

ev.preventDefault();
}

window.showMe = showMe;

viewer = $("#viewer1").iviewer({
src: "test_active_with_objects.GIF",

onClick: function(ev, coords) {
var object = whereIam(coords.x, coords.y);
if (object)

if (object)
alert('Clicked at ('+coords.x+', '+coords.y+'). This is '+object.title);
},

onMouseMove: function(ev, coords) {
var object = whereIam(coords.x, coords.y);

if (object) {
$('#status').html('You are in ('+coords.x.toFixed(1)+', '+coords.y.toFixed(1)+'). This is '+object.title);
this.container.css('cursor', 'crosshair');
} else {
$('#status').html('You are in ('+coords.x.toFixed(1)+', '+coords.y.toFixed(1)+'). This is empty space');
this.container.css('cursor', null);
}
}
},

onBeforeDrag: function(ev, coords) {
// remove pointer if image is getting moving
// because it's not actual anymore
$('#pointer').css('display', 'none');
// forbid dragging when cursor is whithin the object
return whereIam(coords.x, coords.y) ? false : true;
return whereIam(coords.x, coords.y) ? false : true;
},

onZoom: function(ev) {
// remove pointer if image is resizing
// because it's not actual anymore
$('#pointer').css('display', 'none');
},

initCallback: function(ev) {
this.container.context.iviewer = this;
}
Expand All @@ -112,14 +112,14 @@
padding: 0;
margin: 0;
}

.viewer
{
height: 100%;
position: relative;
background-color: lightgreen;
}

.wrapper
{
border: 1px solid black;
Expand All @@ -132,7 +132,7 @@

overflow: hidden; /*for opera*/
}

.toolbar
{
border: 1px solid black;
Expand All @@ -143,7 +143,7 @@
right: 1em;
height: 3em;
}

#pointer
{
background-image: url('arrow.png');
Expand All @@ -152,22 +152,22 @@
position: absolute;
display: none;
}

</style>
</head>
<body>
<div class="toolbar">
<span id="status"></span>|Show me:
<a href="#" onclick="showMe(event, this)">big circle</a>,
<a href="#" onclick="showMe(event, this)">big circle</a>,
<a href="#" onclick="showMe(event, this)">middle circle</a>,
<a href="#" onclick="showMe(event, this)">small circle</a>,
<a href="#" onclick="showMe(event, this)">rectangle</a>
</div>

<div class="wrapper">
<div id="viewer1" class="viewer"></div>
</div>
<div id="pointer"></div>

<div id="pointer"></div>
</body>
</html>