conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
helper: this._getSortableHelper.bind( this ),
cancel: '.elementor-inline-editing, .elementor-tab-title'
=======
helper: _.bind( this._getSortableHelper, this ),
cancel: 'input, textarea, button, select, option, .elementor-inline-editing, .elementor-tab-title'
>>>>>>>
helper: this._getSortableHelper.bind( this ),
cancel: 'input, textarea, button, select, option, .elementor-inline-editing, .elementor-tab-title' |
<<<<<<<
element: {
Model: require( 'elementor-elements/model' )
},
WidgetView: require( 'elementor-elements/widget' ),
=======
element: require( 'elementor-models/element' ),
Module: require( 'elementor-utils/module' ),
WidgetView: require( 'elementor-views/widget' ),
>>>>>>>
element: {
Model: require( 'elementor-elements/model' )
},
Module: require( 'elementor-utils/module' ),
WidgetView: require( 'elementor-elements/widget' ), |
<<<<<<<
box_shadow: require( 'elementor-views/controls/box-shadow' ),
structure: require( 'elementor-views/controls/structure' )
=======
structure: require( 'elementor-views/controls/structure' ),
animation: require( 'elementor-views/controls/animation' )
>>>>>>>
box_shadow: require( 'elementor-views/controls/box-shadow' ),
structure: require( 'elementor-views/controls/structure' ),
animation: require( 'elementor-views/controls/animation' ) |
<<<<<<<
const element = document.$element[ 0 ];
if ( this.previewView && this.previewView.el === element ) {
this.previewView.destroy();
}
elementor.trigger( 'document:before:preview', document );
const preview = new Preview( { el: element, model: elementor.elementsModel } );
=======
const preview = new Preview( { el: document.$element[ 0 ], model: elementor.elementsModel } );
>>>>>>>
elementor.trigger( 'document:before:preview', document );
const preview = new Preview( { el: document.$element[ 0 ], model: elementor.elementsModel } ); |
<<<<<<<
import DocumentsManager from './document/manager';
import Component from './component';
import Document from 'elementor-document/document';
import KitManager from '../../../../core/kits/assets/js/manager.js';
=======
import EditorsDocument from './component';
import Document from './document';
>>>>>>>
import EditorsDocument from './component';
import Document from './document';
import KitManager from '../../../../core/kits/assets/js/manager.js'; |
<<<<<<<
editMode = elementor.channels.dataEditMode.request( 'get:active:mode' ),
isClickInsideElementor = !! $target.closest( '#elementor' ).length;
=======
editMode = elementor.dataEditMode.request( 'activeMode' ),
isClickInsideElementor = !! $target.closest( '#elementor' ).length,
isTargetInsideDocument = this.contains( $target[0] );
>>>>>>>
editMode = elementor.channels.dataEditMode.request( 'activeMode' ),
isClickInsideElementor = !! $target.closest( '#elementor' ).length,
isTargetInsideDocument = this.contains( $target[0] );
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' );
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' );
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' );
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' );
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' );
<<<<<<<
var dataEditMode = elementor.channels.dataEditMode,
oldEditMode = dataEditMode.request( 'get:active:mode' ),
=======
var oldEditMode = elementor.dataEditMode.request( 'activeMode' ),
>>>>>>>
var dataEditMode = elementor.channels.dataEditMode,
oldEditMode = dataEditMode.request( 'activeMode' ),
<<<<<<<
dataEditMode.reply( 'get:active:mode', currentMode );
=======
elementor.dataEditMode.reply( 'activeMode', currentMode );
>>>>>>>
dataEditMode.reply( 'activeMode', currentMode );
<<<<<<<
},{}],56:[function(require,module,exports){
var BaseElementView;
=======
},{}],44:[function(require,module,exports){
var BaseSettingsModel = require( 'elementor-models/base-settings' ),
BaseElementView;
>>>>>>>
},{}],56:[function(require,module,exports){
var BaseSettingsModel = require( 'elementor-models/base-settings' ),
BaseElementView;
<<<<<<<
},{}],57:[function(require,module,exports){
=======
},{"elementor-models/base-settings":32}],45:[function(require,module,exports){
>>>>>>>
},{"elementor-models/base-settings":43}],57:[function(require,module,exports){
<<<<<<<
},{"elementor-behaviors/handle-edit-mode":5,"elementor-behaviors/handle-editor":6,"elementor-models/base-settings":43,"elementor-views/base-element":56}]},{},[1])
=======
},{"elementor-behaviors/handle-edit-mode":5,"elementor-behaviors/handle-editor":6,"elementor-views/base-element":44}]},{},[1])
>>>>>>>
},{"elementor-behaviors/handle-edit-mode":5,"elementor-behaviors/handle-editor":6,"elementor-views/base-element":56}]},{},[1]) |
<<<<<<<
/**
* Function initialize().
*
* Initialize document.
*/
initialize() {
this.history = new HistoryManager( this );
this.revisions = new RevisionsManager( this );
}
=======
>>>>>>> |
<<<<<<<
{kind: "onyx.Toolbar", classes: "onyx-toolbar onyx-menu-toolbar ares-top-toolbar", isContainer: true, name: "toolbar", components: [
{classes: "aresmenu" , components: [
{tag:'span', content:'Ares', ontap: "aresMenuTapped"},
{classes:'lsmallDownArrow', ontap: "aresMenuTapped",},
{name: 'amenu', tag:'ul', components:[
{name: 'account', id:'account', tag:'li', kind: 'control.Link', content: "Accounts...", ontap:"showAccountConfigurator", onmouseup:"aresMenuHide"},
{name: 'properties', id:'properties', tag:'li', kind: 'control.Link', content: "Properties..."}
=======
{kind: "onyx.MoreToolbar", classes: "onyx-menu-toolbar ares_harmonia_toolBar ares-no-padding", isContainer: true, name: "toolbar", components: [
{kind: "onyx.MenuDecorator", onSelect: "menuItemSelected", components: [
{content: "Ares"},
{kind: "onyx.Menu", components: [
{value: "showAccountConfigurator", components: [
{kind: "onyx.IconButton", src: "$project-view/assets/images/ares_accounts.png"},
{content: "Accounts..."}
]},
{classes: "onyx-menu-divider"},
{content: "Properties..."}
>>>>>>>
/*{kind: "onyx.Toolbar", classes: "onyx-toolbar onyx-menu-toolbar ares-top-toolbar", isContainer: true, name: "toolbar", components: [
{classes: "aresmenu" , components: [
{tag:'span', content:'Ares', ontap: "aresMenuTapped"},
{classes:'lsmallDownArrow', ontap: "aresMenuTapped",},
{name: 'amenu', tag:'ul', components:[
{name: 'account', id:'account', tag:'li', kind: 'control.Link', content: "Accounts...", ontap:"showAccountConfigurator", onmouseup:"aresMenuHide"},
{name: 'properties', id:'properties', tag:'li', kind: 'control.Link', content: "Properties..."}*/
{kind: "onyx.MoreToolbar", classes: "onyx-menu-toolbar ares_harmonia_toolBar ares-no-padding", isContainer: true, name: "toolbar", components: [
{kind: "onyx.MenuDecorator", onSelect: "menuItemSelected", components: [
{content: "Ares"},
{kind: "onyx.Menu", components: [
{value: "showAccountConfigurator", components: [
{kind: "onyx.IconButton", src: "$project-view/assets/images/ares_accounts.png"},
{content: "Accounts..."}
]},
{classes: "onyx-menu-divider"},
{content: "Properties..."}
<<<<<<<
showErrorPopup : function(msg) {
this.$.errorPopup.setErrorMsg(msg);
this.$.errorPopup.show();
},
=======
>>>>>>>
showErrorPopup : function(msg) {
this.$.errorPopup.setErrorMsg(msg);
this.$.errorPopup.show();
}, |
<<<<<<<
/*! elementor - v0.1.0 - 31-05-2016 */
=======
/*! elementor - v0.1.1 - 30-05-2016 */
>>>>>>>
/*! elementor - v0.1.1 - 31-05-2016 */ |
<<<<<<<
editMode = elementor.channels.dataEditMode.request( 'get:active:mode' ),
isClickInsideElementor = !! $target.closest( '#elementor' ).length;
=======
editMode = elementor.dataEditMode.request( 'activeMode' ),
isClickInsideElementor = !! $target.closest( '#elementor' ).length,
isTargetInsideDocument = this.contains( $target[0] );
>>>>>>>
editMode = elementor.channels.dataEditMode.request( 'activeMode' ),
isClickInsideElementor = !! $target.closest( '#elementor' ).length,
isTargetInsideDocument = this.contains( $target[0] );
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' ); |
<<<<<<<
data: JSON.stringify( elementor.elements.toJSON() )
},
success: function( data ) {
NProgress.done();
=======
data: JSON.stringify( elementor.elements.toJSON() ),
_nonce: elementor.config.nonce
}
} )
.done( function( data ) {
NProgress.done();
>>>>>>>
data: JSON.stringify( elementor.elements.toJSON() )
},
success: function( data ) {
NProgress.done();
<<<<<<<
=======
Backbone.$.ajax( {
type: 'POST',
url: elementor.config.ajaxurl,
data: {
action: 'elementor_apply_scheme',
scheme_name: schemeName,
data: JSON.stringify( schemes[ schemeName ].items ),
_nonce: elementor.config.nonce
}
} )
>>>>>>>
<<<<<<<
data: JSON.stringify( this.elementSettingsModel.toJSON() )
},
success: _.bind( function( data ) {
=======
data: JSON.stringify( this.elementSettingsModel.toJSON() ),
_nonce: elementor.config.nonce
}
} )
.done( _.bind( function( data ) {
>>>>>>>
data: JSON.stringify( this.elementSettingsModel.toJSON() )
},
success: _.bind( function( data ) { |
<<<<<<<
import CommandHistory from './commands/base/command-history';
import CommandHistoryDebounce from './commands/base/command-history-debounce';
=======
import CommandHistoryBase from './commands/base/history';
import CommandHistoryDebounceBase from './commands/base/history/debounce';
import * as components from './';
>>>>>>>
import CommandHistory from './commands/base/command-history';
import CommandHistoryDebounce from './commands/base/command-history-debounce';
import * as components from './'; |
<<<<<<<
import Promotion from './utils/promotion';
import ScreenshotsModule from 'elementor/modules/screenshots/assets/js/editor/module'
=======
import PopoverToggleControl from 'elementor-controls/popover-toggle';
>>>>>>>
import PopoverToggleControl from 'elementor-controls/popover-toggle';
import Promotion from './utils/promotion';
import ScreenshotsModule from 'elementor/modules/screenshots/assets/js/editor/module'
<<<<<<<
const preview = new Preview( { el: document.$element[ 0 ], model: elementor.elementsModel } );
=======
elementor.trigger( 'document:before:preview', document );
const preview = new Preview( { el: document.$element[ 0 ], model: elementor.elementsModel } );
>>>>>>>
elementor.trigger( 'document:before:preview', document );
const preview = new Preview( { el: document.$element[ 0 ], model: elementor.elementsModel } );
<<<<<<<
=======
this.kitManager.renderGlobalsDefaultCSS();
>>>>>>>
this.kitManager.renderGlobalsDefaultCSS(); |
<<<<<<<
},{}],70:[function(require,module,exports){
var Schemes;
=======
},{}],66:[function(require,module,exports){
var Schemes,
Stylesheet = require( 'elementor-utils/stylesheet' ),
BaseElementView = require( 'elementor-views/base-element' );
>>>>>>>
},{}],70:[function(require,module,exports){
var Schemes,
Stylesheet = require( 'elementor-utils/stylesheet' ),
BaseElementView = require( 'elementor-views/base-element' );
<<<<<<<
},{}],71:[function(require,module,exports){
=======
},{"elementor-utils/stylesheet":67,"elementor-views/base-element":68}],67:[function(require,module,exports){
>>>>>>>
},{"elementor-utils/stylesheet":71,"elementor-views/base-element":72}],71:[function(require,module,exports){ |
<<<<<<<
{name: "providerList", kind: "ProviderList", type: "filesystem",
onSelectProvider: "handleSelectProvider"},
{kind: "HermesFileTree", fit: true}
=======
{kind: "HermesFileTree", fit: true, onFileClick: "selectFile", onFolderClick: "selectFolder",
onNewFileConfirm: "newFileConfirm", onNewFolderConfirm: "newFolderConfirm",
onRenameConfirm: "renameConfirm", onDeleteConfirm: "deleteConfirm",
onCopyFileConfirm: "copyFileConfirm"}
>>>>>>>
{kind: "HermesFileTree", fit: true}
<<<<<<<
providerListNeeded: true,
service: null,
=======
>>>>>>>
<<<<<<<
=======
},
//TODO: How much of the file manipulation code lives here, vs. in HermesFileTree?
selectFile: function(inSender, inEvent) {
if (this.debug) this.log(inEvent.file);
},
selectFolder: function(inSender, inEvent) {
if (this.debug) this.log(inEvent.file);
},
newSelect: function(inSender, inEvent) {
if (inSender.name !== "providerList") {
this.selectedFile=inEvent.file;
}
},
newDeselect: function(inSender, inEvent) {
this.selectedFile=inEvent.file;
},
// File Operations
newFileConfirm: function(inSender, inEvent) {
var folderId = inEvent.folderId;
var name = inEvent.fileName.trim();
var nameStem = name.substring(0, name.lastIndexOf("."));
var type = name.substring(name.lastIndexOf(".")+1);
var templatePath;
var location = window.location.toString();
var prefix = location.substring(0, location.lastIndexOf("/")+1);
if (name == "package.js") {
templatePath = prefix+"../templates/package.js";
} else {
templatePath = prefix+"../templates/template."+type;
}
var options = {
url: templatePath,
cacheBust: false,
handleAs: "text"
};
var replacements = {
"$NAME": nameStem,
"$YEAR": new Date().getFullYear()
};
var r = new enyo.Ajax(options);
r.response(this, function(inSender, inResponse) {
if (this.debug) this.log("response: "+inResponse.toString());
for (var n in replacements) {
inResponse = inResponse.replace(n, replacements[n]);
}
this.createFile(name, folderId, inResponse);
});
r.error(this, function(inSender, error) {
if (error === 404){
this.createFile(name, folderId);
this.$.hermesFileTree.showErrorPopup("No template found for '." + type + "' files. Created an empty one.");
}
else {
this.error("error while fetching " + templatePath + ': ' + error);
}
});
r.go();
},
/**
* Refresh the {HermesFileTree} (if relevant), following a change of the given file
* @param {Object} changedFile
*/
refreshFile: function(changedFile) {
this.$.hermesFileTree.refreshFile(changedFile);
},
delayedRefresh: function(msg) {
var onDone = new enyo.Async() ;
onDone.response(this, function(inSender, toSelectId) {
if (this.debug) this.log("delayed refresh after " + msg + ' on ' + toSelectId) ;
this.$.hermesFileTree.refreshFileTree(null, toSelectId);
}) ;
return onDone ;
},
createFile: function(name, folderId, content) {
if (this.debug) this.log("Creating new file "+name+" into folderId="+folderId);
var service = this.selectedFile.service;
service.createFile(folderId, name, content)
.response(this, function(inSender, inResponse) {
if (this.debug) this.log("Response: "+inResponse);
this.delayedRefresh("file creation done").go(inResponse) ;
})
.error(this, function(inSender, inError) {
if (this.debug) this.log("Error: "+inError);
this.$.hermesFileTree.showErrorPopup("Creating file "+name+" failed:" + inError);
});
},
newFolderConfirm: function(inSender, inEvent) {
var folderId = inEvent.folderId;
var name = inEvent.fileName.trim();
var service = this.selectedFile.service;
if (this.debug) this.log("Creating new folder "+name+" into folderId="+folderId);
service.createFolder(folderId, name)
.response(this, function(inSender, inResponse) {
if (this.debug) this.log("Response: "+inResponse);
this.delayedRefresh("folder creation done").go(inResponse) ;
})
.error(this, function(inSender, inError) {
if (this.debug) this.log("Error: "+inError);
this.$.hermesFileTree.showErrorPopup("Creating folder "+name+" failed:" + inError);
});
},
renameConfirm: function(inSender, inEvent) {
var path = inEvent.path;
var oldId = this.selectedFile.id;
var newName = inEvent.fileName.trim();
var service = this.selectedFile.service;
if (this.debug) this.log("Renaming file " + oldId + " as " + newName + " at " + path);
service.rename(oldId, newName)
.response(this, function(inSender, inResponse) {
if (this.debug) this.log("Response: "+inResponse);
this.delayedRefresh("rename done").go(inResponse) ;
})
.error(this, function(inSender, inError) {
if (this.debug) this.log("Error: "+inError);
this.$.hermesFileTree.showErrorPopup("Renaming file "+oldId+" as " + newName +" failed:" + inError);
});
},
deleteConfirm: function(inSender, inEvent) {
if (this.debug) this.log(inEvent);
var nodeId = inEvent.nodeId;
if (this.debug) this.log(this.selectFile);
var oldId = this.selectedFile.id;
var oldPath = this.selectedFile.path;
var method = this.selectedFile.isDir ? "deleteFolder" : "deleteFile";
var service = this.selectedFile.service;
service.remove(inEvent.nodeId)
.response(this, function(inSender, inResponse) {
if (this.debug) this.log("Response: "+inResponse);
this.delayedRefresh("delete done").go() ;
})
.error(this, function(inSender, inError) {
if (this.debug) this.log("Error: "+inError);
this.$.hermesFileTree.showErrorPopup("Deleting file "+oldPath+" failed:" + inError);
});
},
copyFileConfirm: function(inSender, inEvent) {
if (this.debug) this.log(inEvent);
var oldName = this.selectedFile.name;
var newName = inEvent.fileName.trim();
var service = this.selectedFile.service;
if (this.debug) this.log("Creating new file " + newName + " as copy of" + this.selectedFile.name);
service.copy(this.selectedFile.id, newName)
.response(this, function(inSender, inResponse) {
if (this.debug) this.log("Response: "+inResponse);
this.delayedRefresh("copy done").go(inResponse) ;
})
.error(this, function(inSender, inError) {
if (this.debug) this.log("Error: "+inError);
this.$.hermesFileTree.showErrorPopup("Creating file "+newName+" as copy of" + this.selectedFile.name +" failed:" + inError);
});
>>>>>>>
},
/**
* Refresh the {HermesFileTree} (if relevant), following a change of the given file
* @param {Object} changedFile
*/
refreshFile: function(changedFile) {
this.$.hermesFileTree.refreshFile(changedFile); |
<<<<<<<
this.$.client.applyStyle("width", this.getWidth()+"px");
this.resizeClient();
this.repositionClient();
this.applyZoom();
=======
this.$.designerFrame.applyStyle("width", this.getWidth()+"px");
this.resizeDesignerFrame();
this.repositionDesignerFrame();
>>>>>>>
this.$.designerFrame.applyStyle("width", this.getWidth()+"px");
this.resizeDesignerFrame();
this.repositionDesignerFrame();
this.applyZoom();
<<<<<<<
zoomFromWidth: function(){
var scale = (this.width > 0) ? Math.round((this.getBounds().width * 100)/this.width) : 100;
this.zoom(scale);
return scale;
},
applyZoom: function(){
if(this.autoZoom){
var scale = this.zoomFromWidth();
this.doScaleChange({scale : scale});
}
},
resizeHandler: function(inSender, inEvent){
this.applyZoom();
return true;
},
repositionClient: function() {
=======
repositionDesignerFrame: function() {
>>>>>>>
zoomFromWidth: function(){
var scale = (this.width > 0) ? Math.round((this.getBounds().width * 100)/this.width) : 100;
this.zoom(scale);
return scale;
},
applyZoom: function(){
if(this.autoZoom){
var scale = this.zoomFromWidth();
this.doScaleChange({scale : scale});
}
},
resizeHandler: function(inSender, inEvent){
this.applyZoom();
return true;
},
repositionDesignerFrame: function() {
<<<<<<<
ares.assertCb(next);
this.trace("reloadNeeded", this.reloadNeeded);
=======
>>>>>>>
ares.assertCb(next);
<<<<<<<
setTimeout(next(new Error('reload started')), 0);
=======
this.log("warning: called in state reloadNeeded");
>>>>>>>
this.log("warning: called in state reloadNeeded");
setTimeout(next(new Error('reload started')), 0);
<<<<<<<
setTimeout(next(new Error('on-going reload')), 0);
=======
this.log("warning: called in state != ready");
>>>>>>>
this.log("warning: called in state != ready");
setTimeout(next(new Error('on-going reload')), 0);
<<<<<<<
this.log("dropped rendering: another one is on-going");
setTimeout(next(new Error('on-going rendering')), 0);
=======
this.log("warning: called in state rendering");
>>>>>>>
this.log("dropped rendering: another one is on-going");
setTimeout(next(new Error('on-going rendering')), 0); |
<<<<<<<
/**
* @param {string} command
* @param {function()} callback
*/
=======
getData() {
return this.data;
}
>>>>>>>
getData() {
return this.data;
}
/**
* @param {string} command
* @param {function()} callback
*/
<<<<<<<
const callback = ( args ) => new Class( args );
callback.class = Class;
commands[ command ] = callback;
=======
commands[ command ] = ( args ) => ( new Class( args ) ).run();
// TODO: Temporary code, remove after merge with 'require-commands-base' branch.
// should not return callback, but Class or Instance without run.
this.commandsClasses[ command ] = Class;
>>>>>>>
const callback = ( args ) => new Class( args );
callback.class = Class;
commands[ command ] = callback; |
<<<<<<<
var provider = Phonegap.ProjectProperties.getProvider();
provider.authorize(enyo.bind(this, this.getUserData));
=======
var provider = Phonegap.ProjectProperties.getProvider();
this.showErrorMsg("waitingSignIn");
provider.authorize(enyo.bind(this, this.loadKeys));
>>>>>>>
var provider = Phonegap.ProjectProperties.getProvider();
this.showErrorMsg("waitingSignIn");
provider.authorize(enyo.bind(this, this.getUserData));
<<<<<<<
getUserData: function (err, userData) {
=======
loadKeys: function (err) {
this.trace("err:", err);
>>>>>>>
getUserData: function (err, userData) {
<<<<<<<
this.warn("err:", err);
} else {
var provider = Phonegap.ProjectProperties.getProvider();
=======
//this.warn("err:", err);
this.showErrorMsg("signInError");
this.doError({msg: err.toString(), err: err});
} else {
this.showErrorMsg("userDataRecieved");
var provider = Phonegap.ProjectProperties.getProvider();
>>>>>>>
//this.warn("err:", err);
this.showErrorMsg("signInError");
this.doError({msg: err.toString(), err: err});
} else {
this.showErrorMsg("userDataRecieved");
var provider = Phonegap.ProjectProperties.getProvider(); |
<<<<<<<
this.$.heraButton.valve = this.settings.hera;
=======
this.$.autoTraceButton.value = this.settings.autoTrace;
this.$.autoTraceInputLine.setValue(this.settings.autoTraceLine);
this.$.autoTraceInputBox.setShowing(this.settings.autoTrace);
>>>>>>>
this.$.heraButton.valve = this.settings.hera;
this.$.autoTraceButton.value = this.settings.autoTrace;
this.$.autoTraceInputLine.setValue(this.settings.autoTraceLine);
this.$.autoTraceInputBox.setShowing(this.settings.autoTrace);
<<<<<<<
},
heraChanged: function(inSender, inEvent){
this.log("sender:", inSender, ", event:", inEvent);
this.previewSettings.hera = inEvent.value;
=======
},
aTrace: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTrace = inEvent.value;
this.$.autoTraceInputBox.setShowing(this.previewSettings.autoTrace);
},
atraceline: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTraceLine = inSender.value;
>>>>>>>
},
heraChanged: function(inSender, inEvent){
this.log("sender:", inSender, ", event:", inEvent);
this.previewSettings.hera = inEvent.value;
},
aTrace: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTrace = inEvent.value;
this.$.autoTraceInputBox.setShowing(this.previewSettings.autoTrace);
},
atraceline: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTraceLine = inSender.value; |
<<<<<<<
box_shadow: require( 'elementor-views/controls/box-shadow' ),
structure: require( 'elementor-views/controls/structure' )
=======
structure: require( 'elementor-views/controls/structure' ),
animation: require( 'elementor-views/controls/animation' )
>>>>>>>
box_shadow: require( 'elementor-views/controls/box-shadow' ),
structure: require( 'elementor-views/controls/structure' ),
animation: require( 'elementor-views/controls/animation' )
<<<<<<<
},{"elementor-layouts/panel/panel":31,"elementor-models/element":34,"elementor-utils/heartbeat":38,"elementor-utils/helpers":39,"elementor-utils/introduction":40,"elementor-utils/modals":41,"elementor-utils/presets-factory":42,"elementor-utils/schemes":43,"elementor-views/controls/base":48,"elementor-views/controls/box-shadow":49,"elementor-views/controls/choose":50,"elementor-views/controls/color":51,"elementor-views/controls/dimensions":52,"elementor-views/controls/font":53,"elementor-views/controls/gallery":54,"elementor-views/controls/icon":55,"elementor-views/controls/image-dimensions":56,"elementor-views/controls/media":57,"elementor-views/controls/repeater":59,"elementor-views/controls/section":60,"elementor-views/controls/select2":61,"elementor-views/controls/slider":62,"elementor-views/controls/structure":63,"elementor-views/controls/url":64,"elementor-views/controls/wp_widget":65,"elementor-views/controls/wysiwyg":66,"elementor-views/sections":69}],2:[function(require,module,exports){
=======
},{"elementor-layouts/panel/panel":31,"elementor-models/element":34,"elementor-utils/heartbeat":38,"elementor-utils/helpers":39,"elementor-utils/introduction":40,"elementor-utils/modals":41,"elementor-utils/presets-factory":42,"elementor-utils/schemes":43,"elementor-views/controls/animation":46,"elementor-views/controls/base":49,"elementor-views/controls/choose":50,"elementor-views/controls/color":51,"elementor-views/controls/dimensions":52,"elementor-views/controls/font":53,"elementor-views/controls/gallery":54,"elementor-views/controls/icon":55,"elementor-views/controls/image-dimensions":56,"elementor-views/controls/media":57,"elementor-views/controls/repeater":59,"elementor-views/controls/section":60,"elementor-views/controls/select2":61,"elementor-views/controls/slider":62,"elementor-views/controls/structure":63,"elementor-views/controls/url":64,"elementor-views/controls/wp_widget":65,"elementor-views/controls/wysiwyg":66,"elementor-views/sections":69}],2:[function(require,module,exports){
>>>>>>>
},{"elementor-layouts/panel/panel":31,"elementor-models/element":34,"elementor-utils/heartbeat":38,"elementor-utils/helpers":39,"elementor-utils/introduction":40,"elementor-utils/modals":41,"elementor-utils/presets-factory":42,"elementor-utils/schemes":43,"elementor-views/controls/animation":46,"elementor-views/controls/base":49,"elementor-views/controls/box-shadow":50,"elementor-views/controls/choose":51,"elementor-views/controls/color":52,"elementor-views/controls/dimensions":53,"elementor-views/controls/font":54,"elementor-views/controls/gallery":55,"elementor-views/controls/icon":56,"elementor-views/controls/image-dimensions":57,"elementor-views/controls/media":58,"elementor-views/controls/repeater":60,"elementor-views/controls/section":61,"elementor-views/controls/select2":62,"elementor-views/controls/slider":63,"elementor-views/controls/structure":64,"elementor-views/controls/url":65,"elementor-views/controls/wp_widget":66,"elementor-views/controls/wysiwyg":67,"elementor-views/sections":70}],2:[function(require,module,exports){
<<<<<<<
},{"elementor-behaviors/duplicate":2,"elementor-behaviors/elements-relation":3,"elementor-behaviors/handle-duplicate":4,"elementor-behaviors/handle-edit-mode":5,"elementor-behaviors/handle-editor":6,"elementor-behaviors/resizable":7,"elementor-behaviors/sortable":8,"elementor-views/base-element":44,"elementor-views/element-empty":67,"elementor-views/section":68,"elementor-views/widget":70}],46:[function(require,module,exports){
=======
},{"elementor-behaviors/duplicate":2,"elementor-behaviors/elements-relation":3,"elementor-behaviors/handle-duplicate":4,"elementor-behaviors/handle-edit-mode":5,"elementor-behaviors/handle-editor":6,"elementor-behaviors/resizable":7,"elementor-behaviors/sortable":8,"elementor-views/base-element":44,"elementor-views/element-empty":67,"elementor-views/section":68,"elementor-views/widget":70}],46:[function(require,module,exports){
var ControlBaseItemView = require( 'elementor-views/controls/base' ),
ControlAnimationItemView;
ControlAnimationItemView = ControlBaseItemView.extend( {
onReady: function() {
this.ui.select.select2();
}
} );
module.exports = ControlAnimationItemView;
},{"elementor-views/controls/base":49}],47:[function(require,module,exports){
>>>>>>>
},{"elementor-behaviors/duplicate":2,"elementor-behaviors/elements-relation":3,"elementor-behaviors/handle-duplicate":4,"elementor-behaviors/handle-edit-mode":5,"elementor-behaviors/handle-editor":6,"elementor-behaviors/resizable":7,"elementor-behaviors/sortable":8,"elementor-views/base-element":44,"elementor-views/element-empty":68,"elementor-views/section":69,"elementor-views/widget":71}],46:[function(require,module,exports){
var ControlBaseItemView = require( 'elementor-views/controls/base' ),
ControlAnimationItemView;
ControlAnimationItemView = ControlBaseItemView.extend( {
onReady: function() {
this.ui.select.select2();
}
} );
module.exports = ControlAnimationItemView;
},{"elementor-views/controls/base":49}],47:[function(require,module,exports){
<<<<<<<
},{}],49:[function(require,module,exports){
var ControlMultipleBaseItemView = require( 'elementor-views/controls/base-multiple' ),
ControlBoxShadowItemView;
ControlBoxShadowItemView = ControlMultipleBaseItemView.extend( {
ui: function() {
var ui = ControlMultipleBaseItemView.prototype.ui.apply( this, arguments );
ui.sliders = '.elementor-control-slider';
ui.colors = '.elementor-box-shadow-color-picker';
return ui;
},
childEvents: {
'slide @ui.sliders': 'onSlideChange'
},
initSliders: function() {
var value = this.getControlValue();
this.ui.sliders.each( function() {
var $slider = Backbone.$( this ),
$input = $slider.next( '.elementor-control-slider-input' ).find( 'input' ),
min = Number( $input.attr( 'min' ) ),
max = Number( $input.attr( 'max' ) );
$slider.slider( {
value: value[ this.dataset.input ],
min: min,
max: max
} );
} );
},
initColors: function() {
var $colors = this.ui.colors,
self = this;
$colors.each( function() {
var $color = Backbone.$( this );
$color.wpColorPicker( {
change: function() {
var type = $color.data( 'setting' );
self.setValue( type, $color.wpColorPicker( 'color' ) );
},
clear: function() {
var type = $color.data( 'setting' );
self.setValue( type, '' );
},
width: 251
} );
} );
},
onInputChange: function( event ) {
var type = event.currentTarget.dataset.setting,
$slider = this.ui.sliders.filter( '[data-input="' + type + '"]' ),
$input = Backbone.$( event.currentTarget ),
min = Number( $input.attr( 'min' ) ),
max = Number( $input.attr( 'max' ) );
$slider.slider( {
value: this.getControlValue( type ),
min: min,
max: max
} );
},
onReady: function() {
this.initSliders();
this.initColors();
},
onSlideChange: function( event, ui ) {
var type = event.currentTarget.dataset.input,
$input = this.ui.input.filter( '[data-setting="' + type + '"]' );
$input.val( ui.value );
this.setValue( type, ui.value );
},
onBeforeDestroy: function() {
this.ui.colors.each( function() {
var $color = Backbone.$( this );
if ( $color.wpColorPicker( 'instance' ) ) {
$color.wpColorPicker( 'close' );
}
} );
this.$el.remove();
}
} );
module.exports = ControlBoxShadowItemView;
},{"elementor-views/controls/base-multiple":46}],50:[function(require,module,exports){
=======
},{}],50:[function(require,module,exports){
>>>>>>>
},{}],50:[function(require,module,exports){
var ControlMultipleBaseItemView = require( 'elementor-views/controls/base-multiple' ),
ControlBoxShadowItemView;
ControlBoxShadowItemView = ControlMultipleBaseItemView.extend( {
ui: function() {
var ui = ControlMultipleBaseItemView.prototype.ui.apply( this, arguments );
ui.sliders = '.elementor-control-slider';
ui.colors = '.elementor-box-shadow-color-picker';
return ui;
},
childEvents: {
'slide @ui.sliders': 'onSlideChange'
},
initSliders: function() {
var value = this.getControlValue();
this.ui.sliders.each( function() {
var $slider = Backbone.$( this ),
$input = $slider.next( '.elementor-control-slider-input' ).find( 'input' ),
min = Number( $input.attr( 'min' ) ),
max = Number( $input.attr( 'max' ) );
$slider.slider( {
value: value[ this.dataset.input ],
min: min,
max: max
} );
} );
},
initColors: function() {
var $colors = this.ui.colors,
self = this;
$colors.each( function() {
var $color = Backbone.$( this );
$color.wpColorPicker( {
change: function() {
var type = $color.data( 'setting' );
self.setValue( type, $color.wpColorPicker( 'color' ) );
},
clear: function() {
var type = $color.data( 'setting' );
self.setValue( type, '' );
},
width: 251
} );
} );
},
onInputChange: function( event ) {
var type = event.currentTarget.dataset.setting,
$slider = this.ui.sliders.filter( '[data-input="' + type + '"]' ),
$input = Backbone.$( event.currentTarget ),
min = Number( $input.attr( 'min' ) ),
max = Number( $input.attr( 'max' ) );
$slider.slider( {
value: this.getControlValue( type ),
min: min,
max: max
} );
},
onReady: function() {
this.initSliders();
this.initColors();
},
onSlideChange: function( event, ui ) {
var type = event.currentTarget.dataset.input,
$input = this.ui.input.filter( '[data-setting="' + type + '"]' );
$input.val( ui.value );
this.setValue( type, ui.value );
},
onBeforeDestroy: function() {
this.ui.colors.each( function() {
var $color = Backbone.$( this );
if ( $color.wpColorPicker( 'instance' ) ) {
$color.wpColorPicker( 'close' );
}
} );
this.$el.remove();
}
} );
module.exports = ControlBoxShadowItemView;
},{"elementor-views/controls/base-multiple":47}],51:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],51:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],51:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],52:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],52:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],52:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],53:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base-units":47}],53:[function(require,module,exports){
=======
},{"elementor-views/controls/base-units":48}],53:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base-units":48}],54:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],54:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],54:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],55:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],55:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],55:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],56:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],56:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],56:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],57:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base-multiple":46}],57:[function(require,module,exports){
=======
},{"elementor-views/controls/base-multiple":47}],57:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base-multiple":47}],58:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base-multiple":46}],58:[function(require,module,exports){
=======
},{"elementor-views/controls/base-multiple":47}],58:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base-multiple":47}],59:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48,"elementor-views/controls/repeater-row":58}],60:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49,"elementor-views/controls/repeater-row":58}],60:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49,"elementor-views/controls/repeater-row":59}],61:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],61:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],61:[function(require,module,exports){
// Attention: DO NOT use this control since it has bugs
// TODO: This control is unused
>>>>>>>
},{"elementor-views/controls/base":49}],62:[function(require,module,exports){
// Attention: DO NOT use this control since it has bugs
// TODO: This control is unused
<<<<<<<
},{"elementor-views/controls/base":48}],62:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],62:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],63:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base-units":47}],63:[function(require,module,exports){
=======
},{"elementor-views/controls/base-units":48}],63:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base-units":48}],64:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],64:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],64:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],65:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base-multiple":46}],65:[function(require,module,exports){
=======
},{"elementor-views/controls/base-multiple":47}],65:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base-multiple":47}],66:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],66:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],66:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],67:[function(require,module,exports){
<<<<<<<
},{"elementor-views/controls/base":48}],67:[function(require,module,exports){
=======
},{"elementor-views/controls/base":49}],67:[function(require,module,exports){
>>>>>>>
},{"elementor-views/controls/base":49}],68:[function(require,module,exports){ |
<<<<<<<
require( './core/editor/document/commands/base/base.spec' );
=======
>>>>>>>
<<<<<<<
require( './core/editor/document/manager.spec' );
=======
>>>>>>>
require( './core/editor/document/manager.spec' ); |
<<<<<<<
'image-carousel.default': require( 'elementor-frontend/handlers/image-carousel' ),
'image-swiper.default': require( 'elementor-frontend/handlers/image-swiper' ),
'menu-anchor.default': require( 'elementor-frontend/handlers/menu-anchor' )
=======
'image-carousel.default': require( 'elementor-frontend/handlers/image-carousel' )
>>>>>>>
'image-carousel.default': require( 'elementor-frontend/handlers/image-carousel' ),
'image-swiper.default': require( 'elementor-frontend/handlers/image-swiper' )
<<<<<<<
},{"elementor-frontend/handlers/accordion":3,"elementor-frontend/handlers/alert":4,"elementor-frontend/handlers/counter":5,"elementor-frontend/handlers/global":6,"elementor-frontend/handlers/image-carousel":7,"elementor-frontend/handlers/image-swiper":8,"elementor-frontend/handlers/menu-anchor":9,"elementor-frontend/handlers/progress":10,"elementor-frontend/handlers/section":11,"elementor-frontend/handlers/tabs":12,"elementor-frontend/handlers/toggle":13,"elementor-frontend/handlers/video":14,"elementor-frontend/handlers/widget":15}],2:[function(require,module,exports){
=======
},{"elementor-frontend/handlers/accordion":4,"elementor-frontend/handlers/alert":5,"elementor-frontend/handlers/counter":6,"elementor-frontend/handlers/global":7,"elementor-frontend/handlers/image-carousel":8,"elementor-frontend/handlers/progress":9,"elementor-frontend/handlers/section":10,"elementor-frontend/handlers/tabs":11,"elementor-frontend/handlers/toggle":12,"elementor-frontend/handlers/video":13,"elementor-frontend/handlers/widget":14}],2:[function(require,module,exports){
>>>>>>>
},{"elementor-frontend/handlers/accordion":4,"elementor-frontend/handlers/alert":5,"elementor-frontend/handlers/counter":6,"elementor-frontend/handlers/global":7,"elementor-frontend/handlers/image-carousel":8,"elementor-frontend/handlers/image-swiper":9,"elementor-frontend/handlers/progress":10,"elementor-frontend/handlers/section":11,"elementor-frontend/handlers/tabs":12,"elementor-frontend/handlers/toggle":13,"elementor-frontend/handlers/video":14,"elementor-frontend/handlers/widget":15}],2:[function(require,module,exports){
<<<<<<<
},{"../utils/hooks":17,"elementor-frontend/elements-handler":1,"elementor-frontend/utils":16}],3:[function(require,module,exports){
=======
},{"../utils/hooks":17,"./handler-module":3,"elementor-frontend/elements-handler":1,"elementor-frontend/utils/anchors":15,"elementor-frontend/utils/youtube":16}],3:[function(require,module,exports){
var ViewModule = require( '../utils/view-module' ),
HandlerModule;
HandlerModule = ViewModule.extend( {
$element: null,
onElementChange: null,
__construct: function( $element ) {
this.$element = $element;
if ( elementorFrontend.isEditMode() ) {
this.addEditorListener();
}
},
addEditorListener: function() {
var self = this;
if ( self.onElementChange ) {
var cid = self.getModelCID();
elementorFrontend.addListenerOnce( cid, 'change:' + self.getElementName(), function( controlView, elementView ) {
if ( elementView.model.cid !== cid ) {
return;
}
self.onElementChange( controlView.model.get( 'name' ), controlView, elementView );
}, elementor.channels.editor );
}
},
getElementName: function() {},
getID: function() {
return this.$element.data( 'id' );
},
getModelCID: function() {
return this.$element.data( 'model-cid' );
},
getElementSettings: function( setting ) {
var elementSettings,
modelCID = this.getModelCID();
if ( elementorFrontend.isEditMode() && modelCID ) {
var settings = elementorFrontend.config.elements.data[ modelCID ],
activeControls = settings.getActiveControls(),
activeValues = _.pick( settings.attributes, Object.keys( activeControls ) ),
settingsKeys = elementorFrontend.config.elements.keys[ settings.attributes.widgetType || settings.attributes.elType ];
elementSettings = _.pick( activeValues, settingsKeys );
} else {
elementSettings = this.$element.data( 'settings' );
}
return this.getItems( elementSettings, setting );
}
} );
module.exports = HandlerModule;
},{"../utils/view-module":19}],4:[function(require,module,exports){
>>>>>>>
},{"../utils/hooks":18,"./handler-module":3,"elementor-frontend/elements-handler":1,"elementor-frontend/utils/anchors":16,"elementor-frontend/utils/youtube":17}],3:[function(require,module,exports){
var ViewModule = require( '../utils/view-module' ),
HandlerModule;
HandlerModule = ViewModule.extend( {
$element: null,
onElementChange: null,
__construct: function( $element ) {
this.$element = $element;
if ( elementorFrontend.isEditMode() ) {
this.addEditorListener();
}
},
addEditorListener: function() {
var self = this;
if ( self.onElementChange ) {
var cid = self.getModelCID();
elementorFrontend.addListenerOnce( cid, 'change:' + self.getElementName(), function( controlView, elementView ) {
if ( elementView.model.cid !== cid ) {
return;
}
self.onElementChange( controlView.model.get( 'name' ), controlView, elementView );
}, elementor.channels.editor );
}
},
getElementName: function() {},
getID: function() {
return this.$element.data( 'id' );
},
getModelCID: function() {
return this.$element.data( 'model-cid' );
},
getElementSettings: function( setting ) {
var elementSettings,
modelCID = this.getModelCID();
if ( elementorFrontend.isEditMode() && modelCID ) {
var settings = elementorFrontend.config.elements.data[ modelCID ],
activeControls = settings.getActiveControls(),
activeValues = _.pick( settings.attributes, Object.keys( activeControls ) ),
settingsKeys = elementorFrontend.config.elements.keys[ settings.attributes.widgetType || settings.attributes.elType ];
elementSettings = _.pick( activeValues, settingsKeys );
} else {
elementSettings = this.$element.data( 'settings' );
}
return this.getItems( elementSettings, setting );
}
} );
module.exports = HandlerModule;
},{"../utils/view-module":20}],4:[function(require,module,exports){
<<<<<<<
},{}],8:[function(require,module,exports){
module.exports = function( $scope, $ ) {
var $swiper = $scope.find( '.swiper-container' );
if ( ! $swiper.length ) {
return;
}
var savedOptions = $swiper.data( 'slider_options' );
var mySwiper = new Swiper( $swiper, savedOptions );
/*
var tabletSlides = 1 === savedOptions.slidesToShow ? 1 : 2,
defaultOptions = {
responsive: [
{
breakpoint: 767,
settings: {
slidesToShow: tabletSlides,
slidesToScroll: tabletSlides
}
},
{
breakpoint: 480,
settings: {
slidesToShow: 1,
slidesToScroll: 1
}
}
]
},
slickOptions = $.extend( {}, defaultOptions, $swiper.data( 'slider_options' ) );
$swiper.slick( slickOptions );
*/
};
},{}],9:[function(require,module,exports){
module.exports = function( $scope, $ ) {
if ( elementorFrontend.isEditMode() ) {
return;
}
var $anchor = $scope.find( '.elementor-menu-anchor' ),
anchorID = $anchor.attr( 'id' ),
$anchorLinks = $( 'a[href*="#' + anchorID + '"]' ),
$scrollable = $( 'html, body' ),
adminBarHeight = $( '#wpadminbar' ).height();
$anchorLinks.on( 'click', function( event ) {
var isSamePathname = ( location.pathname === this.pathname ),
isSameHostname = ( location.hostname === this.hostname );
if ( ! isSameHostname || ! isSamePathname ) {
return;
}
event.preventDefault();
var scrollTop = $anchor.offset().top - adminBarHeight;
scrollTop = elementorFrontend.hooks.applyFilters( 'frontend/handlers/menu_anchor/scroll_top_distance', scrollTop );
$scrollable.animate( {
scrollTop: scrollTop
}, 1000 );
} );
};
},{}],10:[function(require,module,exports){
=======
},{}],9:[function(require,module,exports){
>>>>>>>
},{}],9:[function(require,module,exports){
module.exports = function( $scope, $ ) {
var $swiper = $scope.find( '.swiper-container' );
if ( ! $swiper.length ) {
return;
}
var savedOptions = $swiper.data( 'slider_options' );
var mySwiper = new Swiper( $swiper, savedOptions );
};
},{}],10:[function(require,module,exports){
<<<<<<<
},{}],14:[function(require,module,exports){
module.exports = function( $scope, $ ) {
var $imageOverlay = $scope.find( '.elementor-custom-embed-image-overlay' ),
$videoFrame = $scope.find( 'iframe' );
=======
},{}],13:[function(require,module,exports){
var HandlerModule = require( 'elementor-frontend/handler-module' ),
VideoModule;
>>>>>>>
},{}],14:[function(require,module,exports){
var HandlerModule = require( 'elementor-frontend/handler-module' ),
VideoModule;
<<<<<<<
},{}],15:[function(require,module,exports){
=======
},{"elementor-frontend/handler-module":3}],14:[function(require,module,exports){
>>>>>>>
},{"elementor-frontend/handler-module":3}],15:[function(require,module,exports){
<<<<<<<
},{}],16:[function(require,module,exports){
var Utils;
=======
},{}],15:[function(require,module,exports){
var ViewModule = require( '../../utils/view-module' );
>>>>>>>
},{}],16:[function(require,module,exports){
var ViewModule = require( '../../utils/view-module' );
<<<<<<<
},{}],17:[function(require,module,exports){
=======
},{"../../utils/view-module":19}],17:[function(require,module,exports){
>>>>>>>
},{"../../utils/view-module":20}],18:[function(require,module,exports){ |
<<<<<<<
/*{classes:"title-gradient", components:[*/
{name: "serverNode", kind: "Node", classes: "enyo-unselectable", showing: false, content: "server", icon: "$services/assets/images/antenna.png",
expandable: true, expanded: true, collapsible: false, onExpand: "nodeExpand", onNodeTap: "nodeTap"}
/*]}*/
=======
{name: "serverNode", kind: "ares.Node", classes: "enyo-unselectable", showing: false, content: "server", icon: "$services/assets/images/antenna.png", expandable: true, expanded: true, collapsible: false, onExpand: "nodeExpand", onForceView: "adjustScroll" }
>>>>>>>
{name: "serverNode", kind: "Node", classes: "enyo-unselectable", showing: false, content: "server", icon: "$services/assets/images/antenna.png",
expandable: true, expanded: true, collapsible: false, onExpand: "nodeExpand", onNodeTap: "nodeTap"}
{name: "serverNode", kind: "ares.Node", classes: "enyo-unselectable", showing: false, content: "server", icon: "$services/assets/images/antenna.png", expandable: true, expanded: true, collapsible: false, onExpand: "nodeExpand", onForceView: "adjustScroll" }
<<<<<<<
//this.$.serverNode.applyStyle("background-color", "red");
=======
this.$.serverNode.setService(inService);
>>>>>>>
this.$.serverNode.setService(inService); |
<<<<<<<
import Component from './elements/component';
=======
>>>>>>> |
<<<<<<<
import IconsManager from './components/icons-manager/icons-manager';
import LogoView from '../../../../core/common/assets/js/views/modal/logo';
import ModalLayoutView from '../../../../core/common/assets/js/views/modal/layout';
=======
>>>>>>>
import IconsManager from './components/icons-manager/icons-manager'; |
<<<<<<<
this.backend.onHasUserlistUpdate(function() {
that.backend.updateUserlist(that.currentConversation);
=======
backend.onHasUserlistUpdate(function() {
backend.updateUserlist(that.currentConversation);
that.updateConversationHeader();
>>>>>>>
this.backend.onHasUserlistUpdate(function() {
that.backend.updateUserlist(that.currentConversation);
that.updateConversationHeader(); |
<<<<<<<
this.iconManager = new IconsManager();
=======
this.noticeBar = new NoticeBar();
>>>>>>>
this.iconManager = new IconsManager();
this.noticeBar = new NoticeBar(); |
<<<<<<<
const getSideBar = () => {
if ( ! props.sidebar ) {
return '';
}
return (
<Sidebar>
{ props.sidebar }
</Sidebar>
);
};
=======
const uiTheme = elementorAppConfig.ui_theme;
let userPrefersTheme = '';
if ( 'auto' === uiTheme ) {
if ( window.matchMedia && window.matchMedia( '(prefers-color-scheme: dark)' ).matches ) {
userPrefersTheme = ' dark';
}
} else if ( 'dark' === uiTheme ) {
userPrefersTheme = ' dark';
}
>>>>>>>
const getSideBar = () => {
if ( ! props.sidebar ) {
return '';
}
return (
<Sidebar>
{ props.sidebar }
</Sidebar>
);
};
const uiTheme = elementorAppConfig.ui_theme;
let userPrefersTheme = '';
if ( 'auto' === uiTheme ) {
if ( window.matchMedia && window.matchMedia( '(prefers-color-scheme: dark)' ).matches ) {
userPrefersTheme = ' dark';
}
} else if ( 'dark' === uiTheme ) {
userPrefersTheme = ' dark';
} |
<<<<<<<
require( './assets/dev/js/editor/data/globals/component.spec' );
=======
// TODO: Require all components from one file.
require( './core/editor/document/elements/component.spec' );
require( './core/editor/document/globals/component.spec' );
require( './core/editor/document/repeater/component.spec' );
require( './core/editor/document/dynamic/component.spec' );
require( './core/editor/document/history/component.spec' );
require( './core/editor/document/ui/component.spec' );
require( './core/editor/document/save/component.spec' );
require( './core/kits/assets/js/component.spec' );
require( './core/editor/data/globals/component.spec' );
>>>>>>>
require( './assets/dev/js/editor/data/globals/component.spec' );
require( './core/kits/assets/js/component.spec' ); |
<<<<<<<
elementorFrontend.elementsHandler.addHandler( BackgroundVideo, { $element: $scope } );
=======
if ( 'mobile' !== elementorFrontend.getCurrentDeviceMode() ) {
elementorFrontend.elementsHandler.addHandler( BackgroundVideo, { $element: $scope } );
}
elementorFrontend.elementsHandler.addHandler( BackgroundSlideshow, { $element: $scope } );
>>>>>>>
elementorFrontend.elementsHandler.addHandler( BackgroundVideo, { $element: $scope } );
elementorFrontend.elementsHandler.addHandler( BackgroundSlideshow, { $element: $scope } ); |
<<<<<<<
var activeMode = elementor.channels.dataEditMode.request( 'get:active:mode' );
=======
var activeMode = elementor.dataEditMode.request( 'activeMode' );
>>>>>>>
var activeMode = elementor.channels.dataEditMode.request( 'activeMode' ); |
<<<<<<<
if ( ! environment.ie ) {
=======
var isIE = 'Microsoft Internet Explorer' === navigator.appName || !! navigator.userAgent.match( /Trident/g ) || !! navigator.userAgent.match( /MSIE/g ) || !! navigator.userAgent.match( /rv:11/ ),
el = document.createElement( 'div' ),
supportsGrid = 'string' === typeof el.style.grid;
if ( ! isIE && supportsGrid ) {
>>>>>>>
var el = document.createElement( 'div' ),
supportsGrid = 'string' === typeof el.style.grid;
if ( ! environment.ie && supportsGrid ) {
<<<<<<<
var msieCss = '<link rel="stylesheet" id="elementor-frontend-css-msie" href="' + self.config.urls.assets + 'css/frontend-msie.min.css?' + self.config.version + '" type="text/css" />';
=======
var msieCss = '<link rel="stylesheet" id="elementor-frontend-css-msie" href="' + elementorFrontend.config.urls.assets + 'css/frontend-msie.min.css?' + elementorFrontend.config.version + '" type="text/css" />';
>>>>>>>
var msieCss = '<link rel="stylesheet" id="elementor-frontend-css-msie" href="' + self.config.urls.assets + 'css/frontend-msie.min.css?' + self.config.version + '" type="text/css" />'; |
<<<<<<<
isEnabled: () => {
return !! elementor.getStorage( 'transfer' );
=======
isEnabled: function() {
return !! elementorCommon.storage.get( 'transfer' );
>>>>>>>
isEnabled: () => {
return !! elementorCommon.storage.get( 'transfer' );
<<<<<<<
startTransport( type ) {
elementor.setStorage( 'transfer', {
=======
startTransport: function( type ) {
elementorCommon.storage.set( 'transfer', {
>>>>>>>
startTransport( type ) {
elementorCommon.storage.set( 'transfer', {
<<<<<<<
isPasteEnabled() {
const transferData = elementor.getStorage( 'transfer' );
=======
isPasteEnabled: function() {
var transferData = elementorCommon.storage.get( 'transfer' );
>>>>>>>
isPasteEnabled() {
var transferData = elementorCommon.storage.get( 'transfer' );
<<<<<<<
duplicate() {
const oldTransport = elementor.getStorage( 'transfer' );
=======
duplicate: function() {
var oldTransport = elementorCommon.storage.get( 'transfer' );
>>>>>>>
duplicate() {
var oldTransport = elementorCommon.storage.get( 'transfer' );
<<<<<<<
pasteStyle() {
const self = this,
transferData = elementor.getStorage( 'transfer' ),
=======
pasteStyle: function() {
var self = this,
transferData = elementorCommon.storage.get( 'transfer' ),
>>>>>>>
pasteStyle() {
var self = this,
transferData = elementorCommon.storage.get( 'transfer' ), |
<<<<<<<
=======
defSDPOffer.resolve();
>>>>>>>
<<<<<<<
window.pc = pc = new RTCPeerConnection(callSettings.servers, pcOptions);
=======
pc = new RTCPeerConnection(callSettings.servers, pcOptions);
defSDPOffer.promise.done(function () {
processQueues();
}, null);
>>>>>>>
window.pc = pc = new RTCPeerConnection(callSettings.servers, pcOptions);
<<<<<<<
=======
if (!pc || toSendHangup !== undefined) {
log.debug("PeerConnection.close got called twice.");
return;
}
>>>>>>>
<<<<<<<
=======
defSDPAnswer.promise.done(null, function errorHandler() {
log.error('set remote desc of answer failed', evt.signal.sessionDescription);
that.report.callStoppedReason = 'setRemoteDescription failed at answer.';
that.close();
});
>>>>>>>
<<<<<<<
=======
if (!pc && params.processingQueue) { // we hung up.
return;
}
>>>>>>>
if (!pc && params.processingQueue) { // we hung up.
return;
}
<<<<<<<
if ((!pc || that.state.caller && !that.state.receivedSDP) && !params.processingQueue) {
=======
if (!pc) {
>>>>>>>
if (!pc) {
<<<<<<<
if (that.state.sentSDP || that.state.receivedSDP) {
=======
if (defSDPOffer.promise.isFulfilled()) {
>>>>>>>
if (that.state.sentSDP || that.state.receivedSDP) {
<<<<<<<
} else if (!params.processingQueue) {
candidateReceivingQueue.push(params.candidate);
log.debug('Queueing a candidate.');
return;
} else {
console.log("processing queue error", that.state.sentSDP, that.state.receivedSDP, params);
=======
} else {
if (!params.processingQueue) {
candidateReceivingQueue.push(params.candidate);
log.debug('Queueing a candidate because no offer yet.');
}
>>>>>>>
} else if (!params.processingQueue) {
candidateReceivingQueue.push(params.candidate);
log.debug('Queueing a candidate because no offer yet.');
} else {
console.log("processing queue error", that.state.sentSDP, that.state.receivedSDP, params); |
<<<<<<<
initialize() {
=======
getEditButtons: function() {
return {};
},
initialize: function() {
>>>>>>>
getEditButtons: function() {
return {};
},
initialize() {
<<<<<<<
startTransport( type ) {
=======
getHandlesOverlay: function() {
const $handlesOverlay = jQuery( '<div>', { class: 'elementor-element-overlay' } ),
$overlayList = jQuery( '<ul>', { class: `elementor-editor-element-settings elementor-editor-${ this.getElementType() }-settings` } );
jQuery.each( this.getEditButtons(), ( toolName, tool ) => {
const $item = jQuery( '<li>', { class: `elementor-editor-element-setting elementor-editor-element-${ toolName }`, title: tool.title } ),
$icon = jQuery( '<i>', { class: `eicon-${ tool.icon }`, 'aria-hidden': true } ),
$a11y = jQuery( '<span>', { class: 'elementor-screen-only' } );
$a11y.text( tool.title );
$item.append( $icon, $a11y );
$overlayList.append( $item );
} );
$handlesOverlay.append( $overlayList );
return $handlesOverlay;
},
attachElContent: function( html ) {
this.$el.empty().append( this.getHandlesOverlay(), html );
},
startTransport: function( type ) {
>>>>>>>
getHandlesOverlay: function() {
const $handlesOverlay = jQuery( '<div>', { class: 'elementor-element-overlay' } ),
$overlayList = jQuery( '<ul>', { class: `elementor-editor-element-settings elementor-editor-${ this.getElementType() }-settings` } );
jQuery.each( this.getEditButtons(), ( toolName, tool ) => {
const $item = jQuery( '<li>', { class: `elementor-editor-element-setting elementor-editor-element-${ toolName }`, title: tool.title } ),
$icon = jQuery( '<i>', { class: `eicon-${ tool.icon }`, 'aria-hidden': true } ),
$a11y = jQuery( '<span>', { class: 'elementor-screen-only' } );
$a11y.text( tool.title );
$item.append( $icon, $a11y );
$overlayList.append( $item );
} );
$handlesOverlay.append( $overlayList );
return $handlesOverlay;
},
attachElContent: function( html ) {
this.$el.empty().append( this.getHandlesOverlay(), html );
},
startTransport( type ) { |
<<<<<<<
elementorCommon.dialogsManager.createWidget( 'alert', {
message: response.data
=======
self.getDialogsManager().createWidget( 'alert', {
message: response.data,
>>>>>>>
elementorCommon.dialogsManager.createWidget( 'alert', {
message: response.data,
<<<<<<<
confirm: self.config.i18n.yes,
cancel: self.config.i18n.cancel
=======
confirm: self.config.i18n.yes,
cancel: self.config.i18n.cancel,
>>>>>>>
confirm: self.config.i18n.yes,
cancel: self.config.i18n.cancel,
<<<<<<<
=======
setMarionetteTemplateCompiler: function() {
if ( 'undefined' !== typeof Marionette ) {
Marionette.TemplateCache.prototype.compileTemplate = function( rawTemplate, options ) {
options = {
evaluate: /<#([\s\S]+?)#>/g,
interpolate: /{{{([\s\S]+?)}}}/g,
escape: /{{([^}]+?)}}(?!})/g,
};
return _.template( rawTemplate, options );
};
}
},
>>>>>>> |
<<<<<<<
it('returns the original request url in the response.request.responseUrl property', function() {
mock.onGet('/foo').reply(200, {
foo: 'bar'
});
return instance.get('/foo').then(function(response) {
expect(response.status).to.equal(200);
expect(response.data.foo).to.equal('bar');
expect(response.request.responseUrl).to.equal('/foo');
});
});
=======
it('sets isAxiosError property on errors', function() {
mock.onGet('/').reply(404);
return instance
.get('/')
.then(function() {
expect(true).to.be.false;
})
.catch(function(error) {
expect(error.isAxiosError).to.be.true;
});
});
>>>>>>>
it('returns the original request url in the response.request.responseUrl property', function() {
mock.onGet('/foo').reply(200, {
foo: 'bar'
});
return instance.get('/foo').then(function(response) {
expect(response.status).to.equal(200);
expect(response.data.foo).to.equal('bar');
expect(response.request.responseUrl).to.equal('/foo');
});
it('sets isAxiosError property on errors', function() {
mock.onGet('/').reply(404);
return instance
.get('/')
.then(function() {
expect(true).to.be.false;
})
.catch(function(error) {
expect(error.isAxiosError).to.be.true;
});
}); |
<<<<<<<
it('allows sending a stream as response', function(done) {
instance.defaults.baseURL = 'http://www.example.org';
mock.onAny().reply(function(config) {
return [200, fs.createReadStream(__filename)];
});
instance.get('http://www.foo.com/bar', { responseType: 'stream' }).then(function(response) {
expect(response.status).to.equal(200);
var stream = response.data;
var string = '';
stream.on('data', function(chunk) {
string += chunk.toString('utf8');
});
stream.on('end', function() {
expect(string).to.equal(fs.readFileSync(__filename, 'utf8'));
done();
});
});
});
it('allows sending a buffer as response', function() {
instance.defaults.baseURL = 'http://www.example.org';
mock.onAny().reply(function(config) {
return [200, Buffer.from('fooBar', 'utf8')];
});
return instance.get('http://www.foo.com/bar', { responseType: 'stream' }).then(function(response) {
expect(response.status).to.equal(200);
var string = response.data.toString('utf8');
expect(string).to.equal('fooBar');
});
});
it('allows sending an array as response', function() {
mock.onGet('/').reply(200, [1, 2, 3]);
return instance.get('/').then(function(response) {
expect(response.data).to.deep.equal([1, 2, 3]);
});
});
it('allows sending an Uint8Array as response', function() {
var buffer = new ArrayBuffer(1);
var view = new Uint8Array(buffer);
view[0] = 0xff;
mock.onGet('/').reply(200, buffer);
return instance({
url: '/',
method: 'GET',
responseType: 'arraybuffer'
}).then(function(response) {
var view = new Uint8Array(response.data);
expect(view[0]).to.equal(0xff);
});
});
=======
it('returns the original request url in the response.request.responseUrl property', function() {
mock.onGet('/foo').reply(200, {
foo: 'bar'
});
return instance.get('/foo').then(function(response) {
expect(response.status).to.equal(200);
expect(response.data.foo).to.equal('bar');
expect(response.request.responseUrl).to.equal('/foo');
});
});
it('sets isAxiosError property on errors', function() {
mock.onGet('/').reply(404);
return instance
.get('/')
.then(function() {
expect(true).to.be.false;
})
.catch(function(error) {
expect(error.isAxiosError).to.be.true;
});
});
>>>>>>>
it('allows sending a stream as response', function(done) {
instance.defaults.baseURL = 'http://www.example.org';
mock.onAny().reply(function(config) {
return [200, fs.createReadStream(__filename)];
});
instance.get('http://www.foo.com/bar', { responseType: 'stream' }).then(function(response) {
expect(response.status).to.equal(200);
var stream = response.data;
var string = '';
stream.on('data', function(chunk) {
string += chunk.toString('utf8');
});
stream.on('end', function() {
expect(string).to.equal(fs.readFileSync(__filename, 'utf8'));
done();
});
});
});
it('allows sending a buffer as response', function() {
instance.defaults.baseURL = 'http://www.example.org';
mock.onAny().reply(function(config) {
return [200, Buffer.from('fooBar', 'utf8')];
});
return instance.get('http://www.foo.com/bar', { responseType: 'stream' }).then(function(response) {
expect(response.status).to.equal(200);
var string = response.data.toString('utf8');
expect(string).to.equal('fooBar');
});
});
it('allows sending an array as response', function() {
mock.onGet('/').reply(200, [1, 2, 3]);
return instance.get('/').then(function(response) {
expect(response.data).to.deep.equal([1, 2, 3]);
});
});
it('allows sending an Uint8Array as response', function() {
var buffer = new ArrayBuffer(1);
var view = new Uint8Array(buffer);
view[0] = 0xff;
mock.onGet('/').reply(200, buffer);
return instance({
url: '/',
method: 'GET',
responseType: 'arraybuffer'
}).then(function(response) {
var view = new Uint8Array(response.data);
expect(view[0]).to.equal(0xff);
});
});
it('returns the original request url in the response.request.responseUrl property', function() {
mock.onGet('/foo').reply(200, {
foo: 'bar'
});
return instance.get('/foo').then(function(response) {
expect(response.status).to.equal(200);
expect(response.data.foo).to.equal('bar');
expect(response.request.responseUrl).to.equal('/foo');
});
});
it('sets isAxiosError property on errors', function() {
mock.onGet('/').reply(404);
return instance
.get('/')
.then(function() {
expect(true).to.be.false;
})
.catch(function(error) {
expect(error.isAxiosError).to.be.true;
});
}); |
<<<<<<<
ieee.resultstream.end();
=======
// // see how many results were unique
// var originalLength = eupmc.allresults.length;
// ieee.allresults = _.uniq(eupmc.allresults, function(x) {
// return ieee.getIdentifier(x).id;
// });
// if (eupmc.allresults.length < originalLength) {
// log.info('Duplicate records found: ' +
// eupmc.allresults.length +
// ' unique results identified');
// }
// write the full result set to a file
log.info('Saving result metadata');
var pretty = JSON.stringify(ieee.allresults, null, 2);
fs.writeFileSync('ieee_results.json', pretty)
>>>>>>>
// write the full result set to a file
log.info('Saving result metadata');
var pretty = JSON.stringify(ieee.allresults, null, 2);
fs.writeFileSync('ieee_results.json', pretty) |
<<<<<<<
sendOutput(500, res, '{"error" : "Exception caught !!"}');
=======
sendOutput(404, res, '{"error" : ' + err + '}');
>>>>>>>
sendOutput(500, res, '{"error" : ' + err + '}');
<<<<<<<
sendOutput(500, res, '{"error" : "Exception caught !!"}');
=======
sendOutput(404, res, '{"error" : ' + err + '}');
>>>>>>>
sendOutput(500, res, '{"error" : ' + err + '}');
<<<<<<<
console.log("Rasa NLU Train Request -> " + process.env.npm_package_config_rasanluendpoint + "/train?project=" + req.query.project);
=======
console.log("Rasa NLU Train Request -> " + process.env.npm_package_config_rasaserver + "/train?project=" + req.query.project);
logRequest(req, "train", {project: req.query.project, agent: req.query.name, data: req.body});
>>>>>>>
console.log("Rasa NLU Train Request -> " + process.env.npm_package_config_rasanluendpoint + "/train?project=" + req.query.project);
logRequest(req, "train", {project: req.query.project, agent: req.query.name, data: req.body});
<<<<<<<
console.log("Error Occured when posting data to nlu endpoint. "+error);
sendOutput(500, res, error);
=======
console.log("Error Occured when posting data to nlu endpoint. " + error);
sendOutput(404, res, '{"error" : ' + error + '}');
>>>>>>>
console.log("Error Occured when posting data to nlu endpoint. " + error);
sendOutput(500, res, '{"error" : ' + error + '}');
<<<<<<<
sendOutput(500, res, '{"error" : "Exception caught !!"}');
=======
sendOutput(404, res, '{"error" : ' + err + '}');
>>>>>>>
sendOutput(500, res, '{"error" : ' + err + '}');
<<<<<<<
sendOutput(500, res, error);
=======
sendOutput(404, res, '{"error" : ' + error + '}');
>>>>>>>
sendOutput(500, res, '{"error" : ' + error + '}');
<<<<<<<
sendOutput(500, res, '{"error" : "Exception caught !!"}');
=======
sendOutput(404, res, '{"error" : ' + err + '}');
>>>>>>>
sendOutput(500, res, '{"error" : ' + err + '}');
<<<<<<<
nlu_parse_cache.intent_name = rasa_response.intent.name;
nlu_parse_cache.entity_data = JSON.stringify(rasa_response.entities);
nlu_parse_cache.intent_confidence_pct = rasa_response.intent.confidence.toFixed(2)*100;
nlu_parse_cache.nlu_response_time_ms= Date.now() - nlu_parse_cache.createTime;
nluParseLogCache.set(cacheKey, nlu_parse_cache);
=======
try {
nlu_parse_cache.intent_name = rasa_response.intent.name;
nlu_parse_cache.entity_data = JSON.stringify(rasa_response.entities);
nlu_parse_cache.intent_confidence_pct = rasa_response.intent.confidence.toFixed(2)*100;
nlu_parse_cache.nlu_response_time_ms= Date.now() - nlu_parse_cache.createTime;
parseLogCache.set(cacheKey, nlu_parse_cache);
} catch (err) {
//console.log(err);
}
>>>>>>>
try {
nlu_parse_cache.intent_name = rasa_response.intent.name;
nlu_parse_cache.entity_data = JSON.stringify(rasa_response.entities);
nlu_parse_cache.intent_confidence_pct = rasa_response.intent.confidence.toFixed(2)*100;
nlu_parse_cache.nlu_response_time_ms= Date.now() - nlu_parse_cache.createTime;
parseLogCache.set(cacheKey, nlu_parse_cache);
} catch (err) {
//console.log(err);
}
<<<<<<<
nluParseReqObj.intent_name='';
nluParseReqObj.entity_data='{}';
nluParseReqObj.response_text='';
nluParseReqObj.response_rich_data='{}';
nluParseReqObj.intent_confidence_pct=0;
nluParseReqObj.user_response_time_ms=0;
nluParseReqObj.nlu_response_time_ms=0;
//set agent_id
nluParseReqObj.agent_id= agentObj.agent_id;
=======
nluParseReqObj.intent_name = '';
nluParseReqObj.entity_data = '{}';
nluParseReqObj.response_text = '';
nluParseReqObj.response_rich_data = '{}';
nluParseReqObj.intent_confidence_pct = 0;
nluParseReqObj.user_response_time_ms = 0;
nluParseReqObj.nlu_response_time_ms = 0;
nluParseReqObj.agent_id = -1;
>>>>>>>
nluParseReqObj.intent_name = '';
nluParseReqObj.entity_data = '{}';
nluParseReqObj.response_text = '';
nluParseReqObj.response_rich_data = '{}';
nluParseReqObj.intent_confidence_pct = 0;
nluParseReqObj.user_response_time_ms = 0;
nluParseReqObj.nlu_response_time_ms = 0;
nluParseReqObj.agent_id = -1;
<<<<<<<
=======
//get agent by model
var agent_name;
if (req.body.project == undefined) { //default agent none specified
agent_name = req.body.project
} else {
agent_name = "";
}
db.any('select * from agents where agent_name = $1', agent_name)
.then(function (data) {
console.log("Agent Information: " + JSON.stringify(data));
//get the cache object and update with agent_id
parseLogCache.get(cacheKey, function( err, nlu_parse_cache ){
if( !err ){
if(nlu_parse_cache == undefined){
// quite logging and return
console.log("Cache Not Found for key "+ cacheKey);
return;
} else {
if (data.length == 0 ) {
nlu_parse_cache.agent_id = -1;
} else {
nlu_parse_cache.agent_id = data[0].agent_id;
}
parseLogCache.set(cacheKey, nlu_parse_cache);
}
}else{
console.log("Cache Not Found for key "+ cacheKey);
return;
}
});
}).catch(function (err) {
console.log(err);
});
>>>>>>>
//get agent by model
var agent_name;
if (req.body.project == undefined) { //default agent none specified
agent_name = req.body.project
} else {
agent_name = "";
}
db.any('select * from agents where agent_name = $1', agent_name)
.then(function (data) {
console.log("Agent Information: " + JSON.stringify(data));
//get the cache object and update with agent_id
parseLogCache.get(cacheKey, function( err, nlu_parse_cache ){
if( !err ){
if(nlu_parse_cache == undefined){
// quite logging and return
console.log("Cache Not Found for key "+ cacheKey);
return;
} else {
if (data.length == 0 ) {
nlu_parse_cache.agent_id = -1;
} else {
nlu_parse_cache.agent_id = data[0].agent_id;
}
parseLogCache.set(cacheKey, nlu_parse_cache);
}
}else{
console.log("Cache Not Found for key "+ cacheKey);
return;
}
});
}).catch(function (err) {
console.log(err);
}); |
<<<<<<<
server.listen(5001, function () {
console.log('Express server listening on port ' + 5001);
});
=======
app.listen(5001);
checkDB();
checkRasaNLU();
//checkRasaCore();
function checkDB() {
db.one('select current_database(), current_schema(), inet_server_port(), inet_server_addr()')
.then(function (data) {
console.log('');
console.log('DB Connected');
console.log('Postgres Server: ' + data["inet_server_addr"] + ':' + data["inet_server_port"]);
console.log('Database:' + data["current_database"]);
console.log('Schema:' + data["current_schema"]);
console.log('');
})
.catch(function (err) {
console.log('DB Connection Error: ' + err)
});
}
function checkRasaNLU() {
request(process.env.npm_package_config_rasaserver + '/config', function (error, response, body) {
try {
if (body !== undefined) {
console.log('');
console.log('Rasa NLU Connected');
console.log('Rasa NLU Server: ' + process.env.npm_package_config_rasaserver);
}
if (error !== null) {
console.log('');
console.log('Rasa NLU Error: ' + error);
}
console.log('');
} catch (err) {
console.log('Rasa Connection Error: ' + err);
}
});
}
function checkRasaCore() {
request(process.env.npm_package_config_rasacoreendpoint + '/config', function (error, response, body) {
try {
if (body !== undefined) {
console.log('');
console.log('Rasa Core Connected');
console.log('Rasa Core Server: ' + process.env.npm_package_config_rasacoreendpoint);
}
if (error !== null) {
console.log('');
console.log('Rasa Core Error: ' + error);
}
console.log('');
} catch (err) {
console.log('Rasa Connection Error: ' + err);
}
});
}
>>>>>>>
server.listen(5001, function () {
console.log('Express server listening on port ' + 5001);
});
checkDB();
checkRasaNLU();
//checkRasaCore();
function checkDB() {
db.one('select current_database(), current_schema(), inet_server_port(), inet_server_addr()')
.then(function (data) {
console.log('');
console.log('DB Connected');
console.log('Postgres Server: ' + data["inet_server_addr"] + ':' + data["inet_server_port"]);
console.log('Database:' + data["current_database"]);
console.log('Schema:' + data["current_schema"]);
console.log('');
})
.catch(function (err) {
console.log('DB Connection Error: ' + err)
});
}
function checkRasaNLU() {
request(process.env.npm_package_config_rasaserver + '/config', function (error, response, body) {
try {
if (body !== undefined) {
console.log('');
console.log('Rasa NLU Connected');
console.log('Rasa NLU Server: ' + process.env.npm_package_config_rasaserver);
}
if (error !== null) {
console.log('');
console.log('Rasa NLU Error: ' + error);
}
console.log('');
} catch (err) {
console.log('Rasa Connection Error: ' + err);
}
});
}
function checkRasaCore() {
request(process.env.npm_package_config_rasacoreendpoint + '/config', function (error, response, body) {
try {
if (body !== undefined) {
console.log('');
console.log('Rasa Core Connected');
console.log('Rasa Core Server: ' + process.env.npm_package_config_rasacoreendpoint);
}
if (error !== null) {
console.log('');
console.log('Rasa Core Error: ' + error);
}
console.log('');
} catch (err) {
console.log('Rasa Connection Error: ' + err);
}
});
} |
<<<<<<<
* @param {string} [params.fromEndpoint] - If sending, the endpoint ID of the recipient
* @param {string} [params.fromConnection] - If sending, the connection ID of the recipient
* @param {string} [params.connectionId] - The connectionId of the endpoint whose answer signal has been accepted.
=======
* @param {string} [params.fromEndpoint] - If sending, the endpoint ID of the recipient
* @param {string} [params.fromConnection] - If sending, the connection ID of the recipient
>>>>>>>
* @param {string} [params.fromEndpoint] - If sending, the endpoint ID of the recipient
* @param {string} [params.fromConnection] - If sending, the connection ID of the recipient
* @param {string} [params.connectionId] - The connectionId of the endpoint whose answer signal has been accepted.
<<<<<<<
'requesting', 'reason', 'error', 'status', 'connectionId'
=======
'requesting', 'reason', 'error', 'status', 'connectionId', 'version'
>>>>>>>
'requesting', 'reason', 'error', 'status', 'connectionId', 'version'
<<<<<<<
that = JSON.parse(params.rawMessage.body); // Incoming message
that.fromEndpoint = params.rawMessage.header.from;
that.fromConnection = params.rawMessage.header.fromConnection;
=======
that = params.rawMessage.body; // Incoming message
that.fromType = params.rawMessage.header.fromType;
that.fromEndpoint = params.rawMessage.header.from;
that.fromConnection = params.rawMessage.header.fromConnection;
>>>>>>>
that = JSON.parse(params.rawMessage.body); // Incoming message
that.fromType = params.rawMessage.header.fromType;
that.fromEndpoint = params.rawMessage.header.from;
that.fromConnection = params.rawMessage.header.fromConnection; |
<<<<<<<
* @param {function} [params.onSuccess]
* @param {function} [params.onError]
* @param {function} [params.onOpen]
* @param {function} [params.onClose]
* @param {function} [params.onMessage]
* @param {RTCServers} [params.servers]
* @param {string} [params.connectionId]
* @param {boolean} [params.initiator] Whether the logged-in user initiated the datachannel.
* @returns {Promise<brightstream.DirectConnection>}
=======
* @param {function} [params.onOpen] - A callback for receiving notification of when the DirectConnection is
* open and ready to be used.
* @param {function} [params.onClose] - A callback for receiving notification of when the DirectConnection
* is closed and the two Endpoints are disconnected.
* @param {function} [params.onMessage] - A callback for receiving messages sent through the DirectConnection.
* @param {RTCServers} [params.servers] - Additional ICE/STUN/TURN servers to use in connecting.
* @param {string} [params.connectionId] - An optional connection ID to use for this connection. This allows
* the connection to be made to a specific instance of an endpoint in the case that the same endpoint is logged
* in from multiple locations.
* @param {boolean} [params.initiator] - Whether the logged-in user initiated the DirectConnection.
* @returns {brightstream.DirectConnection} The DirectConnection which can be used to send data and messages
* directly to the other endpoint.
>>>>>>>
* @param {function} [params.onSuccess] - Success handler for this invocation of this method only.
* @param {function} [params.onError] - Error handler for this invocation of this method only.
* @param {function} [params.onOpen] - A callback for receiving notification of when the DirectConnection is
* open and ready to be used.
* @param {function} [params.onClose] - A callback for receiving notification of when the DirectConnection
* is closed and the two Endpoints are disconnected.
* @param {function} [params.onMessage] - A callback for receiving messages sent through the DirectConnection.
* @param {RTCServers} [params.servers] - Additional ICE/STUN/TURN servers to use in connecting.
* @param {string} [params.connectionId] - An optional connection ID to use for this connection. This allows
* the connection to be made to a specific instance of an endpoint in the case that the same endpoint is logged
* in from multiple locations.
* @param {boolean} [params.initiator] - Whether the logged-in user initiated the DirectConnection.
* @returns {brightstream.DirectConnection} The DirectConnection which can be used to send data and messages
* directly to the other endpoint.
<<<<<<<
call = brightstream.Call(params);
call.listen('direct-connection', function (evt) {
that.directConnection = evt.directConnection;
if (params.initiator === true) {
that.directConnection.accept({
onOpen: params.onOpen,
onClose: params.onClose,
onMessage: params.onMessage
});
} else {
/**
* @event brightstream.User#direct-connection
* @type {brightstream.Event}
* @property {brightstream.DirectConnection}
*/
clientObj.user.fire('direct-connection', {
directConnection: that.directConnection,
endpoint: that
});
if (!clientObj.user.hasListeners('direct-connection')) {
that.directConnection.reject();
deferred.reject(new Error("Got an incoming direct connection with no handlers to accept it!"));
return deferred.promise;
}
=======
if (params.initiator === true) {
that.directConnection.accept({
onOpen: params.onOpen,
onClose: params.onClose,
onMessage: params.onMessage
});
} else {
/**
* This event is fired when the logged-in endpoint is receiving a request to open a direct connection
* to another endpoint. If the user wishes to allow the direct connection, calling
* evt.directConnection.accept() will allow the connection to be set up.
* @event brightstream.User#direct-connection
* @type {brightstream.Event}
* @property {brightstream.DirectConnection}
*/
clientObj.user.fire('direct-connection', {
directConnection: that.directConnection,
endpoint: that
});
if (!clientObj.user.hasListeners('direct-connection')) {
log.warn("Got an incoming direct connection with no handlers to accept it!");
that.directConnection.reject();
}
}
>>>>>>>
call = brightstream.Call(params);
call.listen('direct-connection', function (evt) {
that.directConnection = evt.directConnection;
if (params.initiator === true) {
that.directConnection.accept({
onOpen: params.onOpen,
onClose: params.onClose,
onMessage: params.onMessage
});
} else {
/**
* This event is fired when the logged-in endpoint is receiving a request to open a direct connection
* to another endpoint. If the user wishes to allow the direct connection, calling
* evt.directConnection.accept() will allow the connection to be set up.
* @event brightstream.User#direct-connection
* @type {brightstream.Event}
* @property {brightstream.DirectConnection}
*/
clientObj.user.fire('direct-connection', {
directConnection: that.directConnection,
endpoint: that
});
if (!clientObj.user.hasListeners('direct-connection')) {
that.directConnection.reject();
deferred.reject(new Error("Got an incoming direct connection with no handlers to accept it!"));
return deferred.promise;
} |
<<<<<<<
exports.TOGGLE_LINE_NUMBERS = "view.toggleLineNumbers";
exports.TOGGLE_ACTIVE_LINE = "view.toggleActiveLine";
exports.TOGGLE_WORD_WRAP = "view.toggleWordWrap";
=======
exports.VIEW_SCROLL_LINE_UP = "view.scrollLineUp";
exports.VIEW_SCROLL_LINE_DOWN = "view.scrollLineDown";
>>>>>>>
exports.VIEW_SCROLL_LINE_UP = "view.scrollLineUp";
exports.VIEW_SCROLL_LINE_DOWN = "view.scrollLineDown";
exports.TOGGLE_LINE_NUMBERS = "view.toggleLineNumbers";
exports.TOGGLE_ACTIVE_LINE = "view.toggleActiveLine";
exports.TOGGLE_WORD_WRAP = "view.toggleWordWrap"; |
<<<<<<<
state.marked.push(cm.markText(cursor.from(), cursor.to(), "CodeMirror-searching"));
//Remove this section when https://github.com/marijnh/CodeMirror/issues/1155 will be fixed
if (cursor.pos.match && cursor.pos.match[0] === "") {
if (cursor.to().line + 1 === cm.lineCount()) {
break;
}
cursor = getSearchCursor(cm, state.query, {line: cursor.to().line + 1, ch: 0});
}
=======
state.marked.push(cm.markText(cursor.from(), cursor.to(), { className: "CodeMirror-searching" }));
>>>>>>>
state.marked.push(cm.markText(cursor.from(), cursor.to(), { className: "CodeMirror-searching" }));
//Remove this section when https://github.com/marijnh/CodeMirror/issues/1155 will be fixed
if (cursor.pos.match && cursor.pos.match[0] === "") {
if (cursor.to().line + 1 === cm.lineCount()) {
break;
}
cursor = getSearchCursor(cm, state.query, {line: cursor.to().line + 1, ch: 0});
} |
<<<<<<<
if (matches) {
doc.extension = matches[3];
doc.url = encodeURI("file://" + doc.file.fullPath);
// the root represents the document that should be displayed in the browser
// for live development (the file for HTML files, index.html for others)
var fileName = /^html?$/.test(matches[3]) ? matches[2] : "index.html";
doc.root = {url: encodeURI("file://" + matches[1] + fileName)};
}
=======
var prefix = "file://";
// The file.fullPath on Windows starts with a drive letter ("C:").
// In order to make it a valid file: URL we need to add an
// additional slash to the prefix.
if (brackets.platform === "win") {
prefix += "/";
}
doc.extension = matches[3];
doc.url = encodeURI(prefix + doc.file.fullPath);
// the root represents the document that should be displayed in the browser
// for live development (the file for HTML files, index.html for others)
var fileName = /^html?$/.test(matches[3]) ? matches[2] : "index.html";
doc.root = {url: encodeURI(prefix + matches[1] + fileName)};
>>>>>>>
if (matches) {
var prefix = "file://";
// The file.fullPath on Windows starts with a drive letter ("C:").
// In order to make it a valid file: URL we need to add an
// additional slash to the prefix.
if (brackets.platform === "win") {
prefix += "/";
}
doc.extension = matches[3];
doc.url = encodeURI(prefix + doc.file.fullPath);
// the root represents the document that should be displayed in the browser
// for live development (the file for HTML files, index.html for others)
var fileName = /^html?$/.test(matches[3]) ? matches[2] : "index.html";
doc.root = {url: encodeURI(prefix + matches[1] + fileName)};
} |
<<<<<<<
SpecRunnerUtils.createTestWindowAndRun( this, function( w ) {
testWindow = w;
// Load module instances from brackets.test
CommandManager = testWindow.brackets.test.CommandManager;
Commands = testWindow.brackets.test.Commands;
FileCommandHandlers = testWindow.brackets.test.FileCommandHandlers;
=======
// this.app = window.open(SpecRunnerUtils.getBracketsSourceRoot() + "/index.html");
// TODO: this will only work if run from the main Brackets window (not from jasmine.sh)
this.app = window.opener;
// Load module instances from brackets.test
CommandManager = this.app.brackets.test.CommandManager;
Commands = this.app.brackets.test.Commands;
FileCommandHandlers = this.app.brackets.test.FileCommandHandlers;
DocumentManager = this.app.brackets.test.DocumentManager;
// FIXME: this does NOT actually reload the modules we saved off above. Reloading the
// Brackets window and waiting until it's done to re-fetch modules is exceedingly hard.
// TODO: fix this so tests don't have intertangled state. See issue #77.
this.app.location.reload();
this.testPath = SpecRunnerUtils.getTestPath("/spec/FileCommandHandlers-test-files");
var isReady = false;
$(this.app.document).ready(function() {
isReady = true;
>>>>>>>
SpecRunnerUtils.createTestWindowAndRun( this, function( w ) {
testWindow = w;
// Load module instances from brackets.test
CommandManager = testWindow.brackets.test.CommandManager;
Commands = testWindow.brackets.test.Commands;
FileCommandHandlers = testWindow.brackets.test.FileCommandHandlers;
DocumentManager = this.app.brackets.test.DocumentManager;
<<<<<<<
expect(testWindow.$("#main-toolbar .title").text()).toBe("Untitled");
=======
expect(this.app.$("#main-toolbar .title").text()).toBe("");
>>>>>>>
expect(testWindow.$("#main-toolbar .title").text()).toBe("");
<<<<<<<
expect(testWindow.$("#main-toolbar .title").text()).toBe("Untitled");
=======
expect(this.app.$("#main-toolbar .title").text()).toBe("");
>>>>>>>
expect(testWindow.$("#main-toolbar .title").text()).toBe("");
<<<<<<<
var filePath = testPath + "/test.js";
var editor = FileCommandHandlers.getEditor();
=======
var filePath = this.testPath + "/test.js";
var editor = DocumentManager.getCurrentDocument()._editor;
>>>>>>>
var filePath = testPath + "/test.js";
var editor = DocumentManager.getCurrentDocument()._editor; |
<<<<<<<
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
/*global brackets, define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, spyOn */
=======
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50, evil: true */
/*global define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, spyOn, xit, xdescribe, jasmine, Node */
/*unittests: HTML Instrumentation*/
>>>>>>>
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50, evil: true */
/*global define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, spyOn, xit, xdescribe, jasmine, Node */
/*unittests: HTML Instrumentation*/
<<<<<<<
var testPath = SpecRunnerUtils.getTestPath("/spec/HTMLInstrumentation-test-files"),
WellFormedFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/wellformed.html"),
NotWellFormedFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/omitEndTags.html"),
InvalidHTMLFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/invalidHTML.html"),
editor,
=======
RemoteFunctions = eval("(" + RemoteFunctions.trim() + ")()");
var editor,
>>>>>>>
var editor, |
<<<<<<<
=======
NativeFileSystem = brackets.getModule("file/NativeFileSystem").NativeFileSystem,
PopUpManager = brackets.getModule("widgets/PopUpManager"),
Strings = brackets.getModule("strings"),
>>>>>>>
PopUpManager = brackets.getModule("widgets/PopUpManager"),
Strings = brackets.getModule("strings"),
<<<<<<<
$dropdown.click(function (e) {
var $link = $(e.target).closest("a"),
id = $link.attr("id"),
path = $link.data("path");
if (path) {
ProjectManager.openProject(path)
.fail(function () {
// Remove the project from the list only if it does not exist on disk
var recentProjects = getRecentProjects(),
index = recentProjects.indexOf(path);
if (index !== -1) {
ProjectManager.getFileSystem().resolve(path)
.fail(function () {
recentProjects.splice(index, 1);
});
}
});
closeDropdown();
} else if (id === "open-folder-link") {
CommandManager.execute(Commands.FILE_OPEN_FOLDER);
}
});
$dropdown.find(".recent-folder-link")
.mouseenter(function () {
// Note: we can't depend on the event here because this can be triggered
// manually from checkHovers().
showDeleteButton($(this));
=======
$dropdown
.on("click", "a", function () {
var $link = $(this),
id = $link.attr("id"),
path = $link.data("path");
if (path) {
ProjectManager.openProject(path)
.fail(function () {
// Remove the project from the list only if it does not exist on disk
var recentProjects = getRecentProjects(),
index = recentProjects.indexOf(path);
if (index !== -1) {
NativeFileSystem.requestNativeFileSystem(path,
function () {},
function () {
recentProjects.splice(index, 1);
});
}
});
closeDropdown();
} else if (id === "open-folder-link") {
CommandManager.execute(Commands.FILE_OPEN_FOLDER);
}
>>>>>>>
$dropdown
.on("click", "a", function (e) {
var $link = $(e.target).closest("a"),
id = $link.attr("id"),
path = $link.data("path");
if (path) {
ProjectManager.openProject(path)
.fail(function () {
// Remove the project from the list only if it does not exist on disk
var recentProjects = getRecentProjects(),
index = recentProjects.indexOf(path);
if (index !== -1) {
ProjectManager.getFileSystem().resolve(path)
.fail(function () {
recentProjects.splice(index, 1);
});
}
});
closeDropdown();
} else if (id === "open-folder-link") {
CommandManager.execute(Commands.FILE_OPEN_FOLDER);
} |
<<<<<<<
=======
});
describe("File extension to mode mapping", function () {
it("should switch to the HTML mode for files ending in .html", function () {
// verify editor content
var mode = LanguageManager.getLanguageForPath("c:/only/testing/the/path.html").getMode();
expect(mode).toSpecifyModeNamed("text/x-brackets-html");
});
it("should switch modes for UNIX absolute path", function () {
// verify editor content
var mode = LanguageManager.getLanguageForPath("/only/testing/the/path.css").getMode();
expect(mode).toSpecifyModeNamed(langNames.css.mode);
});
it("should switch modes for relative path", function () {
// verify editor content
var mode = LanguageManager.getLanguageForPath("only/testing/the/path.css").getMode();
expect(mode).toSpecifyModeNamed(langNames.css.mode);
});
>>>>>>> |
<<<<<<<
WORD_WRAP = "wordWrap",
INDENT_LINE_COMMENT = "indentLineComment";
=======
WORD_WRAP = "wordWrap";
>>>>>>>
WORD_WRAP = "wordWrap",
INDENT_LINE_COMMENT = "indentLineComment";
<<<<<<<
PreferencesManager.definePreference(INDENT_LINE_COMMENT, "boolean", false, {
description: Strings.DESCRIPTION_INDENT_LINE_COMMENT
});
=======
>>>>>>>
PreferencesManager.definePreference(INDENT_LINE_COMMENT, "boolean", false, {
description: Strings.DESCRIPTION_INDENT_LINE_COMMENT
}); |
<<<<<<<
function handleFileDelete() {
var entry = ProjectManager.getSelectedItem();
ProjectManager.deleteItem(entry);
}
=======
/** Show the selected sidebar (tree or working set) item in Finder/Explorer */
function handleShowInOS() {
var entry = ProjectManager.getSelectedItem();
if (entry) {
brackets.app.showOSFolder(entry.fullPath, function (err) {
if (err) {
console.error("Error showing '" + entry.fullPath + "' in OS folder:", err);
}
});
}
}
>>>>>>>
function handleFileDelete() {
var entry = ProjectManager.getSelectedItem();
ProjectManager.deleteItem(entry);
}
/** Show the selected sidebar (tree or working set) item in Finder/Explorer */
function handleShowInOS() {
var entry = ProjectManager.getSelectedItem();
if (entry) {
brackets.app.showOSFolder(entry.fullPath, function (err) {
if (err) {
console.error("Error showing '" + entry.fullPath + "' in OS folder:", err);
}
});
}
} |
<<<<<<<
function handleFileAddToWorkingSet(commandData){
handleFileOpen(commandData)
DocumentManager.addToWorkingSet(DocumentManager.getCurrentDocument());
=======
function handleFileAddToWorkingSet(fullPath){
handleFileOpen(fullPath).done(function(doc) {
DocumentManager.addToWorkingSet(doc);
});
>>>>>>>
function handleFileAddToWorkingSet(commandData){
handleFileOpen(commandData).done(function(doc) {
DocumentManager.addToWorkingSet(doc);
});
<<<<<<<
var document = DocumentManager.getDocumentForPath(fullPath);
if (document != null) {
=======
// TODO: we should implement something like NativeFileSystem.resolveNativeFileSystemURL() (similar
// to what's in the standard file API) to get a FileEntry, rather than manually constructing it
var fileEntry = new NativeFileSystem.FileEntry(fullPath);
var doc = DocumentManager.getDocumentForFile(fileEntry);
if (doc != null) {
>>>>>>>
var doc = DocumentManager.getDocumentForPath(fullPath);
if (doc != null) {
<<<<<<<
// File wasn't open before, so we must load its contents into a new document
var reader = new NativeFileSystem.FileReader();
var fileEntry = new NativeFileSystem.FileEntry(fullPath);
fileEntry.file(function(file) {
reader.onload = function(event) {
// Create a new editor initialized with the file's content, and bind it to a Document
document = EditorManager.createDocumentAndEditor(fileEntry, event.target.result);
// Switch to new document in the UI
DocumentManager.showInEditor(document);
result.resolve();
};
=======
var docResult = EditorManager.createDocumentAndEditor(fileEntry);
>>>>>>>
// File wasn't open before, so we must create a new document for it
var fileEntry = new NativeFileSystem.FileEntry(fullPath);
var docResult = EditorManager.createDocumentAndEditor(fileEntry);
<<<<<<<
function handleFileClose( commandData ) {
var doc = null;
if(commandData)
doc = commandData.doc;
=======
function saveAll() {
var saveResults = [];
>>>>>>>
function saveAll() {
var saveResults = []; |
<<<<<<<
PreferencesManager = require("preferences/PreferencesManager"),
=======
PerfUtils = require("utils/PerfUtils"),
>>>>>>>
PreferencesManager = require("preferences/PreferencesManager"),
PerfUtils = require("utils/PerfUtils"), |
<<<<<<<
var node = this.getDOMNode(),
selectedNode = $(node.parentNode).find(this.props.selectedClassName).closest("li"),
=======
var node = ReactDOM.findDOMNode(this),
selectedNode = $(node.parentNode).find(this.props.selectedClassName),
>>>>>>>
var node = ReactDOM.findDOMNode(this),
selectedNode = $(node.parentNode).find(this.props.selectedClassName).closest("li"), |
<<<<<<<
var defaultScopeOrder = this._defaults.scopeOrder,
shadowScopeOrder = this._defaults._shadowScopeOrder,
=======
var shadowScopeOrder = this._defaultContext._shadowScopeOrder,
>>>>>>>
var shadowScopeOrder = this._defaults._shadowScopeOrder,
<<<<<<<
var defaultScopeOrder = this._defaults.scopeOrder,
shadowScopeOrder = this._defaults._shadowScopeOrder,
=======
var shadowScopeOrder = this._defaultContext._shadowScopeOrder,
>>>>>>>
var shadowScopeOrder = this._defaults._shadowScopeOrder, |
<<<<<<<
function replace(editor, all) {
var cm = editor._codeMirror;
var modalBar = new ModalBar(replaceQueryDialog, true);
=======
function replace(cm, all) {
createModalBar(replaceQueryDialog, true);
>>>>>>>
function replace(editor, all) {
var cm = editor._codeMirror;
createModalBar(replaceQueryDialog, true);
<<<<<<<
editor.setSelection(cursor.from(), cursor.to(), true);
modalBar = new ModalBar(doReplaceConfirm, true);
=======
cm.setSelection(cursor.from(), cursor.to());
createModalBar(doReplaceConfirm, true);
>>>>>>>
editor.setSelection(cursor.from(), cursor.to(), true);
createModalBar(doReplaceConfirm, true); |
<<<<<<<
this._pendingEvents = {};
=======
this._pendingScopes = {};
>>>>>>>
this._pendingEvents = {};
this._pendingScopes = {};
<<<<<<<
delete this._pendingEvents[id];
=======
>>>>>>>
delete this._pendingEvents[id];
<<<<<<<
shadowIndex = _.findIndex(this._defaultContext._shadowScopeOrder, function (entry) {
return entry.id === id;
});
this._defaultContext._shadowScopeOrder.splice(shadowIndex, 1);
=======
>>>>>>>
shadowIndex = _.findIndex(this._defaultContext._shadowScopeOrder, function (entry) {
return entry.id === id;
});
this._defaultContext._shadowScopeOrder.splice(shadowIndex, 1); |
<<<<<<<
var FileUtils = require("FileUtils"),
NativeFileSystem = require("NativeFileSystem").NativeFileSystem,
DocumentManager = require("DocumentManager");
=======
var NativeFileSystem = require("NativeFileSystem").NativeFileSystem,
Commands = require("Commands"),
FileUtils = require("FileUtils"),
Async = require("Async");
>>>>>>>
var NativeFileSystem = require("NativeFileSystem").NativeFileSystem,
Commands = require("Commands"),
FileUtils = require("FileUtils"),
Async = require("Async"),
DocumentManager = require("DocumentManager");
<<<<<<<
testWindow = window.open(getBracketsSourceRoot() + "/index.html", "_blank", "left=400,top=200,width=1000,height=700");
=======
testWindow = window.open(getBracketsSourceRoot() + "/index.html");
testWindow.executeCommand = function executeCommand(cmd, args) {
return testWindow.brackets.test.CommandManager.execute(cmd, args);
};
>>>>>>>
testWindow = window.open(getBracketsSourceRoot() + "/index.html", "_blank", "left=400,top=200,width=1000,height=700");
testWindow.executeCommand = function executeCommand(cmd, args) {
return testWindow.brackets.test.CommandManager.execute(cmd, args);
};
<<<<<<<
exports.getTestRoot = getTestRoot;
exports.getTestPath = getTestPath;
exports.getBracketsSourceRoot = getBracketsSourceRoot;
exports.createMockDocument = createMockDocument;
exports.createTestWindowAndRun = createTestWindowAndRun;
exports.closeTestWindow = closeTestWindow;
exports.loadProjectInTestWindow = loadProjectInTestWindow;
=======
exports.getTestRoot = getTestRoot;
exports.getTestPath = getTestPath;
exports.getBracketsSourceRoot = getBracketsSourceRoot;
exports.createTestWindowAndRun = createTestWindowAndRun;
exports.closeTestWindow = closeTestWindow;
exports.loadProjectInTestWindow = loadProjectInTestWindow;
exports.openProjectFiles = openProjectFiles;
exports.openInlineEditorAtOffset = openInlineEditorAtOffset;
exports.saveFilesWithOffsets = saveFilesWithOffsets;
exports.saveFilesWithoutOffsets = saveFilesWithoutOffsets;
exports.saveFileWithoutOffsets = saveFileWithoutOffsets;
>>>>>>>
exports.getTestRoot = getTestRoot;
exports.getTestPath = getTestPath;
exports.getBracketsSourceRoot = getBracketsSourceRoot;
exports.createMockDocument = createMockDocument;
exports.createTestWindowAndRun = createTestWindowAndRun;
exports.closeTestWindow = closeTestWindow;
exports.loadProjectInTestWindow = loadProjectInTestWindow;
exports.openProjectFiles = openProjectFiles;
exports.openInlineEditorAtOffset = openInlineEditorAtOffset;
exports.saveFilesWithOffsets = saveFilesWithOffsets;
exports.saveFilesWithoutOffsets = saveFilesWithoutOffsets;
exports.saveFileWithoutOffsets = saveFileWithoutOffsets; |
<<<<<<<
/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, window, $, jasmine, brackets */
=======
/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, $, setTimeout */
>>>>>>>
/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, $, setTimeout */
<<<<<<<
describe("Resolve", function () {
function testResolve(path, expectedError, expectedType) {
var cb = resolveCallback();
runs(function () {
fileSystem.resolve(path, cb);
});
waitsFor(function () { return cb.wasCalled; });
runs(function () {
if (!expectedError) {
expect(cb.error).toBeFalsy();
} else {
expect(cb.error).toBe(expectedError);
}
if (expectedType) {
expect(cb.entry instanceof expectedType).toBeTruthy();
}
});
}
it("should resolve a File", function () {
testResolve("/subdir/file3.txt", null, File);
});
it("should resolve a Directory", function () {
testResolve("/subdir/", null, Directory);
});
it("should return an error if the File/Directory is not found", function () {
testResolve("/doesnt-exist.txt", FileSystemError.NOT_FOUND);
testResolve("/doesnt-exist/", FileSystemError.NOT_FOUND);
});
});
=======
>>>>>>>
describe("Resolve", function () {
function testResolve(path, expectedError, expectedType) {
var cb = resolveCallback();
runs(function () {
fileSystem.resolve(path, cb);
});
waitsFor(function () { return cb.wasCalled; });
runs(function () {
if (!expectedError) {
expect(cb.error).toBeFalsy();
} else {
expect(cb.error).toBe(expectedError);
}
if (expectedType) {
expect(cb.entry instanceof expectedType).toBeTruthy();
}
});
}
it("should resolve a File", function () {
testResolve("/subdir/file3.txt", null, File);
});
it("should resolve a Directory", function () {
testResolve("/subdir/", null, Directory);
});
it("should return an error if the File/Directory is not found", function () {
testResolve("/doesnt-exist.txt", FileSystemError.NOT_FOUND);
testResolve("/doesnt-exist/", FileSystemError.NOT_FOUND);
});
}); |
<<<<<<<
that.outgoingMedia.listen('requesting-media', function waitAllowHandler(evt) {
=======
stream = respoke.LocalMedia(params);
stream.listen('requesting-media', function waitAllowHandler(evt) {
if (!pc) {
return;
}
>>>>>>>
that.outgoingMedia.listen('requesting-media', function waitAllowHandler(evt) {
if (!pc) {
return;
}
<<<<<<<
that.outgoingMedia.listen('allow', function allowHandler(evt) {
=======
stream.listen('allow', function allowHandler(evt) {
if (!pc) {
return;
}
>>>>>>>
that.outgoingMedia.listen('allow', function allowHandler(evt) {
if (!pc) {
return;
}
<<<<<<<
that.outgoingMedia.listen('stream-received', function streamReceivedHandler(evt) {
defMedia.resolve(that.outgoingMedia);
=======
stream.listen('stream-received', function streamReceivedHandler(evt) {
if (!pc) {
return;
}
defMedia.resolve(stream);
>>>>>>>
that.outgoingMedia.listen('stream-received', function streamReceivedHandler(evt) {
if (!pc) {
return;
}
defMedia.resolve(that.outgoingMedia); |
<<<<<<<
$(this.editors[0]).off("cursorActivity", this._ensureCursorVisible);
$(this.hostEditor).off("scroll", this._updateRelatedContainer);
=======
$(this).off("offsetTopChanged", this._updateRelatedContainer);
>>>>>>>
$(this.editors[0]).off("cursorActivity", this._ensureCursorVisible);
$(this).off("offsetTopChanged", this._updateRelatedContainer); |
<<<<<<<
FileViewController = require("project/FileViewController"),
=======
NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem,
>>>>>>>
FileViewController = require("project/FileViewController"),
NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem,
<<<<<<<
=======
if (scope instanceof NativeFileSystem.InaccessibleFileEntry) {
return;
}
>>>>>>>
if (scope instanceof NativeFileSystem.InaccessibleFileEntry) {
return;
} |
<<<<<<<
/**
* Called when the editor containing the inline is made visible.
*/
InlineEditor.prototype.afterParentShown = function () {
=======
// Called when the editor containing the inline is made visible.
InlineEditor.prototype.onParentShown = function () {
// We need to call this explicitly whenever the host editor is reshown, since
// we don't actually resize the inline editor while its host is invisible (see
// isFullyVisible() check in sizeInlineEditorToContents()).
>>>>>>>
/**
* Called when the editor containing the inline is made visible.
*/
InlineEditor.prototype.onParentShown = function () {
// We need to call this explicitly whenever the host editor is reshown, since
// we don't actually resize the inline editor while its host is invisible (see
// isFullyVisible() check in sizeInlineEditorToContents()). |
<<<<<<<
HTMLTags = require("text!HtmlTags.json"),
=======
NativeFileSystem = brackets.getModule("file/NativeFileSystem").NativeFileSystem,
ProjectManager = brackets.getModule("project/ProjectManager"),
StringUtils = brackets.getModule("utils/StringUtils");
var HTMLTags = require("text!HtmlTags.json"),
>>>>>>>
HTMLTags = require("text!HtmlTags.json"),
<<<<<<<
=======
this.exclusion = "";
// Used in URL hinting to keep the popup list open
// by setting this to false.
this.closeOnSelect = true;
>>>>>>>
this.exclusion = "";
<<<<<<<
* Helper function that determins the possible value hints for a given html tag/attribute name pair
=======
* Helper function for search(). Create a list of urls to existing files based on the query.
* @param {{queryStr: string}} query -- a query object, used to filter the code hints
* @return {Array.<string>}
*/
AttrHints.prototype._getUrlList = function (query) {
var doc,
result = [];
// site-root relative links are not yet supported, so filter them out
if (query.queryStr.length > 0 && query.queryStr[0] === "/") {
return result;
}
// get path to current document
doc = DocumentManager.getCurrentDocument();
if (!doc || !doc.file) {
return result;
}
var docUrl = window.PathUtils.parseUrl(doc.file.fullPath);
if (!docUrl) {
return result;
}
var docDir = docUrl.domain + docUrl.directory;
// get relative path from query string
// TODO: handle site-root relative
var queryDir = "";
var queryUrl = window.PathUtils.parseUrl(query.queryStr);
if (queryUrl) {
queryDir = queryUrl.directory;
}
// build target folder path
var targetDir = docDir + decodeURI(queryDir);
// get list of files from target folder
var unfiltered = [];
// Getting the file/folder info is an asynch operation, so it works like this:
//
// The initial pass initiates the asynchronous retrieval of data and returns an
// empty list, so no code hints are displayed. In the async callback, the code
// hints and the original query are stored in a cache, and then the process to
// show code hints is re-initiated.
//
// During the next pass, there should now be code hints cached from the initial
// pass, but user may have typed while file/folder info was being retrieved from
// disk, so we need to make sure code hints still apply to current query. If so,
// display them, otherwise, clear cache and start over.
//
// As user types within a folder, the same unfiltered file/folder list is still
// valid and re-used from cache. Filtering based on user input is done outside
// of this method. When user moves to a new folder, then the cache is deleted,
// and file/folder info for new folder is then retrieved.
if (this.cachedHints) {
// url hints have been cached, so determine if they're stale
if (!this.cachedHints.query ||
this.cachedHints.query.tag !== query.tag ||
this.cachedHints.query.attrName !== query.attrName ||
this.cachedHints.queryDir !== queryDir ||
this.cachedHints.docDir !== docDir) {
// delete stale cache
this.cachedHints = null;
}
}
if (this.cachedHints) {
// use cached hints
unfiltered = this.cachedHints.unfiltered;
} else {
var self = this,
origEditor = EditorManager.getFocusedEditor();
if (self.cachedHints && self.cachedHints.deferred) {
self.cachedHints.deferred.reject();
}
// create empty object so we can detect "waiting" state
self.cachedHints = {};
self.cachedHints.deferred = $.Deferred();
self.cachedHints.unfiltered = [];
NativeFileSystem.requestNativeFileSystem(targetDir, function (fs) {
fs.root.createReader().readEntries(function (entries) {
entries.forEach(function (entry) {
if (ProjectManager.shouldShow(entry)) {
// convert to doc relative path
var entryStr = entry.fullPath.replace(docDir, "");
// code hints show the same strings that are inserted into text,
// so strings in list will be encoded. wysiwyg, baby!
unfiltered.push(encodeURI(entryStr));
}
});
self.cachedHints.unfiltered = unfiltered;
self.cachedHints.query = query;
self.cachedHints.queryDir = queryDir;
self.cachedHints.docDir = docDir;
if (self.cachedHints.deferred.state() !== "rejected") {
var currentDeferred = self.cachedHints.deferred;
// Since we've cached the results, the next call to _getUrlList should be synchronous.
// If it isn't, we've got a problem and should reject both the current deferred
// and any new deferred that got created on the call.
var syncResults = self._getUrlList(query);
if (syncResults instanceof Array) {
currentDeferred.resolveWith(self, [syncResults]);
} else {
if (currentDeferred && currentDeferred.state() === "pending") {
currentDeferred.reject();
}
if (self.cachedHints.deferred && self.cachedHints.deferred.state() === "pending") {
self.cachedHints.deferred.reject();
self.cachedHints.deferred = null;
}
}
}
});
});
return self.cachedHints.deferred;
}
// build list
// without these entries, typing "../" will not display entries for containing folder
if (queryUrl.filename === ".") {
result.push(queryDir + ".");
} else if (queryUrl.filename === "..") {
result.push(queryDir + "..");
}
// add file/folder entries
unfiltered.forEach(function (item) {
result.push(item);
});
// TODO: filter by desired file type based on tag, type attr, etc.
// TODO: add list item to top of list to popup modal File Finder dialog
// New string: "Browse..." or "Choose a File..."
// Command: Commands.FILE_OPEN
return result;
};
/**
* Helper function that determines the possible value hints for a given html tag/attribute name pair
>>>>>>>
* Helper function that determins the possible value hints for a given html tag/attribute name pair
<<<<<<<
charCount = tagInfo.attr.value.length;
if (!tagInfo.attr.hasEndQuote) {
endQuote = tagInfo.attr.quoteChar;
=======
textAfterCursor = this.tagInfo.attr.value.substr(offset);
if (CodeHintManager.hasValidExclusion(this.exclusion, textAfterCursor)) {
charCount = offset;
// Set exclusion to null only after attribute value insertion,
// not after attribute name insertion since we need to keep it
// for attribute value insertion.
this.exclusion = null;
} else {
charCount = this.tagInfo.attr.value.length;
}
// Special handling for URL hinting -- if the completion is a file name
// and not a folder, then close the code hint list.
if (!this.closeOnSelect && completion.match(/\/$/) === null) {
this.closeOnSelect = true;
}
if (!this.tagInfo.attr.hasEndQuote) {
endQuote = this.tagInfo.attr.quoteChar;
>>>>>>>
textAfterCursor = this.tagInfo.attr.value.substr(offset);
if (CodeHintManager.hasValidExclusion(this.exclusion, textAfterCursor)) {
charCount = offset;
// Set exclusion to null only after attribute value insertion,
// not after attribute name insertion since we need to keep it
// for attribute value insertion.
this.exclusion = null;
} else {
charCount = this.tagInfo.attr.value.length;
}
if (!this.tagInfo.attr.hasEndQuote) {
endQuote = this.tagInfo.attr.quoteChar;
<<<<<<<
=======
if (!this.closeOnSelect) {
// If we append the missing quote, then we need to adjust the cursor position
// to keep the code hint list open.
if (tokenType === HTMLUtils.ATTR_VALUE && !this.tagInfo.attr.hasEndQuote) {
this.editor.setCursorPos(start.line, start.ch + completion.length - 1);
}
return true;
}
>>>>>>> |
<<<<<<<
var Async = require("utils/Async"),
=======
var _ = require("thirdparty/lodash"),
FileFilters = require("search/FileFilters"),
Async = require("utils/Async"),
>>>>>>>
var _ = require("thirdparty/lodash"),
FileFilters = require("search/FileFilters"),
Async = require("utils/Async"),
<<<<<<<
/** @type {FindInFilesResults} The find in files results. Initialized in htmlReady() */
var findInFilesResults;
=======
/** @const @type {!Object} Token used to indicate a specific reason for zero search results */
var ZERO_FILES_TO_SEARCH = {};
/**
* Map of all the last search results
* @type {Object.<fullPath: string, {matches: Array.<Object>, collapsed: boolean}>}
*/
var searchResults = {};
/** @type {Array.<string>} Keeps a copy of the searched files sorted by name and with the selected file first */
var searchFiles = [];
/** @type {Panel} Bottom panel holding the search results. Initialized in htmlReady() */
var searchResultsPanel;
/** @type {Entry} the File selected on the initial search */
var selectedEntry;
/** @type {number} The index of the first result that is displayed */
var currentStart = 0;
>>>>>>>
/** @const @type {!Object} Token used to indicate a specific reason for zero search results */
var ZERO_FILES_TO_SEARCH = {};
/** @type {FindInFilesResults} The find in files results. Initialized in htmlReady() */
var findInFilesResults;
<<<<<<<
var doSearch = _doSearchInOneFile.bind(undefined, findInFilesResults._addSearchMatches.bind(findInFilesResults));
return Async.doInParallel(fileListResult, doSearch);
=======
// Filter out files/folders that match user's current exclusion filter
fileListResult = FileFilters.filterFileList(currentFilter, fileListResult);
if (fileListResult.length) {
return Async.doInParallel(fileListResult, _doSearchInOneFile);
} else {
return ZERO_FILES_TO_SEARCH;
}
>>>>>>>
// Filter out files/folders that match user's current exclusion filter
fileListResult = FileFilters.filterFileList(currentFilter, fileListResult);
if (fileListResult.length) {
return Async.doInParallel(fileListResult, _doSearchInOneFile);
} else {
return ZERO_FILES_TO_SEARCH;
}
<<<<<<<
findInFilesResults.showResults();
=======
_sortResultFiles();
_showSearchResults(zeroFilesToken);
>>>>>>>
findInFilesResults.showResults(zeroFilesToken);
<<<<<<<
$(DocumentModule).on("documentChange.findInFiles", findInFilesResults._documentChangeHandler.bind(findInFilesResults));
=======
// Listen for FS & Document changes to keep results up to date
if (!$.isEmptyObject(searchResults)) {
_addListeners();
}
exports._searchResults = searchResults; // for unit tests
>>>>>>>
// Listen for FS & Document changes to keep results up to date
if (!$.isEmptyObject(findInFilesResults.searchResults)) {
findInFilesResults._addListeners();
}
exports._searchResults = findInFilesResults.searchResults; // for unit tests
<<<<<<<
findInFilesResults.initializeResults();
=======
exports._searchResults = null; // for unit tests
>>>>>>>
exports._searchResults = null; // for unit tests
findInFilesResults.initializeResults();
<<<<<<<
this.restoreResults();
=======
_sortResultFiles();
_restoreSearchResults();
>>>>>>>
this.restoreResults();
<<<<<<<
var doSearch = _doSearchInOneFile.bind(undefined, function () {
if (self._addSearchMatches(entry)) {
resultsChanged = true;
}
});
=======
>>>>>>>
<<<<<<<
self.restoreResults();
=======
_sortResultFiles();
_restoreSearchResults();
>>>>>>>
self.restoreResults();
<<<<<<<
=======
>>>>>>> |
<<<<<<<
ModalBar = require("widgets/ModalBar").ModalBar,
ScrollTrackMarkers = require("search/ScrollTrackMarkers");
=======
ModalBar = require("widgets/ModalBar").ModalBar,
PanelManager = require("view/PanelManager"),
Resizer = require("utils/Resizer"),
StatusBar = require("widgets/StatusBar"),
ViewUtils = require("utils/ViewUtils");
>>>>>>>
ModalBar = require("widgets/ModalBar").ModalBar,
ScrollTrackMarkers = require("search/ScrollTrackMarkers"),
PanelManager = require("view/PanelManager"),
Resizer = require("utils/Resizer"),
StatusBar = require("widgets/StatusBar"),
ViewUtils = require("utils/ViewUtils");
<<<<<<<
": <input type='text' style='width: 10em'/> <div class='message'><span id='find-counter'></span> " +
"<span style='color: #888'>(" + Strings.SEARCH_REGEXP_INFO + ")</span></div><div class='error'></div>";
function toggleHighlighting(editor, enabled) {
if (enabled) {
if ($(editor.getRootElement()).hasClass("find-highlighting")) {
return;
}
// Temporarily change selection color to improve highlighting - see LESS code for details
$(editor.getRootElement()).addClass("find-highlighting");
} else {
$(editor.getRootElement()).removeClass("find-highlighting");
}
ScrollTrackMarkers.setVisible(editor, enabled);
}
function addHighlight(editor, state, cursor) {
var cm = editor._codeMirror;
state.marked.push(cm.markText(cursor.from(), cursor.to(), { className: "CodeMirror-searching" }));
ScrollTrackMarkers.addTickmark(editor, cursor.from());
}
=======
": <input type='text' style='width: 10em'/>" +
"<div class='navigator'>" +
"<button id='find-prev' class='btn' title='" + Strings.BUTTON_PREV_HINT + "'>" + Strings.BUTTON_PREV + "</button>" +
"<button id='find-next' class='btn' title='" + Strings.BUTTON_NEXT_HINT + "'>" + Strings.BUTTON_NEXT + "</button>" +
"</div>" +
"<div class='message'>" +
"<span id='find-counter'></span> " +
"<span style='color: #888'>(" + Strings.SEARCH_REGEXP_INFO + ")</span>" +
"</div>" +
"<div class='error'></div>";
>>>>>>>
": <input type='text' style='width: 10em'/>" +
"<div class='navigator'>" +
"<button id='find-prev' class='btn' title='" + Strings.BUTTON_PREV_HINT + "'>" + Strings.BUTTON_PREV + "</button>" +
"<button id='find-next' class='btn' title='" + Strings.BUTTON_NEXT_HINT + "'>" + Strings.BUTTON_NEXT + "</button>" +
"</div>" +
"<div class='message'>" +
"<span id='find-counter'></span> " +
"<span style='color: #888'>(" + Strings.SEARCH_REGEXP_INFO + ")</span>" +
"</div>" +
"<div class='error'></div>";
function toggleHighlighting(editor, enabled) {
if (enabled) {
if ($(editor.getRootElement()).hasClass("find-highlighting")) {
return;
}
// Temporarily change selection color to improve highlighting - see LESS code for details
$(editor.getRootElement()).addClass("find-highlighting");
} else {
$(editor.getRootElement()).removeClass("find-highlighting");
}
ScrollTrackMarkers.setVisible(editor, enabled);
}
function addHighlight(editor, state, cursor) {
var cm = editor._codeMirror;
state.marked.push(cm.markText(cursor.from(), cursor.to(), { className: "CodeMirror-searching" }));
ScrollTrackMarkers.addTickmark(editor, cursor.from());
} |
<<<<<<<
searchScopeChanged = false,
findOrReplaceInProgress = false,
changedFileList = {};
//var searchDomain = new NodeDomain("FindInFiles", _domainPath);
=======
fileFilterChanged = false;
>>>>>>>
searchScopeChanged = false,
findOrReplaceInProgress = false,
changedFileList = {}; |
<<<<<<<
state: pc.state,
temporary: true,
source: params.source
=======
temporary: true
>>>>>>>
temporary: true,
source: params.source |
<<<<<<<
describe("without a call listener specified for callee", function () {
var hangupReason;
var remoteStream;
var error;
beforeEach(function (done) {
var done = doneCountBuilder(1, done);
window.thisCall = call = followeeEndpoint.startCall({
=======
xdescribe("without a call listener specified", function () {
it("fails", function (done) {
call = followeeEndpoint.startCall({
>>>>>>>
describe("without a call listener specified for callee", function () {
var hangupReason;
var remoteStream;
var error;
beforeEach(function (done) {
var done = doneCountBuilder(1, done);
call = followeeEndpoint.startCall({
<<<<<<<
try {
expect(iSpy.calledOnce).to.equal(true);
expect(call.callDebugReportEnabled).to.equal(true);
done();
} catch (err) {
done(err);
}
=======
try {
//expect(iSpy.calledOnce).to.equal(true);
expect(call.callDebugReportEnabled).to.equal(true);
done();
} catch (err) {
done(err);
}
>>>>>>>
try {
//expect(iSpy.calledOnce).to.equal(true);
expect(call.callDebugReportEnabled).to.equal(true);
done();
} catch (err) {
done(err);
} |
<<<<<<<
ProjectManager, // loaded from brackets.test
=======
EditorManager, // loaded from brackets.test
>>>>>>>
ProjectManager, // loaded from brackets.test
EditorManager, // loaded from brackets.test
<<<<<<<
ProjectManager = testWindow.brackets.test.ProjectManager;
=======
EditorManager = testWindow.brackets.test.EditorManager;
>>>>>>>
ProjectManager = testWindow.brackets.test.ProjectManager;
EditorManager = testWindow.brackets.test.EditorManager; |
<<<<<<<
this.$editorsDiv = $(document.createElement('div')).addClass("inlineEditorHolder");
this.$relatedContainer = $(document.createElement("div")).addClass("relatedContainer");
var $related = $(document.createElement("div")).appendTo(this.$relatedContainer).addClass("related");
=======
var $editorsDiv = $(document.createElement('div')).addClass("inlineEditorHolder");
// Outer container for border-left and scrolling
this.$relatedContainer = $(document.createElement("div")).addClass("relatedContainer");
// List "selection" highlight
this.$selectedMarker = $(document.createElement("div")).appendTo(this.$relatedContainer).addClass("selection");
// Inner container
var $related = $(document.createElement("div")).appendTo(this.$relatedContainer).addClass("related");
// Rule list
>>>>>>>
this.$editorsDiv = $(document.createElement('div')).addClass("inlineEditorHolder");
// Outer container for border-left and scrolling
this.$relatedContainer = $(document.createElement("div")).addClass("relatedContainer");
// List "selection" highlight
this.$selectedMarker = $(document.createElement("div")).appendTo(this.$relatedContainer).addClass("selection");
// Inner container
var $related = $(document.createElement("div")).appendTo(this.$relatedContainer).addClass("related");
// Rule list
<<<<<<<
this.$htmlContent.append(this.$editorsDiv).append(this.$relatedContainer);
=======
this.$htmlContent.append($editorsDiv).append(this.$relatedContainer);
// initialize position based on the main #editorHolder
setTimeout(function () {
self._updateRelatedContainer();
}, 0);
var updateRelatedContainerProxy = $.proxy(this._updateRelatedContainer, this);
// Changes to the host editor should update the relatedContainer
$(this.hostEditor).on("change.CSSInlineEditor", updateRelatedContainerProxy);
// TODO (jasonsj): install on active inline editor
// Changes in size to the inline editor should update the relatedContainer
$(this.editors[0]).on("change.CSSInlineEditor", updateRelatedContainerProxy);
// Since overflow-y is hidden on the CM scrollerElement, the scroll event is never fired.
// Instead, we add a hook to CM's onScroll to reposition the relatedContainer.
this.hostEditor._codeMirror.setOption("onScroll", updateRelatedContainerProxy);
>>>>>>>
this.$htmlContent.append(this.$editorsDiv).append(this.$relatedContainer);
// initialize position based on the main #editorHolder
setTimeout(function () {
self._updateRelatedContainer();
}, 0);
var updateRelatedContainerProxy = $.proxy(this._updateRelatedContainer, this);
// Changes to the host editor should update the relatedContainer
$(this.hostEditor).on("change.CSSInlineEditor", updateRelatedContainerProxy);
// TODO (jasonsj): install on active inline editor
// Changes in size to the inline editor should update the relatedContainer
$(this.editors[0]).on("change.CSSInlineEditor", updateRelatedContainerProxy);
// Since overflow-y is hidden on the CM scrollerElement, the scroll event is never fired.
// Instead, we add a hook to CM's onScroll to reposition the relatedContainer.
this.hostEditor._codeMirror.setOption("onScroll", updateRelatedContainerProxy); |
<<<<<<<
* @param {bool} allowMultipleSelection Allows selecting more than one file at a time
* @param {bool} chooseDirectories Allows directories to be opened
* @param {string} title The title for the window
* @param {string} initialPath The folder opened inside the window initially. If initialPath
* is not set, or it doesn't exist, the window would show the last
* browsed folder depending on the OS preferences
* @param {Array.<string>} fileTypes List of extensions that are allowed to be opened. A null value
* allows any extension to be selected.
* @param {function(Array.<string>)} successCallback Callback function for successful operations. Receives an
array with the selected paths as first parameter.
* @param {function(FileError)} errorCallback Callback function for error operations.
=======
* @param {bool} allowMultipleSelection
* @param {bool} chooseDirectories
* @param {string} title
* @param {string} initialPath
* @param {Array.<string>} fileTypes
* @param {!function(Array.<string>)} successCallback
* @param {!function(number)} errorCallback (TODO #2057: should this pass a FileError?)
* @constructor
>>>>>>>
* @param {bool} allowMultipleSelection Allows selecting more than one file at a time
* @param {bool} chooseDirectories Allows directories to be opened
* @param {string} title The title for the window
* @param {string} initialPath The folder opened inside the window initially. If initialPath
* is not set, or it doesn't exist, the window would show the last
* browsed folder depending on the OS preferences
* @param {Array.<string>} fileTypes List of extensions that are allowed to be opened. A null value
* allows any extension to be selected.
* @param {!function(Array.<string>)} successCallback Callback function for successful operations. Receives an
array with the selected paths as first parameter.
* @param {!function(number)} errorCallback Callback function for error operations.
* (TODO #2057: should this pass a FileError?)
<<<<<<<
/**
* Implementation of w3 requestFileSystem entry point
* @param {string} path Path of the file in the system
* @param {function(DirectoryEntry)} successCallback Callback function for successful operations. Receives a
* DirectoryEntry pointing to the path
* @param {function(FileError)} errorCallback Callback function for errors, including permission errors.
=======
/** requestNativeFileSystem
*
* @param {!string} path
* @param {!function(DirectoryEntry)} successCallback
* @param {!function(number)} errorCallback (TODO #2057: should pass a FileError)
>>>>>>>
/**
* Implementation of w3 requestFileSystem entry point
* @param {!string} path Path of the file in the system
* @param {!function(DirectoryEntry)} successCallback Callback function for successful operations. Receives a
* DirectoryEntry pointing to the path
* @param {!function(number)} errorCallback Callback function for errors, including permission errors.
* (TODO #2057: should pass a FileError)
<<<<<<<
/**
* Look up metadata about this Entry
* @param {function(Metadata)} successCallback Callback function for successful operations
* @param {function(FileError)} errorCallback Callback function for error operations
*/
=======
/**
* @param {!function(Metadata)} successCallBack
* @param {!function(number)} errorCallback (TODO #2057: should pass a FileError)
*/
>>>>>>>
/**
* Look up metadata about this Entry
* @param {!function(Metadata)} successCallback Callback function for successful operations
* @param {!function(number)} errorCallback Callback function for error operations
* (TODO #2057: should pass a FileError)
*/
<<<<<<<
* @param {function(FileWriter)} successCallback Callback function for successful operations
* @param {function(FileError)} errorCallback Callback function for error operations
=======
*
* @param {!function(FileWriter)} successCallback
* @param {!function(number)} errorCallback (TODO #2057: should pass a FileError)
>>>>>>>
* @param {!function(FileWriter)} successCallback Callback function for successful operations
* @param {!function(number)} errorCallback Callback function for error operations
* (TODO #2057: should pass a FileError)
<<<<<<<
* Returns a File that represents the current state of the file that this FileEntry represents
* @param {function(File)} successCallback Callback function for successful operations
* @param {function(FileError)} errorCallback Callback function for error operations
=======
* Obtains the File objecte for a FileEntry object
*
* @param {!function(File)} successCallback
* @param {!function(FileError)} errorCallback
>>>>>>>
* Returns a File that represents the current state of the file that this FileEntry represents
* @param {!function(File)} successCallback Callback function for successful operations
* @param {!function(FileError)} errorCallback Callback function for error operations
<<<<<<<
/**
* Creates or looks up a directory
* @param {string} path Either an absolute path or a relative path from this DirectoryEntry
* to the directory to be looked up or created
* @param {Object} options Object with the flags "create" and "exclusive" to modify the method behavior
* based on http://www.w3.org/TR/2011/WD-file-system-api-20110419/#widl-DirectoryEntry-getDirectory
* @param {function(Entry)} successCallback Callback function for successful operations
* @param {function(FileError)} errorCallback Callback function for error operations
*/
=======
/**
* @param {!string} path
* @param {!{create:?boolean, exclusive:?boolean}} options
* @param {!function(DirectoryEntry)} successCallback
* @param {!function(FileError|number)} errorCallback (TODO #2057: should consistently pass a FileError)
*/
>>>>>>>
/**
* Creates or looks up a directory
* @param {!string} path Either an absolute path or a relative path from this DirectoryEntry
* to the directory to be looked up or created
* @param {{!{create:?boolean, exclusive:?boolean}}} options Object with the flags "create" and "exclusive" to modify the method behavior
* based on http://www.w3.org/TR/2011/WD-file-system-api-20110419/#widl-DirectoryEntry-getDirectory
* @param {!function(Entry)} successCallback Callback function for successful operations
* @param {!function(FileError)} errorCallback Callback function for error operations
* (TODO #2057: should consistently pass a FileError)
*/
<<<<<<<
/**
* Read the next block of entries from this directory
* @param {function(Array.<Entry>)} successCallback
* @param {function(FileError)} errorCallback
=======
/** readEntries
*
* @param {!function(Array.<Entry>)} successCallback
* @param {!function(FileError|number)} errorCallback (TODO #2057: should consistently pass a FileError)
* @returns {Array.<Entry>}
>>>>>>>
/**
* Read the next block of entries from this directory
* @param {!function(Array.<Entry>)} successCallback
* @param {!function(FileError|number)} errorCallback (TODO #2057: should consistently pass a FileError) |
<<<<<<<
if (keyCode === KeyEvent.DOM_VK_TAB) {
self.close();
} else if (keyCode === KeyEvent.DOM_VK_UP) {
self._rotateSelection(-1);
=======
if (keyCode === KeyEvent.DOM_VK_UP) {
// Move up one, wrapping at edges (if nothing selected, select the last item)
self._tryToSelect(self._selectedIndex === -1 ? -1 : self._selectedIndex - 1, -1);
>>>>>>>
if (keyCode === KeyEvent.DOM_VK_TAB) {
self.close();
} else if (keyCode === KeyEvent.DOM_VK_UP) {
// Move up one, wrapping at edges (if nothing selected, select the last item)
self._tryToSelect(self._selectedIndex === -1 ? -1 : self._selectedIndex - 1, -1); |
<<<<<<<
function handleFileDelete() {
var entry = ProjectManager.getSelectedItem();
ProjectManager.deleteItem(entry);
}
function init($titleContainerToolbar) {
=======
// Init DOM elements
AppInit.htmlReady(function () {
var $titleContainerToolbar = $("#titlebar");
>>>>>>>
function handleFileDelete() {
var entry = ProjectManager.getSelectedItem();
ProjectManager.deleteItem(entry);
}
// Init DOM elements
AppInit.htmlReady(function () {
var $titleContainerToolbar = $("#titlebar");
<<<<<<<
// Register global commands
CommandManager.register(Strings.CMD_FILE_OPEN, Commands.FILE_OPEN, handleFileOpen);
CommandManager.register(Strings.CMD_ADD_TO_WORKING_SET, Commands.FILE_ADD_TO_WORKING_SET, handleFileAddToWorkingSet);
// TODO: (issue #274) For now, hook up File > New to the "new in project" handler. Eventually
// File > New should open a new blank tab, and handleFileNewInProject should
// be called from a "+" button in the project
CommandManager.register(Strings.CMD_FILE_NEW, Commands.FILE_NEW, handleFileNewInProject);
CommandManager.register(Strings.CMD_FILE_NEW_FOLDER, Commands.FILE_NEW_FOLDER, handleNewFolderInProject);
CommandManager.register(Strings.CMD_FILE_SAVE, Commands.FILE_SAVE, handleFileSave);
CommandManager.register(Strings.CMD_FILE_SAVE_ALL, Commands.FILE_SAVE_ALL, handleFileSaveAll);
CommandManager.register(Strings.CMD_FILE_RENAME, Commands.FILE_RENAME, handleFileRename);
CommandManager.register(Strings.CMD_FILE_DELETE, Commands.FILE_DELETE, handleFileDelete);
CommandManager.register(Strings.CMD_FILE_CLOSE, Commands.FILE_CLOSE, handleFileClose);
CommandManager.register(Strings.CMD_FILE_CLOSE_ALL, Commands.FILE_CLOSE_ALL, handleFileCloseAll);
CommandManager.register(Strings.CMD_CLOSE_WINDOW, Commands.FILE_CLOSE_WINDOW, handleFileCloseWindow);
CommandManager.register(Strings.CMD_QUIT, Commands.FILE_QUIT, handleFileQuit);
CommandManager.register(Strings.CMD_REFRESH_WINDOW, Commands.DEBUG_REFRESH_WINDOW, handleFileReload);
CommandManager.register(Strings.CMD_ABORT_QUIT, Commands.APP_ABORT_QUIT, _handleAbortQuit);
CommandManager.register(Strings.CMD_NEXT_DOC, Commands.NAVIGATE_NEXT_DOC, handleGoNextDoc);
CommandManager.register(Strings.CMD_PREV_DOC, Commands.NAVIGATE_PREV_DOC, handleGoPrevDoc);
CommandManager.register(Strings.CMD_SHOW_IN_TREE, Commands.NAVIGATE_SHOW_IN_FILE_TREE, handleShowInTree);
// Listen for changes that require updating the editor titlebar
$(DocumentManager).on("dirtyFlagChange", handleDirtyChange);
$(DocumentManager).on("currentDocumentChange fileNameChange", updateDocumentTitle);
=======
// Register global commands
CommandManager.register(Strings.CMD_FILE_OPEN, Commands.FILE_OPEN, handleFileOpen);
CommandManager.register(Strings.CMD_ADD_TO_WORKING_SET, Commands.FILE_ADD_TO_WORKING_SET, handleFileAddToWorkingSet);
// TODO: (issue #274) For now, hook up File > New to the "new in project" handler. Eventually
// File > New should open a new blank tab, and handleFileNewInProject should
// be called from a "+" button in the project
CommandManager.register(Strings.CMD_FILE_NEW, Commands.FILE_NEW, handleFileNewInProject);
CommandManager.register(Strings.CMD_FILE_NEW_FOLDER, Commands.FILE_NEW_FOLDER, handleNewFolderInProject);
CommandManager.register(Strings.CMD_FILE_SAVE, Commands.FILE_SAVE, handleFileSave);
CommandManager.register(Strings.CMD_FILE_SAVE_ALL, Commands.FILE_SAVE_ALL, handleFileSaveAll);
CommandManager.register(Strings.CMD_FILE_RENAME, Commands.FILE_RENAME, handleFileRename);
CommandManager.register(Strings.CMD_FILE_CLOSE, Commands.FILE_CLOSE, handleFileClose);
CommandManager.register(Strings.CMD_FILE_CLOSE_ALL, Commands.FILE_CLOSE_ALL, handleFileCloseAll);
CommandManager.register(Strings.CMD_CLOSE_WINDOW, Commands.FILE_CLOSE_WINDOW, handleFileCloseWindow);
if (brackets.platform === "win") {
CommandManager.register(Strings.CMD_EXIT, Commands.FILE_QUIT, handleFileQuit);
} else {
CommandManager.register(Strings.CMD_QUIT, Commands.FILE_QUIT, handleFileQuit);
>>>>>>>
// Register global commands
CommandManager.register(Strings.CMD_FILE_OPEN, Commands.FILE_OPEN, handleFileOpen);
CommandManager.register(Strings.CMD_ADD_TO_WORKING_SET, Commands.FILE_ADD_TO_WORKING_SET, handleFileAddToWorkingSet);
// TODO: (issue #274) For now, hook up File > New to the "new in project" handler. Eventually
// File > New should open a new blank tab, and handleFileNewInProject should
// be called from a "+" button in the project
CommandManager.register(Strings.CMD_FILE_NEW, Commands.FILE_NEW, handleFileNewInProject);
CommandManager.register(Strings.CMD_FILE_NEW_FOLDER, Commands.FILE_NEW_FOLDER, handleNewFolderInProject);
CommandManager.register(Strings.CMD_FILE_SAVE, Commands.FILE_SAVE, handleFileSave);
CommandManager.register(Strings.CMD_FILE_SAVE_ALL, Commands.FILE_SAVE_ALL, handleFileSaveAll);
CommandManager.register(Strings.CMD_FILE_RENAME, Commands.FILE_RENAME, handleFileRename);
CommandManager.register(Strings.CMD_FILE_DELETE, Commands.FILE_DELETE, handleFileDelete);
CommandManager.register(Strings.CMD_FILE_CLOSE, Commands.FILE_CLOSE, handleFileClose);
CommandManager.register(Strings.CMD_FILE_CLOSE_ALL, Commands.FILE_CLOSE_ALL, handleFileCloseAll);
CommandManager.register(Strings.CMD_CLOSE_WINDOW, Commands.FILE_CLOSE_WINDOW, handleFileCloseWindow);
if (brackets.platform === "win") {
CommandManager.register(Strings.CMD_EXIT, Commands.FILE_QUIT, handleFileQuit);
} else {
CommandManager.register(Strings.CMD_QUIT, Commands.FILE_QUIT, handleFileQuit); |
<<<<<<<
callerendpoint: that.call.initiator ? clientObj.user.name : that.call.remoteEndpoint.id,
callerconnection: that.call.initiator ? clientObj.user.id : that.call.connectionId,
calleeendpoint: that.call.initiator ? that.call.remoteEndpoint.id : clientObj.user.name,
calleeconnection: that.call.initiator ? that.call.connectionId : clientObj.user.id,
callId: that.call.id,
=======
sessionId: that.call.id,
>>>>>>>
callerendpoint: that.call.initiator ? clientObj.user.name : that.call.remoteEndpoint.id,
callerconnection: that.call.initiator ? clientObj.user.id : that.call.connectionId,
calleeendpoint: that.call.initiator ? that.call.remoteEndpoint.id : clientObj.user.name,
calleeconnection: that.call.initiator ? that.call.connectionId : clientObj.user.id,
sessionId: that.call.id,
<<<<<<<
if (that.call.initiator) {
that.report.calleeconnection = evt.signal.connectionId;
}
that.call.connectionId = evt.signal.connectionId;
=======
>>>>>>>
if (that.call.initiator) {
that.report.calleeconnection = evt.signal.connectionId;
}
that.call.connectionId = evt.signal.connectionId; |
<<<<<<<
FileSystem = require("filesystem/FileSystem"),
=======
EditorManager = require("editor/EditorManager"),
>>>>>>>
FileSystem = require("filesystem/FileSystem"),
EditorManager = require("editor/EditorManager"),
<<<<<<<
return Async.doInParallel(files, function (path, idx) {
=======
return Async.doInParallel(filteredFiles, function (file, idx) {
>>>>>>>
return Async.doInParallel(filteredFiles, function (path, idx) {
<<<<<<<
if (idx < files.length - 1) {
if (DocumentManager.findInWorkingSet(path) !== -1) {
=======
if (idx < filteredFiles.length - 1) {
if (DocumentManager.findInWorkingSet(file) !== -1) {
>>>>>>>
if (idx < filteredFiles.length - 1) {
if (DocumentManager.findInWorkingSet(path) !== -1) {
<<<<<<<
} else if (!err && item.isDirectory && files.length === 1) {
=======
} else if (!err && stat.isDirectory() && filteredFiles.length === 1) {
>>>>>>>
} else if (!err && item.isDirectory() && filteredFiles.length === 1) { |
<<<<<<<
projectTreeContainer.jstree({
plugins : ["ui", "themes", "json_data"],
json_data : { data:treeDataProvider, correct_state: false },
=======
ProjectManager._projectTree = projectTreeContainer.jstree({
plugins : ["ui", "themes", "json_data", "crrm"],
json_data : { data:treeDataProvider },
>>>>>>>
ProjectManager._projectTree = projectTreeContainer.jstree({
plugins : ["ui", "themes", "json_data", "crrm"],
json_data : { data:treeDataProvider, correct_state: false }, |
<<<<<<<
QuickNavigateDialog.prototype.handleDocumentMouseDown = function (e) {
if (this.modalBar.getRoot().find(e.target).length === 0 && $(".smart_autocomplete_container").find(e.target).length === 0) {
=======
QuickNavigateDialog.prototype._handleDocumentMouseDown = function (e) {
if ($(this.dialog).find(e.target).length === 0 && $(".smart_autocomplete_container").find(e.target).length === 0) {
>>>>>>>
QuickNavigateDialog.prototype._handleDocumentMouseDown = function (e) {
if (this.modalBar.getRoot().find(e.target).length === 0 && $(".smart_autocomplete_container").find(e.target).length === 0) {
<<<<<<<
// Show the search bar ("dialog")
var dialogHTML = "<div align='right'>" + Strings.CMD_QUICK_OPEN + ": <input type='text' autocomplete='off' id='quickOpenSearch' style='width: 30em'></div>";
that.modalBar = new ModalBar(dialogHTML, false);
that.$searchField = $("input#quickOpenSearch");
=======
>>>>>>> |
<<<<<<<
stream.numPc = 1;
respoke.streams.push({stream: stream, constraints: that.constraints});
=======
that.stream.numPc = 1;
respoke.streams[that.constraints] = that.stream;
>>>>>>>
that.stream.numPc = 1;
respoke.streams.push({stream: that.stream, constraints: that.constraints});
<<<<<<<
stream.numPc -= 1;
if (stream.numPc === 0) {
stream.stop();
removeStream(that.constraints);
=======
that.stream.numPc -= 1;
if (that.stream.numPc === 0) {
that.stream.stop();
delete respoke.streams[that.constraints];
>>>>>>>
that.stream.numPc -= 1;
if (that.stream.numPc === 0) {
that.stream.stop();
removeStream(that.constraints); |
<<<<<<<
* The provider is passed the text of the file and its fullPath. Providers should not assume
* that the file is open (i.e. DocumentManager.getOpenDocumentForPath() may return null) or
* that the file on disk matches the text given (file may have unsaved changes).
*
* @param {string} languageId
* @param {{name:string, scanFile:function(string, string):?{!errors:Array, aborted:boolean}} provider
*
* Each error is: { pos:{line,ch}, endPos:?{line,ch}, message:string, type:?Type }
* If type is unspecified, Type.WARNING is assumed.
*/
function register(languageId, provider) {
if (!_providers[languageId]) {
_providers[languageId] = [];
}
_providers[languageId].push(provider);
}
function unregisterAll() {
CollectionUtils.forEach(_providers, function (languageId) { delete _providers[languageId]; });
_providers = {};
}
/**
=======
>>>>>>>
* The provider is passed the text of the file and its fullPath. Providers should not assume
* that the file is open (i.e. DocumentManager.getOpenDocumentForPath() may return null) or
* that the file on disk matches the text given (file may have unsaved changes).
*
* @param {string} languageId
* @param {{name:string, scanFile:function(string, string):?{!errors:Array, aborted:boolean}} provider
*
* Each error is: { pos:{line,ch}, endPos:?{line,ch}, message:string, type:?Type }
* If type is unspecified, Type.WARNING is assumed.
*/
function register(languageId, provider) {
if (!_providers[languageId]) {
_providers[languageId] = [];
}
_providers[languageId].push(provider);
}
function unregisterAll() {
CollectionUtils.forEach(_providers, function (languageId) { delete _providers[languageId]; });
_providers = {};
}
/**
<<<<<<<
var providerList = (provider || getProviderForPath(fileEntry.fullPath)) || [];
=======
provider = provider || getProviderForPath(file.fullPath);
>>>>>>>
var providerList = (provider || getProviderForPath(fileEntry.fullPath)) || []; |
<<<<<<<
lastPos; // Last line/ch pos processed by handleMouseMove
=======
currentImagePreviewContent = "", // Current image preview content, or "" if no content is showing.
lastPreviewedColorOrGradient = "", // Color/gradient value of last previewed.
lastPreviewedImagePath = ""; // Image path of last previewed.
>>>>>>>
lastPos; // Last line/ch pos processed by handleMouseMove
<<<<<<<
};
var popover = { start: sPos, end: ePos, content: imgPreview, onShow: showHandler, xpos: xpos, ytop: coord.top, ybot: coord.bottom };
return popover;
=======
previewMark = cm.markText(
sPos,
ePos,
{className: "hover-preview-highlight"}
);
currentImagePreviewContent = imgPreview;
lastPreviewedImagePath = imgPath;
}
return true;
>>>>>>>
};
var popover = { start: sPos, end: ePos, content: imgPreview, onShow: showHandler, xpos: xpos, ytop: coord.top, ybot: coord.bottom };
return popover;
<<<<<<<
=======
function getLastPreviewedColorOrGradient() {
return lastPreviewedColorOrGradient;
}
function getLastPreviewedImagePath() {
return lastPreviewedImagePath;
}
>>>>>>> |
<<<<<<<
=======
Commands = require("command/Commands"),
Async = require("utils/Async"),
>>>>>>>
Commands = require("command/Commands"),
<<<<<<<
function _projectOpen(e) {
// file root is appended for each project
var files = [],
context = { location : { scope: "user",
layer: "project" } };
files = PreferencesManager.getViewState("project.files", context);
console.assert(Object.keys(_openDocuments).length === 0); // no files leftover from prev proj
if (!files) {
return;
}
var filesToOpen = [],
viewStates = {},
activeFile;
// Add all files to the working set without verifying that
// they still exist on disk (for faster project switching)
files.forEach(function (value, index) {
filesToOpen.push(FileSystem.getFileForPath(value.file));
if (value.active) {
activeFile = value.file;
}
if (value.viewState) {
viewStates[value.file] = value.viewState;
}
});
addListToWorkingSet(filesToOpen);
// Allow for restoring saved editor UI state
EditorManager._resetViewStates(viewStates);
// Initialize the active editor
if (!activeFile && _workingSet.length > 0) {
activeFile = _workingSet[0].fullPath;
}
if (activeFile) {
var promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: activeFile });
// Add this promise to the event's promises to signal that this handler isn't done yet
e.promises.push(promise);
}
=======
function notifyPathDeleted(path) {
/* FileSyncManager.syncOpenDocuments() does all the work of closing files
in the working set and notifying the user of any unsaved changes. */
FileSyncManager.syncOpenDocuments(Strings.FILE_DELETED_TITLE);
// Send a "pathDeleted" event. This will trigger the views to update.
$(exports).triggerHandler("pathDeleted", path);
>>>>>>>
function notifyPathDeleted(path) {
/* FileSyncManager.syncOpenDocuments() does all the work of closing files
in the working set and notifying the user of any unsaved changes. */
FileSyncManager.syncOpenDocuments(Strings.FILE_DELETED_TITLE);
// Send a "pathDeleted" event. This will trigger the views to update.
$(exports).triggerHandler("pathDeleted", path); |
<<<<<<<
* @name forceTurn
* @private
* @type {boolean}
*/
var forceTurn = !!params.forceTurn;
/**
* @memberof! respoke.Call
=======
>>>>>>>
<<<<<<<
state: respoke.CallState({
caller: that.caller,
hasMedia: function () {
return that.hasMedia();
}
}),
forceTurn: forceTurn,
=======
forceTurn: !!params.forceTurn,
>>>>>>>
state: respoke.CallState({
caller: that.caller,
hasMedia: function () {
return that.hasMedia();
}
}),
forceTurn: !!params.forceTurn, |
<<<<<<<
=======
}
});
it("should return an error if the directory doesn't exist", function() {
var successCalled = false, errorCalled = false, error = null;
NativeFileSystem.requestNativeFileSystem(this.path + '/nonexistent-dir', function(data) {
successCalled = true;
}, function(err) {
errorCalled = true;
error = err;
>>>>>>>
<<<<<<<
=======
});
describe("Reading a file", function() {
it("should read a file from disk", function() {
var gotFile = false, readFile = false, gotError = false, content;
var fileEntry = new NativeFileSystem.FileEntry(this.path + "/file1");
fileEntry.file(function(file) {
gotFile = true;
var reader = new NativeFileSystem.FileReader();
reader.onload = function(event) {
readFile = true;
content = event.target.result;
};
reader.onerror = function(event) {
gotError = true;
};
reader.readAsText(file, "utf8");
});
waitsFor(function() { return gotFile && readFile; }, 1000);
runs(function() {
expect(gotFile).toBe(true);
expect(readFile).toBe(true);
expect(gotError).toBe(false);
expect(content).toBe("Here is file1\n");
});
});
it("should return an error if the file is not found", function() {
var gotFile = false, readFile = false, errorCode;
var fileEntry = new NativeFileSystem.FileEntry(this.path + "/idontexist");
fileEntry.file(function(file) {
gotFile = true;
var reader = new NativeFileSystem.FileReader();
reader.onload = function(event) {
readFile = true;
};
reader.onerror = function(event) {
errorCode = event.target.error.code;
};
reader.readAsText(file, "utf8");
});
waitsFor(function() { return gotFile && errorCode; }, 1000);
runs(function() {
expect(gotFile).toBe(true);
expect(readFile).toBe(false);
expect(errorCode).toBe(FileError.NOT_FOUND_ERR);
});
});
it("should fire appropriate events when the file is done loading", function() {
var gotFile = false, gotLoad = false, gotLoadStart = false, gotLoadEnd = false,
gotProgress = false, gotError = false, gotAbort = false;
var fileEntry = new NativeFileSystem.FileEntry(this.path + "/file1");
fileEntry.file(function(file) {
gotFile = true;
var reader = new NativeFileSystem.FileReader();
reader.onload = function(event) {
gotLoad = true;
};
reader.onloadstart = function(event) {
gotLoadStart = true;
}
reader.onloadend = function(event) {
gotLoadEnd = true;
};
reader.onprogress = function(event) {
gotProgress = true;
};
reader.onerror = function(event) {
gotError = true;
};
reader.onabort = function(event) {
gotAbort = true;
}
reader.readAsText(file, "utf8");
});
waitsFor(function() { return gotLoad && gotLoadEnd && gotProgress; }, 1000);
runs(function() {
expect(gotFile).toBe(true);
expect(gotLoadStart).toBe(true);
expect(gotLoad).toBe(true);
expect(gotLoadEnd).toBe(true);
expect(gotProgress).toBe(true);
expect(gotError).toBe(false);
expect(gotAbort).toBe(false);
});
});
it("should return an error but not crash if you create a bad FileEntry", function() {
var gotFile = false, readFile = false, gotError = false;
var fileEntry = new NativeFileSystem.FileEntry(null);
fileEntry.file(function(file) {
gotFile = true;
var reader = new NativeFileSystem.FileReader();
reader.onload = function(event) {
readFile = true;
};
reader.onerror = function(event) {
gotError = true;
};
reader.readAsText(file, "utf8");
});
waitsFor(function() { return gotError; }, 1000);
runs(function() {
expect(gotFile).toBe(true);
expect(readFile).toBe(false);
expect(gotError).toBe(true);
});
});
});
>>>>>>> |
<<<<<<<
describe("Open image files", function () {
=======
/*
TODO: Disabled until image support is added for splitview
describe("Opens image file and validates EditorManager APIs", function () {
>>>>>>>
describe("Open image files", function () {
<<<<<<<
it("opening text file while other text open should fire currentDocumentChange and activeEditorChange events", function () {
=======
});
*/
describe("Open a text file while a text file is open", function () {
it("should fire currentDocumentChange and activeEditorChange events", function () {
>>>>>>>
it("opening text file while other text open should fire currentDocumentChange and activeEditorChange events", function () {
<<<<<<<
=======
describe("Opens text file and validates EditorManager APIs", function () {
it("should return an editor after opening a text file", function () {
var path = testPath + "/test.js",
promise;
runs(function () {
promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: path });
waitsForDone(promise, Commands.FILE_OPEN);
});
runs(function () {
var e = EditorManager.getActiveEditor();
expect(e.document.file.fullPath).toBe(path);
e = EditorManager.getCurrentFullEditor();
expect(e.document.file.fullPath).toBe(path);
e = EditorManager.getFocusedEditor();
expect(e.document.file.fullPath).toBe(path);
e = EditorManager.getCurrentFullEditor();
expect(e.document.file.fullPath).toBe(path);
});
});
});
>>>>>>> |
<<<<<<<
var combinedConnectionSettings = client.callSettings.clone();
var deferred = Q.defer();
var retVal = brightstream.handlePromise(deferred.promise, params.onSuccess, params.onError);
=======
var combinedConnectionSettings = clone(client.callSettings);
var deferred = brightstream.makeDeferred(params.onSuccess, params.onError);
>>>>>>>
var combinedConnectionSettings = clone(client.callSettings);
var deferred = Q.defer();
var retVal = brightstream.handlePromise(deferred.promise, params.onSuccess, params.onError); |
<<<<<<<
FindBar = require("search/FindBar").FindBar,
FindUtils = require("search/FindUtils"),
=======
ModalBar = require("widgets/ModalBar").ModalBar,
KeyEvent = require("utils/KeyEvent"),
SearchResults = require("search/SearchResults").SearchResults,
>>>>>>>
FindBar = require("search/FindBar").FindBar,
FindUtils = require("search/FindUtils"),
SearchResults = require("search/SearchResults").SearchResults,
<<<<<<<
var searchReplacePanelTemplate = require("text!htmlContent/search-replace-panel.html"),
searchReplaceResultsTemplate = require("text!htmlContent/search-replace-results.html");
=======
var searchBarTemplate = require("text!htmlContent/findreplace-bar.html"),
replaceAllSummaryTemplate = require("text!htmlContent/search-summary-replace.html");
>>>>>>>
var replaceAllSummaryTemplate = require("text!htmlContent/search-summary-replace.html");
<<<<<<<
/** @type {$.Element} jQuery elements used in the replaceAll panel */
var $replaceAllContainer,
$replaceAllWhat,
$replaceAllWith,
$replaceAllSummary,
$replaceAllTable;
/** @type {?FindBar} Currently open Find or Find/Replace bar, if any */
var findBar;
=======
/** @type {?ModalBar} Currently open Find or Find/Replace bar, if any */
var modalBar;
>>>>>>>
/** @type {?FindBar} Currently open Find or Find/Replace bar, if any */
var findBar;
<<<<<<<
/**
* @private
* Shows a panel with search results and offers to replace them,
* user can use checkboxes to select which results he wishes to replace.
* @param {Editor} editor - Currently active editor that was used to invoke this action.
* @param {string|RegExp} replaceWhat - Query that will be passed into CodeMirror Cursor to search for results.
* @param {string} replaceWith - String that should be used to replace chosen results.
*/
function _showReplaceAllPanel(editor, replaceWhat, queryInfo, replaceWith) {
var results = [],
cm = editor._codeMirror,
cursor = getSearchCursor(cm, replaceWhat, queryInfo),
from,
to,
line,
multiLine,
matchResult = cursor.findNext();
// Collect all results from document
while (matchResult) {
from = cursor.from();
to = cursor.to();
line = editor.document.getLine(from.line);
multiLine = from.line !== to.line;
results.push({
index: results.length, // add indexes to array
from: from,
to: to,
line: from.line + 1,
pre: line.slice(0, from.ch),
highlight: line.slice(from.ch, multiLine ? undefined : to.ch),
post: multiLine ? "\u2026" : line.slice(to.ch),
result: matchResult
});
if (results.length >= REPLACE_ALL_MAX) {
break;
}
matchResult = cursor.findNext();
}
// This text contains some formatting, so all the strings are assumed to be already escaped
var resultsLength = results.length,
summary = StringUtils.format(
Strings.FIND_REPLACE_TITLE_PART3,
resultsLength,
resultsLength > 1 ? Strings.FIND_IN_FILES_MATCHES : Strings.FIND_IN_FILES_MATCH,
resultsLength >= REPLACE_ALL_MAX ? Strings.FIND_IN_FILES_MORE_THAN : ""
);
// Insert the search summary
$replaceAllWhat.text(replaceWhat.toString());
$replaceAllWith.text(replaceWith.toString());
$replaceAllSummary.html(summary);
// All checkboxes are checked by default
$replaceAllContainer.find(".check-all").prop("checked", true);
// Attach event to replace button
$replaceAllContainer.find("button.replace-checked").off().on("click", function (e) {
$replaceAllTable.find(".check-one:checked")
.closest(".replace-row")
.toArray()
.reverse()
.forEach(function (checkedRow) {
var match = results[$(checkedRow).data("match")],
rw = typeof replaceWhat === "string" ? replaceWith : FindUtils.parseDollars(replaceWith, match.result);
editor.document.replaceRange(rw, match.from, match.to, "+replaceAll");
});
_closeReplaceAllPanel();
});
// Insert the search results
$replaceAllTable
.empty()
.append(Mustache.render(searchReplaceResultsTemplate, {searchResults: results}))
.off()
.on("click", ".check-one", function (e) {
e.stopPropagation();
})
.on("click", ".replace-row", function (e) {
var match = results[$(e.currentTarget).data("match")];
editor.setSelection(match.from, match.to, true);
});
// we can't safely replace after document has been modified
// this handler is only attached, when replaceAllPanel is visible
currentDocument = DocumentManager.getCurrentDocument();
$(currentDocument).on("change.replaceAll", function () {
_closeReplaceAllPanel();
});
replaceAllPanel.show();
$replaceAllTable.scrollTop(0); // Otherwise scroll pos from previous contents is remembered
}
function doReplace(editor, all) {
var cm = editor._codeMirror,
state = getSearchState(cm),
replaceText = findBar.getReplaceText();
if (all) {
findBar.close();
_showReplaceAllPanel(editor, state.query, state.queryInfo, replaceText);
} else {
cm.replaceSelection(typeof state.query === "string" ? replaceText : FindUtils.parseDollars(replaceText, state.lastMatch));
updateResultSet(editor); // we updated the text, so result count & tickmarks must be refreshed
findNext(editor);
if (!state.lastMatch) {
// No more matches, so destroy find bar
findBar.close();
}
}
}
=======
/** Shows the Find-Replace search bar at top */
>>>>>>>
function doReplace(editor, all) {
var cm = editor._codeMirror,
state = getSearchState(cm),
replaceText = findBar.getReplaceText();
if (all) {
findBar.close();
replaceAllResults.showReplaceAll(editor, state.query, state.queryInfo, replaceText);
} else {
cm.replaceSelection(typeof state.query === "string" ? replaceText : FindUtils.parseDollars(replaceText, state.lastMatch));
updateResultSet(editor); // we updated the text, so result count & tickmarks must be refreshed
findNext(editor);
if (!state.lastMatch) {
// No more matches, so destroy find bar
findBar.close();
}
}
}
<<<<<<<
openSearchBar(editor, true);
=======
openSearchBar(editor, {replace: true});
addShortcutToTooltip($("#replace-yes"), Commands.CMD_REPLACE);
var cm = editor._codeMirror,
state = getSearchState(cm);
function getReplaceWith() {
return $("#replace-with").val() || "";
}
modalBar.getRoot().on("click", function (e) {
if (e.target.id === "replace-yes") {
var text = getReplaceWith();
cm.replaceSelection(typeof state.query === "string" ? text : parseDollars(text, state.lastMatch));
updateResultSet(editor); // we updated the text, so result count & tickmarks must be refreshed
findNext(editor);
if (!state.lastMatch) {
// No more matches, so destroy modalBar
modalBar.close();
}
} else if (e.target.id === "replace-all") {
modalBar.close();
replaceAllResults.showReplaceAll(editor, state.query, getReplaceWith());
}
});
>>>>>>>
openSearchBar(editor, true);
<<<<<<<
=======
// Insert the search results
this._showResultsList();
};
/**
* Hides the Search Results Panel
*/
ReplaceAllResults.prototype.hideResults = function () {
this.parentClass.hideResults.apply(this);
$(currentDocument).off("change.replaceAll");
};
PreferencesManager.stateManager.definePreference("caseSensitive", "boolean", false);
PreferencesManager.stateManager.definePreference("regexp", "boolean", false);
PreferencesManager.convertPreferences(module, {"caseSensitive": "user", "regexp": "user"}, true);
>>>>>>>
// Insert the search results
this._showResultsList();
};
/**
* Hides the Search Results Panel
*/
ReplaceAllResults.prototype.hideResults = function () {
this.parentClass.hideResults.apply(this);
$(currentDocument).off("change.replaceAll");
}; |
<<<<<<<
/** @type {Array.<File>} */
=======
/**
* List of files
* @type {Array.<FileInfo>}
*/
>>>>>>>
/** @type {Array.<File>} */
<<<<<<<
/** @type {$.Promise} */
=======
/**
* File list promise
* @type {$.Promise}
*/
>>>>>>>
/** @type {$.Promise} */
<<<<<<<
* The currently open (or last open) QuickNavigateDialog
* @type {?QuickNavigateDialog}
=======
* The currently open quick open dialog.
* @type {Dialog}
>>>>>>>
* The currently open (or last open) QuickNavigateDialog
* @type {?QuickNavigateDialog}
<<<<<<<
QuickNavigateDialog.prototype._handleCloseBar = function (event, reason, modalBarClosePromise) {
console.assert(!this.closePromise);
this.closePromise = modalBarClosePromise;
=======
/**
* Called synchronously after all other processing is done (_handleFilter(), updating cached "last result" and
* re-rendering DOM list items). NOT called if the last filter action had 0 results.
*/
QuickNavigateDialog.prototype._handleShowResults = function (e, results) {
// Scroll to top result (unless some other item has been highlighted by user)
if ($(".smart_autocomplete_highlight").length === 0) {
this._handleItemFocus(null, $(".smart_autocomplete_container > li:first-child").get(0));
}
};
/**
* Closes the search dialog and notifies all quick open plugins that
* searching is done.
* @param {{x: number, y: number}=} scrollPos If specified, scroll to the given
* position when closing the ModalBar.
* @param Array.<{{start:{line:number, ch:number}, end:{line:number, ch:number}, primary:boolean, reversed:boolean}}>
* selections If specified, restore the given selections when closing the ModalBar.
* @param {boolean=} keepScrollPos Adjust scroll pos to keep current position when modal bar closes.
* Useful for Go to Line case where doc is scrolled, but don't know actual scroll pos to set so let modal bar figure it out.
* @return {$.Promise} Resolved when the search bar is entirely closed.
*/
QuickNavigateDialog.prototype.close = function (scrollPos, selections, keepScrollPos) {
if (!this.isOpen) {
return this._closeDeferred.promise();
}
>>>>>>>
QuickNavigateDialog.prototype._handleCloseBar = function (event, reason, modalBarClosePromise) {
console.assert(!this.closePromise);
this.closePromise = modalBarClosePromise;
<<<<<<<
// Close popup & ensure we ignore any still-pending result promises
this.searchField.destroy();
// Restore original selection / scroll pos if closed via Escape
if (reason === ModalBar.CLOSE_ESCAPE) {
// We can reset the scroll position synchronously on the ModalBar "close" event (before the animation
// completes) since the editor has already been resized at this point.
=======
// Closing the dialog is a little tricky (see #1384): some Smart Autocomplete code may run later (e.g.
// (because it's a later handler of the event that just triggered close()), and that code expects to
// find metadata that it stuffed onto the DOM node earlier. But $.remove() strips that metadata.
// So we wait until after this call chain is complete before actually closing the dialog.
var self = this;
setTimeout(function () {
self.modalBar.close(!!keepScrollPos).done(function () {
self._closeDeferred.resolve();
});
// Note that we deliberately reset the scroll position synchronously on return from
// `ModalBar.close()` (before the animation completes).
// See description of `restoreScrollPos` in `ModalBar.close()`.
>>>>>>>
// Close popup & ensure we ignore any still-pending result promises
this.searchField.destroy();
// Restore original selection / scroll pos if closed via Escape
if (reason === ModalBar.CLOSE_ESCAPE) {
// We can reset the scroll position synchronously on ModalBar's "close" event (before close animation
// completes) since ModalBar has already resized the editor and done its own scroll adjustment before
// this event fired - so anything we set here will override the pos (re)set by ModalBar.
<<<<<<<
this.searchField.setText(initialString);
=======
var $field = this.$searchField;
$field.val(initialString).focus();
$field.get(0).setSelectionRange(prefix.length, initialString.length);
>>>>>>>
this.searchField.setText(initialString);
<<<<<<<
=======
* Close the dialog when the user clicks outside of it. Smart-autocomplete listens for this and automatically closes its popup,
* but we want to close the whole search "dialog." (And we can't just piggyback on the popup closing event, since there are cases
* where the popup closes that we want the dialog to remain open (e.g. deleting search term via backspace).
* @param {!Event} e
*/
QuickNavigateDialog.prototype._handleDocumentMouseDown = function (e) {
if (this.modalBar.getRoot().find(e.target).length === 0 && $(".smart_autocomplete_container").find(e.target).length === 0) {
// User clicked in page, so ignore original scroll pos/selection to use new scroll pos/selection.
this.close(null, null, true);
} else {
// Allow clicks in the search field to propagate. Clicks in the menu should be
// blocked to prevent focus from leaving the search field.
if ($("input#quickOpenSearch").get(0) !== e.target) {
e.preventDefault();
e.stopPropagation();
}
}
};
/**
* Close the dialog when it loses focus.
*/
QuickNavigateDialog.prototype._handleBlur = function (e) {
var origScrollPos, origSelections,
curDoc = DocumentManager.getCurrentDocument();
// If doc hasn't changed, restore scroll pos/selections
if (curDoc && this._origDocPath === curDoc.file.fullPath) {
origScrollPos = this._origScrollPos;
origSelections = this._origSelections;
}
this.close(origScrollPos, origSelections, true);
};
/**
>>>>>>> |
<<<<<<<
=======
exports.isOpen = isOpen;
exports.handleKeyEvent = handleKeyEvent;
exports.handleChange = handleChange;
>>>>>>>
exports.isOpen = isOpen;
exports.handleKeyEvent = handleKeyEvent;
exports.handleChange = handleChange; |
<<<<<<<
exports.SCROLL_SHADOW_HEIGHT = SCROLL_SHADOW_HEIGHT;
exports.addScrollerShadow = addScrollerShadow;
exports.removeScrollerShadow = removeScrollerShadow;
exports.sidebarList = sidebarList;
exports.scrollElementIntoView = scrollElementIntoView;
exports.getElementClipSize = getElementClipSize;
exports.getFileEntryDisplay = getFileEntryDisplay;
exports.toggleClass = toggleClass;
=======
exports.SCROLL_SHADOW_HEIGHT = SCROLL_SHADOW_HEIGHT;
exports.addScrollerShadow = addScrollerShadow;
exports.removeScrollerShadow = removeScrollerShadow;
exports.sidebarList = sidebarList;
exports.scrollElementIntoView = scrollElementIntoView;
exports.getFileEntryDisplay = getFileEntryDisplay;
exports.toggleClass = toggleClass;
exports.getDirNamesForDuplicateFiles = getDirNamesForDuplicateFiles;
>>>>>>>
exports.SCROLL_SHADOW_HEIGHT = SCROLL_SHADOW_HEIGHT;
exports.addScrollerShadow = addScrollerShadow;
exports.removeScrollerShadow = removeScrollerShadow;
exports.sidebarList = sidebarList;
exports.scrollElementIntoView = scrollElementIntoView;
exports.getElementClipSize = getElementClipSize;
exports.getFileEntryDisplay = getFileEntryDisplay;
exports.toggleClass = toggleClass;
exports.getDirNamesForDuplicateFiles = getDirNamesForDuplicateFiles; |
<<<<<<<
=======
if (!pc || toSendHangup !== undefined) {
log.debug("PeerConnection.close got called twice.");
return;
}
>>>>>>>
<<<<<<<
if (!pc || that.state.caller && !that.state.receivedAnswer) {
=======
if ((!pc || that.call.caller && defSDPAnswer.promise.isPending()) && !params.processingQueue) {
>>>>>>>
if ((!pc || that.state.caller && !that.state.receivedAnswer) && !params.processingQueue) { |
<<<<<<<
exports.EDIT_OPEN_LINE_ABOVE = "edit.openLineAbove";
exports.EDIT_OPEN_LINE_BELOW = "edit.openLineBelow";
=======
exports.TOGGLE_CLOSE_BRACKETS = "edit.autoCloseBrackets";
>>>>>>>
exports.EDIT_OPEN_LINE_ABOVE = "edit.openLineAbove";
exports.EDIT_OPEN_LINE_BELOW = "edit.openLineBelow";
exports.TOGGLE_CLOSE_BRACKETS = "edit.autoCloseBrackets"; |
<<<<<<<
if (!brackets.inBrowser) {
window.ProjectManager.showOpenDialog(false, true, "Choose a folder", null, null,showOpenDialogCallback);
=======
if (!inBrowser) {
window.NativeFileSystem.showOpenDialog(false, true, "Choose a folder", null, null, showOpenDialogCallback);
>>>>>>>
if (!brackets.inBrowser) {
window.NativeFileSystem.showOpenDialog(false, true, "Choose a folder", null, null, showOpenDialogCallback); |
<<<<<<<
var doClose = true,
self = this;
=======
// This is a work-around to select first item when a selection event occurs
// (usually from pressing the enter key) and no item is selected in the list.
// This is a work-around since Smart auto complete doesn't select the first item
if (!selectedDOMItem) {
selectedDOMItem = $(".smart_autocomplete_container > li:first-child").get(0);
}
var selectedItem = domItemToSearchResult(selectedDOMItem),
doClose = true,
self = this,
query = this.$searchField.val(),
cursorPos = extractCursorPos(query);
>>>>>>>
var doClose = true,
self = this;
<<<<<<<
// extract line number, if any
var gotoLine = extractLineNumber(query);
=======
>>>>>>>
// extract line number, if any
var cursorPos = extractCursorPos(query);
<<<<<<<
=======
* @param {{x: number, y: number}=} scrollPos If specified, scroll to the given
* position when closing the ModalBar.
* @param Array.<{{start:{line:number, ch:number}, end:{line:number, ch:number}, primary:boolean, reversed:boolean}}>
* selections If specified, restore the given selections when closing the ModalBar.
>>>>>>>
<<<<<<<
QuickNavigateDialog.prototype.close = function () {
console.log("QuickOpen.close()", this.isOpen, this.closePromise);
=======
QuickNavigateDialog.prototype.close = function (scrollPos, selections) {
>>>>>>>
QuickNavigateDialog.prototype.close = function () {
console.log("QuickOpen.close()", this.isOpen, this.closePromise);
<<<<<<<
if (this._origSelection) {
editor.setSelection(this._origSelection.start, this._origSelection.end);
=======
if (selections) {
editor.setSelections(selections);
>>>>>>>
if (this._origSelections) {
editor.setSelections(this._origSelections);
<<<<<<<
function _doSearchFileList(query, matcher) {
=======
/**
* Returns true if the query string doesn't match the query text field. This can happen when _handleFilter()
* runs slow (either synchronously or async as in searchFileList()). Several key events queue up before filtering
* is done, and each sets a timeout. After all the key events are handled, we wind up with a queue of timeouts
* waiting to run, once per key event. All but the last one reflect a stale value of the text field.
* @param {string} query
* @return {boolean}
*/
function queryIsStale(query) {
var currentQuery = $("input#quickOpenSearch").val();
return currentQuery !== query;
}
function searchFileList(query, matcher) {
// The file index may still be loading asynchronously - if so, can't return a result yet
if (!fileList) {
// Smart Autocomplete allows us to return a Promise instead...
var asyncResult = new $.Deferred();
fileListPromise.done(function () {
// ...but it's not very robust. If a previous Promise is obsoleted by the query string changing, it
// keeps listening to it anyway. So the last Promise to resolve "wins" the UI update even if it's for
// a stale query. Guard from that by checking that filter text hasn't changed while we were waiting:
if (!queryIsStale(query)) {
// We're still the current query. Synchronously re-run the search call and resolve with its results
asyncResult.resolve(searchFileList(query, matcher));
} else {
asyncResult.reject();
}
});
return asyncResult.promise();
}
var cursorPos = extractCursorPos(query);
if (cursorPos && !cursorPos.local && cursorPos.query !== "") {
query = query.replace(cursorPos.query, "");
}
>>>>>>>
function _doSearchFileList(query, matcher) {
// Strip off line/col number suffix so it doesn't interfere with filename search
var cursorPos = extractCursorPos(query);
if (cursorPos && !cursorPos.local && cursorPos.query !== "") {
query = query.replace(cursorPos.query, "");
}
<<<<<<<
if (query[0] === ":") {
if (query.length === 1) { // treat blank ":" query as valid, but no-op
return { error: null };
} else {
var lineNum = extractLineNumber(query),
editor = EditorManager.getCurrentFullEditor();
// We could just use 0 and lineCount() here, but in future we might want this logic to work for inline editors as well.
if (!isNaN(lineNum) && editor && lineNum >= editor.getFirstVisibleLine() && lineNum <= editor.getLastVisibleLine()) {
// Go to the line now (don't wait for Enter/commit event)
var from = {line: lineNum, ch: 0},
to = {line: lineNum, ch: 99999};
EditorManager.getCurrentFullEditor().setSelection(from, to, true);
return { error: null }; // no error even though no results listed
} else {
return []; // red error highlight: line number out of range, or no editor open
}
}
=======
var cursorPos = extractCursorPos(query);
if (cursorPos && cursorPos.local) {
var from = {line: cursorPos.line, ch: cursorPos.ch},
to = {line: cursorPos.line};
EditorManager.getCurrentFullEditor().setSelection(from, to, true);
>>>>>>>
var cursorPos = extractCursorPos(query);
if (cursorPos && cursorPos.local) {
// Bare Go to Line (no filename search) - can validate & jump to it now, without waiting for Enter/commit
var editor = EditorManager.getCurrentFullEditor();
// Validate (could just use 0 and lineCount() here, but in future might want this to work for inline editors too)
if (cursorPos && editor && cursorPos.line >= editor.getFirstVisibleLine() && cursorPos.line <= editor.getLastVisibleLine()) {
var from = {line: cursorPos.line, ch: cursorPos.ch},
to = {line: cursorPos.line};
EditorManager.getCurrentFullEditor().setSelection(from, to, true);
return { error: null }; // no error even though no results listed
} else {
return []; // red error highlight: line number out of range, or no editor open
}
}
if (query === ":") { // treat blank ":" query as valid, but no-op
return { error: null };
<<<<<<<
// Show the search bar
var searchBarHTML = "<div align='right'><span class='find-dialog-label'></span> <input type='text' autocomplete='off' id='quickOpenSearch' style='width: 30em'></div>";
this.modalBar = new ModalBar(searchBarHTML, true);
=======
// Show the search bar ("dialog")
var dialogHTML = "<div align='right'><input type='text' autocomplete='off' id='quickOpenSearch' placeholder='" + Strings.CMD_QUICK_OPEN + "\u2026' style='width: 30em'><span class='find-dialog-label'></span></div>";
this.modalBar = new ModalBar(dialogHTML, false);
this.$searchField = $("input#quickOpenSearch");
// The various listeners registered below fire in this order:
// keydown, (async gap), keyup, (async gap), filter, resultsReady, showResults/noResults
// The later events *always* come after the keydown & keyup (they're triggered on a timeout from keyup). But
// because of the async gaps, a keydown for the *next* key typed might come *before* they run:
// keydown, (async gap), keyup, (async gap), keydown #2, (async gap), filter, resultsReady, showResults/noResults
// The staleness check in _filterCallback() and the forced async wait in _handleKeyUp() are due to this.
>>>>>>>
// Show the search bar
var searchBarHTML = "<div align='right'><input type='text' autocomplete='off' id='quickOpenSearch' placeholder='" + Strings.CMD_QUICK_OPEN + "\u2026' style='width: 30em'><span class='find-dialog-label'></span></div>";
this.modalBar = new ModalBar(searchBarHTML, true); |
<<<<<<<
expectSelection(fooExpectedMatches[0]);
=======
expectSelection({start: {line: LINE_FIRST_REQUIRE, ch: 8}, end: {line: LINE_FIRST_REQUIRE, ch: 11}});
expect(myEditor.centerOnCursor.calls.length).toEqual(5);
>>>>>>>
expectSelection(fooExpectedMatches[0]);
expect(myEditor.centerOnCursor.calls.length).toEqual(5);
<<<<<<<
expectHighlightedMatches([]);
expectCursorAt({line: LINE_FIRST_REQUIRE, ch: CH_REQUIRE_PAREN});
=======
expect(myEditor).toHaveCursorPosition(LINE_FIRST_REQUIRE, CH_REQUIRE_PAREN);
>>>>>>>
expectHighlightedMatches([]);
expect(myEditor).toHaveCursorPosition(LINE_FIRST_REQUIRE, CH_REQUIRE_PAREN);
<<<<<<<
expectHighlightedMatches([]);
expectCursorAt({line: 0, ch: 0}); // no change
=======
expect(myEditor).toHaveCursorPosition(0, 0); // no change
>>>>>>>
expectHighlightedMatches([]);
expect(myEditor).toHaveCursorPosition(0, 0); // no change
<<<<<<<
expectHighlightedMatches([]);
expectCursorAt({line: 0, ch: 0}); // no change
=======
expect(myEditor).toHaveCursorPosition(0, 0); // no change
>>>>>>>
expectHighlightedMatches([]);
expect(myEditor).toHaveCursorPosition(0, 0); // no change |
<<<<<<<
* @param {!string|Array.<string>} prefix Prefix string or and array of prefix strings
* to use for line comments (e.g. "//" or ["//", "#"])
=======
* @param {!string|Array.<string>} prefix Prefix string or an array of prefix strings
* to use for line comments (i.e. "//" or ["//", "#"])
>>>>>>>
* @param {!string|Array.<string>} prefix Prefix string or an array of prefix strings
* to use for line comments (e.g. "//" or ["//", "#"]) |
<<<<<<<
FileSystem = require("filesystem/FileSystem"),
ImageViewer = require("editor/ImageViewer"),
=======
>>>>>>>
FileSystem = require("filesystem/FileSystem"),
<<<<<<<
var mode = LanguageManager.getLanguageForPath(fullPath);
if (mode.getId() === "image") {
var $imageHolder = ImageViewer.getImageHolder(fullPath);
EditorManager.showCustomViewer($imageHolder, fullPath);
=======
var viewProvider = EditorManager.getCustomViewerForPath(fullPath);
if (viewProvider) {
EditorManager.showCustomViewer(viewProvider, fullPath);
>>>>>>>
var viewProvider = EditorManager.getCustomViewerForPath(fullPath);
if (viewProvider) {
EditorManager.showCustomViewer(viewProvider, fullPath);
<<<<<<<
var filesToOpen = [];
paths.forEach(function (file) {
filesToOpen.push(FileSystem.getFileForPath(file));
=======
var filesToOpen = [],
filteredPaths = DragAndDrop.filterFilesToOpen(paths);
filteredPaths.forEach(function (file) {
filesToOpen.push(new NativeFileSystem.FileEntry(file));
>>>>>>>
var filesToOpen = [],
filteredPaths = DragAndDrop.filterFilesToOpen(paths);
filteredPaths.forEach(function (file) {
filesToOpen.push(FileSystem.getFileForPath(file)); |
<<<<<<<
/** @const Maximum file size to search within (in chars) */
=======
var searchBarTemplate = require("text!htmlContent/findreplace-bar.html"),
searchReplacePanelTemplate = require("text!htmlContent/search-replace-panel.html"),
searchReplaceResultsTemplate = require("text!htmlContent/search-replace-results.html");
/**
* Maximum file size to search within (in chars)
* @const {number}
*/
>>>>>>>
/**
* Maximum file size to search within (in chars)
* @const {number}
*/
<<<<<<<
/** @type {?FindBar} Currently open Find or Find/Replace bar, if any */
var findBar;
=======
/**
* jQuery elements used in the replaceAll panel
* @type {$.Element}
*/
var $replaceAllContainer,
$replaceAllWhat,
$replaceAllWith,
$replaceAllSummary,
$replaceAllTable;
/**
* Currently open Find or Find/Replace bar, if any
* @type {?ModalBar}
*/
var modalBar;
/**
* API from FindInFiles for closing its conflicting search bar, if open
* @type {!function():void}
*/
var closeFindInFilesBar;
>>>>>>>
/**
* Currently open Find or Find/Replace bar, if any
* @type {?FindBar}
*/
var findBar; |
<<<<<<<
Dialogs.showModalDialog(dialogId, Strings.EXT_MODIFIED_TITLE, message, buttons)
=======
Dialogs.showModalDialog(dialogId, title, message)
>>>>>>>
Dialogs.showModalDialog(dialogId, title, message, buttons) |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.