Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:jquerytools/jquerytools
Browse files Browse the repository at this point in the history
  • Loading branch information
Tero Piirainen committed Feb 28, 2010
2 parents 859272c + 6976bd6 commit be0eed4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/overlay/overlay.apple.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}

// url("bg.jpg") --> bg.jpg
bg = bg.substring(bg.indexOf("(") + 1, bg.indexOf(")")).replace(/\"/g, "");
bg = bg.slice(bg.indexOf("(") + 1, bg.indexOf(")")).replace(/\"/g, "");
overlay.css("backgroundImage", "none");

img = $('<img src="' + bg + '"/>');
Expand Down
2 changes: 1 addition & 1 deletion src/overlay/overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
overlay,
opened,
maskConf = $.tools.mask && (conf.mask || conf.expose),
uid = Math.random().toString().substring(10);
uid = Math.random().toString().slice(10);


// mask configuration
Expand Down
4 changes: 2 additions & 2 deletions src/toolbox/toolbox.flashembed.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function getHTML(p, c) {

// force id for IE or Flash API cannot be returned
if (ie && !e.id) {
e.id = "_" + ("" + Math.random()).substring(9);
e.id = "_" + ("" + Math.random()).slice(9);
}

if (e.id) {
Expand Down Expand Up @@ -207,7 +207,7 @@ function getHTML(p, c) {
vars += key +'='+ (typeof c[key] == 'object' ? asString(c[key]) : c[key]) + '&';
}
}
vars = vars.substring(0, vars.length -1);
vars = vars.slice(0, -1);
html += '<param name="flashvars" value=\'' + vars + '\' />';
}

Expand Down
2 changes: 1 addition & 1 deletion src/toolbox/toolbox.lazyload.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@

// url("bg.jpg") --> bg.jpg
var bg = el.data("bg"), p = this.getProgress();
bg = bg.substring(bg.indexOf("(") + 1, bg.indexOf(")")).replace(/\"/g, "");
bg = bg.slice(bg.indexOf("(") + 1, bg.indexOf(")")).replace(/\"/g, "");

// progress indicator
if (p) { el.prepend(p); }
Expand Down

0 comments on commit be0eed4

Please sign in to comment.