TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:octobercms/october into develop

This commit is contained in:
alekseybobkov 2016-02-04 18:00:42 -08:00
parent 778e73964e af4f42e208
commit bfb0fa1671
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/cms/classes/Controller.php
View File

@ -168,6 +168,7 @@ class Controller
MaintenanceSettings::get('is_enabled', false) &&
!BackendAuth::getUser()
) {
$this->setStatusCode(503);
$page = Page::loadCached($this->theme, MaintenanceSettings::get('cms_page'));
}

2
modules/system/assets/ui/js/input.trigger.js
View File

@ -25,7 +25,7 @@
if (this.options.triggerCondition.indexOf('value') == 0) {
var match = this.options.triggerCondition.match(/[^[\]]+(?=])/g)
this.triggerCondition = 'value'
this.triggerConditionValue = (match) ? match : ""
this.triggerConditionValue = (match) ? match : [""]
}
this.triggerParent = this.options.triggerClosestParent !== undefined

2
modules/system/assets/ui/storm-min.js vendored
View File

@ -2891,7 +2891,7 @@ throw new Error('Trigger action is not specified.')
this.triggerCondition=this.options.triggerCondition
if(this.options.triggerCondition.indexOf('value')==0){var match=this.options.triggerCondition.match(/[^[\]]+(?=])/g)
this.triggerCondition='value'
this.triggerConditionValue=(match)?match:""}
this.triggerConditionValue=(match)?match:[""]}
this.triggerParent=this.options.triggerClosestParent!==undefined?$el.closest(this.options.triggerClosestParent):undefined
if(this.triggerCondition=='checked'||this.triggerCondition=='unchecked'||this.triggerCondition=='value'){$(document).on('change',this.options.trigger,$.proxy(this.onConditionChanged,this))}
var self=this