Compare commits

...
Author SHA1 Message Date
Stefan Eilers f1cb388827 Fix "jake release" 2012-10-25 15:35:21 +02:00
Stefan Eilers 2e1a0da0e4 Fix regression
Revert "Fixed: token field scrolling away from selected token."

This reverts commit 26c26914da.

Conflicts:

	AppKit/CPTokenField.j
2012-10-24 18:36:08 +02:00
Stefan Eilers 47d0537ae4 Merge remote-tracking branch 'origin/master' into upstream_master 2012-10-23 17:24:58 +02:00
Stefan Eilers 81c2f219ee Merge branch 'refs/heads/master' into upstream_master 2012-08-29 15:55:17 +02:00
Stefan Eilers 5e53a2326c Merge branch 'refs/heads/master' into upstream_master 2012-07-31 23:35:16 +02:00
Stefan Eilers 0394731fdf Merge branch 'refs/heads/master' into master_upstream 2012-07-23 11:43:20 +02:00
Stefan Eilers a426aec2c9 Merge remote-tracking branch 'origin/master' into master_upstream 2012-07-20 10:40:53 +02:00
Stefan Eilers dbad10f060 Merge remote-tracking branch 'origin/master' into master_upstream 2012-07-13 14:34:45 +02:00
Stefan Eilers 3985ef24e3 Merge remote-tracking branch 'origin/master' into master_upstream 2012-06-19 14:04:18 +02:00
Stefan Eilers ff4a79d6cd Merge remote-tracking branch 'refs/remotes/origin/master' into master_upstream 2012-05-01 23:35:44 +02:00
Stefan Eilers 9b017de39c Fix incorrect _isLocalFileConnection if a locally called web application calls a remote server.
If a locally called web application (called with file://foo/index.html) is doing a http get request call using "http://whatever/", we receive a connection:didReceiveResponse: of response type CPURLResponse instead CPHTTPURLResponse as expected.
2012-04-26 12:13:46 +02:00
3 changed files with 5 additions and 16 deletions
+2 -9
View File
@@ -1076,15 +1076,8 @@ var CPScrollDestinationNone = 0,
if (isEditing && _selectedRange.length)
{
_inputFrame = nil;
var inputElement = [self _inputElement];
inputElement.style.display = "none";
}
else if (isEditing)
{
var inputElement = [self _inputElement];
inputElement.style.display = "block";
if (document.activeElement !== inputElement)
inputElement.focus();
[self _inputElement].style.left = "-10000px";
[self _inputElement].focus();
}
// Trim off any excess height downwards (in case we shrank).
+2 -6
View File
@@ -151,12 +151,8 @@ var CPURLConnectionDelegate = nil;
var URL = [_request URL],
scheme = [URL scheme];
// Browsers use "file:", Titanium uses "app:"
_isLocalFileConnection = scheme === "file" ||
((scheme === "http" || scheme === "https:") &&
window.location &&
(window.location.protocol === "file:" || window.location.protocol === "app:"));
// Browsers use "file:"
_isLocalFileConnection = scheme === "file";
_HTTPRequest = new CFHTTPRequest();
if (shouldStartImmediately)
+1 -1
View File
@@ -111,7 +111,7 @@ function environmentFlags()
var SHRINKSAFE = require("minify/shrinksafe");
function compressor(code) {
return SHRINKSAFE.compress(code, { charset : "UTF-16", useServer : true });
return SHRINKSAFE.compress(code, { charset : "UTF-8", useServer : true });
}
function gcc(inputFilePath, outputFilePath, flags, compress)