diff --git a/src/Umbraco.Web.UI.Client/docs/html/belleLabTasks.html b/src/Umbraco.Web.UI.Client/docs/html/belleLabTasks.html index aba373f3c5..ac0dd8235e 100644 --- a/src/Umbraco.Web.UI.Client/docs/html/belleLabTasks.html +++ b/src/Umbraco.Web.UI.Client/docs/html/belleLabTasks.html @@ -1,159 +1,159 @@ - - -
-71-75 Shelton Street -London -WC2H 9JQ
-Meeting room 11 - 17
-replace requireJs for dependency loading, so we dont have to load tinyMCE, googlemaps, etc -on app start $script, yepNope, labjs?
-get the app to load .aspx pages in an iframe instead of a "normal" view
-http://briantford.com/blog/huuuuuge-angular-apps.html
-Convert tree into directive, recursive, lazy-load
-best practices for directives, what should we convert?
-H Way to handle templates with missing controller? -> replace ng-include? <- yup - angular-app/samples/directives/fielddirective for code
-71-75 Shelton Street +London +WC2H 9JQ
+Meeting room 11 - 17
+replace requireJs for dependency loading, so we dont have to load tinyMCE, googlemaps, etc +on app start $script, yepNope, labjs?
+get the app to load .aspx pages in an iframe instead of a "normal" view
+http://briantford.com/blog/huuuuuge-angular-apps.html
+Convert tree into directive, recursive, lazy-load
+best practices for directives, what should we convert?
+H Way to handle templates with missing controller? -> replace ng-include? <- yup + angular-app/samples/directives/fielddirective for code
+The super fast introduction to getting belle running on your local machine, both as a pre-built environment, and with the full setup with unit-tests, grunt-tasks and node.
-Right-click the /build folder and choose "open in webmatrix", run the website in webmatrix and browse to localhost:9999/Belle/, this should display the Belle login screen
Port 9999 should be used because that is the target site that the grunt build command mentioned below will launch
-Open a terminal inside the "/build" folder and run the command:
-python -m SimpleHTTPServer 9999
-This will start a local webserver, hosting the site on localhost:9999 browse to localhost:9999/Belle/ which should display the belle login screen.
The dev environment is tad more tricky to get running, since it depends on a number of unit tests and automated tools, to produce the contents of the /build folder
-The dev environment is cross platform, so will work on both osx and windows, and do not currently have any dependencies to .net
-We need node to run tests and automated less compiling and other automated tasks. go to http://nodejs.org. Node.js is a powerfull javascript engine, which allows us to run all our tests and tasks written in javascript locally.
-note: On windows you might need to restart explorer.exe to register node.
-Next we need to install all the required packages. This is done with the package tool, included with node.js, open /Umbraco.Belle.Client in cmd.exe or osx terminal and run the command:
-npm install
-this will fetch all needed packages to your local machine.
-Grunt is a task runner for node.js, and we use it for all automated tasks in the build process. For convenience we need to install it globally on your machine, so it can be used directly in cmd.exe or the terminal.
-So run the command:
-npm install grunt-cli -g
-note: On windows you might need to restart explorer.exe to register the grunt cmd.
-note: On OSX you might need to run:
-sudo npm install grunt-cli -g
-Now that you have node and grunt installed, you can open /Umbraco.Belle.Client in either cmd.exe or terminal and run:
grunt dev
-This will build the site, merge less files, run tests and create the /Build folder, launch the web browser and monitor changes.
-grunt dev will continue to run in the background monitoring changes to files. When changes are detected it will rebuild the JS and also run the unit tests.
- - - + + + +The super fast introduction to getting belle running on your local machine, both as a pre-built environment, and with the full setup with unit-tests, grunt-tasks and node.
+Right-click the /build folder and choose "open in webmatrix", run the website in webmatrix and browse to localhost:9999/Belle/, this should display the Belle login screen
Port 9999 should be used because that is the target site that the grunt build command mentioned below will launch
+Open a terminal inside the "/build" folder and run the command:
+python -m SimpleHTTPServer 9999
+This will start a local webserver, hosting the site on localhost:9999 browse to localhost:9999/Belle/ which should display the belle login screen.
The dev environment is tad more tricky to get running, since it depends on a number of unit tests and automated tools, to produce the contents of the /build folder
+The dev environment is cross platform, so will work on both osx and windows, and do not currently have any dependencies to .net
+We need node to run tests and automated less compiling and other automated tasks. go to http://nodejs.org. Node.js is a powerfull javascript engine, which allows us to run all our tests and tasks written in javascript locally.
+note: On windows you might need to restart explorer.exe to register node.
+Next we need to install all the required packages. This is done with the package tool, included with node.js, open /Umbraco.Belle.Client in cmd.exe or osx terminal and run the command:
+npm install
+this will fetch all needed packages to your local machine.
+Grunt is a task runner for node.js, and we use it for all automated tasks in the build process. For convenience we need to install it globally on your machine, so it can be used directly in cmd.exe or the terminal.
+So run the command:
+npm install grunt-cli -g
+note: On windows you might need to restart explorer.exe to register the grunt cmd.
+note: On OSX you might need to run:
+sudo npm install grunt-cli -g
+Now that you have node and grunt installed, you can open /Umbraco.Belle.Client in either cmd.exe or terminal and run:
grunt dev
+This will build the site, merge less files, run tests and create the /Build folder, launch the web browser and monitor changes.
+grunt dev will continue to run in the background monitoring changes to files. When changes are detected it will rebuild the JS and also run the unit tests.
+ + + diff --git a/src/Umbraco.Web.UI.Client/docs/html/todo.html b/src/Umbraco.Web.UI.Client/docs/html/todo.html index 0e182921e3..530c1a415e 100644 --- a/src/Umbraco.Web.UI.Client/docs/html/todo.html +++ b/src/Umbraco.Web.UI.Client/docs/html/todo.html @@ -1,176 +1,176 @@ - - - -Have core services, resources and other common items under umbraco
-third party modules outside of the root umbraco module, but registered in app.js
-to access 3rd party service: - ecomEditor.controller.js - angular.module("umbraco.myeditor", ["ecommerce.services"]).controller("ecom.editor",
- function("inventoryFactory"){
- do things...
- });
-best way to setup services and controllers are: -.controller("name",[ - "service", - "dependency", - function(s, d){
-} -]);
-move logic from controllers to services, especcially around navigation
-Change /section/page/id to /section/area/page/id to support all section scenarios -Have a fallback to defaults?
-- Service to load required scripts for a controller using $script
-- remove requirejs dependency as it makes things muddy
-Angular-app: common/security/interceptor.js , intercept http requests
-Use promises pattern for all our services
-$http.get(url)
- .then(function(response){
- return response.data;
- }, function(response){
- return $q.reject("http failed");
- }).then(function(data){
- alert("our data:" + data);
- })
-Usecase: member picker editor, which fetches member-data
-Sublime linter
- - - + + + +Have core services, resources and other common items under umbraco
+third party modules outside of the root umbraco module, but registered in app.js
+to access 3rd party service: + ecomEditor.controller.js + angular.module("umbraco.myeditor", ["ecommerce.services"]).controller("ecom.editor",
+ function("inventoryFactory"){
+ do things...
+ });
+best way to setup services and controllers are: +.controller("name",[ + "service", + "dependency", + function(s, d){
+} +]);
+move logic from controllers to services, especcially around navigation
+Change /section/page/id to /section/area/page/id to support all section scenarios +Have a fallback to defaults?
+- Service to load required scripts for a controller using $script
+- remove requirejs dependency as it makes things muddy
+Angular-app: common/security/interceptor.js , intercept http requests
+Use promises pattern for all our services
+$http.get(url)
+ .then(function(response){
+ return response.data;
+ }, function(response){
+ return $q.reject("http failed");
+ }).then(function(data){
+ alert("our data:" + data);
+ })
+Usecase: member picker editor, which fetches member-data
+Sublime linter
+ + + diff --git a/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js b/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js index fb47b80926..c5a7b14fd7 100644 --- a/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js +++ b/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js @@ -24,7 +24,6 @@ function ($scope,assetsService, dialogService) { //subscribe to the image dialog clicks editor2.hooks.set("insertImageDialog", function (callback) { - alert("Please click okay to start scanning your brain..."); dialogService.mediaPicker({callback: function(data){ $(data.selection).each(function(i, item){