Commit adb6a1dc authored by clone's avatar clone

BUG

parent 5e1fca10
...@@ -19,7 +19,8 @@ if (!function_exists('create_editor')) { ...@@ -19,7 +19,8 @@ if (!function_exists('create_editor')) {
if (!empty($config)) { if (!empty($config)) {
$_config = array_merge($_config, $config); $_config = array_merge($_config, $config);
} }
$CKEditor->editor("describe", $value, $_config); //$CKEditor->editor("describe", $value, $_config);
$CKEditor->editor($id,$value,$_config);
} }
} }
......
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
<!--<label for="" style="width: 100%;">内容</label>--> <!--<label for="" style="width: 100%;">内容</label>-->
<div class="input-group" style="width: 100%;" id="dajiangtang"> <div class="input-group" style="width: 100%;" id="dajiangtang">
<?php <?php
create_editor('describe'); create_editor('goods_sup_id','');
?> ?>
</div> </div>
</div> </div>
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
<!--<label for="" style="width: 100%;">内容</label>--> <!--<label for="" style="width: 100%;">内容</label>-->
<div class="input-group" style="width: 100%;" id="dajiangtang"> <div class="input-group" style="width: 100%;" id="dajiangtang">
<?php <?php
create_editor('describe'); create_editor('goods_sup_id','');
?> ?>
</div> </div>
</div> </div>
......
...@@ -402,7 +402,9 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde ...@@ -402,7 +402,9 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url
var _dajiangtangObj = $('#dajiangtang'); //大讲堂 var _dajiangtangObj = $('#dajiangtang'); //大讲堂
var _dajiangtangVal = _dajiangtangObj.find('iframe').contents().find('body').html(); var _dajiangtangVal = _dajiangtangObj.find('iframe').contents().find('body').html();
console.log(_dajiangtangVal); console.log( getCKeditorValue("goods_sup_id"));
return false;
if(_liebiaoPicObj.length < 1) { if(_liebiaoPicObj.length < 1) {
alert('列表页封面图需要上传'); alert('列表页封面图需要上传');
......
...@@ -42,7 +42,7 @@ require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ImagesConfig.php"; ...@@ -42,7 +42,7 @@ require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ImagesConfig.php";
* @package CKFinder * @package CKFinder
* @subpackage Config * @subpackage Config
* @copyright CKSource - Frederico Knabben * @copyright CKSource - Frederico Knabben
* @global string $GLOBALS['config'] * @global string $GLOBALS ['config']
*/ */
class CKFinder_Connector_Core_Config class CKFinder_Connector_Core_Config
{ {
...@@ -157,7 +157,7 @@ class CKFinder_Connector_Core_Config ...@@ -157,7 +157,7 @@ class CKFinder_Connector_Core_Config
* @var array * @var array
* @access private * @access private
*/ */
private $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js'); private $_htmlExtensions = array( 'html', 'htm', 'xml', 'xsd', 'txt', 'js' );
/** /**
* Chmod files after upload to the following permission * Chmod files after upload to the following permission
* *
...@@ -178,14 +178,14 @@ class CKFinder_Connector_Core_Config ...@@ -178,14 +178,14 @@ class CKFinder_Connector_Core_Config
* @var array * @var array
* @access private * @access private
*/ */
private $_hideFolders = array(".svn", "CVS"); private $_hideFolders = array( ".svn", "CVS" );
/** /**
* Hide files * Hide files
* *
* @var integer * @var integer
* @access private * @access private
*/ */
private $_hideFiles = array(".*"); private $_hideFiles = array( ".*" );
/** /**
* If set to true, force ASCII names * If set to true, force ASCII names
* *
...@@ -285,12 +285,11 @@ class CKFinder_Connector_Core_Config ...@@ -285,12 +285,11 @@ class CKFinder_Connector_Core_Config
if (!isset($folderRegex)) { if (!isset($folderRegex)) {
if (is_array($this->_hideFolders) && $this->_hideFolders) { if (is_array($this->_hideFolders) && $this->_hideFolders) {
$folderRegex = join("|", $this->_hideFolders); $folderRegex = join("|", $this->_hideFolders);
$folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__")); $folderRegex = strtr($folderRegex, array( "?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__" ));
$folderRegex = preg_quote($folderRegex, "/"); $folderRegex = preg_quote($folderRegex, "/");
$folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|")); $folderRegex = strtr($folderRegex, array( "__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|" ));
$folderRegex = "/^(?:" . $folderRegex . ")$/uim"; $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
} } else {
else {
$folderRegex = ""; $folderRegex = "";
} }
} }
...@@ -311,12 +310,11 @@ class CKFinder_Connector_Core_Config ...@@ -311,12 +310,11 @@ class CKFinder_Connector_Core_Config
if (!isset($fileRegex)) { if (!isset($fileRegex)) {
if (is_array($this->_hideFiles) && $this->_hideFiles) { if (is_array($this->_hideFiles) && $this->_hideFiles) {
$fileRegex = join("|", $this->_hideFiles); $fileRegex = join("|", $this->_hideFiles);
$fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__")); $fileRegex = strtr($fileRegex, array( "?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__" ));
$fileRegex = preg_quote($fileRegex, "/"); $fileRegex = preg_quote($fileRegex, "/");
$fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|")); $fileRegex = strtr($fileRegex, array( "__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|" ));
$fileRegex = "/^(?:" . $fileRegex . ")$/uim"; $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
} } else {
else {
$fileRegex = ""; $fileRegex = "";
} }
} }
...@@ -465,7 +463,15 @@ class CKFinder_Connector_Core_Config ...@@ -465,7 +463,15 @@ class CKFinder_Connector_Core_Config
} }
reset($GLOBALS['config']['ResourceType']); reset($GLOBALS['config']['ResourceType']);
while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) { /* while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
if ($_resourceTypeNode['name'] === $resourceTypeName) {
$this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
return $this->_resourceTypeConfigCache[$resourceTypeName];
}
}*/
foreach ($GLOBALS['config']['ResourceType'] as $_key => $_resourceTypeNode) {
if ($_resourceTypeNode['name'] === $resourceTypeName) { if ($_resourceTypeNode['name'] === $resourceTypeName) {
$this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode); $this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
...@@ -531,10 +537,10 @@ class CKFinder_Connector_Core_Config ...@@ -531,10 +537,10 @@ class CKFinder_Connector_Core_Config
if (function_exists('CheckAuthentication')) { if (function_exists('CheckAuthentication')) {
$this->_isEnabled = CheckAuthentication(); $this->_isEnabled = CheckAuthentication();
} }
if(isset($GLOBALS['config']['Resource_Root_Dir'])){ if (isset($GLOBALS['config']['Resource_Root_Dir'])) {
$this->_resource_root_dir = (string)$GLOBALS['config']['Resource_Root_Dir']; $this->_resource_root_dir = (string)$GLOBALS['config']['Resource_Root_Dir'];
} }
if(isset($GLOBALS['config']['Resource_Space_Size'])){ if (isset($GLOBALS['config']['Resource_Space_Size'])) {
$this->_resource_space_size = (array)$GLOBALS['config']['Resource_Space_Size']; $this->_resource_space_size = (array)$GLOBALS['config']['Resource_Space_Size'];
} }
if (isset($GLOBALS['config']['LicenseName'])) { if (isset($GLOBALS['config']['LicenseName'])) {
...@@ -631,22 +637,24 @@ class CKFinder_Connector_Core_Config ...@@ -631,22 +637,24 @@ class CKFinder_Connector_Core_Config
/** /**
* Get X-Sendfile option * Get X-Sendfile option
*/ */
public function getXSendfile(){ public function getXSendfile()
{
return $this->_xsendfile; return $this->_xsendfile;
} }
/** /**
* Get the dditional Nginx X-Sendfile configuration (location => root) * Get the dditional Nginx X-Sendfile configuration (location => root)
*/ */
public function getXSendfileNginx(){ public function getXSendfileNginx()
{
$xsendfileNginx = array(); $xsendfileNginx = array();
foreach ( $this->_xsendfileNginx as $location => $root ){ foreach ($this->_xsendfileNginx as $location => $root) {
$root = (string)$root; $root = (string)$root;
$location = rtrim((string)$location,'/').'/'; $location = rtrim((string)$location, '/') . '/';
if ( substr($root,-1,1) != '/' && substr($root,-1,1) != '\\') { if (substr($root, -1, 1) != '/' && substr($root, -1, 1) != '\\') {
// root and location paths are concatenated // root and location paths are concatenated
// @see http://wiki.nginx.org/XSendfile // @see http://wiki.nginx.org/XSendfile
$root = CKFinder_Connector_Utils_FileSystem::combinePaths(rtrim($root,'/'),$location); $root = CKFinder_Connector_Utils_FileSystem::combinePaths(rtrim($root, '/'), $location);
} }
$xsendfileNginx[$location] = $root; $xsendfileNginx[$location] = $root;
} }
......
var global = {
'attach_prefix' : '/public/resource/lib/Attachments/'
}
function BrowseServer(input_image,fun ) function BrowseServer(input_image,fun )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment