changed default location of prop editor views to not be in the 'umbraco' folder (not needed)

This commit is contained in:
Shannon
2013-06-18 18:44:33 +10:00
parent 895ff65585
commit 9720717076
37 changed files with 1243 additions and 1227 deletions

View File

@@ -17,7 +17,7 @@ function propertyEditorFilter($log) {
return path;
}
else {
return "views/propertyeditors/umbraco/" + path.replace('.', '/') + "/editor.html";
return "views/propertyeditors/" + path.replace('.', '/') + "/editor.html";
}
};
}

View File

@@ -1,24 +1,24 @@
angular.module("umbraco").controller("Umbraco.Editors.DatepickerController",
function ($scope, notificationsService) {
require(
[
'views/propertyeditors/umbraco/datepicker/bootstrap.datepicker.js',
'css!/belle/views/propertyeditors/umbraco/datepicker/bootstrap.datepicker.css'
],
function () {
//The Datepicker js and css files are available and all components are ready to use.
// Get the id of the datepicker button that was clicked
var pickerId = $scope.model.alias;
// Open the datepicker and add a changeDate eventlistener
$("#" + pickerId).datepicker({
format: "dd/mm/yyyy",
autoclose: true
}).on("changeDate", function (e) {
// When a date is clicked the date is stored in model.value as a ISO 8601 date
$scope.model.value = e.date.toISOString();
});
}
);
});
angular.module("umbraco").controller("Umbraco.Editors.DatepickerController",
function ($scope, notificationsService) {
require(
[
'views/propertyeditors/umbraco/datepicker/bootstrap.datepicker.js',
'css!/belle/views/propertyeditors/umbraco/datepicker/bootstrap.datepicker.css'
],
function () {
//The Datepicker js and css files are available and all components are ready to use.
// Get the id of the datepicker button that was clicked
var pickerId = $scope.model.alias;
// Open the datepicker and add a changeDate eventlistener
$("#" + pickerId).datepicker({
format: "dd/mm/yyyy",
autoclose: true
}).on("changeDate", function (e) {
// When a date is clicked the date is stored in model.value as a ISO 8601 date
$scope.model.value = e.date.toISOString();
});
}
);
});

View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Editors.DatepickerController">
<div class="input-append date datepicker" id="{{model.alias}}">
<input data-format="dd/MM/yyyy" type="text" value="{{model.value | date:'dd/MM/yyyy'}}" />
<span class="add-on"> <i class="icon-calendar"></i></span>
</div>
<div ng-controller="Umbraco.Editors.DatepickerController">
<div class="input-append date datepicker" id="{{model.alias}}">
<input data-format="dd/MM/yyyy" type="text" value="{{model.value | date:'dd/MM/yyyy'}}" />
<span class="add-on"> <i class="icon-calendar"></i></span>
</div>
</div>

View File

@@ -1,2 +1,2 @@
<!-- shows a property editor with its own controller -->
<!-- shows a property editor with its own controller -->
<input type="file" multiple/>

View File

@@ -1,3 +1,3 @@
<div ng-controller="Umbraco.Editors.GoogleMapsController" class="span7">
<div class="" style="height: 400px;" id="{{model.alias}}_map"></div>
<div ng-controller="Umbraco.Editors.GoogleMapsController" class="span7">
<div class="" style="height: 400px;" id="{{model.alias}}_map"></div>
</div>

View File

@@ -17,11 +17,11 @@ angular.module("umbraco")
toolbar: "bold italic | styleselect | alignleft aligncenter alignright | bullist numlist | outdent indent | link image mediapicker",
setup : function(editor) {
editor.on('blur', function(e) {
$scope.$apply(function() {
//$scope.model.value = e.getBody().innerHTML;
$scope.model.value = editor.getContent();
});
editor.on('blur', function(e) {
$scope.$apply(function() {
//$scope.model.value = e.getBody().innerHTML;
$scope.model.value = editor.getContent();
});
});
editor.addButton('mediapicker', {
@@ -31,16 +31,16 @@ angular.module("umbraco")
dialogService.mediaPicker({scope: $scope, callback: function(data){
//really simple example on how to intergrate a service with tinyMCE
$(data.selection).each(function (i, img) {
var imagePropVal = umbImageHelper.getImagePropertyVaue({imageModel: img, scope: $scope});
var data = {
src: (imagePropVal != null && imagePropVal != "")
? imagePropVal
: "nothing.jpg",
style: 'width: 100px; height: 100px',
id: '__mcenew'
$(data.selection).each(function (i, img) {
var imagePropVal = umbImageHelper.getImagePropertyVaue({imageModel: img, scope: $scope});
var data = {
src: (imagePropVal != null && imagePropVal != "")
? imagePropVal
: "nothing.jpg",
style: 'width: 100px; height: 100px',
id: '__mcenew'
};
editor.insertContent(editor.dom.createHTML('img', data));
@@ -63,11 +63,11 @@ angular.module("umbraco")
};
function bindValue(inst){
$log.log("woot");
$scope.$apply(function() {
$scope.model.value = inst.getBody().innerHTML;
});
$log.log("woot");
$scope.$apply(function() {
$scope.model.value = inst.getBody().innerHTML;
});
}
function myHandleEvent(e){

View File

@@ -0,0 +1,16 @@
/*! umbraco - v0.0.1-SNAPSHOT - 2013-06-18
* http://umbraco.github.io/Belle
* Copyright (c) 2013 Per Ploug, Anders Stenteberg & Shannon Deminick;
* Licensed MIT
*/
'use strict';
define(['angular'], function (angular) {
var app = angular.module('umbraco', [
'umbraco.filters',
'umbraco.directives',
'umbraco.mocks.resources',
'umbraco.services'
]);
return app;
});