Changeset 905


Ignore:
Timestamp:
10/15/07 23:08:28 (7 years ago)
Author:
ray
Message:
  • added Xinha copyright notice to XinhaCore?.js and about popup (see #916)
  • compress.php now adds a prefix to each file stating that this is a compressed file an uncompressed version of which can be found on Xinha.org; XinhaCore?.js additionally keeps copyright & licensing info
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/XinhaCore.js

    r894 r905  
    11  
    22  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:-- 
    3     --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/ 
     3    --  Xinha (is not htmlArea) - http://xinha.org 
    44    -- 
    55    --  Use of Xinha is granted by the terms of the htmlArea License (based on 
    66    --  BSD license)  please read license.txt in this package for details. 
    77    -- 
     8    --  Copyright (c) 2005-2007 Xinha Developer Team and contributors 
     9    --   
    810    --  Xinha was originally based on work by Mihai Bazon which is: 
    911    --      Copyright (c) 2003-2004 dynarch.com. 
  • trunk/contrib/compress.php

    r823 r905  
    2828                        $url  = $durl . '/' . $file; 
    2929 
    30                         if(preg_match("/.svn|lang/",$path)) continue; 
     30                        if(preg_match("/\.svn|lang/",$path)) continue; 
    3131                         
    3232                        if(is_dir($path)) 
     
    4949$cwd = getcwd(); 
    5050print "Processing ".count($return)." files<br />"; 
     51 
     52$prefix = "/* This compressed file is part of Xinha. For uncomressed sources, forum, and bug reports, go to xinha.org */"; 
     53$core_prefix = ' 
     54  /*-------------------------------------------------------------------------- 
     55    --  Xinha (is not htmlArea) - http://xinha.org 
     56    -- 
     57    --  Use of Xinha is granted by the terms of the htmlArea License (based on 
     58    --  BSD license)  please read license.txt in this package for details. 
     59    -- 
     60    --  Copyright (c) 2005-2007 Xinha Developer Team and contributors 
     61    --   
     62    --  Xinha was originally based on work by Mihai Bazon which is: 
     63    --      Copyright (c) 2003-2004 dynarch.com. 
     64    --      Copyright (c) 2002-2003 interactivetools.com, inc. 
     65    --      This copyright notice MUST stay intact for use. 
     66    -------------------------------------------------------------------------*/ 
     67'; 
    5168foreach ($return as $file) 
    5269{ 
     
    5572        flush(); 
    5673        copy($file,$file."_uncompr.js"); 
    57         exec("java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js > $file 2>&1"); 
     74 
     75        exec("echo \"".(preg_match('/XinhaCore.js$/',$file) ? $prefix.$core_prefix : $prefix)."\" > $file && java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js >> $file 2>&1"); 
    5876        if (preg_match('/js: ".*?", line \d+:/',file_get_contents($file))) 
    5977        { 
  • trunk/popups/about.html

    r858 r905  
    2020<script type="text/javascript" src="popup.js"></script> 
    2121<script type="text/javascript"> 
    22 window.resizeTo(450, 250); 
     22window.resizeTo(450, 365); 
    2323var TABS = []; 
    2424var CURRENT_TAB = 0; 
     
    199199   Use of Xinha is granted by the terms of the htmlArea License (based on BSD license) 
    200200  </p> 
     201 <pre> 
     202Copyright (c) 2005-2007 Xinha Developer Team and contributors 
     203        </pre> 
    201204  <p> 
    202205    Xinha was originally based on work by Mihai Bazon which is: 
    203206  </p> 
    204   <blockquote><pre>Copyright (c) 2003-2004 dynarch.com. 
    205     Copyright (c) 2002-2003 interactivetools.com, inc. 
    206     This copyright notice MUST stay intact for use.</pre></blockquote> 
    207  
     207  <pre> 
     208Copyright (c) 2003-2004 dynarch.com. 
     209Copyright (c) 2002-2003 interactivetools.com, inc. 
     210This copyright notice MUST stay intact for use. 
     211  </pre> 
    208212</div> 
    209213 
  • trunk/release-notes.txt

    r824 r905  
    55 
    66Release History 
     7 
     8Xinha 0.94 
     9 * Ticket #1093 [InsertSmiley] remove smiley gifs from trunk 
     10 * fixed Ticket #1019 Cusor not jumping to editable part of window when clicked in IE 
     11 * [TableOperations] Add config option to not dispaly toolbar buttons 
     12 * fixed Ticket #1021  Prevent ExtendedFileManager from masking ImageManager 
     13 * fixed Ticket #1023 [ImageManager] Add config item to allow the advanced image options to be hidden from the user 
     14 * fixed Ticket #1026 fix problems with loading skins 
     15 * fixed Tickets #1030 & #1031: slow loading large pages in IE 
     16 * fixed Ticket #1034 [ExtendedFileManager] Color pickers shown when use_color_pickers is false 
     17 * fixed Ticket #1035 [TransformInnerHTML] tags corruptedunder certain circumstances 
     18 * fixed Ticket #1036 [ExtendedFileManager] window is only resized after all thumbnails have benn loaded, which can take quite some time 
     19 * fixed Ticket #1039 Firefox full page adds multiple paragraphs after view source 
     20 * fixed Ticket #1019 Cusor not jumping to editable part of window when clicked in IE7 
     21 * fixed Ticket #1046 Error in IE 6 when switching from text to wysiwyg 
     22 * [DOMwalk] linebreaks inserted before <br />s 
     23 * catch error in IE when trying to restore selection on non-displayed area 
     24 * fixed Ticket #973 Error switching wysiwyg/html including javascript file on the code 
     25 * fixed Ticket #1028  - [Linker] automatically (attempt to) work around an issue with mod_security being triggered because of the charset on our POST requests 
     26 * fixed Ticket #1055 [Stylist] Inappropriate styles (for other tags) are shown 
     27 * added Dutch language files 
     28 * added new hook 'onBeforeSubmit' for firePluginEvent() 
     29 * added new hook 'onBeforeUnload' for firePluginEvent() 
     30 * fixed Ticket #1048 Full Screen plugin doesn't load if many editors on page 
     31 * fixed Ticket #1053 ListType plugin doesn't work in panel config with multiple editors 
     32 * fixed Ticket #1026 Skins referenced with <link>-tags don't work anymore 
     33 * fixed Ticket #1059 [Equation] loosing formula onsubmit 
     34 * fixed Ticket #1060 [Equation] various updates 
     35 * [Equation] preserve formula on reload in Mozilla 
     36 * [Equation] updated ASCIIMathML.js 
     37 * [Skin:silva] padding and border on textarea make the textmode too wide  
     38 * fixed Ticket#1001 Editor loads a bunch of null urls in ie 
     39 * fixed Ticket #1068 [TranformInnerHTML] newlines added after </script> 
     40 * fixed Ticket#1069 Editor document URL prefixed to any href that only consists of URL parameters 
     41 * added Thai translation for core 
     42 * added complete Portuguese Brazilian translation 
     43 * updated lc_parse script 
     44 * fixed Ticket #1071 [ExtendedFileManager] external image URL image inserted with width/height 0, amking it invisible 
     45 * fixed Ticket #1074 [SuperClean] throws warnings in PHP 5 
     46 * fixed Ticket #1079 [DynamicCSS] lists Xinha internal CSS 
     47 * fixed Ticket #1080 Some plugins leave behind stylesheet links in fullpage mode 
     48 * fixed Ticket #1083 Convert URLs to links - Error 
     49 * fixed Ticket #1084 URL auto-linking (Gecko): URLs with user:password@domain.tld falsely recognized as email address 
     50 * fixed Ticket #1085 URL auto-linking (Gecko): IP numbers don't work 
     51 * fixed Ticket #1081 Control character is not being removed inside SCRIPT tags or HEAD when switching from textmode to htmlmode 
     52 * fixed Ticket #1078 [InsertImage] spacing attributes: inconsistent behaviour when editing image 
     53 * fixed Ticket #1089 [Color Picker] Localize OK Label 
     54 * fixed Ticket #1091 [SaveSubmit] does not correctly submit value of checkboxes and radio buttons 
    755 
    856Xinha 0.93 
Note: See TracChangeset for help on using the changeset viewer.