[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 976f06b70571151c6d4f2326aeb2874f6c7275f9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 1 21:42:32 2002 +0000

    	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::jScriptEnabled): Hook this up to the
            preference from WebKit.
            (KHTMLPart::jScript): Return 0 if JavaScript is disabled. This is exactly what
            the original KHTMLPart from KDE did.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@923 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0e6425a..400bae3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-04-01  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::jScriptEnabled): Hook this up to the
+        preference from WebKit.
+        (KHTMLPart::jScript): Return 0 if JavaScript is disabled. This is exactly what
+        the original KHTMLPart from KDE did.
+
+2002-04-01  Darin Adler  <darin at apple.com>
+
 	* src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
         in JavaScriptCore that has to do the same thing.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0e6425a..400bae3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-04-01  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::jScriptEnabled): Hook this up to the
+        preference from WebKit.
+        (KHTMLPart::jScript): Return 0 if JavaScript is disabled. This is exactly what
+        the original KHTMLPart from KDE did.
+
+2002-04-01  Darin Adler  <darin at apple.com>
+
 	* src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
         in JavaScriptCore that has to do the same thing.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0e6425a..400bae3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-04-01  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::jScriptEnabled): Hook this up to the
+        preference from WebKit.
+        (KHTMLPart::jScript): Return 0 if JavaScript is disabled. This is exactly what
+        the original KHTMLPart from KDE did.
+
+2002-04-01  Darin Adler  <darin at apple.com>
+
 	* src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
         in JavaScriptCore that has to do the same thing.
 
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 57bc0ff..41a914b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -301,15 +301,9 @@ KHTMLView *KHTMLPart::view() const
   return d->m_view;
 }
 
-void KHTMLPart::setJScriptEnabled( bool enable )
-{
-    _logNotYetImplemented();
-}
-
 bool KHTMLPart::jScriptEnabled() const
 {
-    //_logNotYetImplemented();
-    return TRUE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJScriptEnabled"] boolValue];
 }
 
 bool KHTMLPart::metaRefreshEnabled() const
@@ -320,6 +314,8 @@ bool KHTMLPart::metaRefreshEnabled() const
 
 KJSProxy *KHTMLPart::jScript()
 {
+  if (!jScriptEnabled()) return 0;
+
   if ( !d->m_jscript )
   {
     d->m_jscript = kjs_html_init(this);
@@ -370,11 +366,6 @@ QVariant KHTMLPart::executeScheduledScript()
     return QVariant();
 }
 
-void KHTMLPart::setJavaEnabled( bool enable )
-{
-    _logNotYetImplemented();
-}
-
 bool KHTMLPart::javaEnabled() const
 {
     return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 57bc0ff..41a914b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -301,15 +301,9 @@ KHTMLView *KHTMLPart::view() const
   return d->m_view;
 }
 
-void KHTMLPart::setJScriptEnabled( bool enable )
-{
-    _logNotYetImplemented();
-}
-
 bool KHTMLPart::jScriptEnabled() const
 {
-    //_logNotYetImplemented();
-    return TRUE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJScriptEnabled"] boolValue];
 }
 
 bool KHTMLPart::metaRefreshEnabled() const
@@ -320,6 +314,8 @@ bool KHTMLPart::metaRefreshEnabled() const
 
 KJSProxy *KHTMLPart::jScript()
 {
+  if (!jScriptEnabled()) return 0;
+
   if ( !d->m_jscript )
   {
     d->m_jscript = kjs_html_init(this);
@@ -370,11 +366,6 @@ QVariant KHTMLPart::executeScheduledScript()
     return QVariant();
 }
 
-void KHTMLPart::setJavaEnabled( bool enable )
-{
-    _logNotYetImplemented();
-}
-
 bool KHTMLPart::javaEnabled() const
 {
     return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 57bc0ff..41a914b 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -301,15 +301,9 @@ KHTMLView *KHTMLPart::view() const
   return d->m_view;
 }
 
-void KHTMLPart::setJScriptEnabled( bool enable )
-{
-    _logNotYetImplemented();
-}
-
 bool KHTMLPart::jScriptEnabled() const
 {
-    //_logNotYetImplemented();
-    return TRUE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJScriptEnabled"] boolValue];
 }
 
 bool KHTMLPart::metaRefreshEnabled() const
@@ -320,6 +314,8 @@ bool KHTMLPart::metaRefreshEnabled() const
 
 KJSProxy *KHTMLPart::jScript()
 {
+  if (!jScriptEnabled()) return 0;
+
   if ( !d->m_jscript )
   {
     d->m_jscript = kjs_html_init(this);
@@ -370,11 +366,6 @@ QVariant KHTMLPart::executeScheduledScript()
     return QVariant();
 }
 
-void KHTMLPart::setJavaEnabled( bool enable )
-{
-    _logNotYetImplemented();
-}
-
 bool KHTMLPart::javaEnabled() const
 {
     return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];

-- 
WebKit Debian packaging