yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Canvas designer Selector based on schema instead of name

Browse Source
This commit is contained in:
antoine
2014-09-30 21:38:05 +02:00
parent 4ed496921a
commit 97ed172472
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.front.js
View File

@@ -80,7 +80,8 @@ var initIntelCanvasdesigner = function (canvasdesignerModel) {
$.each(canvasdesignerModel.configs, function (indexConfig, config) {
var schema = config.selector ? config.selector : config.schema;
if (schema) {
$(schema).attr("canvasdesigner-over", config.name);
$(schema).attr("canvasdesigner-over", config.schema);
$(schema).attr("canvasdesigner-over-name", config.name);
$(schema).css("cursor", "default");
}
});
@@ -145,7 +146,7 @@ var outlinePosition = function (oTarget) {
$(".canvasdesigner-overlay").css('height', height + "px");
//console.info("element select " + localname);
$(".canvasdesigner-overlay span").html(target.attr('canvasdesigner-over'));
$(".canvasdesigner-overlay span").html(target.attr('canvasdesigner-over-name'));
}
else {
@@ -185,7 +186,7 @@ var outlineSelected = function (oTarget) {
$(".canvasdesigner-overlay-selected").css('height', height + "px");
//console.info("element select " + localname);
$(".canvasdesigner-overlay-selected span").html(target.attr('canvasdesigner-over'));
$(".canvasdesigner-overlay-selected span").html(target.attr('canvasdesigner-over-name'));
}
else {

10
src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.global.js
View File

@@ -4,18 +4,18 @@
/*********************************************************************************************************/
/* Called for every canvasdesigner-over rollover */
var refrechIntelCanvasdesigner = function (name) {
var refrechIntelCanvasdesigner = function (schema) {
var scope = angular.element($("#canvasdesignerPanel")).scope();
if (scope.schemaFocus != name.toLowerCase()) {
var notFound = true;
//if (scope.schemaFocus != schema.toLowerCase()) {
//var notFound = true;
$.each(scope.canvasdesignerModel.configs, function (indexConfig, config) {
if (config.name && name.toLowerCase() == config.name.toLowerCase()) {
if (config.schema && schema.toLowerCase() == config.schema.toLowerCase()) {
scope.currentSelected = config;
}
});
}
//}
scope.clearSelectedCategory();