colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: web view loadHTMLString:"" now works again. Incidentally it only used to work by accident.

Browse Source
This commit is contained in:
Alexander Ljungberg
2011-03-24 00:33:54 -04:00
parent b9d2927368
commit 3bd2c2d266
4 changed files with 180 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPWebView.j
+1 -1
View File
@@ -418,7 +418,7 @@ CPWebViewAppKitScrollMaxPollCount = 3;
_iframe.src = _url;
}
else if (_html)
else if (_html !== nil)
{
// clear the iframe
_iframe.src = "";
Tests/Manual/CPWebViewTest/AppController.j
+10
View File
@@ -50,6 +50,16 @@
[webView6 setMainFrameURL:"http://www.cappuccino.org"];
}
- (void)clearAll:(id)sender
{
var allViews = [webView1, webView2, webView3, webView4, webView5, webView6];
for (var i = 0; i < 6; i++)
{
var view = allViews[i];
[view loadHTMLString:""];
}
}
- (void)awakeFromCib
{
// This is called when the cib is done loading.
Tests/Manual/CPWebViewTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPWebViewTest/Resources/MainMenu.xib
+168 -25
View File
@@ -46,7 +46,7 @@
<object class="NSWindowTemplate" id="972006081">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{335, 19}, {1051, 731}}</string>
<string key="NSWindowRect">{{335, -45}, {1056, 795}}</string>
<int key="NSWTFlags">1946157056</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
@@ -60,7 +60,7 @@
<object class="NSTextField" id="914614746">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 694}, {506, 17}}</string>
<string key="NSFrame">{{17, 758}, {506, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="701605033">
@@ -117,7 +117,7 @@
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{20, 526}, {500, 160}}</string>
<string key="NSFrame">{{20, 590}, {500, 160}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -146,7 +146,7 @@
<object class="NSTextField" id="45596274">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 461}, {529, 17}}</string>
<string key="NSFrame">{{17, 525}, {529, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="454719405">
@@ -183,7 +183,7 @@
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{20, 293}, {500, 160}}</string>
<string key="NSFrame">{{20, 357}, {500, 160}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -195,7 +195,7 @@
<object class="NSTextField" id="763812597">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{525, 694}, {506, 17}}</string>
<string key="NSFrame">{{525, 758}, {506, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="506188802">
@@ -232,7 +232,7 @@
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{528, 526}, {500, 160}}</string>
<string key="NSFrame">{{528, 590}, {500, 160}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -244,7 +244,7 @@
<object class="NSTextField" id="554761570">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 228}, {506, 17}}</string>
<string key="NSFrame">{{17, 292}, {506, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="365555838">
@@ -281,7 +281,7 @@
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{20, 60}, {500, 160}}</string>
<string key="NSFrame">{{20, 124}, {500, 160}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -293,7 +293,7 @@
<object class="NSTextField" id="863007491">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{525, 461}, {529, 17}}</string>
<string key="NSFrame">{{525, 525}, {529, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="107016852">
@@ -330,7 +330,7 @@
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{528, 293}, {500, 160}}</string>
<string key="NSFrame">{{528, 357}, {500, 160}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -342,7 +342,7 @@
<object class="NSTextField" id="553862803">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{525, 228}, {506, 17}}</string>
<string key="NSFrame">{{525, 292}, {506, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="324402773">
@@ -379,7 +379,7 @@
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{528, 60}, {500, 160}}</string>
<string key="NSFrame">{{528, 124}, {500, 160}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -391,7 +391,7 @@
<object class="NSButton" id="113204084">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{430, 478}, {96, 32}}</string>
<string key="NSFrame">{{430, 542}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="291900070">
@@ -411,7 +411,7 @@
<object class="NSButton" id="498713247">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{941, 478}, {96, 32}}</string>
<string key="NSFrame">{{941, 542}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="50917429">
@@ -431,7 +431,7 @@
<object class="NSButton" id="299055891">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{423, 245}, {96, 32}}</string>
<string key="NSFrame">{{423, 309}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="134066492">
@@ -451,7 +451,7 @@
<object class="NSButton" id="199340929">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{941, 245}, {96, 32}}</string>
<string key="NSFrame">{{941, 309}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="894042900">
@@ -471,7 +471,7 @@
<object class="NSButton" id="337561225">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{423, 12}, {96, 32}}</string>
<string key="NSFrame">{{423, 76}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="28457133">
@@ -491,7 +491,7 @@
<object class="NSButton" id="228463681">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{941, 12}, {96, 32}}</string>
<string key="NSFrame">{{941, 76}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="957145862">
@@ -508,8 +508,74 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSBox" id="1051169359">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">34</int>
<string key="NSFrame">{{20, 61}, {1024, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="554332617"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<int key="NSBorderType">3</int>
<int key="NSBoxType">2</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
<object class="NSButton" id="1051650027">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{14, 15}, {93, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="985199601">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Clear All</string>
<reference key="NSSupport" ref="554332617"/>
<reference key="NSControlView" ref="1051650027"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSTextField" id="280438444">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{122, 25}, {506, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="343570184">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">272631296</int>
<string key="NSContents">Clicking this button should render all web views empty.</string>
<reference key="NSSupport" ref="554332617"/>
<reference key="NSControlView" ref="280438444"/>
<reference key="NSBackgroundColor" ref="400417361"/>
<reference key="NSTextColor" ref="691283944"/>
</object>
</object>
</object>
<string key="NSFrameSize">{1051, 731}</string>
<string key="NSFrameSize">{1056, 795}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -634,6 +700,14 @@
</object>
<int key="connectionID">524</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">clearAll:</string>
<reference key="source" ref="635946545"/>
<reference key="destination" ref="1051650027"/>
</object>
<int key="connectionID">534</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -696,6 +770,9 @@
<reference ref="199340929"/>
<reference ref="337561225"/>
<reference ref="228463681"/>
<reference ref="1051169359"/>
<reference ref="1051650027"/>
<reference ref="280438444"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -902,6 +979,39 @@
<reference key="object" ref="957145862"/>
<reference key="parent" ref="228463681"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">525</int>
<reference key="object" ref="1051169359"/>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">526</int>
<reference key="object" ref="1051650027"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="985199601"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">527</int>
<reference key="object" ref="985199601"/>
<reference key="parent" ref="1051650027"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">529</int>
<reference key="object" ref="280438444"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="343570184"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">530</int>
<reference key="object" ref="343570184"/>
<reference key="parent" ref="280438444"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -964,13 +1074,21 @@
<string>517.IBPluginDependency</string>
<string>517.IBViewBoundsToFrameTransform</string>
<string>518.IBPluginDependency</string>
<string>525.IBPluginDependency</string>
<string>525.IBViewBoundsToFrameTransform</string>
<string>526.IBPluginDependency</string>
<string>526.IBViewBoundsToFrameTransform</string>
<string>527.IBPluginDependency</string>
<string>529.IBPluginDependency</string>
<string>529.IBViewBoundsToFrameTransform</string>
<string>530.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{22, 275}, {1051, 731}}</string>
<string>{{105, 289}, {1056, 795}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{22, 275}, {1051, 731}}</string>
<string>{{105, 289}, {1056, 795}}</string>
<integer value="1"/>
<string>{{33, 99}, {480, 360}}</string>
<string>{3.40282e+38, 3.40282e+38}</string>
@@ -1004,7 +1122,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw5AAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw5mAAA</bytes>
</object>
<string>com.apple.WebKitIBPlugin</string>
<object class="NSAffineTransform">
@@ -1051,7 +1169,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD04AAwigAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABD04AAwtQAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1059,6 +1177,20 @@
<bytes key="NSTransformStruct">P4AAAL+AAABD04AAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUGgAABChgAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwjQAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABC9AAAwiAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -1077,13 +1209,24 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">524</int>
<int key="maxID">534</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">AppController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">clearAll:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">clearAll:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">clearAll:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">