Permalink
Browse files

Merge

  • Loading branch information...
David Håsäther
David Håsäther committed Apr 21, 2010
2 parents 7dbff28 + 64dc755 commit d696da1d678533eae5e985ecbdbe9e9dd22bd6ad
View
167 LICENSE
@@ -0,0 +1,167 @@
+Apache License, Version 2.0
+
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this
+License, each Contributor hereby grants to You a perpetual, worldwide,
+non-exclusive, no-charge, royalty-free, irrevocable copyright license to
+reproduce, prepare Derivative Works of, publicly display, publicly perform,
+sublicense, and distribute the Work and such Derivative Works in Source or
+Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License,
+each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import, and otherwise
+transfer the Work, where such license applies only to those patent claims
+licensable by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s) with the Work
+to which such Contribution(s) was submitted. If You institute patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Work or a Contribution incorporated within the Work
+constitutes direct or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate as of the date
+such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or
+Derivative Works thereof in any medium, with or without modifications, and in
+Source or Object form, provided that You meet the following conditions:
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any
+Contribution intentionally submitted for inclusion in the Work by You to the
+Licensor shall be under the terms and conditions of this License, without any
+additional terms or conditions. Notwithstanding the above, nothing herein shall
+supersede or modify the terms of any separate license agreement you may have
+executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names,
+trademarks, service marks, or product names of the Licensor, except as required
+for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in
+writing, Licensor provides the Work (and each Contributor provides its
+Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied, including, without limitation, any warranties
+or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any risks
+associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in
+tort (including negligence), contract, or otherwise, unless required by
+applicable law (such as deliberate and grossly negligent acts) or agreed to in
+writing, shall any Contributor be liable to You for damages, including any
+direct, indirect, special, incidental, or consequential damages of any character
+arising as a result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill, work stoppage,
+computer failure or malfunction, or any and all other commercial damages or
+losses), even if such Contributor has been advised of the possibility of such
+damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or
+Derivative Works thereof, You may choose to offer, and charge a fee for,
+acceptance of support, warranty, indemnity, or other liability obligations
+and/or rights consistent with this License. However, in accepting such
+obligations, You may act only on Your own behalf and on Your sole
+responsibility, not on behalf of any other Contributor, and only if You agree to
+indemnify, defend, and hold each Contributor harmless for any liability incurred
+by, or claims asserted against, such Contributor by reason of your accepting any
+such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+
+Copyright � 2010 The Apache Software Foundation, Licensed under the Apache
+License, Version 2.0.
+Apache and the Apache feather logo are trademarks of The Apache Software
+Foundation.
View
@@ -0,0 +1 @@
+python tools/dfbuild.py -dsm src build
View
@@ -0,0 +1,17 @@
+/**
+ * Copyright 2006 - 2010 Opera Software ASA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ **/
+
View
@@ -1,34 +0,0 @@
-/**
- *
- * Copyright (c) 2008, Opera Software ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of Opera Software nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- **/
-
View
@@ -39,7 +39,7 @@ Options:
-h, --help show this help message and exit
-c, --no-concat Do NOT concatenate script and css
-l, --no-license Do NOT append license file to js and css. (license is
- taken from $cwd/license.txt
+ taken from $cwd/include-license.txt
-k key=value, --keyword=key=value
A key/value pair. All instances of key will be
replaced by value in all files. More than one
@@ -68,7 +68,7 @@ Options:
Suitable command line for release builds
-pyhton tools/dfbuild.py -l license.txt -m -t -k "$dfversion$=Dragonfly testversion" -k "$revdate$=<todays datetime>" src build
+pyhton tools/dfbuild.py -l include-license.txt -m -t -k "$dfversion$=Dragonfly testversion" -k "$revdate$=<todays datetime>" src build
@@ -21,7 +21,6 @@ window.app.builders.EcmascriptDebugger["5.0"] = function(service)
namespace.Object_inspection_data.prototype = ObjectDataBase;
window.object_inspection_data = new namespace.Object_inspection_data();
- var service_interface = service_interface;
window.runtimes = new namespace.Runtimes();
window.runtimes.bind(service_interface);
@@ -253,6 +253,7 @@ var ErrorConsoleView = function(id, name, container_class, source)
// Switch on whether we have a table element allready. If we do, just
// render the latest log entry
var entries = error_console_data.getMessages(source);
+ topCell.statusbar.updateInfo(ui_strings.S_CONSOLE_TOOLBAR_MESSAGES_COUNT.replace("%s", entries.length));
var expand_all = settings.console.get('expand-all-entries');
// If there is no table, it's empty or expand state changed, render all
View
@@ -14,11 +14,11 @@ cls.debug.wrap_transmit = function()
cls.debug.guess_message_map = function()
{
- var
- service = '',
- versions = null,
- version_arr = null,
- version = '',
+ var
+ service = '',
+ versions = null,
+ version_arr = null,
+ version = '',
re_version = /^\d+\.\d+$/;
for(service in window.message_maps)
@@ -45,34 +45,34 @@ cls.debug.create_debug_environment = function(params)
{
window.ini.debug = true;
cls.debug.guess_message_map();
- window.cls.TestFramework.prototype = ViewBase;
- cls.debug.Debug.prototype =
- window.cls.debug.TestScopeMessages.prototype =
+ window.cls.TestFramework.prototype = ViewBase;
+ cls.debug.Debug.prototype =
+ window.cls.debug.TestScopeMessages.prototype =
new window.cls.TestFramework();
window.debug = new cls.debug.Debug('debug', 'Debug', 'scroll debug-container');
- new cls.debug.ConfigureMessgeFilters(
+ new cls.debug.ConfigureMessageFilters(
'configure-message-filters', 'Message Filters', 'scroll filter-container');
var test_messages = new cls.debug.TestScopeMessages(
'test-messages', 'Test Messages', 'scroll test-messages');
eventHandlers.click['test-messages'] = test_messages.get_bound_click_handler();
eventHandlers.change['test-messages'] = test_messages.get_bound_change_handler();
new CompositeView('debug_new', 'Debug', {
dir: 'v', width: 700, height: 700,
- children:
+ children:
[
{ height: 200, tabs: ['debug', 'test-messages'] }
]
});
-
+
new Settings
(
// id
- 'debug',
+ 'debug',
// kel-value map
{
'show-as-tab': true,
'pretty-print-messages': true
- },
+ },
// key-label map
{
'show-as-tab': 'Show view in a tab',
@@ -92,11 +92,15 @@ cls.debug.create_debug_environment = function(params)
[
{
handler: 'debug-clear-log',
- title: 'clear debug log'
+ title: 'Clear debug log'
},
{
handler: 'configure-message-filters',
title: 'Configure Message Filters'
+ },
+ {
+ handler: 'reload-dragonfly',
+ title: 'Reload Dragonfly'
}
]
)
@@ -106,7 +110,13 @@ cls.debug.create_debug_environment = function(params)
[
'pretty-print-messages',
]
- )
+ );
+
+ eventHandlers.click['reload-dragonfly'] = function(event, target)
+ {
+ window.location.reload();
+ }
+
eventHandlers.click['debug-clear-log'] = function(event, target)
{
window.debug.clear_log();
@@ -140,7 +150,7 @@ cls.debug.create_debug_environment = function(params)
eventHandlers.change['config-filter-msg'] = function(event, target)
{
- var
+ var
parent = event.target.parentNode.parentNode.parentNode,
msg = event.target.getAttribute('data-filter-target'),
type = parent.getAttribute('data-filter-type'),
@@ -174,20 +184,20 @@ cls.debug.create_debug_environment = function(params)
* Set a cookie named "key" to the value "value" with expiry in "time "
* seconds. If time is not set, time out after a year
*/
- this.set = function(key, value, time)
+ this.set = function(key, value, time)
{
document.cookie = (
key + "=" + encodeURIComponent(value) +
- "; expires=" +
- ( new Date( new Date().getTime() + ( time || 360*24*60*60*1000 ) ) ).toGMTString() +
+ "; expires=" +
+ ( new Date( new Date().getTime() + ( time || 360*24*60*60*1000 ) ) ).toGMTString() +
"; path=/");
return value;
}
/**
* Get a cookie with name "key"
*/
- this.get = function(key)
+ this.get = function(key)
{
var value = new RegExp(key + "=([^;]*)").exec(document.cookie);
return value && decodeURIComponent(value[1]);
Oops, something went wrong.

0 comments on commit d696da1

Please sign in to comment.