Skip to content
Snippets Groups Projects
Commit a6b7bb69 authored by Anton Guz's avatar Anton Guz
Browse files

Merge branch 'MAGETWO-31191' of... 

Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
parents 805f86b4 2c673928
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+ 1
− 1
View file @ a6b7bb69
......@@ -111,7 +111,7 @@ class Editor extends Textarea
'
<script type="text/javascript">
//<![CDATA[
require(["jquery", "mage/translate", "mage/adminhtml/events", "mage/adminhtml/wysiwyg/tiny_mce/setup"], function(jQuery){' .
require(["jquery", "mage/translate", "mage/adminhtml/events", "mage/adminhtml/wysiwyg/tiny_mce/setup", "mage/adminhtml/wysiwyg/widget"], function(jQuery){' .
"\n" .
'(function($) {$.mage.translate.add(' .
\Zend_Json::encode(
......
lib/web/mage/adminhtml/tabs.js deleted 100644 → 0
+ 0
− 271
View file @ 805f86b4
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
define([
'jquery',
'prototype',
'mage/adminhtml/events'
], function(jQuery){
varienTabs = new Class.create();
varienTabs.prototype = {
initialize : function(containerId, destElementId, activeTabId, shadowTabs){
this.containerId = containerId;
this.destElementId = destElementId;
this.activeTab = null;
this.tabOnClick = this.tabMouseClick.bindAsEventListener(this);
this.tabs = $$('#'+this.containerId+' li a.tab-item-link');
this.hideAllTabsContent();
for (var tab=0; tab<this.tabs.length; tab++) {
Event.observe(this.tabs[tab],'click',this.tabOnClick);
// move tab contents to destination element
if($(this.destElementId)){
var tabContentElement = $(this.getTabContentElementId(this.tabs[tab]));
if(tabContentElement && tabContentElement.parentNode.id != this.destElementId){
$(this.destElementId).appendChild(tabContentElement);
tabContentElement.container = this;
tabContentElement.statusBar = this.tabs[tab];
tabContentElement.tabObject = this.tabs[tab];
this.tabs[tab].contentMoved = true;
this.tabs[tab].container = this;
this.tabs[tab].show = function(){
this.container.showTabContent(this);
}
if(varienGlobalEvents){
varienGlobalEvents.fireEvent('moveTab', {tab:this.tabs[tab]});
}
}
}
/*
// this code is pretty slow in IE, so lets do it in tabs*.phtml
// mark ajax tabs as not loaded
if (Element.hasClassName($(this.tabs[tab].id), 'ajax')) {
Element.addClassName($(this.tabs[tab].id), 'notloaded');
}
*/
// bind shadow tabs
if (this.tabs[tab].id && shadowTabs && shadowTabs[this.tabs[tab].id]) {
this.tabs[tab].shadowTabs = shadowTabs[this.tabs[tab].id];
}
}
this.displayFirst = activeTabId;
Event.observe(window,'load',this.moveTabContentInDest.bind(this));
Event.observe(window,'load',this.bindOnbeforeSubmit.bind(this));
Event.observe(window,'load',this.bindOnInvalid.bind(this));
},
bindOnInvalid: function() {
jQuery.each(this.tabs, jQuery.proxy(function(i, tab) {
jQuery('#' + this.getTabContentElementId(tab))
.on('highlight.validate', function() {
jQuery(tab).addClass('error').find('.error').show();
})
.on('focusin', jQuery.proxy(function() {
this.showTabContentImmediately(tab);
}, this));
}, this));
},
bindOnbeforeSubmit: function() {
jQuery('#' + this.destElementId).on('beforeSubmit', jQuery.proxy(function(e, data) {
var tabsIdValue = this.activeTab.id;
if (this.tabsBlockPrefix) {
if (this.activeTab.id.startsWith(this.tabsBlockPrefix)) {
tabsIdValue = tabsIdValue.substr(this.tabsBlockPrefix.length);
}
}
jQuery(this.tabs).removeClass('error');
var options = {action: {args: {}}};
options.action.args[this.tabIdArgument || 'tab'] = tabsIdValue;
data = data ? jQuery.extend(data, options) : options;
}, this));
},
setSkipDisplayFirstTab : function(){
this.displayFirst = null;
},
moveTabContentInDest : function(){
for(var tab=0; tab<this.tabs.length; tab++){
if($(this.destElementId) && !this.tabs[tab].contentMoved){
var tabContentElement = $(this.getTabContentElementId(this.tabs[tab]));
if(tabContentElement && tabContentElement.parentNode.id != this.destElementId){
$(this.destElementId).appendChild(tabContentElement);
tabContentElement.container = this;
tabContentElement.statusBar = this.tabs[tab];
tabContentElement.tabObject = this.tabs[tab];
this.tabs[tab].container = this;
this.tabs[tab].show = function(){
this.container.showTabContent(this);
}
if(varienGlobalEvents){
varienGlobalEvents.fireEvent('moveTab', {tab:this.tabs[tab]});
}
}
}
}
if (this.displayFirst) {
this.showTabContent($(this.displayFirst));
this.displayFirst = null;
}
},
getTabContentElementId : function(tab){
if(tab){
return tab.id+'_content';
}
return false;
},
tabMouseClick : function(event) {
var tab = Event.findElement(event, 'a');
// go directly to specified url or switch tab
if ((tab.href.indexOf('#') != tab.href.length-1)
&& !(Element.hasClassName(tab, 'ajax'))
) {
location.href = tab.href;
}
else {
this.showTabContent(tab);
}
Event.stop(event);
},
hideAllTabsContent : function(){
for(var tab in this.tabs){
this.hideTabContent(this.tabs[tab]);
}
},
// show tab, ready or not
showTabContentImmediately : function(tab) {
this.hideAllTabsContent();
var tabContentElement = $(this.getTabContentElementId(tab));
if (tabContentElement) {
Element.show(tabContentElement);
Element.addClassName(tab, 'active');
// load shadow tabs, if any
if (tab.shadowTabs && tab.shadowTabs.length) {
for (var k in tab.shadowTabs) {
this.loadShadowTab($(tab.shadowTabs[k]));
}
}
if (!Element.hasClassName(tab, 'ajax only')) {
Element.removeClassName(tab, 'notloaded');
}
this.activeTab = tab;
}
if (varienGlobalEvents) {
varienGlobalEvents.fireEvent('showTab', {tab:tab});
}
},
// the lazy show tab method
showTabContent : function(tab) {
var tabContentElement = $(this.getTabContentElementId(tab));
if (tabContentElement) {
if (this.activeTab != tab) {
if (varienGlobalEvents) {
var defaultTab = this.tabs[0];
var eventData = {
from: this.activeTab ? this.activeTab.getAttribute('id') : null,
to: tab ? tab.getAttribute('id') : null,
first: defaultTab && tab && tab.getAttribute('id') == defaultTab.getAttribute('id')
};
if (varienGlobalEvents.fireEvent('tabChangeBefore', eventData) === false) {
return;
};
}
}
// wait for ajax request, if defined
var isAjax = Element.hasClassName(tab, 'ajax');
var isEmpty = tabContentElement.innerHTML=='' && tab.href.indexOf('#')!=tab.href.length-1;
var isNotLoaded = Element.hasClassName(tab, 'notloaded');
if ( isAjax && (isEmpty || isNotLoaded) )
{
new Ajax.Request(tab.href, {
parameters: {form_key: FORM_KEY},
evalScripts: true,
onSuccess: function(transport) {
try {
if (transport.responseText.isJSON()) {
var response = transport.responseText.evalJSON()
if (response.error) {
alert(response.message);
}
if(response.ajaxExpired && response.ajaxRedirect) {
setLocation(response.ajaxRedirect);
}
} else {
$(tabContentElement.id).update(transport.responseText);
this.showTabContentImmediately(tab)
}
}
catch (e) {
$(tabContentElement.id).update(transport.responseText);
this.showTabContentImmediately(tab)
}
}.bind(this)
});
}
else {
this.showTabContentImmediately(tab);
}
}
},
loadShadowTab : function(tab) {
var tabContentElement = $(this.getTabContentElementId(tab));
if (tabContentElement && Element.hasClassName(tab, 'ajax') && Element.hasClassName(tab, 'notloaded')) {
new Ajax.Request(tab.href, {
parameters: {form_key: FORM_KEY},
evalScripts: true,
onSuccess: function(transport) {
try {
if (transport.responseText.isJSON()) {
var response = transport.responseText.evalJSON()
if (response.error) {
alert(response.message);
}
if(response.ajaxExpired && response.ajaxRedirect) {
setLocation(response.ajaxRedirect);
}
} else {
$(tabContentElement.id).update(transport.responseText);
if (!Element.hasClassName(tab, 'ajax only')) {
Element.removeClassName(tab, 'notloaded');
}
}
}
catch (e) {
$(tabContentElement.id).update(transport.responseText);
if (!Element.hasClassName(tab, 'ajax only')) {
Element.removeClassName(tab, 'notloaded');
}
}
}.bind(this)
});
}
},
hideTabContent : function(tab){
var tabContentElement = $(this.getTabContentElementId(tab));
if($(this.destElementId) && tabContentElement){
Element.hide(tabContentElement);
Element.removeClassName(tab, 'active');
}
if(varienGlobalEvents){
varienGlobalEvents.fireEvent('hideTab', {tab:tab});
}
}
};
});
\ No newline at end of file
lib/web/mage/backend/ajax-setup.js deleted 100644 → 0
+ 0
− 65
View file @ 805f86b4
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
/*jshint browser:true jquery:true */
/*global window:true FORM_KEY:true SessionError:true*/
define([
"jquery",
"jquery/ui"
], function($){
$.ajaxSetup({
/*
* @type {string}
*/
type: 'POST',
/*
* Ajax before send callback
* @param {Object} The jQuery XMLHttpRequest object returned by $.ajax()
* @param {Object}
*/
beforeSend: function(jqXHR, settings){
if (!settings.url.match(new RegExp('[?&]isAjax=true',''))) {
settings.url = settings.url.match(
new RegExp('\\?',"g")) ?
settings.url + '&isAjax=true' :
settings.url + '?isAjax=true';
}
if ($.type(settings.data) === "string" && settings.data.indexOf('form_key=') === -1
) {
settings.data += '&' + $.param({
form_key: FORM_KEY
});
} else {
if (!settings.data) {
settings.data = {
form_key: FORM_KEY
};
}
if (!settings.data.form_key) {
settings.data.form_key = FORM_KEY;
}
}
},
/*
* Ajax complete callback
* @param {Object} The jQuery XMLHttpRequest object returned by $.ajax()
*/
complete: function(jqXHR){
if (jqXHR.readyState === 4) {
try {
var jsonObject = $.parseJSON(jqXHR.responseText);
if (jsonObject.ajaxExpired && jsonObject.ajaxRedirect) {
window.location.replace(jsonObject.ajaxRedirect);
throw new SessionError('session expired');
}
} catch (e) {
if (e instanceof SessionError) {
return;
}
}
}
}
});
});
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment