@@ -96,19 +96,10 @@
}
-/*
-Content-Type: multipart/related; boundary="BLANK_IMAGE"
-
---BLANK_IMAGE
-Content-Location:SC
-Content-Transfer-Encoding:base64
-
-R0lGODlhAQABAJAAAP///wAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==
-*/
.sc-menu-item.disabled div.checkbox,
.sc-menu-item div.checkbox.inactive {
background-image: url(data:image/gif;base64,R0lGODlhAQABAJAAAP///wAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==) top left no-repeat;
- *background-image: url(mhtml:stylesheet.css!SC) top left no-repeat; /* IE < 8 */
+ *background-image: sc_static('blank.gif') top left no-repeat; /* IE < 8 */
}
.sc-menu-item span.value {
frameworks/desktop/english.lproj/menu_item_view.css
@@ -1093,7 +1093,7 @@ SC.CollectionView = SC.View.extend(
// walk up the element hierarchy until we find this or an element with an
// id matching the base guid (i.e. a collection item)
while (element && element !== document && element !== layer) {
- id = element ? element.getAttribute('id') : null ;
+ id = element ? SC.$(element).attr('id') : null ;
if (id && (contentIndex = this.contentIndexForLayerId(id)) !== null) {
break;
}
frameworks/desktop/views/collection.js
@@ -553,7 +553,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
classNames: function(classNames, cloneOnModify) {
if (classNames === undefined) {
if (!this._classNames && this._elem) {
- this._classNames = (this._elem.getAttribute('class')||'').split(' ');
+ this._classNames = (SC.$(this._elem).attr('class')||'').split(' ');
}
if (this._cloneClassNames) {
@@ -611,7 +611,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
var classNames = this._classNames, idx;
if (!classNames && this._elem) {
classNames = this._classNames =
- (this._elem.getAttribute('class')||'').split(' ');
+ (SC.$(this._elem).attr('class')||'').split(' ');
}
if (classNames && (idx=classNames.indexOf(className))>=0) {
@@ -666,7 +666,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
classNames = this._classNames ;
if (!classNames && this._elem) {
classNames = this._classNames =
- (this._elem.getAttribute('class')||'').split(' ');
+ (SC.$(this._elem).attr('class')||'').split(' ');
}
if (!classNames) classNames = this._classNames = [];
frameworks/foundation/system/render_context.js
@@ -269,10 +269,10 @@ SC.mixin( /** @scope SC */ {
}
style = '%@; width: %@px; left: %@px; position: absolute'.fmt(style, width, (-1*width));
- elem.setAttribute('style', style);
+ SC.$(elem).attr('style', style);
if (classes !== '') {
- elem.setAttribute('class', classes);
+ SC.$(elem).attr('class', classes);
}
elem.textContent = str;
frameworks/foundation/system/utils.js
@@ -137,20 +137,20 @@ module("SC.RenderContext#update - className", {
test("does not change class names if retrieved but not edited", function() {
context.classNames();
context.update();
- equals(elem.getAttribute("class"), "foo bar", "class");
+ equals(SC.$(elem).attr("class"), "foo bar", "class");
});
test("replaces class name if classNames edited", function() {
context.classNames('bar baz'.w());
context.update();
- equals(elem.getAttribute("class"), "bar baz", "attribute");
+ equals(SC.$(elem).attr("class"), "bar baz", "attribute");
});
test("set class names override class attr", function() {
context.attr("class", "bar");
context.classNames('baz'.w());
context.update();
- equals(elem.getAttribute("class"), "baz", "should use classNames");
+ equals(SC.$(elem).attr("class"), "baz", "should use classNames");
});
// ..........................................................
frameworks/foundation/tests/system/render_context/update.js
@@ -24,7 +24,7 @@ test("invokes prepareContext() and then updates layer element", function() {
});
view.updateLayer();
- ok(layer.getAttribute('class').toString().indexOf('did-update')>=0, 'has class name added by prepareContext()');
+ ok(SC.$(layer).attr('class').indexOf('did-update')>=0, 'has class name added by prepareContext()');
});
// ..........................................................
frameworks/foundation/tests/views/view/updateLayer.js
@@ -17,7 +17,9 @@ SC.IMAGE_STATE_SPRITE = 'sprite';
/**
URL to a transparent GIF. Used for spriting.
*/
-SC.BLANK_IMAGE_URL = "data:image/gif;base64,R0lGODlhAQABAJAAAP///wAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw=="
+SC.BLANK_IMAGE_DATAURL = "data:image/gif;base64,R0lGODlhAQABAJAAAP///wAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==";
+
+SC.BLANK_IMAGE_URL = SC.browser.msie && SC.browser.msie<8 ? sc_static('blank.gif') : SC.BLANK_IMAGE_DATAURL;
/**
@class
frameworks/foundation/views/image.js
@@ -14,5 +14,5 @@ R0lGODlhAQABAJAAAP///wAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==
*/
.sc-theme div.sc-ghost-view {
background-image: url(data:image/gif;base64,R0lGODlhAQABAJAAAP///wAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==) top left no-repeat;
- *background-image: url(mhtml:stylesheet.css!SCTheme) top left no-repeat; /* IE < 8 */
+ *background-image: sc_static('blank.gif') top left no-repeat; /* IE < 8 */
}
themes/standard_theme/english.lproj/pane.css
a8efd0da1c6158d06a7dc46e6e1ea94b493cb169
Juan Pinzon
juanpin@da0602a-dhcp86.apple.com
http://github.com/sproutit/sproutcore/commit/229a536fc731ce76e1a7dc49c8e54f24c212daae
229a536fc731ce76e1a7dc49c8e54f24c212daae
2009-10-29T16:52:06-07:00
2009-10-28T17:23:08-07:00
Fixes for IE7, views update and pass all unit tests.
cb42a3fa01deb03b38bba9db583a5488834eff09
Charles Jolley
charles@sproutit.com