{'Extensions'|i18n('design/standard/setup','eZ Publish extensions')}
- {$Order:item.account_name|wash}
+ {$Order:item.account_name|wash}
{$Order:item.total_ex_vat|l10n(currency)}
diff --git a/design/standard/templates/sitedata/list.tpl b/design/standard/templates/sitedata/list.tpl
new file mode 100644
index 00000000000..eaecf83b81b
--- /dev/null
+++ b/design/standard/templates/sitedata/list.tpl
@@ -0,0 +1,45 @@
+Site Data
+
+Search by key
+
+
+
+Found {$count|wash()} entrie(s).
+
+{if $entries}
+
+
+
+ Key
+ Value
+
+
+
+ {foreach $entries as $entry}
+
+
+ {$entry.name|wash()}
+
+
+ {$entry.value|wash()}
+
+
+ {/foreach}
+
+
+
+
+ {include
+ name='navigator'
+ uri='design:navigator/google.tpl'
+ page_uri='/sitedata/list/'
+ item_count=$count
+ view_parameters=$view_parameters
+ item_limit=$limit
+ }
+
+{/if}
\ No newline at end of file
diff --git a/doc/INSTALL b/doc/INSTALL
deleted file mode 100644
index 4727a0f0d5b..00000000000
--- a/doc/INSTALL
+++ /dev/null
@@ -1,46 +0,0 @@
-eZ Publish 4 INSTALL
-
-
-Requirements
-------------
-
-o Apache version:
-
- The latest version of the 1.3 branch.
- or
- Apache 2.x run in "prefork" mode.
-
-o PHP version:
-
- The latest version of the 5.2 branch is strongly recommended.
-
- Note that you will have to increase the default "memory_limit" setting
- which is located in the "php.ini" configuration file to 64 MB or larger. (Don't
- forget to restart Apache after editing "php.ini".)
-
- The date.timezone directive must be set in php.ini or in
- .htaccess. For a list of supported timezones please see
- http://php.net/manual/en/timezones.php
-
-
-o Database server:
-
- MySQL 4.1 or later (UTF-8 is required)
- or
- PostgreSQL 8.x
- or
- Oracle 11g
-
-o eZ Components:
- Enterprise edition includes a version of eZ Components that is tested and certified
- with this version of eZ Publish-
-
- The community edition requires the latest stable release of eZ Components.
- To install this, you also need PEAR
- See http://ez.no/ezcomponents for more information
-
-
-Installation guide
-------------------
-
-You will find the installation guide at http://ez.no/doc
\ No newline at end of file
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
new file mode 100644
index 00000000000..c30b51754d6
--- /dev/null
+++ b/doc/INSTALL.md
@@ -0,0 +1,15 @@
+Lovestack installation instructions
+===
+
+With composer
+--
+
+1) Install composer (https://getcomposer.org/)
+2) Download following composer config file:
+`wget -O composer.json https://raw.githubusercontent.com/mugoweb/ezpublish-legacy/master/doc/composer_project_example.json`
+3) Edit the file `composer.json` and remove all comments. Decide if you'd like to use some of the packages that are currently commented out.
+4) Execute 'composer install' - it will install the Lovestack into a subdirectory
+5) Make sure your web server is serving a PHP application from the subdirectory the composer process created
+6) Use a web browser to access the Lovestack application
+7) Follow the instructions of the web installation wizard
+8) It's a good idea to _Store the commit hash in eZ Publish_. See [update/README.md](update/README.md)
diff --git a/doc/examples/htaccess b/doc/apache2/htaccess
similarity index 100%
rename from doc/examples/htaccess
rename to doc/apache2/htaccess
diff --git a/doc/examples/ezpublish.conf b/doc/apache2/legacy.conf
similarity index 97%
rename from doc/examples/ezpublish.conf
rename to doc/apache2/legacy.conf
index e3fcde063d5..fad775507db 100644
--- a/doc/examples/ezpublish.conf
+++ b/doc/apache2/legacy.conf
@@ -6,7 +6,7 @@ NameVirtualHost [IP_ADDRESS]
ServerAlias [SERVER_ALIAS]
- Options FollowSymLinks
+ Options FollowSymLinks
AllowOverride None
@@ -26,13 +26,13 @@ NameVirtualHost [IP_ADDRESS]
RewriteEngine On
# REST API
RewriteRule ^/api/ /index_rest.php [L]
-
+
RewriteRule ^/([^/]+/)?content/treemenu.* /index_treemenu.php [L]
RewriteRule ^/var/([^/]+/)?storage/images(-versioned)?/.* - [L]
RewriteRule ^/var/([^/]+/)?cache/(texttoimage|public)/.* - [L]
RewriteRule ^/design/[^/]+/(stylesheets|images|javascript|fonts)/.* - [L]
RewriteRule ^/share/icons/.* - [L]
- RewriteRule ^/extension/[^/]+/design/[^/]+/(stylesheets|flash|images|lib|javascripts?)/.* - [L]
+ RewriteRule ^/extension/[^/]+/design/[^/]+/(stylesheets|flash|images|lib|fonts|javascripts?)/.* - [L]
RewriteRule ^/packages/styles/.+/(stylesheets|images|javascript)/[^/]+/.* - [L]
RewriteRule ^/packages/styles/.+/thumbnail/.* - [L]
RewriteRule ^/var/storage/packages/.* - [L]
@@ -70,7 +70,7 @@ NameVirtualHost [IP_ADDRESS]
ExpiresDefault "now plus 10 years"
-
+
# A good optimization if you normally don't change your design often
ExpiresActive on
ExpiresDefault "now plus 5 days"
diff --git a/doc/apache2/newstack_legacy.conf b/doc/apache2/newstack_legacy.conf
new file mode 100644
index 00000000000..d7b119a0e0f
--- /dev/null
+++ b/doc/apache2/newstack_legacy.conf
@@ -0,0 +1,191 @@
+# Official VirtualHost configuration for Apache 2.x
+# Note: This is meant to be tailored for your needs, expires headers might for instance not work for dev.
+# Params: %IP_ADDRESS%, %PORT%, %HOST%, %HOST_ALIAS%, %BASEDIR%, %ENV% and %PROXY%
+
+# NameVirtualHost %IP_ADDRESS%
+
+
+ ServerName %HOST%
+ ServerAlias %HOST_ALIAS%
+ DocumentRoot %BASEDIR%/web
+ DirectoryIndex index.php
+
+ # Enabled for Dev environment
+ # LogLevel debug
+
+
+ Options FollowSymLinks
+ AllowOverride None
+ # depending on your global Apache settings, you may need to uncomment and adapt
+ # for Apache 2.2 and earlier:
+ #Allow from all
+ # for Apache 2.4:
+ #Require all granted
+
+
+ ## eZ Publish ENVIRONMENT variables, used for customizing index.php execution (not used by console commands)
+
+ # Environment.
+ # Possible values: "prod" and "dev" out-of-the-box, other values possible with proper configuration
+ # Defaults to "prod" if omitted (uses SetEnvIf so value can be used in rewrite rules)
+ SetEnvIf Request_URI ".*" ENVIRONMENT=%ENV%
+
+ # Whether to use custom ClassLoader (autoloader) file
+ # Needs to be a valid path relative to root web/ directory
+ # Defaults to bootstrap.php.cache, or autoload.php in debug, supported on 2015.01 and higher
+ #SetEnv CUSTOM_CLASSLOADER_FILE "../ezpublish/autoload.php"
+
+ # Whether to use Symfony's ApcClassLoader.
+ # Possible values: 0 or 1
+ # Defaults to 0 if omitted, supported on 5.2 and higher
+ #! Not supported as of 2015.01, use CUSTOM_CLASSLOADER_FILE instead for this.
+ #SetEnv USE_APC_CLASSLOADER 0
+
+ # Prefix used when USE_APC_CLASSLOADER is set to 1.
+ # Use a unique prefix in order to prevent cache key conflicts
+ # with other applications also using APC.
+ # Defaults to "ezpublish" if omitted, supported on 5.2 and higher
+ #! Not supported as of 2015.01, use CUSTOM_CLASSLOADER_FILE instead for this.
+ #SetEnv APC_CLASSLOADER_PREFIX "ezpublish"
+
+ # Whether to use debugging.
+ # Possible values: 0 or 1
+ # Defaults to 0 if omitted, unless ENVIRONMENT is set to: "dev", supported on 5.2 and higher
+ #SetEnv USE_DEBUGGING 0
+
+ # Whether to use Symfony's HTTP Caching.
+ # Disable it if you are using an external reverse proxy (e.g. Varnish)
+ # Possible values: 0 or 1
+ # Defaults to 1 if omitted, unless ENVIRONMENT is set to: "dev", supported on 5.2 and higher
+ #SetEnv USE_HTTP_CACHE 1
+
+ # Whether to use custom HTTP Cache class if USE_HTTP_CACHE is enabled
+ # Value must be a autoloadable cache class
+ # Defaults to to use "EzPublishCache", supported on 2015.01 and higher
+ #SetEnv HTTP_CACHE_CLASS "\Vendor\Project\MyCache"
+
+ # Defines the proxies to trust.
+ # Separate entries by a comma
+ # Example: "proxy1.example.com,proxy2.example.org"
+ # By default, no trusted proxies are set, supported on 5.2 and higher
+ #SetEnv TRUSTED_PROXIES "%PROXY%"
+
+
+ RewriteEngine On
+
+ # Uncomment in FastCGI mode or when using PHP-FPM, to get basic auth working.
+ RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
+ # Needed for ci testing, remove in prod.
+ RewriteCond %{REQUEST_URI} ^/php5-fcgi(.*)
+ RewriteRule . - [L]
+
+ # If using cluster, uncomment the following two lines:
+ ## For 5.4 and higher:
+ #RewriteRule ^/var/([^/]+/)?storage/images(-versioned)?/.* /index.php [L]
+ #RewriteRule ^/var/([^/]+/)?cache/(texttoimage|public)/.* /index_cluster.php [L]
+ ## Versions prior to 5.4:
+ #RewriteRule ^/var/([^/]+/)?storage/images(-versioned)?/.* /index_cluster.php [L]
+ #RewriteRule ^/var/([^/]+/)?cache/(texttoimage|public)/.* /index_cluster.php [L]
+
+ RewriteRule ^/var/([^/]+/)?storage/images(-versioned)?/.* - [L]
+ RewriteRule ^/var/([^/]+/)?cache/(texttoimage|public)/.* - [L]
+ RewriteRule ^/design/[^/]+/(stylesheets|images|javascript|fonts)/.* - [L]
+ RewriteRule ^/share/icons/.* - [L]
+ RewriteRule ^/extension/[^/]+/design/[^/]+/(stylesheets|flash|images|lib|fonts|javascripts?)/.* - [L]
+ RewriteRule ^/packages/styles/.+/(stylesheets|images|javascript)/[^/]+/.* - [L]
+ RewriteRule ^/packages/styles/.+/thumbnail/.* - [L]
+ RewriteRule ^/var/storage/packages/.* - [L]
+
+ # Makes it possible to place your favicon at the root of your
+ # eZ Publish instance. It will then be served directly.
+ RewriteRule ^/favicon\.ico - [L]
+
+ # Uncomment the line below if you want your favicon be served
+ # from the standard design. You can customize the path to
+ # favicon.ico by changing /design/standard/images/favicon\.ico
+ #RewriteRule ^/favicon\.ico /design/standard/images/favicon.ico [L]
+ RewriteRule ^/design/standard/images/favicon\.ico - [L]
+
+ # Give direct access to robots.txt for use by crawlers (Google,
+ # Bing, Spammers..)
+ RewriteRule ^/robots\.txt - [L]
+
+ # Platform for Privacy Preferences Project ( P3P ) related files
+ # for Internet Explorer
+ # More info here : http://en.wikipedia.org/wiki/P3p
+ RewriteRule ^/w3c/p3p\.xml - [L]
+
+ # Uncomment the following lines when using popup style debug in legacy
+ #RewriteRule ^/var/([^/]+/)?cache/debug\.html.* - [L]
+
+ # Following rule is needed to correctly display assets from eZ Publish5 / Symfony bundles
+ RewriteRule ^/bundles/ - [L]
+
+ # Additional Assetic rules for environments different from dev,
+ # remember to run php ezpublish/console assetic:dump --env=prod
+ RewriteCond %{ENV:ENVIRONMENT} !^(dev)
+ RewriteRule ^/(css|js|font)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
+
+ # Conditions for enabling webdav and soap interfaces from legacy
+ ## Symlink files into your web folder and correct domain names to be valid server aliases
+ #RewriteCond %{HTTP_HOST} ^webdav\..*
+ #RewriteRule ^(.*) /webdav.php [L]
+ #RewriteCond %{HTTP_HOST} ^soap\..*
+ #RewriteRule ^(.*) /soap.php [L]
+
+ # For 5.x versions prior to 5.2, enable this to use dev env based on ENVIRONMENT variable set above
+ #RewriteCond %{ENV:ENVIRONMENT} "dev"
+ #RewriteRule .* /index_dev.php [L]
+
+ # Prevent access to website with direct usage of app.php in URL
+ RewriteRule ^/(.+/)?index\.php - [R=404,L]
+
+ RewriteRule .* /index.php
+
+
+ # Everything below is optional to improve performance by forcing
+ # clients to cache image and design files, change the expires time
+ # to suite project needs.
+
+
+ # eZ Publish appends the version number to image URL (ezimage
+ # datatype) so when an image is updated, its URL changes to
+ ExpiresActive on
+ ExpiresDefault "now plus 10 years"
+
+
+
+ # A good optimization if you don't change your design often
+ ExpiresActive on
+ ExpiresDefault "now plus 5 days"
+
+
+
+ # Libraries get a new url (version number) on updates
+ ExpiresActive on
+ ExpiresDefault "now plus 90 days"
+
+
+
+ # Same as above for bundled eZ Publish designs
+ ExpiresActive on
+ ExpiresDefault "now plus 7 days"
+
+
+
+ # Icons as used by admin interface, barly change
+ ExpiresActive on
+ ExpiresDefault "now plus 7 days"
+
+
+ # When ezjscore.ini/[Packer]/AppendLastModifiedTime=enabled
+ # so that file names change when source files are modified
+ #
+ # Force ezjscore packer js/css files to be cached 30 days
+ # at client side
+ #ExpiresActive on
+ #ExpiresDefault "now plus 30 days"
+ #
+
+
\ No newline at end of file
diff --git a/doc/bc/5.4/changes-5.4.txt b/doc/bc/5.4/changes-5.4.txt
index 45d9d22b6fe..bb7d3ba2e38 100644
--- a/doc/bc/5.4/changes-5.4.txt
+++ b/doc/bc/5.4/changes-5.4.txt
@@ -16,6 +16,10 @@ Change of behavior
Note: To avoid that you have to many cache blocks take advantage of putting identical once in
own template so they will share cache (template and location of block is part of internal unique key).
+- EZP-26028: Unable to use Online Editor when using PHP7
+
+ To fix this issue, first parameter of all XML input and output handlers, `$xmlData` can not be a reference anymore.
+
Removed features
----------------
diff --git a/doc/bc/5.90/password_length.md b/doc/bc/5.90/password_length.md
new file mode 100644
index 00000000000..e6fd868b612
--- /dev/null
+++ b/doc/bc/5.90/password_length.md
@@ -0,0 +1,9 @@
+# Default password length requirement changes
+
+For first v2019 release, the default password length requirement has been increased to 10 characters. Existing passwords that are shorter than this will continue to work, but when creating new passwords the new requirement must be fulfilled.
+
+The default password of the Admin user is not changed. But you must of course change it before going live with a new project, and when you do, the new rule comes into effect.
+
+The length of autogenerated passwords has also been increased, to 16 characters.
+
+These defaults can be changed in site.ini [UserSettings], see MinPasswordLength and GeneratePasswordLength.
diff --git a/doc/composer_project_example.json b/doc/composer_project_example.json
new file mode 100644
index 00000000000..1d3d3d1c185
--- /dev/null
+++ b/doc/composer_project_example.json
@@ -0,0 +1,34 @@
+{
+ "name": "mugoweb/project",
+ "description": "Mugo base project installer",
+ "license": "GPL-2.0",
+ "minimum-stability": "dev",
+ "require": {
+ "mugoweb/ezpublish-legacy": "*",
+
+ // == eZ Systems extensions ==
+ // "ezsystems/ezgmaplocation-ls-extension": "~5.3",
+ // "ezsystems/ezie-ls": "~5.3",
+ // "ezsystems/ezmbpaex-ls": "~5.3",
+ // "ezsystems/ezmultiupload-ls": "~5.3",
+ // "ezsystems/ezodf-ls": "~5.3",
+ // "ezsystems/ezprestapiprovider-ls": "~5.3",
+ // "ezsystems/ezstarrating-ls-extension": "~5.3",
+
+ // == Mugo Extensions ==
+ // "mugoweb/mugo_varnish": "*",
+ // "mugoweb/mugocontentclassmanager": "*",
+ // "mugoweb/data_import": "*",
+ // "mugoweb/mugo_view_extras": "*",
+
+ // eep - no composer file yet
+ // mugoweb/mugo_queue - no composer file yet
+ },
+ "extra": {
+ "ezpublish-legacy-dir": "project"
+ },
+ "config": {
+ "vendor-dir": "project/vendor",
+ "discard-changes": true
+ }
+}
\ No newline at end of file
diff --git a/doc/features/5.4/event.txt b/doc/features/5.4/event.txt
index 11b158b0a2e..0e9afd008f0 100644
--- a/doc/features/5.4/event.txt
+++ b/doc/features/5.4/event.txt
@@ -2,6 +2,7 @@ Event system
============
- Added new events for image aliases removal
+- 5.4.6 Added new events for state assigments
New events
----------
@@ -10,3 +11,6 @@ image/invalidateAliases
image/removeAliases ( $originalAliasURI )
image/purgeAliases ( $originalAliasURI )
image/trashAliases ( $originalAliasURI )
+
+
+content/state/assign ( $objectID, $selectedStateIDList )
diff --git a/extension/ezformtoken/event/ezxformtoken.php b/extension/ezformtoken/event/ezxformtoken.php
old mode 100755
new mode 100644
diff --git a/extension/ezformtoken/settings/site.ini.append.php b/extension/ezformtoken/settings/site.ini.append.php
old mode 100755
new mode 100644
diff --git a/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php b/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php
index c94b42347d8..98ede4a47c9 100644
--- a/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php
+++ b/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php
@@ -38,10 +38,6 @@
class ezjscAccessTemplateFunctions
{
- function ezjscAccessTemplateFunctions()
- {
- }
-
function operatorList()
{
return array( 'has_access_to_limitation' );
diff --git a/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php b/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php
index bd709090206..2d03191bfda 100644
--- a/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php
+++ b/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php
@@ -42,10 +42,6 @@
class ezjscEncodingTemplateFunctions
{
- function ezjscEncodingTemplateFunctions()
- {
- }
-
function operatorList()
{
return array( 'json_encode',
diff --git a/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php b/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php
index 006b3e05f77..0026d18a20d 100644
--- a/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php
+++ b/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php
@@ -84,10 +84,6 @@
class ezjscPackerTemplateFunctions
{
- function ezjscPackerTemplateFunctions()
- {
- }
-
function operatorList()
{
return array( 'ezscript', 'ezscript_require', 'ezscript_load', 'ezscriptfiles', 'ezcss', 'ezcss_require', 'ezcss_load', 'ezcssfiles' );
diff --git a/extension/ezjscore/classes/ezjsccssoptimizer.php b/extension/ezjscore/classes/ezjsccssoptimizer.php
index faf19193232..460928485c8 100644
--- a/extension/ezjscore/classes/ezjsccssoptimizer.php
+++ b/extension/ezjscore/classes/ezjsccssoptimizer.php
@@ -72,7 +72,7 @@ public static function optimize( $css, $packLevel = 2 )
// Optimize hex colors from #bbbbbb to #bbb
$css = preg_replace( "/color:#([0-9a-fA-F])\\1([0-9a-fA-F])\\2([0-9a-fA-F])\\3/", "color:#\\1\\2\\3", $css );
}
- return $css;
+ return trim( $css );
}
}
?>
diff --git a/extension/ezjscore/classes/ezjscpacker.php b/extension/ezjscore/classes/ezjscpacker.php
index 0a196152865..30fb69da940 100644
--- a/extension/ezjscore/classes/ezjscpacker.php
+++ b/extension/ezjscore/classes/ezjscpacker.php
@@ -495,6 +495,7 @@ static function fixImgPaths( $fileContent, $file )
{
if ( preg_match_all( "/url\(\s*[\'|\"]?([A-Za-z0-9_\-\/\.\\%?&#=]+)[\'|\"]?\s*\)/ix", $fileContent, $urlMatches ) )
{
+ $urlPaths = array();
$urlMatches = array_unique( $urlMatches[1] );
$cssPathArray = explode( '/', $file );
$wwwDir = self::getWwwDir();
@@ -515,9 +516,10 @@ static function fixImgPaths( $fileContent, $file )
$newMatchPath .= implode( '/', $cssPathSlice ) . '/';
}
$newMatchPath .= str_replace( '../', '', $match );
- $fileContent = str_replace( $match, $newMatchPath, $fileContent );
+ $urlPaths[$match] = $newMatchPath;
}
}
+ $fileContent = strtr( $fileContent, $urlPaths );
}
return $fileContent;
}
diff --git a/extension/ezjscore/classes/ezjscserverfunctionsajaxuploader.php b/extension/ezjscore/classes/ezjscserverfunctionsajaxuploader.php
index 18889298005..e02fa9393be 100644
--- a/extension/ezjscore/classes/ezjscserverfunctionsajaxuploader.php
+++ b/extension/ezjscore/classes/ezjscserverfunctionsajaxuploader.php
@@ -370,6 +370,17 @@ static function preview( $args )
$http->postVariable( 'UploadLocation', false ),
$http->postVariable( 'UploadName', '' )
);
+
+ if( $http->hasPostVariable( 'UploadAlternativeText' ) )
+ {
+ $data_map = $contentObject->attribute( 'data_map' );
+ $imgAttribute = $data_map[ 'image' ];
+ $content = $imgAttribute->attribute( 'content' );
+
+ $content->setAttribute( 'alternative_text', $http->postVariable( 'UploadAlternativeText' ) );
+ $content->store( $imgAttribute );
+ }
+
unlink( $tmpFile );
$tpl = eZTemplate::factory();
diff --git a/extension/ezjscore/classes/ezjscserverfunctionsnode.php b/extension/ezjscore/classes/ezjscserverfunctionsnode.php
index 681e7211bc3..673f83966ab 100644
--- a/extension/ezjscore/classes/ezjscserverfunctionsnode.php
+++ b/extension/ezjscore/classes/ezjscserverfunctionsnode.php
@@ -64,6 +64,14 @@ public static function subTree( $args )
throw new ezcBaseFunctionalityNotSupportedException( 'Fetch node list', "Parent node '$parentNodeID' is not valid" );
}
+ $ezjscoreIni = eZINI::instance( 'ezjscore.ini' );
+ $hardLimit = (int)$ezjscoreIni->variable( 'ezjscServer_ezjscnode', 'HardLimit' );
+
+ if ( $hardLimit > 0 && $limit > $hardLimit )
+ {
+ $limit = $hardLimit;
+ }
+
$params = array( 'Depth' => 1,
'Limit' => $limit,
'Offset' => $offset,
diff --git a/extension/ezjscore/classes/ezjscserverrouter.php b/extension/ezjscore/classes/ezjscserverrouter.php
index 0a9dc7a1868..399cc01bc72 100644
--- a/extension/ezjscore/classes/ezjscserverrouter.php
+++ b/extension/ezjscore/classes/ezjscserverrouter.php
@@ -40,7 +40,7 @@ class ezjscServerRouter
protected $functionArguments = array();
protected $isTemplateFunction = false;
- protected function ezjscServerRouter( $className, $functionName = 'call', array $functionArguments = array(), $isTemplateFunction = false )
+ protected function __construct( $className, $functionName = 'call', array $functionArguments = array(), $isTemplateFunction = false )
{
$this->className = $className;
$this->functionName = $functionName;
diff --git a/extension/ezjscore/design/standard/javascript/jquery-ui-1.10.3.custom.min.js b/extension/ezjscore/design/standard/javascript/jquery-ui-1.10.3.custom.min.js
old mode 100755
new mode 100644
diff --git a/extension/ezjscore/design/standard/lib/yui/2.8.2/build/uploader/assets/uploader.swf b/extension/ezjscore/design/standard/lib/yui/2.8.2/build/uploader/assets/uploader.swf
deleted file mode 100644
index dfc94f62ec9..00000000000
Binary files a/extension/ezjscore/design/standard/lib/yui/2.8.2/build/uploader/assets/uploader.swf and /dev/null differ
diff --git a/extension/ezjscore/settings/ezjscore.ini b/extension/ezjscore/settings/ezjscore.ini
index 5e01a81f3eb..0f1aa89c7f7 100644
--- a/extension/ezjscore/settings/ezjscore.ini
+++ b/extension/ezjscore/settings/ezjscore.ini
@@ -116,6 +116,13 @@ Class=ezjscServerFunctionsJs
Class=ezjscServerFunctionsNode
#File=extension/ezjscore/classes/ezjscserverfunctionsnode.php
+# Allows setting a Hard Limit to the subtree method to prevent the load of very large subtrees
+# reducing server load and risk of DOS attacks.
+# false disables the feature, any integer will set the hard limit.
+# for example: a hard limit of 100 will allow limiting to 30 or 40, but will replace a
+# limit of 150.
+HardLimit=100
+
[ezjscServer_ezjsctemplate]
# Url to test this server function(return alert message):
# /ezjscore/call/ezjsctemplate::alert
diff --git a/extension/ezoe/autoloads/ezoetemplateutils.php b/extension/ezoe/autoloads/ezoetemplateutils.php
index a964cb4bfdb..d307fdbffa5 100644
--- a/extension/ezoe/autoloads/ezoetemplateutils.php
+++ b/extension/ezoe/autoloads/ezoetemplateutils.php
@@ -35,10 +35,6 @@
class eZOETemplateUtils
{
- function eZOETemplateUtils()
- {
- }
-
function operatorList()
{
return array( 'ezoe_ini_section' );
diff --git a/extension/ezoe/design/standard/javascript/classes/Editor.js b/extension/ezoe/design/standard/javascript/classes/Editor.js
index 5a72ccf8073..2dc9538bd58 100644
--- a/extension/ezoe/design/standard/javascript/classes/Editor.js
+++ b/extension/ezoe/design/standard/javascript/classes/Editor.js
@@ -217,17 +217,20 @@
tinyMCE.settings = s;
// Element not found, then skip initialization
- if (!t.getElement())
+ if (!t.getElement()) {
return;
+ }
// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
// here since the browser says it has contentEditable support but there is no visible caret.
- if (tinymce.isIDevice && !tinymce.isIOS5)
+ if (tinymce.isIDevice && !tinymce.isIOS5) {
return;
+ }
// Add hidden input for non input elements inside form elements
- if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))
+ if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form')) {
DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);
+ }
// Hide target element early to prevent content flashing
if (!s.content_editable) {
@@ -254,13 +257,15 @@
* custom_param : 1
* });
*/
- if (tinymce.WindowManager)
+ if (tinymce.WindowManager) {
t.windowManager = new tinymce.WindowManager(t);
+ }
if (s.encoding == 'xml') {
t.onGetContent.add(function(ed, o) {
- if (o.save)
+ if (o.save) {
o.content = DOM.encode(o.content);
+ }
});
}
@@ -275,8 +280,9 @@
if (s.add_unload_trigger) {
t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {
- if (t.initialized && !t.destroyed && !t.isHidden())
+ if (t.initialized && !t.destroyed && !t.isHidden()) {
t.save({format : 'raw', no_events : true});
+ }
});
}
@@ -286,12 +292,14 @@
t.onBeforeRenderUI.add(function() {
var n = t.getElement().form;
- if (!n)
+ if (!n) {
return;
+ }
// Already patched
- if (n._mceOldSubmit)
+ if (n._mceOldSubmit) {
return;
+ }
// Check page uses id="submit" or name="submit" for it's submit button
if (!n.submit.nodeType && !n.submit.length) {
@@ -312,11 +320,13 @@
// Load scripts
function loadScripts() {
- if (s.language && s.language_load !== false)
+ if (s.language && s.language_load !== false) {
sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
+ }
- if (s.theme && typeof s.theme != "function" && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
+ if (s.theme && typeof s.theme != "function" && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme]) {
ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+ }
each(explode(s.plugins), function(p) {
if (p &&!PluginManager.urls[p]) {
@@ -340,10 +350,11 @@
// Init when que is loaded
sl.loadQueue(function() {
- if (!t.removed)
+ if (!t.removed) {
t.init();
+ }
});
- };
+ }
loadScripts();
},
@@ -377,8 +388,9 @@
o = ThemeManager.get(s.theme);
t.theme = new o();
- if (t.theme.init)
+ if (t.theme.init) {
t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
+ }
} else {
t.theme = s.theme;
}
@@ -406,14 +418,16 @@
// Setup popup CSS path(s)
if (s.popup_css !== false) {
- if (s.popup_css)
+ if (s.popup_css) {
s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);
- else
+ } else {
s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
+ }
}
- if (s.popup_css_add)
+ if (s.popup_css_add) {
s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);
+ }
/**
* Control manager instance for the editor. Will enables you to create new UI elements and change their states etc.
@@ -439,11 +453,13 @@
mh = s.min_height || 100;
re = /^[0-9\.]+(|px)$/i;
- if (re.test('' + w))
+ if (re.test('' + w)) {
w = Math.max(parseInt(w, 10) + (o.deltaWidth || 0), 100);
+ }
- if (re.test('' + h))
+ if (re.test('' + h)) {
h = Math.max(parseInt(h, 10) + (o.deltaHeight || 0), mh);
+ }
// Render UI
o = t.theme.renderUI({
@@ -461,8 +477,9 @@
});
h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
- if (h < mh)
+ if (h < mh) {
h = mh;
+ }
} else {
o = s.theme(t, e);
@@ -517,22 +534,25 @@
}
// User specified a document.domain value
- if (document.domain && location.hostname != document.domain)
+ if (document.domain && location.hostname != document.domain) {
tinymce.relaxedDomain = document.domain;
+ }
t.iframeHTML = s.doctype + '';
// We only need to override paths if we have to
// IE has a bug where it remove site absolute urls to relative ones if this is specified
- if (s.document_base_url != tinymce.documentBaseURL)
+ if (s.document_base_url != tinymce.documentBaseURL) {
t.iframeHTML += '
if (!node.attributes.map.name && !node.attributes.map.id) {
tempNode = node.parent;
- node.empty().remove();
+
+
+ if (blockElements[node.name]) {
+ node.empty().remove();
+ } else {
+ node.unwrap();
+ }
+
node = tempNode;
return;
}
@@ -621,7 +618,7 @@
// Found a non BR element
if (prevName !== "br")
break;
-
+
// Found another br it's a
so they become
+ // Replaces BR elements inside inline elements like
so they become
lastParent = node;
while (parent.firstChild === lastParent && parent.lastChild === lastParent) {
lastParent = parent;
diff --git a/extension/ezoe/design/standard/javascript/classes/tinymce.js b/extension/ezoe/design/standard/javascript/classes/tinymce.js
index dfb48e7a072..fa1f93c50a9 100644
--- a/extension/ezoe/design/standard/javascript/classes/tinymce.js
+++ b/extension/ezoe/design/standard/javascript/classes/tinymce.js
@@ -168,6 +168,13 @@
*/
t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
+ // Handle IE 12 sniffing
+ t.isIE12 = (document.msElementsFromPoint && !t.isIE && !t.isIE11);
+ if (t.isIE12) {
+ t.isIE11 = true;
+ t.isWebKit = false;
+ }
+
// TinyMCE .NET webcontrol might be setting the values for TinyMCE
if (win.tinyMCEPreInit) {
t.suffix = tinyMCEPreInit.suffix;
diff --git a/extension/ezoe/design/standard/javascript/classes/util/Quirks.js b/extension/ezoe/design/standard/javascript/classes/util/Quirks.js
index 8ecf8420a29..e01e2fb186f 100644
--- a/extension/ezoe/design/standard/javascript/classes/util/Quirks.js
+++ b/extension/ezoe/design/standard/javascript/classes/util/Quirks.js
@@ -295,20 +295,21 @@ tinymce.util.Quirks = function(editor) {
*/
function selectControlElements() {
editor.onClick.add(function(editor, e) {
- e = e.target;
-
- // Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
- // WebKit can't even do simple things like selecting an image
- // Needs tobe the setBaseAndExtend or it will fail to select floated images
- if (/^(IMG|HR)$/.test(e.nodeName)) {
- selection.getSel().setBaseAndExtent(e, 0, e, 1);
- }
-
- if (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor')) {
- selection.select(e);
- }
-
- editor.nodeChanged();
+ var target = e.target;
+
+ // Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
+ // WebKit can't even do simple things like selecting an image
+ // Needs tobe the setBaseAndExtend or it will fail to select floated images
+ if (/^(IMG|HR)$/.test(target.nodeName)) {
+ e.preventDefault();
+ editor.selection.select(target);
+ editor.nodeChanged();
+ }
+
+ if (target.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor')) {
+ e.preventDefault();
+ selection.select(target);
+ }
});
};
@@ -1034,6 +1035,34 @@ tinymce.util.Quirks = function(editor) {
});
}
+ /**
+ * Fixes control selection bug #6613 in IE 11 by an ugly hack. IE 11 has a bug where it will return the parent
+ * element container of an image if you select it as the last child in for
+ * example this HTML: a
+ */
+ function fixControlSelection() {
+ editor.onInit.add(function() {
+ var selectedRng;
+
+ editor.getBody().addEventListener('mscontrolselect', function(e) {
+ setTimeout(function() {
+ if (editor.selection.getNode() != e.target) {
+ selectedRng = editor.selection.getRng();
+ selection.fakeRng = editor.dom.createRng();
+ selection.fakeRng.setStartBefore(e.target);
+ selection.fakeRng.setEndAfter(e.target);
+ }
+ }, 0);
+ }, false);
+
+ editor.getDoc().addEventListener('selectionchange', function(e) {
+ if (selectedRng && !tinymce.dom.RangeUtils.compareRanges(editor.selection.getRng(), selectedRng)) {
+ selection.fakeRng = selectedRng = null;
+ }
+ }, false);
+ });
+ }
+
// All browsers
disableBackspaceIntoATable();
removeBlockQuoteOnBackSpace();
@@ -1070,6 +1099,7 @@ tinymce.util.Quirks = function(editor) {
// IE 11+
if (tinymce.isIE11) {
bodyHeight();
+ fixControlSelection();
}
// Gecko
diff --git a/extension/ezoe/design/standard/javascript/ezoe/ez_core.js b/extension/ezoe/design/standard/javascript/ezoe/ez_core.js
old mode 100755
new mode 100644
diff --git a/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js b/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js
index 90ec036c5ce..8436e042e0f 100644
--- a/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js
+++ b/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js
@@ -270,8 +270,6 @@ var eZOEPopupUtils = {
if ( 'TABLE'.indexOf( s.editorElement.tagName ) === 0 )
ed.selection.select( jQuery( s.editorElement ).find( "tr:first-child > *:first-child" ).get(0), true );
- else if ( 'DIV'.indexOf( s.editorElement.tagName ) === 0 )
- ed.selection.select( s.editorElement );
else
ed.selection.select( s.editorElement, true );
ed.nodeChanged();
@@ -747,7 +745,7 @@ var eZOEPopupUtils = {
var postData = '', val;
jQuery.each( jQuery('#' + id + ' input, #' + id + ' select').serializeArray(), function(i, o){
if ( o.value )
- postData += ( postData ? '&' : '') + o.name + '=' + o.value;
+ postData += ( postData ? '&' : '') + o.name + '=' + encodeURIComponent(o.value);
});
return postData;
},
diff --git a/extension/ezoe/design/standard/javascript/plugins/breakoutspace/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/breakoutspace/editor_plugin.js
new file mode 100644
index 00000000000..ed01a0a92ff
--- /dev/null
+++ b/extension/ezoe/design/standard/javascript/plugins/breakoutspace/editor_plugin.js
@@ -0,0 +1,56 @@
+/**
+ * Break Out Space TinyMCE plugin. When you press CTRL+Enter in a custom tag you will get an empty paragraph outside the tag
+ *
+ * @author Peter Keung
+ * @copyright Copyright 2014, Mugo Web
+ */
+
+( function()
+{
+ tinymce.create('tinymce.plugins.breakoutspace',
+ {
+ /**
+ * Initializes the plugin, this will be executed after the plugin has been created.
+ * This call is done before the editor instance has finished it's initialization so use the onInit event
+ * of the editor instance to intercept that event.
+ *
+ * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+ * @param {string} url Absolute URL to where the plugin is located.
+ */
+ init: function( ed, url )
+ {
+ ed.onKeyDown.add( function( ed, e )
+ {
+ // Capture CTRL+Enter
+ if( ( ( e.keyCode == 13 ) || ( e.keyCode == 10 ) ) && ( e.ctrlKey == true ) )
+ {
+ var dom = ed.dom;
+
+ var parents = dom.getParents( ed.selection.getNode() );
+ for( var i=0; i < parents.length; i++ )
+ {
+ currentNode = parents[i];
+ // Insert empty paragraph at the end of the parent of the closest custom tag
+ if( currentNode.nodeName == 'DIV' && currentNode.getAttribute( 'type' ) == 'custom' )
+ {
+ // dom.insertAfter doesn't work reliably
+ var uniqueID = dom.uniqueId();
+ jQuery( '
' ).insertAfter( currentNode );
+
+ // Move to the new node
+ var newParagraph = dom.select( 'p#' + uniqueID )[0];
+ ed.selection.setCursorLocation( newParagraph );
+
+ // Don't create an extra paragraph
+ e.preventDefault();
+ break;
+ }
+ }
+ }
+ });
+ }
+ });
+
+ // Register plugin
+ tinymce.PluginManager.add( 'breakoutspace', tinymce.plugins.breakoutspace );
+})();
diff --git a/extension/ezoe/design/standard/javascript/plugins/custom_tags_controls/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/custom_tags_controls/editor_plugin.js
new file mode 100644
index 00000000000..54267f08353
--- /dev/null
+++ b/extension/ezoe/design/standard/javascript/plugins/custom_tags_controls/editor_plugin.js
@@ -0,0 +1,106 @@
+/**
+ * Custom Tags Controls TinyMCE plugin. When you focus a custom tag there will appear some extra controls
+ *
+ * @author Peter Keung
+ * @copyright Copyright 2014, Mugo Web
+ */
+
+( function()
+{
+ tinymce.create('tinymce.plugins.custom_tags_controls',
+ {
+ /**
+ * Initializes the plugin, this will be executed after the plugin has been created.
+ * This call is done before the editor instance has finished it's initialization so use the onInit event
+ * of the editor instance to intercept that event.
+ *
+ * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+ * @param {string} url Absolute URL to where the plugin is located.
+ */
+ init: function( ed, url )
+ {
+ var t = this;
+ ed.onKeyDown.add( function( ed, e )
+ {
+ if( e.keyCode != 8 )
+ {
+ t.manageControls( ed );
+ }
+ else
+ {
+ elem = jQuery( ed.selection.getNode() ).closest('div.ezoeItemCustomTag,div.ezoeItemContentTypeObjects');
+ if( elem.length && elem.find('.custom_tags_controls').length != 0 && elem.text() == '' )
+ {
+ jQuery('
').insertBefore(elem);
+ elem.remove();
+ }
+ }
+ });
+ ed.onClick.add( function( ed, e )
+ {
+
+ t.manageControls( ed );
+ });
+ ed.onRemove.add( function( ed, e )
+ {
+ t.manageControls( ed );
+ });
+ },
+ manageControls: function( ed )
+ {
+ elem = jQuery( ed.selection.getNode() ).closest('div.ezoeItemCustomTag,div.ezoeItemContentTypeObjects');
+ if( elem.length && elem.find('.custom_tags_controls').length == 0 )
+ {
+ // first remove all existing controls
+ this.removeControls( ed );
+ this.addControls( elem );
+ }
+ else if( elem.length == 0 )
+ {
+ this.removeControls( ed );
+ }
+ },
+ addControls: function( elem )
+ {
+ elem.append( '
').insertAfter(parent);
+ }
+ }
+ });
+ elem.find('.custom_tags_controls.edit').on('click', function(event){
+ event.preventDefault();
+ event.stopPropagation();
+ var ed = tinyMCE.activeEditor;
+ parent = jQuery(this).closest('div.ezoeItemCustomTag,div.ezoeItemContentTypeObjects');
+ var currentDomElement = jQuery( ed.selection.getNode() ).closest('div.ezoeItemCustomTag,div.ezoeItemContentTypeObjects').get(0);
+ var x = ed.theme.__getTagCommand( currentDomElement );
+ if (x) ed.execCommand( x.cmd, currentDomElement || false, x.val );
+ });
+ },
+ removeControls: function( ed )
+ {
+ jQuery( ed.selection.getNode() ).closest( 'body' ).find( '.custom_tags_controls' ).remove();
+ }
+ });
+
+ // Register plugin
+ tinymce.PluginManager.add( 'custom_tags_controls', tinymce.plugins.custom_tags_controls );
+})();
\ No newline at end of file
diff --git a/extension/ezoe/design/standard/javascript/plugins/eztable/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/eztable/editor_plugin.js
index 2a575f5f7aa..0dcd65348c4 100644
--- a/extension/ezoe/design/standard/javascript/plugins/eztable/editor_plugin.js
+++ b/extension/ezoe/design/standard/javascript/plugins/eztable/editor_plugin.js
@@ -26,11 +26,11 @@
elm.appendChild(rng2.cloneContents());
// Check for text characters of other elements that should be treated as content
- return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
- };
+ return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length === 0;
+ }
function getSpanVal(td, name) {
- return parseInt(td.getAttribute(name) || 1);
+ return parseInt(td.getAttribute(name) || 1, 10);
}
/**
@@ -70,8 +70,9 @@
// Skip over existing cells produced by rowspan
if (grid[y]) {
- while (grid[y][x])
+ while (grid[y][x]) {
x++;
+ }
}
// Get col/rowspan from cell
@@ -80,8 +81,9 @@
// Fill out rowspan/colspan right and down
for (y2 = y; y2 < y + rowspan; y2++) {
- if (!grid[y2])
+ if (!grid[y2]) {
grid[y2] = [];
+ }
for (x2 = x; x2 < x + colspan; x2++) {
grid[y2][x2] = {
@@ -98,30 +100,32 @@
startY += rows.length;
});
- };
+ }
function getCell(x, y) {
var row;
row = grid[y];
- if (row)
+ if (row) {
return row[x];
- };
+ }
+ }
function setSpanVal(td, name, val) {
if (td) {
- val = parseInt(val);
+ val = parseInt(val, 10);
- if (val === 1)
+ if (val === 1) {
td.removeAttribute(name, 1);
- else
+ } else {
td.setAttribute(name, val, 1);
+ }
}
}
function isCellSelected(cell) {
return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
- };
+ }
function getSelectedRows() {
var rows = [];
@@ -136,7 +140,7 @@
});
return rows;
- };
+ }
function deleteTable() {
var rng = dom.createRng();
@@ -147,7 +151,7 @@
selection.setRng(rng);
dom.remove(table);
- };
+ }
function cloneCell(cell) {
var formatNode;
@@ -194,17 +198,19 @@
// end eZ
node = cloneNode(node, false);
- if (!formatNode)
+ if (!formatNode) {
formatNode = curNode = node;
- else if (curNode)
+ } else if (curNode) {
curNode.appendChild(node);
+ }
curNode = node;
});
// Add something to the inner node
- if (curNode)
+ if (curNode) {
curNode.innerHTML = tinymce.isIE && !tinymce.isIE11 ? ' ' : '"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("",i);m.head=k(h.substring(0,i+1));c=h.indexOf("\n"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='\n'}f+=c.getParam("fullpage_default_doctype",'');f+="\n\n\n";if(e=c.getParam("fullpage_default_title")){f+=""+e+" \n"}if(e=c.getParam("fullpage_default_encoding")){f+='\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var e=this._parseHeader(),g={},h,f,d=this.editor;function c(k,i){var j=k.attr(i);return j||""}g.fontface=d.getParam("fullpage_default_fontface","");g.fontsize=d.getParam("fullpage_default_fontsize","");h=e.firstChild;if(h.type==7){g.xml_pi=true;f=/encoding="([^"]+)"/.exec(h.value);if(f){g.docencoding=f[1]}}h=e.getAll("#doctype")[0];if(h){g.doctype=""}h=e.getAll("title")[0];if(h&&h.firstChild){g.metatitle=h.firstChild.value}b(e.getAll("meta"),function(l){var j=l.attr("name"),i=l.attr("http-equiv"),k;if(j){g["meta"+j.toLowerCase()]=l.attr("content")}else{if(i=="Content-Type"){k=/charset\s*=\s*(.*)\s*/gi.exec(l.attr("content"));if(k){g.docencoding=k[1]}}}});h=e.getAll("html")[0];if(h){g.langcode=c(h,"lang")||c(h,"xml:lang")}h=e.getAll("link")[0];if(h&&h.attr("rel")=="stylesheet"){g.stylesheet=h.attr("href")}h=e.getAll("body")[0];if(h){g.langdir=c(h,"dir");g.style=c(h,"style");g.visited_color=c(h,"vlink");g.link_color=c(h,"link");g.active_color=c(h,"alink")}return g},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("",i);m.head=k(h.substring(0,i+1));c=h.indexOf("\n"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='\n'}f+=c.getParam("fullpage_default_doctype",'');f+="\n\n\n";if(e=c.getParam("fullpage_default_title")){f+=""+e+" \n"}if(e=c.getParam("fullpage_default_encoding")){f+='\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
diff --git a/extension/ezoe/design/standard/javascript/plugins/fullpage/editor_plugin_src.js b/extension/ezoe/design/standard/javascript/plugins/fullpage/editor_plugin_src.js
index 23de7c5a1a2..7663a14acf4 100644
--- a/extension/ezoe/design/standard/javascript/plugins/fullpage/editor_plugin_src.js
+++ b/extension/ezoe/design/standard/javascript/plugins/fullpage/editor_plugin_src.js
@@ -50,13 +50,13 @@
// Private plugin internal methods
_htmlToData : function() {
- var headerFragment = this._parseHeader(), data = {}, nodes, elm, matches, editor = this.editor;
+ var headerFragment = this._parseHeader(), data = {}, elm, matches, editor = this.editor;
function getAttr(elm, name) {
var value = elm.attr(name);
return value || '';
- };
+ }
// Default some values
data.fontface = editor.getParam("fullpage_default_fontface", "");
@@ -67,14 +67,16 @@
if (elm.type == 7) {
data.xml_pi = true;
matches = /encoding="([^"]+)"/.exec(elm.value);
- if (matches)
+ if (matches) {
data.docencoding = matches[1];
+ }
}
// Parse doctype
elm = headerFragment.getAll('#doctype')[0];
- if (elm)
+ if (elm) {
data.doctype = '";
+ }
// Parse title element
elm = headerFragment.getAll('title')[0];
@@ -86,25 +88,28 @@
each(headerFragment.getAll('meta'), function(meta) {
var name = meta.attr('name'), httpEquiv = meta.attr('http-equiv'), matches;
- if (name)
+ if (name) {
data['meta' + name.toLowerCase()] = meta.attr('content');
- else if (httpEquiv == "Content-Type") {
+ } else if (httpEquiv == "Content-Type") {
matches = /charset\s*=\s*(.*)\s*/gi.exec(meta.attr('content'));
- if (matches)
+ if (matches) {
data.docencoding = matches[1];
+ }
}
});
// Parse html attribs
elm = headerFragment.getAll('html')[0];
- if (elm)
+ if (elm) {
data.langcode = getAttr(elm, 'lang') || getAttr(elm, 'xml:lang');
+ }
// Parse stylesheet
elm = headerFragment.getAll('link')[0];
- if (elm && elm.attr('rel') == 'stylesheet')
+ if (elm && elm.attr('rel') == 'stylesheet') {
data.stylesheet = elm.attr('href');
+ }
// Parse body parts
elm = headerFragment.getAll('body')[0];
@@ -124,14 +129,15 @@
function setAttr(elm, name, value) {
elm.attr(name, value ? value : undefined);
- };
+ }
function addHeadNode(node) {
- if (headElement.firstChild)
+ if (headElement.firstChild) {
headElement.insert(node, headElement.firstChild);
- else
+ } else {
headElement.append(node);
- };
+ }
+ }
headerFragment = this._parseHeader();
headElement = headerFragment.getAll('head')[0];
@@ -139,10 +145,11 @@
elm = headerFragment.getAll('html')[0];
headElement = new Node('head', 1);
- if (elm.firstChild)
+ if (elm.firstChild) {
elm.insert(headElement, elm.firstChild, true);
- else
+ } else {
elm.append(headElement);
+ }
}
// Add/update/remove XML-PI
@@ -150,8 +157,9 @@
if (data.xml_pi) {
value = 'version="1.0"';
- if (data.docencoding)
+ if (data.docencoding) {
value += ' encoding="' + data.docencoding + '"';
+ }
if (elm.type != 7) {
elm = new Node('xml', 7);
@@ -159,8 +167,9 @@
}
elm.value = value;
- } else if (elm && elm.type == 7)
+ } else if (elm && elm.type == 7) {
elm.remove();
+ }
// Add/update/remove doctype
elm = headerFragment.getAll('#doctype')[0];
@@ -168,15 +177,17 @@
if (!elm) {
elm = new Node('#doctype', 10);
- if (data.xml_pi)
+ if (data.xml_pi) {
headerFragment.insert(elm, headerFragment.firstChild);
- else
+ } else {
addHeadNode(elm);
+ }
}
elm.value = data.doctype.substring(9, data.doctype.length - 1);
- } else if (elm)
+ } else if (elm) {
elm.remove();
+ }
// Add/update/remove title
elm = headerFragment.getAll('title')[0];
@@ -192,8 +203,9 @@
if (data.docencoding) {
elm = null;
each(headerFragment.getAll('meta'), function(meta) {
- if (meta.attr('http-equiv') == 'Content-Type')
+ if (meta.attr('http-equiv') == 'Content-Type') {
elm = meta;
+ }
});
if (!elm) {
@@ -214,10 +226,11 @@
meta = nodes[i];
if (meta.attr('name') == name) {
- if (value)
+ if (value) {
meta.attr('content', value);
- else
+ } else {
meta.remove();
+ }
return;
}
@@ -236,10 +249,11 @@
// Add/update/delete link
elm = headerFragment.getAll('link')[0];
if (elm && elm.attr('rel') == 'stylesheet') {
- if (data.stylesheet)
+ if (data.stylesheet) {
elm.attr('href', data.stylesheet);
- else
+ } else {
elm.remove();
+ }
} else if (data.stylesheet) {
elm = new Node('link', 1);
elm.attr({
@@ -304,15 +318,17 @@
function low(s) {
return s.replace(/<\/?[A-Z]+/g, function(a) {
return a.toLowerCase();
- })
- };
+ });
+ }
// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate
- if (o.format == 'raw' && self.head)
+ if (o.format == 'raw' && self.head) {
return;
+ }
- if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))
+ if (o.source_view && ed.getParam('fullpage_hide_in_source_view')) {
return;
+ }
// Parse out head, body and footer
content = content.replace(/<(\/?)BODY/gi, '<$1body');
@@ -323,8 +339,9 @@
self.head = low(content.substring(0, startPos + 1));
endPos = content.indexOf('\n';
+ }
header += editor.getParam('fullpage_default_doctype', '');
header += '\n\n\n';
- if (value = editor.getParam('fullpage_default_title'))
+ if (value = editor.getParam('fullpage_default_title')) {
header += '' + value + ' \n';
+ }
- if (value = editor.getParam('fullpage_default_encoding'))
+ if (value = editor.getParam('fullpage_default_encoding')) {
header += '\n';
@@ -395,8 +420,9 @@
_getContent : function(ed, o) {
var self = this;
- if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))
+ if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view')) {
o.content = tinymce.trim(self.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(self.foot);
+ }
}
});
diff --git a/extension/ezoe/design/standard/javascript/plugins/fullpage/js/fullpage.js b/extension/ezoe/design/standard/javascript/plugins/fullpage/js/fullpage.js
index 3f672ad3ba3..435a046e350 100644
--- a/extension/ezoe/design/standard/javascript/plugins/fullpage/js/fullpage.js
+++ b/extension/ezoe/design/standard/javascript/plugins/fullpage/js/fullpage.js
@@ -11,7 +11,7 @@
(function() {
tinyMCEPopup.requireLangPack();
- var defaultDocTypes =
+ var defaultDocTypes =
'XHTML 1.0 Transitional=,' +
'XHTML 1.0 Frameset=,' +
'XHTML 1.0 Strict=,' +
@@ -20,7 +20,7 @@
'HTML 4.01 Strict=,' +
'HTML 4.01 Frameset=';
- var defaultEncodings =
+ var defaultEncodings =
'Western european (iso-8859-1)=iso-8859-1,' +
'Central European (iso-8859-2)=iso-8859-2,' +
'Unicode (UTF-8)=utf-8,' +
@@ -31,7 +31,7 @@
'Korean (iso-2022-kr)=iso-2022-kr,' +
'ASCII (us-ascii)=us-ascii';
- var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+ var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact,sans-serif;WingDings=wingdings';
var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
function setVal(id, value) {
@@ -40,26 +40,29 @@
if (elm) {
value = value || '';
- if (elm.nodeName == "SELECT")
+ if (elm.nodeName == "SELECT") {
selectByValue(document.forms[0], id, value);
- else if (elm.type == "checkbox")
+ } else if (elm.type == "checkbox") {
elm.checked = !!value;
- else
+ } else {
elm.value = value;
+ }
}
- };
+ }
function getVal(id) {
var elm = document.getElementById(id);
- if (elm.nodeName == "SELECT")
+ if (elm.nodeName == "SELECT") {
return elm.options[elm.selectedIndex].value;
+ }
- if (elm.type == "checkbox")
+ if (elm.type == "checkbox") {
return elm.checked;
+ }
return elm.value;
- };
+ }
window.FullPageDialog = {
changedStyle : function() {
@@ -69,10 +72,11 @@
setVal('fontsize', styles['font-size']);
setVal('textcolor', styles['color']);
- if (val = styles['background-image'])
+ if (val = styles['background-image']) {
setVal('bgimage', val.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"));
- else
+ } else {
setVal('bgimage', '');
+ }
setVal('bgcolor', styles['background-color']);
@@ -91,17 +95,21 @@
styles['margin-left'] = val[3] || val[0] || '';
}
- if (val = styles['margin-top'])
+ if (val = styles['margin-top']) {
setVal('topmargin', val.replace(/px/, ''));
+ }
- if (val = styles['margin-right'])
+ if (val = styles['margin-right']) {
setVal('rightmargin', val.replace(/px/, ''));
+ }
- if (val = styles['margin-bottom'])
+ if (val = styles['margin-bottom']) {
setVal('bottommargin', val.replace(/px/, ''));
+ }
- if (val = styles['margin-left'])
+ if (val = styles['margin-left']) {
setVal('leftmargin', val.replace(/px/, ''));
+ }
updateColor('bgcolor_pick', 'bgcolor');
updateColor('textcolor_pick', 'textcolor');
@@ -109,7 +117,7 @@
changedStyleProp : function() {
var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style'));
-
+
styles['font-face'] = getVal('fontface');
styles['font-size'] = getVal('fontsize');
styles['color'] = getVal('textcolor');
@@ -146,7 +154,7 @@
setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles))));
this.changedStyle();
},
-
+
update : function() {
var data = {};
@@ -158,7 +166,7 @@
tinyMCEPopup.close();
}
};
-
+
function init() {
var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor;
diff --git a/extension/ezoe/design/standard/javascript/plugins/media/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/media/editor_plugin.js
index 9ac42e0d21e..778d838e545 100644
--- a/extension/ezoe/design/standard/javascript/plugins/media/editor_plugin.js
+++ b/extension/ezoe/design/standard/javascript/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var b=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),a=tinymce.makeMap(b.join(",")),f=tinymce.html.Node,d,i,h=tinymce.util.JSON,g;d=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function e(j){return typeof(j)=="string"?j.replace(/[^0-9%]/g,""):j}function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(s){return s&&s.nodeName==="IMG"&&n.dom.hasClass(s,"mceItemMedia")}r.editor=n;r.url=j;i="";for(m=0;m0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A0){N+=(N?"&":"")+O+"="+escape(P)}});if(N.length){F.params.flashvars=N}K=q.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(K,function(P,O){F.params[O]=""+P})}}function x(K,J,I,L){G=new h("object",1).attr({id:K.attr("id"),width:f(K.attr("width")),height:f(K.attr("height")),style:J});tinymce.each(I,function(N){var O=L[N];if(N=="class"&&O){O=O.replace(/mceItem.+ ?/g,"")}if(O&&N!="type"){G.attr(N,O)}});for(var n in L.params){var M;M=new h("param",1);M.shortEnded=true;y=L.params[n];if(n==="src"&&r.name==="WindowsMedia"){n="url"}M.attr({name:n,value:y});G.append(M)}if(L.object_html){y=new h("#text",3);y.raw=true;y.value=L.object_html;G.append(y)}if(D){D.append(G)}return G}F=z.attr("data-mce-json");if(!F){return}F=i.parse(F);r=this.getType(z.attr("class"));C=z.attr("data-mce-style");if(!C){C=z.attr("style");if(C){C=q.dom.serializeStyle(q.dom.parseStyle(C,"img"))}}F.width=z.attr("width")||F.width;F.height=z.attr("height")||F.height;if(r.name==="Iframe"){A=new h("iframe",1);tinymce.each(d,function(n){var I=z.attr(n);if(n=="class"&&I){I=I.replace(/mceItem.+ ?/g,"")}if(I&&I.length>0){A.attr(n,I)}});for(H in F.params){A.attr(H,F.params[H])}A.attr({style:C,src:F.params.src});z.replace(A);return}if(this.editor.settings.media_use_script){A=new h("script",1).attr("type","text/javascript");y=new h("#text",3);y.value="write"+r.name+"("+i.serialize(tinymce.extend(F.params,{width:z.attr("width"),height:z.attr("height")}))+");";A.append(y);z.replace(A);return}if(r.name==="Video"&&F.video.sources[0]){D=new h("video",1).attr(tinymce.extend({id:z.attr("id"),width:f(z.attr("width")),height:f(z.attr("height")),style:C},F.video.attrs));if(F.video.attrs){m=F.video.attrs.poster}l=F.video.sources=e(F.video.sources);for(B=0;B 0)
+ if (value.length > 0) {
flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);
+ }
});
- if (flashVarsOutput.length)
+ if (flashVarsOutput.length) {
data.params.flashvars = flashVarsOutput;
+ }
params = editor.getParam('flash_video_player_params', {
allowfullscreen: true,
@@ -373,11 +390,62 @@
data.params[name] = "" + value;
});
}
- };
+ }
+
+ function createObject (node, style, rootAttributes, data) {
+ object = new Node('object', 1).attr({
+ id : node.attr('id'),
+ width: normalizeSize(node.attr('width')),
+ height: normalizeSize(node.attr('height')),
+ style : style
+ });
+
+ tinymce.each(rootAttributes, function(name) {
+ var value = data[name];
+
+ if (name == 'class' && value) {
+ value = value.replace(/mceItem.+ ?/g, '');
+ }
+
+ if (value && name != 'type') {
+ object.attr(name, value);
+ }
+ });
+
+ for (var name in data.params) {
+ var param;
+ param = new Node('param', 1);
+ param.shortEnded = true;
+ value = data.params[name];
+
+ // Windows media needs to use url instead of src for the media URL
+ if (name === 'src' && typeItem.name === 'WindowsMedia') {
+ name = 'url';
+ }
+
+ param.attr({name: name, value: value});
+ object.append(param);
+ }
+
+ if (data.object_html) {
+ value = new Node('#text', 3);
+ value.raw = true;
+ value.value = data.object_html;
+ object.append(value);
+ }
+
+ // Append object to video element if it exists
+ if (video) {
+ video.append(object);
+ }
+
+ return object;
+ }
data = node.attr('data-mce-json');
- if (!data)
+ if (!data) {
return;
+ }
data = JSON.parse(data);
typeItem = this.getType(node.attr('class'));
@@ -386,8 +454,9 @@
if (!style) {
style = node.attr('style');
- if (style)
+ if (style) {
style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));
+ }
}
// Use node width/height to override the data width/height when the placeholder is resized
@@ -401,15 +470,18 @@
tinymce.each(rootAttributes, function(name) {
var value = node.attr(name);
- if (name == 'class' && value)
+ if (name == 'class' && value) {
value = value.replace(/mceItem.+ ?/g, '');
+ }
- if (value && value.length > 0)
+ if (value && value.length > 0) {
replacement.attr(name, value);
+ }
});
- for (name in data.params)
+ for (name in data.params) {
replacement.attr(name, data.params[name]);
+ }
replacement.attr({
style: style,
@@ -448,13 +520,15 @@
}, data.video.attrs));
// Get poster source and use that for flash fallback
- if (data.video.attrs)
+ if (data.video.attrs) {
posterSrc = data.video.attrs.poster;
+ }
sources = data.video.sources = toArray(data.video.sources);
for (i = 0; i < sources.length; i++) {
- if (/\.mp4$/.test(sources[i].src))
+ if (/\.mp4$/.test(sources[i].src)) {
mp4Source = sources[i].src;
+ }
}
if (!sources[0].type) {
@@ -472,8 +546,9 @@
if (mp4Source) {
addPlayer(mp4Source, posterSrc);
typeItem = self.getType('flash');
- } else
+ } else {
data.params.src = '';
+ }
}
// Add HTML5 audio element
@@ -487,8 +562,9 @@
}, data.video.attrs));
// Get poster source and use that for flash fallback
- if (data.video.attrs)
+ if (data.video.attrs) {
posterSrc = data.video.attrs.poster;
+ }
sources = data.video.sources = toArray(data.video.sources);
if (!sources[0].type) {
@@ -516,12 +592,14 @@
type: node.attr('type')
});
- for (name in data.params)
+ for (name in data.params) {
embed.attr(name, data.params[name]);
+ }
tinymce.each(rootAttributes, function(name) {
- if (data[name] && name != 'type')
+ if (data[name] && name != 'type') {
embed.attr(name, data[name]);
+ }
});
data.params.src = '';
@@ -530,44 +608,16 @@
// Do we have a params src then we can generate object
if (data.params.src) {
// Is flv movie add player for it
- if (/\.flv$/i.test(data.params.src))
+ if (/\.flv$/i.test(data.params.src)) {
addPlayer(data.params.src, '');
+ }
- if (args && args.force_absolute)
+ if (args && args.force_absolute) {
data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);
-
- // Create new object element
- object = new Node('object', 1).attr({
- id : node.attr('id'),
- width: normalizeSize(node.attr('width')),
- height: normalizeSize(node.attr('height')),
- style : style
- });
-
- tinymce.each(rootAttributes, function(name) {
- var value = data[name];
-
- if (name == 'class' && value)
- value = value.replace(/mceItem.+ ?/g, '');
-
- if (value && name != 'type')
- object.attr(name, value);
- });
-
- // Add params
- for (name in data.params) {
- param = new Node('param', 1);
- param.shortEnded = true;
- value = data.params[name];
-
- // Windows media needs to use url instead of src for the media URL
- if (name === 'src' && typeItem.name === 'WindowsMedia')
- name = 'url';
-
- param.attr({name: name, value: value});
- object.append(param);
}
+ object = createObject(node, style, rootAttributes, data, video);
+
// Setup add type and classid if strict is disabled
if (this.editor.getParam('media_strict', true)) {
object.attr({
@@ -575,10 +625,12 @@
type: typeItem.mimes[0]
});
} else {
- object.attr({
- classid: "clsid:" + typeItem.clsids[0],
- codebase: typeItem.codebase
- });
+ if(typeItem.clsids[0]) {
+ object.attr({
+ classid: "clsid:" + typeItem.clsids[0],
+ codebase: typeItem.codebase
+ });
+ }
embed = new Node('embed', 1);
embed.shortEnded = true;
@@ -590,28 +642,22 @@
type: typeItem.mimes[0]
});
- for (name in data.params)
+ for (name in data.params) {
embed.attr(name, data.params[name]);
+ }
tinymce.each(rootAttributes, function(name) {
- if (data[name] && name != 'type')
+ if (data[name] && name != 'type') {
embed.attr(name, data[name]);
+ }
});
-
object.append(embed);
}
- // Insert raw HTML
- if (data.object_html) {
- value = new Node('#text', 3);
- value.raw = true;
- value.value = data.object_html;
- object.append(value);
- }
-
- // Append object to video element if it exists
- if (video)
- video.append(object);
+ } else if (typeItem.name === 'Object') {
+ // Remove data.params.src since not in the original object
+ delete data.params.src;
+ object = createObject(node, style, rootAttributes, data, video);
}
if (video) {
@@ -635,10 +681,11 @@
}
var n = video || audio || object || embed;
- if (n)
+ if (n) {
node.replace(n);
- else
+ } else {
node.remove();
+ }
},
/**
@@ -662,7 +709,7 @@
inner: true,
validate: false
}).serialize(node);
- };
+ }
function lookupAttribute(o, attr) {
return lookup[(o.attr(attr) || '').toLowerCase()];
@@ -674,16 +721,19 @@
}
// If node isn't in document
- if (!node.parent)
+ if (!node.parent) {
return;
+ }
// Handle media scripts
- if (node.name === 'script') {
- if (node.firstChild)
+ if (node.name === 'script') {
+ if (node.firstChild) {
matches = scriptRegExp.exec(node.firstChild.value);
+ }
- if (!matches)
+ if (!matches) {
return;
+ }
type = matches[1];
data = {video : {}, params : JSON.parse(matches[2])};
@@ -716,12 +766,14 @@
// Get all video attributes
attrs = data.video.attrs;
- for (name in video.attributes.map)
+ for (name in video.attributes.map) {
attrs[name] = video.attributes.map[name];
+ }
source = node.attr('src');
- if (source)
+ if (source) {
data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', node.name)});
+ }
// Get all sources
sources = video.getAll("source");
@@ -736,8 +788,9 @@
}
// Convert the poster URL
- if (attrs.poster)
+ if (attrs.poster) {
attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', node.name);
+ }
}
// Object element
@@ -747,8 +800,9 @@
}
// Embed element
- if (node.name === 'embed')
+ if (node.name === 'embed') {
embed = node;
+ }
// Iframe element
if (node.name === 'iframe') {
@@ -758,8 +812,6 @@
if (object) {
// Get width/height
- width = width || object.attr('width');
- height = height || object.attr('height');
style = style || object.attr('style');
id = id || object.attr('id');
hspace = hspace || object.attr('hspace');
@@ -767,17 +819,23 @@
align = align || object.attr('align');
bgcolor = bgcolor || object.attr('bgcolor');
data.name = object.attr('name');
+ data["class"] = object.attr('class');
// Get all object params
params = object.getAll("param");
+
for (i = 0; i < params.length; i++) {
param = params[i];
name = param.remove().attr('name');
- if (!excludedAttrs[name])
+ if (!subExcludedAttrs[name]) {
data.params[name] = param.attr('value');
+ }
}
+ width = width || object.attr('width') || data.params.width;
+ height = height || object.attr('height') || data.params.height;
+
data.params.src = data.params.src || object.attr('data');
}
@@ -794,9 +852,11 @@
// Get all embed attributes
for (name in embed.attributes.map) {
- if (!excludedAttrs[name] && !data.params[name])
+ if (!excludedAttrs[name] && !data.params[name]) {
data.params[name] = embed.attributes.map[name];
+ }
}
+
}
if (iframe) {
@@ -816,8 +876,9 @@
// Get all iframe attributes
for (name in iframe.attributes.map) {
- if (!excludedAttrs[name] && !data.params[name])
+ if (!excludedAttrs[name] && !data.params[name]) {
data.params[name] = iframe.attributes.map[name];
+ }
}
}
@@ -828,22 +889,25 @@
}
// Convert the URL to relative/absolute depending on configuration
- if (data.params.src)
+ if (data.params.src) {
data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');
+ }
if (video) {
- if (node.name === 'video')
+ if (node.name === 'video') {
type = lookup.video.name;
- else if (node.name === 'audio')
+ } else if (node.name === 'audio') {
type = lookup.audio.name;
+ }
}
- if (object && !type)
- type = (lookupAttribute(object, 'clsid') || lookupAttribute(object, 'classid') || lookupAttribute(object, 'type') || {}).name;
-
- if (embed && !type)
+ if (embed && !type) {
type = (lookupAttribute(embed, 'type') || lookupExtension(data.params.src) || {}).name;
+ }
+ if (object && !type) {
+ type = (lookupAttribute(object, 'clsid') || lookupAttribute(object, 'classid') || lookupAttribute(object, 'type') || {name: 'Object'}).name;
+ }
// for embedded audio we preserve the original specified type
if (embed && type == 'EmbeddedAudio') {
data.params.type = embed.attr('type');
@@ -852,24 +916,25 @@
// Replace the video/object/embed element with a placeholder image containing the data
node.replace(img);
- // Remove embed
- if (embed)
+ if (embed) {
embed.remove();
+ }
// Serialize the inner HTML of the object element
if (object) {
html = getInnerHTML(object.remove());
-
- if (html)
+ if (html) {
data.object_html = html;
+ }
}
// Serialize the inner HTML of the video element
if (video) {
html = getInnerHTML(video.remove());
- if (html)
+ if (html) {
data.video_html = html;
+ }
}
data.hspace = hspace;
diff --git a/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin.js
index da411ebc09c..9da0e2bd408 100644
--- a/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin.js
+++ b/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.dom.TreeWalker;var a="contenteditable",d="data-mce-"+a;var e=tinymce.VK;function b(n){var j=n.dom,p=n.selection,r,o="mce_noneditablecaret",r="\uFEFF";function m(t){var s;if(t.nodeType===1){s=t.getAttribute(d);if(s&&s!=="inherit"){return s}s=t.contentEditable;if(s!=="inherit"){return s}}return null}function g(s){var t;while(s){t=m(s);if(t){return t==="false"?s:null}s=s.parentNode}}function l(s){while(s){if(s.id===o){return s}s=s.parentNode}}function k(s){var t;if(s){t=new c(s,s);for(s=t.current();s;s=t.next()){if(s.nodeType===3){return s}}}}function f(v,u){var s,t;if(m(v)==="false"){if(j.isBlock(v)){p.select(v);return}}t=j.createRng();if(m(v)==="true"){if(!v.firstChild){v.appendChild(n.getDoc().createTextNode("\u00a0"))}v=v.firstChild;u=true}s=j.create("span",{id:o,"data-mce-bogus":true},r);if(u){v.parentNode.insertBefore(s,v)}else{j.insertAfter(s,v)}t.setStart(s.firstChild,1);t.collapse(true);p.setRng(t);return s}function i(s){var v,t,u;if(s){rng=p.getRng(true);rng.setStartBefore(s);rng.setEndBefore(s);v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true);p.setRng(rng)}else{t=l(p.getStart());while((s=j.get(o))&&s!==u){if(t!==s){v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true)}u=s}}}function q(){var s,w,u,t,v;function x(B,D){var A,F,E,C,z;A=t.startContainer;F=t.startOffset;if(A.nodeType==3){z=A.nodeValue.length;if((F>0&&F0?F-1:F;A=A.childNodes[G];if(A.hasChildNodes()){A=A.firstChild}}else{return !D?B:null}}E=new c(A,B);while(C=E[D?"prev":"next"]()){if(C.nodeType===3&&C.nodeValue.length>0){return}else{if(m(C)==="true"){return C}}}return B}i();u=p.isCollapsed();s=g(p.getStart());w=g(p.getEnd());if(s||w){t=p.getRng(true);if(u){s=s||w;var y=p.getStart();if(v=x(s,true)){f(v,true)}else{if(v=x(s,false)){f(v,false)}else{p.select(s)}}}else{t=p.getRng(true);if(s){t.setStartBefore(s)}if(w){t.setEndAfter(w)}p.setRng(t)}}}function h(z,B){var F=B.keyCode,x,C,D,v;function u(H,G){while(H=H[G?"previousSibling":"nextSibling"]){if(H.nodeType!==3||H.nodeValue.length>0){return H}}}function y(G,H){p.select(G);p.collapse(H)}function t(K){var J,I,M,H;function G(O){var N=I;while(N){if(N===O){return}N=N.parentNode}j.remove(O);q()}function L(){var O,P,N=z.schema.getNonEmptyElements();P=new tinymce.dom.TreeWalker(I,z.getBody());while(O=(K?P.prev():P.next())){if(N[O.nodeName.toLowerCase()]){break}if(O.nodeType===3&&tinymce.trim(O.nodeValue).length>0){break}if(m(O)==="false"){G(O);return true}}if(g(O)){return true}return false}if(p.isCollapsed()){J=p.getRng(true);I=J.startContainer;M=J.startOffset;I=l(I)||I;if(H=g(I)){G(H);return false}if(I.nodeType==3&&(K?M>0:M124)&&F!=e.DELETE&&F!=e.BACKSPACE){if((tinymce.isMac?B.metaKey:B.ctrlKey)&&(F==67||F==88||F==86)){return}B.preventDefault();if(F==e.LEFT||F==e.RIGHT){var w=F==e.LEFT;if(z.dom.isBlock(x)){var A=w?x.previousSibling:x.nextSibling;var s=new c(A,A);var E=w?s.prev():s.next();y(E,!w)}else{y(x,w)}}}else{if(F==e.LEFT||F==e.RIGHT||F==e.BACKSPACE||F==e.DELETE){C=l(D);if(C){if(F==e.LEFT||F==e.BACKSPACE){x=u(C,true);if(x&&m(x)==="false"){B.preventDefault();if(F==e.LEFT){y(x,true)}else{j.remove(x);return}}else{i(C)}}if(F==e.RIGHT||F==e.DELETE){x=u(C);if(x&&m(x)==="false"){B.preventDefault();if(F==e.RIGHT){y(x,false)}else{j.remove(x);return}}else{i(C)}}}if((F==e.BACKSPACE||F==e.DELETE)&&!t(F==e.BACKSPACE)){B.preventDefault();return false}}}}n.onMouseDown.addToTop(function(s,u){var t=s.selection.getNode();if(m(t)==="false"&&t==u.target){q()}});n.onMouseUp.addToTop(q);n.onKeyDown.addToTop(h);n.onKeyUp.addToTop(q)}tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(i,k){var h,g,j;function f(m,n){var o=j.length,p=n.content,l=tinymce.trim(g);if(n.format=="raw"){return}while(o--){p=p.replace(j[o],function(s){var r=arguments,q=r[r.length-2];if(q>0&&p.charAt(q-1)=='"'){return s}return''+m.dom.encode(typeof(r[1])==="string"?r[1]:r[0])+" "})}n.content=p}h=" "+tinymce.trim(i.getParam("noneditable_editable_class","mceEditable"))+" ";g=" "+tinymce.trim(i.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";j=i.getParam("noneditable_regexp");if(j&&!j.length){j=[j]}i.onPreInit.add(function(){b(i);if(j){i.selection.onBeforeSetContent.add(f);i.onBeforeSetContent.add(f)}i.parser.addAttributeFilter("class",function(l){var m=l.length,n,o;while(m--){o=l[m];n=" "+o.attr("class")+" ";if(n.indexOf(h)!==-1){o.attr(d,"true")}else{if(n.indexOf(g)!==-1){o.attr(d,"false")}}}});i.serializer.addAttributeFilter(d,function(l,m){var n=l.length,o;while(n--){o=l[n];if(j&&o.attr("data-mce-content")){o.name="#text";o.type=3;o.raw=true;o.value=o.attr("data-mce-content")}else{o.attr(a,null);o.attr(d,null)}}});i.parser.addAttributeFilter(a,function(l,m){var n=l.length,o;while(n--){o=l[n];o.attr(d,o.attr(a));o.attr(a,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var h=tinymce.dom.TreeWalker;var d="contenteditable",c="data-mce-"+d;var i=tinymce.VK;var e,j,b;function g(t){var p=t.dom,v=t.selection,u="mce_noneditablecaret",x="\uFEFF",m=t.getParam("noneditable_prevent_delete");function s(z){var y;if(z.nodeType===1){y=z.getAttribute(c);if(y&&y!=="inherit"){return y}y=z.contentEditable;if(y!=="inherit"){return y}}return null}function l(y){var z;while(y){z=s(y);if(z){return z==="false"?y:null}y=y.parentNode}}function r(y){while(y){if(y.id===u){return y}y=y.parentNode}}function q(y){var z;if(y){z=new h(y,y);for(y=z.current();y;y=z.next()){if(y.nodeType===3){return y}}}}function k(B,A){var y,z;if(s(B)==="false"){if(p.isBlock(B)){v.select(B);return}}z=p.createRng();if(s(B)==="true"){if(!B.firstChild){B.appendChild(t.getDoc().createTextNode("\u00a0"))}B=B.firstChild;A=true}y=p.create("span",{id:u,"data-mce-bogus":true},x);if(A){B.parentNode.insertBefore(y,B)}else{p.insertAfter(y,B)}z.setStart(y.firstChild,1);z.collapse(true);v.setRng(z);return y}function o(y){var C,A,B,z;if(y){z=v.getRng(true);z.setStartBefore(y);z.setEndBefore(y);C=q(y);if(C&&C.nodeValue.charAt(0)==x){C=C.deleteData(0,1)}p.remove(y,true);v.setRng(z)}else{A=r(v.getStart());while((y=p.get(u))&&y!==B){if(A!==y){C=q(y);if(C&&C.nodeValue.charAt(0)==x){C=C.deleteData(0,1)}p.remove(y,true)}B=y}}}function w(){var y,C,A,z,B;function D(G,I){var F,K,J,H,E;F=z.startContainer;K=z.startOffset;if(F.nodeType==3){E=F.nodeValue.length;if((K>0&&K0?K-1:K;F=F.childNodes[L];if(F.hasChildNodes()){F=F.firstChild}}else{return !I?G:null}}J=new h(F,G);while(H=J[I?"prev":"next"]()){if(H.nodeType===3&&H.nodeValue.length>0){return}else{if(s(H)==="true"){return H}}}return G}o();A=v.isCollapsed();y=l(v.getStart());C=l(v.getEnd());if(y||C){z=v.getRng(true);if(A){y=y||C;if(D(y,true)){B=D(y,true);k(B,true)}else{if(D(y,false)){B=D(y,false);k(B,false)}else{v.select(y)}}}else{z=v.getRng(true);if(y){z.setStartBefore(y)}if(C){z.setEndAfter(C)}v.setRng(z)}}}function n(D,Q){var G=Q.keyCode,S,J,y,F,A,I=false,z;function B(U,T){while(U=U[T?"previousSibling":"nextSibling"]){if(U.nodeType!==3||U.nodeValue.length>0){return U}}}function K(T,U){v.select(T);v.collapse(U)}function P(X){var W,V,Z,U;function T(ab){var aa=V;while(aa){if(aa===ab){return}aa=aa.parentNode}p.remove(ab);w()}function Y(){var ab,ac,aa=D.schema.getNonEmptyElements();ac=new tinymce.dom.TreeWalker(V,D.getBody());while(ab=(X?ac.prev():ac.next())){if(aa[ab.nodeName.toLowerCase()]){break}if(ab.nodeType===3&&tinymce.trim(ab.nodeValue).length>0){break}if(s(ab)==="false"){if(!m){T(ab)}return true}}if(l(ab)){return true}return false}W=v.getRng(true);V=W.startContainer;Z=W.startOffset;V=r(V)||V;if(v.isCollapsed()){if(U=l(V)){T(U);return false}if(V.nodeType==3&&(X?Z>0:Z124)&&G!=i.DELETE&&G!=i.BACKSPACE){if((tinymce.isMac?Q.metaKey:Q.ctrlKey)&&(G==67||G==88||G==86)){return}Q.preventDefault();if(G==i.LEFT||G==i.RIGHT){var C=G==i.LEFT;if(D.dom.isBlock(S)){var H=C?S.previousSibling:S.nextSibling;var N=new h(H,H);var L=C?N.prev():N.next();K(L,!C)}else{K(S,C)}}}else{if(G==i.LEFT||G==i.RIGHT||G==i.BACKSPACE||G==i.DELETE){J=r(y);if(J){O(G,J,Q)}if((G==i.BACKSPACE||G==i.DELETE)&&!P(G==i.BACKSPACE)){Q.preventDefault();return false}if(m&&I){var R=confirm(D.getLang("noneditable.confirm_delete"));if(!R){Q.preventDefault();return false}}}}}t.onMouseUp.addToTop(w);t.onMouseDown.addToTop(w);t.onKeyDown.addToTop(n);t.onKeyUp.addToTop(w)}function a(k){return" "+tinymce.trim(k.getParam("noneditable_editable_class","mceEditable"))+" "}function f(k){return" "+tinymce.trim(k.getParam("noneditable_noneditable_class","mceNonEditable"))+" "}tinymce.PluginManager.requireLangPack("noneditable");tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(l){function k(n,o){var p=b.length,q=o.content,m=tinymce.trim(j);if(o.format=="raw"){return}while(p--){q=q.replace(b[p],function(t){var s=arguments,r=s[s.length-2];if(r>0&&q.charAt(r-1)=='"'){return t}return''+n.dom.encode(typeof(s[1])==="string"?s[1]:s[0])+" "})}o.content=q}e=a(l);j=f(l);b=l.getParam("noneditable_regexp");if(b&&!b.length){b=[b]}l.onPreInit.add(function(){g(l);if(b){l.selection.onBeforeSetContent.add(k);l.onBeforeSetContent.add(k)}l.parser.addAttributeFilter("class",function(m){var n=m.length,o,p;while(n--){p=m[n];o=" "+p.attr("class")+" ";if(o.indexOf(e)!==-1){p.attr(c,"true")}else{if(o.indexOf(j)!==-1){p.attr(c,"false")}}}});l.serializer.addAttributeFilter(c,function(m){var n=m.length,o;while(n--){o=m[n];if(b&&o.attr("data-mce-content")){o.name="#text";o.type=3;o.raw=true;o.value=o.attr("data-mce-content")}else{o.attr(d,null);o.attr(c,null)}}});l.parser.addAttributeFilter(d,function(m){var n=m.length,o;while(n--){o=m[n];o.attr(c,o.attr(d));o.attr(d,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin_src.js b/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin_src.js
index a18bcd786ac..d561b7d1a5e 100644
--- a/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin_src.js
+++ b/extension/ezoe/design/standard/javascript/plugins/noneditable/editor_plugin_src.js
@@ -12,9 +12,12 @@
var TreeWalker = tinymce.dom.TreeWalker;
var externalName = 'contenteditable', internalName = 'data-mce-' + externalName;
var VK = tinymce.VK;
+ var editClass, nonEditClass, nonEditableRegExps;
function handleContentEditableSelection(ed) {
- var dom = ed.dom, selection = ed.selection, invisibleChar, caretContainerId = 'mce_noneditablecaret', invisibleChar = '\uFEFF';
+ var dom = ed.dom, selection = ed.selection, caretContainerId = 'mce_noneditablecaret', invisibleChar = '\uFEFF',
+ nondeletable = ed.getParam('noneditable_prevent_delete');
+
// Returns the content editable state of a node "true/false" or null
function getContentEditable(node) {
@@ -119,7 +122,7 @@
// Removes any caret container except the one we might be in
function removeCaretContainer(caretContainer) {
- var child, currentCaretContainer, lastContainer;
+ var child, currentCaretContainer, lastContainer, rng;
if (caretContainer) {
rng = selection.getRng(true);
@@ -213,11 +216,13 @@
// If it's a caret selection then look left/right to see if we need to move the caret out side or expand
if (isCollapsed) {
nonEditableStart = nonEditableStart || nonEditableEnd;
- var start = selection.getStart();
- if (element = hasSideContent(nonEditableStart, true)) {
+
+ if (hasSideContent(nonEditableStart, true)) {
+ element = hasSideContent(nonEditableStart, true);
// We have no contents to the left of the caret then insert a caret container before the noneditable element
insertCaretContainerOrExpandToBlock(element, true);
- } else if (element = hasSideContent(nonEditableStart, false)) {
+ } else if (hasSideContent(nonEditableStart, false)) {
+ element = hasSideContent(nonEditableStart, false);
// We have no contents to the right of the caret then insert a caret container after the noneditable element
insertCaretContainerOrExpandToBlock(element, false);
} else {
@@ -243,7 +248,8 @@
};
function handleKey(ed, e) {
- var keyCode = e.keyCode, nonEditableParent, caretContainer, startElement, endElement;
+ var keyCode = e.keyCode, nonEditableParent, caretContainer, startElement, endElement, htmlSelection,
+ selectionContainsNonEditable = false, selectedRegion;
function getNonEmptyTextNodeSibling(node, prev) {
while (node = node[prev ? 'previousSibling' : 'nextSibling']) {
@@ -293,7 +299,9 @@
// Found non editable node
if (getContentEditable(node) === "false") {
- removeNodeIfNotParent(node);
+ if (!nondeletable)
+ removeNodeIfNotParent(node);
+
return true;
}
}
@@ -306,12 +314,12 @@
return false;
}
- if (selection.isCollapsed()) {
- rng = selection.getRng(true);
- container = rng.startContainer;
- offset = rng.startOffset;
- container = getParentCaretContainer(container) || container;
+ rng = selection.getRng(true);
+ container = rng.startContainer;
+ offset = rng.startOffset;
+ container = getParentCaretContainer(container) || container;
+ if (selection.isCollapsed()) {
// Is in noneditable parent
if (nonEditableParent = getNonEditableParent(container)) {
removeNodeIfNotParent(nonEditableParent);
@@ -334,14 +342,79 @@
}
}
+ // Is in noneditable parent
+ if (getNonEditableParent(container)) {
+ nonEditableParent = getNonEditableParent(container);
+ removeNodeIfNotParent(nonEditableParent);
+ return false;
+ }
+
return true;
+ }
+
+ /**
+ * handleDirectionalStroke handles when the user presses a button within a caret container, and
+ * make sure the direction of the cursor or of the deletion is within the
+ * user expectations.
+ *
+ * @param {string} keyCode is the current keycode
+ * @param {object} caretContainer is the caretContainer
+ * @param {string} side left (backspace and left arrow) or right (delete and right arrow)
+ * @param {object} e is the currenlty handled event
+ * @return {null}
+ */
+ function handleDirectionalStroke(keyCode, caretContainer, e) {
+ var nonEditableParent;
+ var side = (keyCode === VK.LEFT) || (keyCode === VK.BACKSPACE) ? 'left' : 'right';
+ var arrow = side === 'left' ? VK.LEFT : VK.RIGHT;
+ var action = side === 'left' ? VK.BACKSPACE : VK.DELETE;
+ var next = side === 'left' ? true : false;
+ var caret = selection.getRng(true);
+
+
+ if (keyCode === arrow || keyCode === action) {
+ nonEditableParent = getNonEmptyTextNodeSibling(caretContainer, next);
+
+ if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {
+
+ if (keyCode === arrow) {
+ positionCaretOnElement(nonEditableParent, next);
+ }
+
+ if (keyCode === action && (caretContainer.innerHTML === invisibleChar || !tinymce.trim(caretContainer.innerText || caretContainer.textContent)) ) {
+ e.preventDefault();
+ positionCaretOnElement(nonEditableParent, next);
+ if (!nondeletable) {
+ dom.remove(nonEditableParent);
+ return;
+ }
+ }
+
+ } else if (!nondeletable) {
+ removeCaretContainer(caretContainer);
+ }
+
+ }
}
- startElement = selection.getStart()
+
+ startElement = selection.getStart();
endElement = selection.getEnd();
// Disable all key presses in contentEditable=false except delete or backspace
nonEditableParent = getNonEditableParent(startElement) || getNonEditableParent(endElement);
+
+ if (nondeletable && !selection.isCollapsed()) {
+ var rng = selection.getRng(true);
+ var rngContents = rng.cloneContents();
+
+ var selectionContainsNonEditable = false;
+ tinymce.walk(rngContents, function(n) {
+ selectionContainsNonEditable = getContentEditable(n) === 'false';
+ return !selectionContainsNonEditable;
+ }, 'childNodes');
+ }
+
if (nonEditableParent && (keyCode < 112 || keyCode > 124) && keyCode != VK.DELETE && keyCode != VK.BACKSPACE) {
// Is Ctrl+c, Ctrl+v or Ctrl+x then use default browser behavior
if ((tinymce.isMac ? e.metaKey : e.ctrlKey) && (keyCode == 67 || keyCode == 88 || keyCode == 86)) {
@@ -368,68 +441,42 @@
if (keyCode == VK.LEFT || keyCode == VK.RIGHT || keyCode == VK.BACKSPACE || keyCode == VK.DELETE) {
caretContainer = getParentCaretContainer(startElement);
if (caretContainer) {
- // Arrow left or backspace
- if (keyCode == VK.LEFT || keyCode == VK.BACKSPACE) {
- nonEditableParent = getNonEmptyTextNodeSibling(caretContainer, true);
-
- if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {
- e.preventDefault();
-
- if (keyCode == VK.LEFT) {
- positionCaretOnElement(nonEditableParent, true);
- } else {
- dom.remove(nonEditableParent);
- return;
- }
- } else {
- removeCaretContainer(caretContainer);
- }
- }
-
- // Arrow right or delete
- if (keyCode == VK.RIGHT || keyCode == VK.DELETE) {
- nonEditableParent = getNonEmptyTextNodeSibling(caretContainer);
-
- if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {
- e.preventDefault();
-
- if (keyCode == VK.RIGHT) {
- positionCaretOnElement(nonEditableParent, false);
- } else {
- dom.remove(nonEditableParent);
- return;
- }
- } else {
- removeCaretContainer(caretContainer);
- }
- }
+ handleDirectionalStroke(keyCode, caretContainer, e);
}
if ((keyCode == VK.BACKSPACE || keyCode == VK.DELETE) && !canDelete(keyCode == VK.BACKSPACE)) {
e.preventDefault();
return false;
}
- }
- }
- };
-
- ed.onMouseDown.addToTop(function(ed, e) {
- var node = ed.selection.getNode();
- if (getContentEditable(node) === "false" && node == e.target) {
- // Expand selection on mouse down we can't block the default event since it's used for drag/drop
- moveSelection();
+ if (nondeletable && selectionContainsNonEditable) {
+ var confirmDeleting = confirm(ed.getLang("noneditable.confirm_delete"));
+ if (!confirmDeleting) {
+ e.preventDefault();
+ return false;
+ }
+ }
+ }
}
- });
-
+ }
+
ed.onMouseUp.addToTop(moveSelection);
+ ed.onMouseDown.addToTop(moveSelection);
ed.onKeyDown.addToTop(handleKey);
ed.onKeyUp.addToTop(moveSelection);
};
+ function getEditClass(ed) {
+ return " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
+ }
+ function getNonEditClass(ed) {
+ return " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
+ }
+
+ tinymce.PluginManager.requireLangPack('noneditable');
+
tinymce.create('tinymce.plugins.NonEditablePlugin', {
- init : function(ed, url) {
- var editClass, nonEditClass, nonEditableRegExps;
+ init : function(ed) {
// Converts configured regexps to noneditable span items
function convertRegExpsToNonEditable(ed, args) {
@@ -454,10 +501,10 @@
}
args.content = content;
- };
+ }
- editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
- nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
+ editClass = getEditClass(ed);
+ nonEditClass = getNonEditClass(ed);
// Setup noneditable regexps array
nonEditableRegExps = ed.getParam("noneditable_regexp");
@@ -490,7 +537,7 @@
});
// Remove internal name
- ed.serializer.addAttributeFilter(internalName, function(nodes, name) {
+ ed.serializer.addAttributeFilter(internalName, function(nodes) {
var i = nodes.length, node;
while (i--) {
@@ -509,7 +556,7 @@
});
// Convert external name into internal name
- ed.parser.addAttributeFilter(externalName, function(nodes, name) {
+ ed.parser.addAttributeFilter(externalName, function(nodes) {
var i = nodes.length, node;
while (i--) {
diff --git a/extension/ezoe/design/standard/javascript/plugins/noneditable/langs/en.js b/extension/ezoe/design/standard/javascript/plugins/noneditable/langs/en.js
new file mode 100644
index 00000000000..0e9c654756c
--- /dev/null
+++ b/extension/ezoe/design/standard/javascript/plugins/noneditable/langs/en.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('en.noneditable',{ confirm_delete : 'The selection contains non-editable text. Are you sure you want to continue?' });
\ No newline at end of file
diff --git a/extension/ezoe/design/standard/javascript/plugins/paste/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/paste/editor_plugin.js
index f69f263f995..5d062618846 100644
--- a/extension/ezoe/design/standard/javascript/plugins/paste/editor_plugin.js
+++ b/extension/ezoe/design/standard/javascript/plugins/paste/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,""+o.encode(r).replace(/\r?\n\r?\n/g,"
").replace(/\r?\n/g,"
"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"
$1
")}if(b(k,"paste_convert_middot_lists")){d([[//gi,"$&__MCE_ITEM__"],[/(]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([//gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/ /gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/"/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/]*>/gi,""],[/<\/h[1-6][^>]*>/gi,"
"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/ /g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.( |\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*( |\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.( |\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/ /gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length"],[/^(.*<\/p>)(
)$/,"
$1"]])}else{e([[/\n\n/g,"
"],[/^(.*<\/p>)(
)$/,"
$1"],[/\n/g,"
"+o.encode(r).replace(/\r?\n\r?\n/g,"
").replace(/\r?\n/g,"
"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"
$1
")}if(b(k,"paste_convert_middot_lists")){d([[//gi,"$&__MCE_ITEM__"],[/(]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([//gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/ /gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/"/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/]*>/gi,""],[/<\/h[1-6][^>]*>/gi,"
"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/ /g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.( |\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*( |\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*[\w|'<'|'>']+\.( |\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/ /gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length"],[/^(.*<\/p>)(
)$/,"
$1"]])}else{e([[/\n\n/g,"
"],[/^(.*<\/p>)(
)$/,"
$1"],[/\n/g,"{#table_dlg.align_right}
-
+
{#table_dlg.cell_type}
@@ -76,7 +76,6 @@
{#table_dlg.height}
-
{#class_name}
@@ -95,8 +94,8 @@
diff --git a/extension/ezoe/design/standard/javascript/plugins/table/editor_plugin.js b/extension/ezoe/design/standard/javascript/plugins/table/editor_plugin.js
index 4a92e1b364b..dbdadd184b6 100644
--- a/extension/ezoe/design/standard/javascript/plugins/table/editor_plugin.js
+++ b/extension/ezoe/design/standard/javascript/plugins/table/editor_plugin.js
@@ -1 +1 @@
-(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){if(!O){return}var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;iN){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){var T=S&&S[R?"lastChild":"firstChild"];return T&&T.nodeName==="BR"?C.dom.getParent(T,"td,th"):T}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){if(r.settings.forced_root_block){r.dom.add(r.getBody(),r.settings.forced_root_block,null,d.isIE&&!d.isIE11?" ":'1){r(P,"rowSpan",L+1);continue}}else{if(J>0&&g[J-1][O]){S=g[J-1][O].elm;L=a(S,"rowSpan");if(L>1){r(S,"rowSpan",L+1);continue}}}K=f(P);r(K,"colSpan",P.colSpan);R.appendChild(K);M=P}}if(R.hasChildNodes()){if(!N){D.insertAfter(R,Q)}else{Q.parentNode.insertBefore(R,Q)}}}function h(K){var L,J;e(g,function(M){e(M,function(O,N){if(i(O)){L=N;if(K){return false}}});if(K){return !L}});e(g,function(P,Q){var M,N,O;if(!P[L]){return}M=P[L].elm;if(M!=J){O=a(M,"colspan");N=a(M,"rowspan");if(O==1){if(!K){D.insertAfter(f(M),M);t(L,Q,N-1,O)}else{M.parentNode.insertBefore(f(M),M);t(L,Q,N-1,O)}}else{r(M,"colSpan",M.colSpan+1)}J=M}})}function m(){var J=[];e(g,function(K){e(K,function(M,L){if(i(M)&&d.inArray(J,L)===-1){e(g,function(P){var N=P[L].elm,O;O=a(N,"colSpan");if(O>1){r(N,"colSpan",O-1)}else{D.remove(N)}});J.push(L)}})});p()}function l(){var K;function J(M){var N,L;e(M.cells,function(O){var P=a(O,"rowSpan");if(P>1){r(O,"rowSpan",P-1);N=C(O);t(N.x,N.y,1,1)}});N=C(M.cells[0]);e(g[N.y],function(O){var P;O=O.elm;if(O!=L){P=a(O,"rowSpan");if(P<=1){D.remove(O)}else{r(O,"rowSpan",P-1)}L=O}})}K=j();e(K.reverse(),function(L){J(L)});p()}function B(){var J=j();D.remove(J);p();return J}function G(){var J=j();e(J,function(L,K){J[K]=x(L,true)});return J}function y(L,K){if(!L){return}var M=j(),J=M[K?0:M.length-1],N=J.cells.length;e(g,function(P){var O;N=0;e(P,function(Q){if(Q.real){N+=Q.colspan}if(Q.elm.parentNode==J){O=1}});if(O){return false}});if(!K){L.reverse()}e(L,function(R){var Q=R.cells.length,O,P;for(P=0;PK){K=N}if(M>J){J=M}if(O.real){Q=O.colspan-1;P=O.rowspan-1;if(Q){if(N+Q>K){K=N+Q}}if(P){if(M+P>J){J=M+P}}}}})});return{x:K,y:J}}function u(R){var M,L,T,S,K,J,N,O,P,Q;A=C(R);if(I&&A){M=Math.min(I.x,A.x);L=Math.min(I.y,A.y);T=Math.max(I.x,A.x);S=Math.max(I.y,A.y);K=T;J=S;for(P=L;P<=J;P++){R=g[P][M];if(!R.real){if(M-(R.colspan-1)K){K=Q+N}}if(O){if(P+O>J){J=P+O}}}}}D.removeClass(D.select("td.mceSelected,th.mceSelected"),"mceSelected");for(P=L;P<=J;P++){for(Q=M;Q<=K;Q++){if(g[P][Q]){D.addClass(g[P][Q].elm,"mceSelected")}}}}}s();n=D.getParent(H.getStart(),"th,td");if(n){I=C(n);A=F();n=w(I.x,I.y)}d.extend(this,{deleteTable:q,split:z,merge:o,insertRow:k,insertCol:h,deleteCols:m,deleteRows:l,cutRows:B,copyRows:G,pasteRows:y,getPos:C,setStartCell:v,setEndCell:u})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,l,i=true;function k(o){var n=g.selection,m=g.dom.getParent(o||n.getNode(),"table");if(m){return new b(m,g.dom,n)}}function j(){g.getBody().style.webkitUserSelect="";if(i){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");i=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(m){g.addButton(m[0],{title:m[1],cmd:m[2],ui:m[3]})});if(!d.isIE){g.onClick.add(function(m,n){n=n.target;if(n.nodeName==="TABLE"){m.selection.select(n);m.nodeChanged()}})}g.onPreProcess.add(function(n,o){var m,p,q,s=n.dom,r;m=s.select("table",o.node);p=m.length;while(p--){q=m[p];s.setAttrib(q,"data-mce-style","");if((r=s.getAttrib(q,"width"))){s.setStyle(q,"width",r);s.setAttrib(q,"width","")}if((r=s.getAttrib(q,"height"))){s.setStyle(q,"height",r);s.setAttrib(q,"height","")}}});g.onNodeChange.add(function(o,m,r){var q;r=o.selection.getStart();q=o.dom.getParent(r,"td,th,caption");m.setActive("table",r.nodeName==="TABLE"||!!q);if(q&&q.nodeName==="CAPTION"){q=0}m.setDisabled("delete_table",!q);m.setDisabled("delete_col",!q);m.setDisabled("delete_table",!q);m.setDisabled("delete_row",!q);m.setDisabled("col_after",!q);m.setDisabled("col_before",!q);m.setDisabled("row_after",!q);m.setDisabled("row_before",!q);m.setDisabled("row_props",!q);m.setDisabled("cell_props",!q);m.setDisabled("split_cells",!q);m.setDisabled("merge_cells",!q)});g.onInit.add(function(q){var o,s,p=q.dom,t;f=q.windowManager;q.onMouseDown.add(function(v,w){if(w.button!=2){j();s=p.getParent(w.target,"td,th");o=p.getParent(s,"table")}});p.bind(q.getDoc(),"mouseover",function(z){var x,w,y=z.target;if(s&&(t||y!=s)&&(y.nodeName=="TD"||y.nodeName=="TH")){w=p.getParent(y,"table");if(w==o){if(!t){t=k(w);t.setStartCell(s);q.getBody().style.webkitUserSelect="none"}t.setEndCell(y);i=true}x=q.selection.getSel();try{if(x.removeAllRanges){x.removeAllRanges()}else{x.empty()}}catch(v){}z.preventDefault()}});q.onMouseUp.add(function(y){var w,B=y.selection,v,C,A,z;function x(D,F){var E=new d.dom.TreeWalker(D,D);do{if(D.nodeType==3&&d.trim(D.nodeValue).length!==0){if(F){w.setStart(D,0)}else{w.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){w.setStartBefore(D)}else{w.setEndBefore(D)}return}D=(F?E.next():E.prev())}while(D)}if(s){if(t){y.getBody().style.webkitUserSelect=""}v=p.select("td.mceSelected,th.mceSelected");if(v.length>0){w=p.createRng();A=v[0];w.setStartBefore(A);w.setEndAfter(A);x(A,1);C=new d.dom.TreeWalker(A,p.getParent(v[0],"table"));do{if(A.nodeName=="TD"||A.nodeName=="TH"){if(!p.hasClass(A,"mceSelected")){break}z=A}A=C.next()}while(A);x(z);B.setRng(w)}y.nodeChanged();s=t=o=null}});q.onKeyUp.add(function(){j()});q.onKeyDown.add(function(v){m(v)});q.onMouseDown.add(function(v,w){if(w.button!=2){m(v)}});function n(A,w,x,C){var y=3,D=A.dom.getParent(w.startContainer,"TABLE"),z,v,B;if(D){z=D.parentNode}v=w.startContainer.nodeType==y&&w.startOffset===0&&w.endOffset===0&&C&&(x.nodeName==="TR"||x===z);B=(x.nodeName==="TD"||x.nodeName==="TH")&&!C;return v||B}function m(x){if(!d.isWebKit){return}var w=x.selection.getRng();var z=x.selection.getNode();var y=x.dom.getParent(w.startContainer,"TD,TH");if(!n(x,w,z,y)){return}if(!y){y=z}var v=y.lastChild;while(v.lastChild){v=v.lastChild}w.setEnd(v,v.nodeValue.length);x.selection.setRng(w)}q.plugins.table.fixTableCellSelection=m;if(q&&q.plugins.contextmenu){q.plugins.contextmenu.onContextMenu.add(function(x,v,z){var A,y=q.selection,w=y.getNode()||q.getBody();if(q.dom.getParent(z,"td")||q.dom.getParent(z,"th")||q.dom.select("td.mceSelected,th.mceSelected").length){v.removeAll();if(w.nodeName=="A"&&!q.dom.getAttrib(w,"name")){v.add({title:"advanced.link_desc",icon:"link",cmd:q.plugins.advlink?"mceAdvLink":"mceLink",ui:true});v.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});v.addSeparator()}if(w.nodeName=="IMG"&&w.className.indexOf("mceItem")==-1){v.add({title:"advanced.image_desc",icon:"image",cmd:q.plugins.advimage?"mceAdvImage":"mceImage",ui:true});v.addSeparator()}v.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});v.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});v.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});v.addSeparator();A=v.addMenu({title:"table.cell"});A.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});A.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});A.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});A=v.addMenu({title:"table.row"});A.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});A.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});A.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});A.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});A.addSeparator();A.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});A.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});A.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!l);A.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!l);A=v.addMenu({title:"table.col"});A.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});A.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});A.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{v.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}function u(z,K){var I=d.VK;var N=K.keyCode;function L(V,R,P){var Q=V?"previousSibling":"nextSibling";var W=z.dom.getParent(R,"tr");var U=W[Q];if(U){w(z,R,U,V);d.dom.Event.cancel(P);return true}else{var X=z.dom.getParent(W,"table");var T=W.parentNode;var O=T.nodeName.toLowerCase();if(O==="tbody"||O===(V?"tfoot":"thead")){var S=v(V,X,T,"tbody");if(S!==null){return H(V,S,R,P)}}return J(V,W,Q,X,P)}}function v(S,Q,R,U){var P=z.dom.select(">"+U,Q);var O=P.indexOf(R);if(S&&O===0||!S&&O===P.length-1){return y(S,Q)}else{if(O===-1){var T=R.tagName.toLowerCase()==="thead"?0:P.length-1;return P[T]}else{return P[O+(S?-1:1)]}}}function y(R,Q){var P=R?"thead":"tfoot";var O=z.dom.select(">"+P,Q);return O.length!==0?O[0]:null}function H(S,Q,P,R){var O=G(Q,S);if(O){w(z,P,O,S)}d.dom.Event.cancel(R);return true}function J(V,R,O,U,T){var P=U[O];if(P){C(P);return true}else{var S=z.dom.getParent(U,"td,th");if(S){return L(V,S,T)}else{var Q=G(R,!V);C(Q);return d.dom.Event.cancel(T)}}}function G(P,O){var Q=P&&P[O?"lastChild":"firstChild"];return Q&&Q.nodeName==="BR"?z.dom.getParent(Q,"td,th"):Q}function C(O){z.selection.setCursorLocation(O,0)}function x(){return N==I.UP||N==I.DOWN}function A(O){var Q=O.selection.getNode();var P=O.dom.getParent(Q,"tr");return P!==null}function M(P){var O=0;var Q=P;while(Q.previousSibling){Q=Q.previousSibling;O=O+a(Q,"colspan")}return O}function B(Q,O){var R=0;var P=0;e(Q.children,function(S,T){R=R+a(S,"colspan");P=T;if(R>O){return false}});return P}function w(Q,T,V,S){var U=M(Q.dom.getParent(T,"td,th"));var P=B(V,U);var O=V.childNodes[P];var R=G(O,S);C(R||O)}function E(O){var Q=z.selection.getNode();var R=z.dom.getParent(Q,"td,th");var P=z.dom.getParent(O,"td,th");return R&&R!==P&&F(R,P)}function F(P,O){return z.dom.getParent(P,"TABLE")===z.dom.getParent(O,"TABLE")}if(x()&&A(z)){var D=z.selection.getNode();setTimeout(function(){if(E(D)){L(!K.shiftKey&&N===I.UP,D,K)}},0)}}if(d.isWebKit){q.onKeyDown.add(u)}function r(){var v;v=q.getBody().lastChild;while(v&&v.nodeType==3&&!v.nodeValue.length){v=v.previousSibling}if(v&&v.nodeName==="TABLE"){if(q.settings.forced_root_block){q.dom.add(q.getBody(),q.settings.forced_root_block,null,d.isIE&&!d.isIE11?" ":' ';
else
- html += '';
}
html += " ";
@@ -254,7 +316,7 @@ function insertTable() {
}
try {
- // IE9 might fail to do this selection
+ // IE9 might fail to do this selection
inst.selection.setCursorLocation(tdorth[0], 0);
} catch (ex) {
// Ignore
@@ -269,6 +331,42 @@ function insertTable() {
tinyMCEPopup.close();
}
+function styleTDTH (elm, name, value) {
+ if (elm.tagName === "TD" || elm.tagName === "TH") {
+ dom.setStyle(elm, name, value);
+ } else {
+ if (elm.children) {
+ for (var i = 0; i < elm.children.length; i++) {
+ styleTDTH(elm.children[i], name, value);
+ }
+ }
+ }
+}
+
+function getTDTHOverallStyle (elm, name) {
+ var cells = dom.select("td,th", elm), firstChildStyle;
+
+ function checkChildren(firstChildStyle, elms) {
+
+ for (var i = 0; i < elms.length; i++) {
+ var currentStyle = dom.getStyle(elms[i], name);
+ if (typeof firstChildStyle === "undefined") {
+ firstChildStyle = currentStyle;
+ }
+ if (firstChildStyle != currentStyle) {
+ return "";
+ }
+ }
+
+ return firstChildStyle;
+
+ }
+
+ firstChildStyle = checkChildren(firstChildStyle, cells);
+
+ return firstChildStyle;
+}
+
function makeAttrib(attrib, value) {
var formObj = document.forms[0];
var valueElm = formObj.elements[attrib];
@@ -300,9 +398,9 @@ function init() {
document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
- var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
+ var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', ''), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
- var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
+ var id = "", summary = "", style = "", dir = "", lang = "", background = "", rules = "", frame = "";
var inst = tinyMCEPopup.editor, dom = inst.dom;
var formObj = document.forms[0];
var elm = dom.getParent(inst.selection.getNode(), "table");
@@ -323,7 +421,7 @@ function init() {
if (elm && action != "insert") {
var rowsAr = elm.rows;
- var cols = 0;
+ cols = 0;
for (var i=0; i