colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-28 22:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cappuccino/cappuccino

Browse Source
This commit is contained in:
Alexander Ljungberg
2013-05-16 14:18:46 -07:00
parent de1d6aad9c 391ff7279d
commit cb2ba64a73
9 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPBrowser.j
+1 -1
View File
@@ -181,7 +181,7 @@
if (columnIndex > 0)
[_tableViews[columnIndex - 1] setNeedsDisplay:YES];
[_tableViews[columnIndex] setNeedsDisplay:YES];
[[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"]
AppKit/CPCollectionView.j
+2 -2
View File
@@ -455,12 +455,12 @@ var HORIZONTAL_MARGIN = 2;
[self tileIfNeeded:NO];
}
- (void)resizeSubviewsWithOldSize:(CPSize)oldBoundsSize
- (void)resizeSubviewsWithOldSize:(CGSize)oldBoundsSize
{
// Desactivate subviews autoresizing
}
- (void)resizeWithOldSuperviewSize:(CPSize)oldBoundsSize
- (void)resizeWithOldSuperviewSize:(CGSize)oldBoundsSize
{
if (_lockResizing)
return;
AppKit/CPTableView.j
+1 -1
View File
@@ -1322,7 +1322,7 @@ NOT YET IMPLEMENTED
for (var identifier in _dataViewsForTableColumns)
{
var dataViewsInTableColumn = _dataViewsForTableColumns[identifier]
var dataViewsInTableColumn = _dataViewsForTableColumns[identifier];
for (var i = 0; i < selectInfo.length; ++i)
{
AppKit/Platform/DOM/CPPlatformWindow+DOM.j
+1 -1
View File
@@ -1060,7 +1060,7 @@ var resizeTimer = nil;
{
// Find the scroll delta
var deltaX = _DOMScrollingElement.scrollLeft - 150,
deltaY = (_DOMScrollingElement.scrollTop - 150) || (aDOMEvent.deltaY===undefined?0: aDOMEvent.deltaY);
deltaY = (_DOMScrollingElement.scrollTop - 150) || (aDOMEvent.deltaY === undefined ? 0 : aDOMEvent.deltaY);
// If we scroll super with momentum,
// there are so many events going off that
AppKit/Themes/Aristo/ThemeDescriptors.j
+1 -1
View File
@@ -1204,7 +1204,7 @@ var themedButtonValues = nil,
[@"bezel-color-calendar", [CPColor whiteColor]],
[@"bezel-color-calendar", [CPColor colorWithCalibratedRed:159.0 / 255.0 green:201.0 / 255.0 blue:225.0 / 255.0 alpha:1.0], CPThemeStateSelected],
[@"bezel-color-calendar", [CPColor colorWithCalibratedRed:159.0 / 255.0 green:201.0 / 255.0 blue:225.0 / 255.0 alpha:0.5], CPThemeStateSelected |CPThemeStateDisabled],
[@"bezel-color-calendar", [CPColor colorWithCalibratedRed:159.0 / 255.0 green:201.0 / 255.0 blue:225.0 / 255.0 alpha:0.5], CPThemeStateSelected | CPThemeStateDisabled],
[@"bezel-color-clock", clockImageColor],
[@"bezel-color-clock", clockImageColorDisabled, CPThemeStateDisabled],
AppKit/_CPPopoverWindow.j
+2 -1
View File
@@ -410,7 +410,8 @@ var _CPPopoverWindow_shouldClose_ = 1 << 0,
var transformOrigin = "50% 100%",
frame = [self frame],
preferredEdge = [_windowView preferredEdge],
posX, posY;
posX,
posY;
switch (preferredEdge)
{
Foundation/CPArray/_CPJavaScriptArray.j
+1 -1
View File
@@ -128,7 +128,7 @@ var concat = Array.prototype.concat,
var ranges = indexes._ranges,
count = ranges.length,
result = [],
i = 0;
i = 0;
for (; i < count; i++)
{
Foundation/CPPredicate/_CPPredicate.j
+1 -1
View File
@@ -970,7 +970,7 @@
@end
var CPRaiseParseError = function CPRaiseParseError(aScanner, target)
var CPRaiseParseError = function(aScanner, target)
{
[CPException raise:CPInvalidArgumentException reason:@"unable to parse " + target + " at index " + [aScanner scanLocation]];
};
Foundation/CPTimeZone.j
+1 -1
View File
@@ -627,4 +627,4 @@ var abbreviationDictionary,
return [[[localizedName valueForKey:[locale objectForKey:CPLocaleLanguageCode]] valueForKey:_abbreviation] objectAtIndex:style];
}
@end
@end