fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-18 01:42:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14 from xpressengine/develop

Browse source 
Update Branch
This commit is contained in:
YJSoft 2015-07-13 21:36:48 +09:00
commit bbf3f9b20f
7 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/extravar/Extravar.class.php
View file

@ -289,6 +289,16 @@ class ExtraItem
}
}
/**
* Returns a value for HTML
*
* @return string Returns a value expressed in HTML.
*/
function getValue()
{
return $this->_getTypeValue($this->type, $this->value);
}
/**
* Returns a value for HTML
*

7
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -60,6 +60,8 @@
last_selected_file: null,
});
var currentEnforce_ssl = window.enforce_ssl;
if(location.protocol == 'https:') { window.enforce_ssl = true; }
var settings = {
url: request_uri
@ -122,6 +124,8 @@
}
}
};
window.enforce_ssl = currentEnforce_ssl;
data.settings = $.extend({} , default_settings, settings, opt || {});
$container.data(data);
@ -287,7 +291,6 @@
obj.editor_sequence = data.editorSequence;
$.exec_json('file.getFileList', obj, function(res){
console.log(res);
data.uploadTargetSrl = res.upload_target_srl;
editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl;
data.uploadTargetSrl = res.uploadTargetSrl;
@ -366,8 +369,6 @@
return u;
};
xe.unregisterApp();
})(jQuery);

2
common/js/plugins/jquery.fileupload/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.8.5');
define('__XE_VERSION__', '1.8.6');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

10
layouts/xedition/layout.html
View file

@ -307,35 +307,35 @@
<!--@if($_sample_slide)-->
<include target="./demo/slide.html" />
<!--@else-->
<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');">
<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');" class="swiper-slide">
<div cond="$layout_info->slide_text1">
<div>
{$layout_info->slide_text1}
</div>
</div>
</div>
<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');">
<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');" class="swiper-slide">
<div cond="$layout_info->slide_text2">
<div>
{$layout_info->slide_text2}
</div>
</div>
</div>
<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');">
<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');" class="swiper-slide">
<div cond="$layout_info->slide_text3">
<div>
{$layout_info->slide_text3}
</div>
</div>
</div>
<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');">
<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');" class="swiper-slide">
<div cond="$layout_info->slide_text4">
<div>
{$layout_info->slide_text4}
</div>
</div>
</div>
<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');">
<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');" class="swiper-slide">
<div cond="$layout_info->slide_text5">
<div>
{$layout_info->slide_text5}

4
modules/document/document.item.php
View file

@ -651,7 +651,7 @@ class documentItem extends Object
function getExtraValue($idx)
{
$extra_vars = $this->getExtraVars();
return $extra_vars[$idx]->value;
return $extra_vars[$idx]->getValue();
}
function getExtraValueHTML($idx)
@ -679,7 +679,7 @@ class documentItem extends Object
$extra_eid[$key->eid] = $key;
}
}
return $extra_eid[$eid]->value;
return $extra_eid[$eid]->getValue();
}
function getExtraEidValueHTML($eid)

2
modules/editor/skins/ckeditor/editor.html
View file

@ -32,9 +32,9 @@
<script>
(function($){
"use strict";
// editor
$(function(){
<!--@if(!FileHandler::exists('common/js/plugins/ckeditor/ckeditor/config.js'))-->CKEDITOR.config.customConfig = '';<!--@endif-->
var settings = {
ckeconfig: {
height: '{$editor_height}',