Fixes #496. Update Pretty Diff and fix adding two spaces incorrectly
Also fix the related unit tests.
This commit is contained in:
parent
b7978075d0
commit
00b15f3b59
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
|
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
|
<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
|
||||||
<title>Shopping List for
|
<title>Shopping List for
|
||||||
<%= @date.strftime('%A, %d %B %Y') %></title>
|
<%= @date.strftime('%A, %d %B %Y') %></title>
|
||||||
</head>
|
</head>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
var Mist = React.createClass({
|
var Mist = React.createClass({
|
||||||
renderList: function() {
|
renderList: function() {
|
||||||
return this.props.items.map(function(item) {
|
return this.props.items.map(function(item) {
|
||||||
return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
|
return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
|
@ -1,5 +1,5 @@
|
||||||
<apex:page standardController="Contact">
|
<apex:page standardController="Contact">
|
||||||
|
|
||||||
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
|
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
|
||||||
|
|
||||||
</apex:page>
|
</apex:page>
|
|
@ -1,15 +1,15 @@
|
||||||
<apex:page standardController="Contact">
|
<apex:page standardController="Contact">
|
||||||
|
|
||||||
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
|
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
|
||||||
|
|
||||||
<apex:form >
|
<apex:form >
|
||||||
<apex:pageBlock title="Contact">
|
<apex:pageBlock title="Contact">
|
||||||
<apex:pageBlockSection title="Editing">
|
<apex:pageBlockSection title="Editing">
|
||||||
<apex:inputfield value="{!contact.firstname}"/>
|
<apex:inputfield value="{!contact.firstname}"/>
|
||||||
<apex:inputfield value="{!contact.lastname}"/>
|
<apex:inputfield value="{!contact.lastname}"/>
|
||||||
<apex:inputfield value="{!contact.salutation}"/>
|
<apex:inputfield value="{!contact.salutation}"/>
|
||||||
<apex:inputfield value="{!contact.birthdate}"/>
|
<apex:inputfield value="{!contact.birthdate}"/>
|
||||||
<apex:commandButton action="{!save}" value="Save"/>
|
<apex:commandButton action="{!save}" value="Save"/>
|
||||||
</apex:pageBlockSection>
|
</apex:pageBlockSection>
|
||||||
</apex:pageBlock>
|
</apex:pageBlock>
|
||||||
</apex:form>
|
</apex:form>
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
<apex:page standardController="Contact">
|
<apex:page standardController="Contact">
|
||||||
|
|
||||||
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
|
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
|
||||||
|
|
||||||
<apex:pageBlock title="Contact">
|
<apex:pageBlock title="Contact">
|
||||||
<apex:pageBlockSection title="Details">
|
<apex:pageBlockSection title="Details">
|
||||||
<apex:outputfield value="{!contact.firstname}"/>
|
<apex:outputfield value="{!contact.firstname}"/>
|
||||||
<apex:outputfield value="{!contact.lastname}"/>
|
<apex:outputfield value="{!contact.lastname}"/>
|
||||||
<apex:outputfield value="{!contact.salutation}"/>
|
<apex:outputfield value="{!contact.salutation}"/>
|
||||||
<apex:outputfield value="{!contact.birthdate}"/>
|
<apex:outputfield value="{!contact.birthdate}"/>
|
||||||
</apex:pageBlockSection>
|
</apex:pageBlockSection>
|
||||||
</apex:pageBlock>
|
</apex:pageBlock>
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
"loophole": "^1.0.0",
|
"loophole": "^1.0.0",
|
||||||
"node-dir": "^0.1.8",
|
"node-dir": "^0.1.8",
|
||||||
"node-uuid": "^1.4.3",
|
"node-uuid": "^1.4.3",
|
||||||
"prettydiff": "^1.12.17",
|
"prettydiff": "^1.12.19",
|
||||||
"space-pen": "^5.1.1",
|
"space-pen": "^5.1.1",
|
||||||
"strip-json-comments": "^1.0.2",
|
"strip-json-comments": "^1.0.2",
|
||||||
"temp": "^0.8.3",
|
"temp": "^0.8.3",
|
||||||
|
|
Loading…
Reference in New Issue