Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Conflicts:
	inc/reg-sidebars.php
  • Loading branch information
andrewmbacon committed Jul 22, 2014
2 parents c1ba01b + 2c4f863 commit 140b203
Show file tree
Hide file tree
Showing 3 changed files with 163 additions and 163 deletions.
2 changes: 1 addition & 1 deletion inc/_notes/dwsync.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484062356" remote="-4611765574913112878" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3483712245" remote="-4611765574913112878" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611765574913112878" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482666228" remote="-4611765574913112878" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488484477" remote="-4611742485168575071" Dst="-1" /><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3484062356" remote="-4611742485168575071" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3483712245" remote="-4611742485168575071" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168575071" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611742485168575071" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482672152" remote="-4611742485168575071" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482666228" remote="-4611742485168575071" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488827239" remote="1060845724326119274" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611742485168575071" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484062356" remote="-4611765574913112878" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3483712245" remote="-4611765574913112878" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611765574913112878" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482666228" remote="-4611765574913112878" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488484477" remote="-4611742485168575071" Dst="-1" /><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3484062356" remote="-4611742485168575071" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3483712245" remote="-4611742485168575071" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168575071" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611742485168575071" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482672152" remote="-4611742485168575071" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482666228" remote="-4611742485168575071" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488827242" remote="1060845724326119274" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611742485168575071" Dst="-1" /></dwsync>
Expand Down
322 changes: 161 additions & 161 deletions js/layoutbuilder.js
Original file line number Diff line number Diff line change
@@ -1,162 +1,162 @@
jQuery(document).ready(function($) {

//Slider
$(function() {

var currentHandle = -1;
var canDelete = -1;
var rows = 0;
wp.customize('homepagerows', function(obj) {

rows = obj.get();

} );
var addRow = function(i){
$('.sliders').append('<div class="slider-wrap"><div class="slider" id="slider'+i+'"></div><div class="button sliderAddColumn" title="Add Column Divider" id="addColumn'+i+'"><div class="dashicons dashicons-plus"></div></div></div>');
$('#addColumn'+i).click(function(){
addColumnButton(this);
});
var myarr = [];
var widths = [];
wp.customize('homepage_'+i, function(obj) {

widths = new String(obj.get());

} );
widths = widths.split(',');
for(var j in widths){
if(myarr.length == 0){
myarr[myarr.length] = parseInt(widths[j]);
}
else{
myarr[myarr.length] = parseInt(widths[j])+myarr[myarr.length-1];
}

}
if(myarr.length == 0) myarr[0] = 12;
$( "#slider"+i ).slider({
min: 0,
max: 12,
step: 1,
values: myarr,
change: function(event, ui){onSliderChange(event, ui, i);}
});
$( "#slider"+i ).children().last().css('display','none');
}

var addColumnButton = function(button){
var row = $(button).attr('id').substr(-1);
var myarr = $( "#slider"+row ).slider( "option", "values" );
if(myarr.length == 11) return;
myarr[myarr.length] = 12;
myarr.sort(function(a,b){return a - b});
$( "#slider"+row ).slider( "destroy" );
$( "#slider"+row ).slider({
min: 0,
max: 12,
step: 1,
values: myarr,
change: function(event, ui){onSliderChange(event, ui, row);}
});
$( "#slider"+row ).children().last().css('display','none');
}

var deleteColumn = function(){
if(!currentHandle) return;
var row = canDelete;
//if(!$(':focus').hasClass('ui-slider-handle')) return;
var count = 0;
var widths = 0;
var values = $.unique($('#slider'+row).slider( "values" ));
if(values.indexOf(currentHandle) == -1) return;
values.splice(values.indexOf(currentHandle),1);
values.sort(function(a,b){return a - b});
$( "#slider"+row ).slider( "destroy" );
$( "#slider"+row ).slider({
min: 0,
max: 12,
step: 1,
values: values,
change: function(event, ui){onSliderChange(event, ui, row);}
});
$( "#slider"+row ).children().last().css('display','none');
for(var j in values){
if(values[j] != 0){
if(widths == 0) widths = values[j];
else {
var dif = parseInt(values[j])-parseInt(values[j-1]);
widths = widths+','+dif
}
}
}
wp.customize('homepage_'+row, function(obj) {

obj.set(widths);

} );
$('.sliderDeleteColumn').addClass('disabled');
}

var onSliderChange = function(event, ui, row){
var widths = 0;
var values = $.unique(ui.values);
values.sort(function(a,b){return a - b});
for(var j in values){
if(values[j] != 0){
if(widths == 0) widths = values[j];
else {
var dif = parseInt(values[j])-parseInt(values[j-1]);
widths = widths+','+dif
}
}
}
wp.customize('homepage_'+row, function(obj) {

obj.set(widths);

} );
currentHandle = parseInt($(':focus').css('left').split('px')[0])/20;
canDelete = row;
$('.sliderDeleteColumn').removeClass('disabled');
}


for(var i=0; i<rows; i++){
addRow(i);
}

$('.sliderAddRow').click(function(){
if(rows == 5) return;
$('.sliderDeleteRow').removeClass('disabled')
addRow(rows);
rows++;
wp.customize('homepagerows', function(obj) {

obj.set(rows);

} );
});

$('.sliderDeleteRow').click(function(){
if(rows == 0) return;
rows--;
if(rows == 0) $('.sliderDeleteRow').addClass('disabled');
$( "#slider"+rows ).slider( "destroy" );
$( "#slider"+rows ).remove();
$( "#addColumn"+rows ).remove()
wp.customize('homepagerows', function(obj) {

obj.set(rows);

} );
currentHandle = -1;
canDelete = -1;
$('.sliderDeleteColumn').addClass('disabled');
});

$('.sliderDeleteColumn').click(function(){
deleteColumn();
});
});

jQuery(document).ready(function($) {

//Slider
$(function() {

var currentHandle = -1;
var canDelete = -1;
var rows = 0;
wp.customize('homepagerows', function(obj) {

rows = obj.get();

} );
var addRow = function(i){
$('.sliders').append('<div class="slider-wrap"><div class="slider" id="slider'+i+'"></div><div class="button sliderAddColumn" title="Add Column Divider" id="addColumn'+i+'"><div class="dashicons dashicons-plus"></div></div></div>');
$('#addColumn'+i).click(function(){
addColumnButton(this);
});
var myarr = [];
var widths = [];
wp.customize('homepage_'+i, function(obj) {

widths = new String(obj.get());

} );
widths = widths.split(',');
for(var j in widths){
if(myarr.length == 0){
myarr[myarr.length] = parseInt(widths[j]);
}
else{
myarr[myarr.length] = parseInt(widths[j])+myarr[myarr.length-1];
}

}
if(myarr.length == 0) myarr[0] = 12;
$( "#slider"+i ).slider({
min: 0,
max: 12,
step: 1,
values: myarr,
change: function(event, ui){onSliderChange(event, ui, i);}
});
$( "#slider"+i ).children().last().css('display','none');
}

var addColumnButton = function(button){
var row = $(button).attr('id').substr(-1);
var myarr = $( "#slider"+row ).slider( "option", "values" );
if(myarr.length == 11) return;
myarr[myarr.length] = 12;
myarr.sort(function(a,b){return a - b});
$( "#slider"+row ).slider( "destroy" );
$( "#slider"+row ).slider({
min: 0,
max: 12,
step: 1,
values: myarr,
change: function(event, ui){onSliderChange(event, ui, row);}
});
$( "#slider"+row ).children().last().css('display','none');
}

var deleteColumn = function(){
if(!currentHandle) return;
var row = canDelete;
//if(!$(':focus').hasClass('ui-slider-handle')) return;
var count = 0;
var widths = 0;
var values = $.unique($('#slider'+row).slider( "values" ));
if(values.indexOf(currentHandle) == -1) return;
values.splice(values.indexOf(currentHandle),1);
values.sort(function(a,b){return a - b});
$( "#slider"+row ).slider( "destroy" );
$( "#slider"+row ).slider({
min: 0,
max: 12,
step: 1,
values: values,
change: function(event, ui){onSliderChange(event, ui, row);}
});
$( "#slider"+row ).children().last().css('display','none');
for(var j in values){
if(values[j] != 0){
if(widths == 0) widths = values[j];
else {
var dif = parseInt(values[j])-parseInt(values[j-1]);
widths = widths+','+dif
}
}
}
wp.customize('homepage_'+row, function(obj) {

obj.set(widths);

} );
$('.sliderDeleteColumn').addClass('disabled');
}

var onSliderChange = function(event, ui, row){
var widths = 0;
var values = $.unique(ui.values);
values.sort(function(a,b){return a - b});
for(var j in values){
if(values[j] != 0){
if(widths == 0) widths = values[j];
else {
var dif = parseInt(values[j])-parseInt(values[j-1]);
widths = widths+','+dif
}
}
}
wp.customize('homepage_'+row, function(obj) {

obj.set(widths);

} );
currentHandle = Math.round(parseInt($(':focus').css('left').split('px')[0])/16.25);
canDelete = row;
$('.sliderDeleteColumn').removeClass('disabled');
}


for(var i=0; i<rows; i++){
addRow(i);
}

$('.sliderAddRow').click(function(){
if(rows == 5) return;
$('.sliderDeleteRow').removeClass('disabled')
addRow(rows);
rows++;
wp.customize('homepagerows', function(obj) {

obj.set(rows);

} );
});

$('.sliderDeleteRow').click(function(){
if(rows == 0) return;
rows--;
if(rows == 0) $('.sliderDeleteRow').addClass('disabled');
$( "#slider"+rows ).slider( "destroy" );
$( "#slider"+rows ).remove();
$( "#addColumn"+rows ).remove()
wp.customize('homepagerows', function(obj) {

obj.set(rows);

} );
currentHandle = -1;
canDelete = -1;
$('.sliderDeleteColumn').addClass('disabled');
});

$('.sliderDeleteColumn').click(function(){
deleteColumn();
});
});

})
Loading

0 comments on commit 140b203

Please sign in to comment.