diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index 0b806275d..2f057d0d9 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -87,7 +87,8 @@ $el.on('oc.triggerOn.update',function(e){e.stopPropagation() self.onConditionChanged()}) self.onConditionChanged()} TriggerOn.prototype.onConditionChanged=function(){if(this.triggerCondition=='checked'){this.updateTarget($(this.options.trigger+':checked',this.triggerParent).length>0)} -else if(this.triggerCondition=='value'){var trigger=$(this.options.trigger+':checked',this.triggerParent);if(trigger.length){this.updateTarget(trigger.val()==this.triggerConditionValue)}else{this.updateTarget($(this.options.trigger,this.triggerParent).val()==this.triggerConditionValue)}}} +else if(this.triggerCondition=='value'){var trigger=$(this.options.trigger+':checked',this.triggerParent);if(trigger.length){this.updateTarget(trigger.val()==this.triggerConditionValue)} +else{this.updateTarget($(this.options.trigger,this.triggerParent).val()==this.triggerConditionValue)}}} TriggerOn.prototype.updateTarget=function(status){if(this.options.triggerAction=='show') this.$el.toggleClass('hide',!status).trigger('hide.oc.triggerapi',[!status]) else if(this.options.triggerAction=='hide') @@ -394,7 +395,9 @@ this.$el.on('modified.oc.tab',function(ev){ev.preventDefault() self.modifyTab($(ev.target).closest('ul.nav-tabs > li, div.tab-content > div'))}) this.$el.on('unmodified.oc.tab',function(ev){ev.preventDefault() self.unmodifyTab($(ev.target).closest('ul.nav-tabs > li, div.tab-content > div'))}) -this.$tabsContainer.on('shown.bs.tab','li',function(){$(window).trigger('oc.updateUi')}) +this.$tabsContainer.on('shown.bs.tab','li',function(){$(window).trigger('oc.updateUi') +var tabUrl=$('> a',this).data('tabUrl') +if(tabUrl){window.history.replaceState({},'Tab link reference',tabUrl)}}) if(this.options.slidable){this.$pagesContainer.touchwipe({wipeRight:function(){self.prev();},wipeLeft:function(){self.next();},preventDefaultEvents:false,min_move_x:60});} this.$tabsContainer.toolbar({scrollClassContainer:this.$el}) this.updateClasses()} diff --git a/modules/backend/assets/js/october.tab.js b/modules/backend/assets/js/october.tab.js index 7154eb71d..a4d5bf344 100644 --- a/modules/backend/assets/js/october.tab.js +++ b/modules/backend/assets/js/october.tab.js @@ -107,8 +107,13 @@ }) this.$tabsContainer.on('shown.bs.tab', 'li', function(){ - // self.$tabsContainer.dragScroll('fixScrollClasses') - $(window).trigger('oc.updateUi') + // self.$tabsContainer.dragScroll('fixScrollClasses') + $(window).trigger('oc.updateUi') + + var tabUrl = $('> a', this).data('tabUrl') + if (tabUrl) { + window.history.replaceState({}, 'Tab link reference', tabUrl) + } }) if (this.options.slidable) { diff --git a/modules/system/controllers/eventlogs/index.htm b/modules/system/controllers/eventlogs/index.htm index 59f52c79d..d11fc0666 100644 --- a/modules/system/controllers/eventlogs/index.htm +++ b/modules/system/controllers/eventlogs/index.htm @@ -1,4 +1,4 @@ -
+
makeHintPartial('system_eventlogs_hint', 'hint') ?>
diff --git a/modules/system/controllers/requestlogs/index.htm b/modules/system/controllers/requestlogs/index.htm index e55af6fad..d20ced27e 100644 --- a/modules/system/controllers/requestlogs/index.htm +++ b/modules/system/controllers/requestlogs/index.htm @@ -1,4 +1,4 @@ -
+
makeHintPartial('system_requestlogs_hint', 'hint') ?>