Skip to content

Commit

Permalink
update image loader
Browse files Browse the repository at this point in the history
  • Loading branch information
jssor committed Oct 18, 2014
1 parent 6d4c7b4 commit 33ee7c1
Show file tree
Hide file tree
Showing 10 changed files with 78 additions and 13 deletions.
73 changes: 69 additions & 4 deletions js/jssor.js
Original file line number Diff line number Diff line change
Expand Up @@ -1775,10 +1775,75 @@ var $Jssor$ = window.$Jssor$ = new function () {
}
};

//function ImageLoader() {
// var _ThisImageLoader = this;
// var _BaseImageLoader = _This.$Inherit(_ThisImageLoader, $JssorObject$);

// var _ImageLoading = 1;
// var _MainImageSrc;
// var _MainImage;
// var _CompleteCallback;
// var _MainImageAbort;

// function LoadCompleteCallback(image, abort) {
// _ImageLoading--;

// if (image) {
// _This.$RemoveEvent(image, "load");
// _This.$RemoveEvent(image, "abort");
// _This.$RemoveEvent(image, "error");

// if (_MainImageSrc == image.src) {
// _MainImage = image;
// _MainImageAbort = abort;
// }
// }

// _CompleteCallback && _CompleteCallback(_MainImage, _MainImageAbort);
// }

// function LoadImage(src) {
// _ImageLoading++;

// if (IsBrowserOpera() && browserRuntimeVersion < 11.6 || !src) {
// LoadImageCallback(callback, null, !src);
// }
// else {
// var image = new Image();

// _This.$AddEvent(image, "load", _This.$CreateCallback(null, LoadImageCallback, image, false));

// var abortHandler = _This.$CreateCallback(null, LoadImageCallback, image, true);
// _This.$AddEvent(image, "abort", abortHandler);
// _This.$AddEvent(image, "error", abortHandler);

// image.src = src;
// }
// }

// _ThisImageLoader.$LoadImage = function (src, callback) {
// _MainImageSrc = src;
// _CompleteCallback = callback;

// LoadImage(src);
// LoadComplete();
// };

// _ThisImageLoader.$LoadImages = function (imageElmts, mainImageElmt, callback) {
// mainImageElmt && (_MainImageSrc = mainImageElmt.src);
// _CompleteCallback = callback;

// each(imageElmts, function (imageElmt) {
// LoadImage(imageElmt.src);
// });
// LoadComplete();
// };
//}

function LoadImageCallback(callback, image, abort) {
_This.$RemoveEvent(image, "load");
_This.$RemoveEvent(image, "abort");
_This.$RemoveEvent(image, "error");
_This.$RemoveEvent(image, "load", LoadImageCallback.caller);
_This.$RemoveEvent(image, "abort", LoadImageCallback.caller);
_This.$RemoveEvent(image, "error", LoadImageCallback.caller);

if (callback)
callback(image, abort);
Expand Down Expand Up @@ -1822,7 +1887,7 @@ var $Jssor$ = window.$Jssor$ = new function () {
template = CloneNode(template);

var templateHolders = $Jssor$.$GetElementsByTag(template, tagName);
for (var j = templateHolders.length - 1; j > -1; j--) {
for (var j = templateHolders.length -1; j > -1; j--) {
var templateHolder = templateHolders[j];
var replaceItem = CloneNode(replacer);
ClassName(replaceItem, ClassName(templateHolder));
Expand Down
2 changes: 1 addition & 1 deletion js/jssor.player.ytiframe.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jssor.slider.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jssor.slider.mini.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jssor.sliderc.mini.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jssor.sliders.mini.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion transitions/caption-transition-builder-controller.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion transitions/slideshow-transition-builder-controller.min.js

Large diffs are not rendered by default.

0 comments on commit 33ee7c1

Please sign in to comment.